Added Rigaku500k

Author: qzhang234

src/instrument/devices/registers_device.py

@@ -22,6 +22,7 @@ class EpicsPvStorageRegisters(Device):
     spec_file = Component(EpicsSignal, "StrReg10", string=True)
     analysis_type = Component(EpicsSignal, "StrReg11", string=True)
     start_bluesky = Component(EpicsSignal, "StrReg12", string=True)
+    det_name = Component(EpicsSignal, "StrReg13", string=True)
 
     measurement_num = Component(EpicsSignal, "Reg1")
     qnw_index = Component(EpicsSignal, "Reg2")

src/instrument/plans/nexus_utils.py

@@ -139,8 +139,8 @@ def create_runtime_metadata_dict(det=None, additional_metadata=None):
 
         "/entry/instrument/detector_1/beam_center_x": pv_registers.current_db_x0.get(),
         "/entry/instrument/detector_1/beam_center_y": pv_registers.current_db_y0.get(),
-        "/entry/instrument/detector_1/beam_center_position_x": pv_registers.current_db_x0.get(),
-        "/entry/instrument/detector_1/beam_center_position_y": pv_registers.current_db_y0.get(),
+        "/entry/instrument/detector_1/beam_center_position_x": detector.x.position,
+        "/entry/instrument/detector_1/beam_center_position_y": detector.y.position,
         "/entry/instrument/detector_1/position_x": detector.x.position,
         "/entry/instrument/detector_1/position_y": detector.y.position,
 

src/instrument/plans/spec_8IDE_eiger4M.py

@@ -43,7 +43,8 @@ def submit_Nexus_DM():
                         "filePath": f"{filename}.h5", 
                         "qmap": f"{qmap_file}",
                         "analysisMachine": f"{analysis_machine}",
-                        "gpuID": -2
+                        "gpuID": -2,
+                        "analysis_type": 'Both'
                         }
             job = workflowProcApi.startProcessingJob(dmuser, f"{workflow_name}", argsDict=argsDict)
             print(f"Job {job['id']} processing {filename}")