diff --git a/csaxs_bec/device_configs/main.yaml b/csaxs_bec/device_configs/main.yaml index 732cbaf..dc05949 100644 --- a/csaxs_bec/device_configs/main.yaml +++ b/csaxs_bec/device_configs/main.yaml @@ -10,8 +10,8 @@ endstation: - !include ./bl_endstation.yaml -detectors: - - !include ./bl_detectors.yaml +# detectors: +# - !include ./bl_detectors.yaml #sastt: # - !include ./sastt.yaml diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index b905ad7..3013bc2 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -395,7 +395,7 @@ rtz: readoutPriority: on_request connectionTimeout: 20 -omny_positions: +rt_positions: deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniFlyer deviceConfig: host: mpc2844.psi.ch @@ -522,18 +522,18 @@ omny_panda: FMC_IN.VAL2.Min: cap_voltage_fzp_x_min FMC_IN.VAL2.Max: cap_voltage_fzp_x_max FMC_IN.VAL2.Mean: cap_voltage_fzp_x_mean - INENC1_VAL_Max: interf_st_fzp_y_max - INENC1_VAL_Mean: interf_st_fzp_y_mean - INENC1_VAL_Min: interf_st_fzp_y_min - INENC2_VAL_Max: interf_st_fzp_x_max - INENC2_VAL_Mean: interf_st_fzp_x_mean - INENC2_VAL_Min: interf_st_fzp_x_min - INENC3_VAL_Max: interf_st_rotz_max - INENC3_VAL_Mean: interf_st_rotz_mean - INENC3_VAL_Min: interf_st_rotz_min - INENC4_VAL_Max: interf_st_rotx_max - INENC4_VAL_Mean: interf_st_rotx_mean - INENC4_VAL_Min: interf_st_rotx_min + INENC1.VAL.Max: interf_st_fzp_y_max + INENC1.VAL.Mean: interf_st_fzp_y_mean + INENC1.VAL.Min: interf_st_fzp_y_min + INENC2.VAL.Max: interf_st_fzp_x_max + INENC2.VAL.Mean: interf_st_fzp_x_mean + INENC2.VAL.Min: interf_st_fzp_x_min + INENC3.VAL.Max: interf_st_rotz_max + INENC3.VAL.Mean: interf_st_rotz_mean + INENC3.VAL.Min: interf_st_rotz_min + INENC4.VAL.Max: interf_st_rotx_max + INENC4.VAL.Mean: interf_st_rotx_mean + INENC4.VAL.Min: interf_st_rotx_min deviceTags: - detector enabled: true diff --git a/csaxs_bec/scans/flomni_fermat_scan.py b/csaxs_bec/scans/flomni_fermat_scan.py index 3a7c060..d724f27 100644 --- a/csaxs_bec/scans/flomni_fermat_scan.py +++ b/csaxs_bec/scans/flomni_fermat_scan.py @@ -105,11 +105,11 @@ class FlomniFermatScan(AsyncFlyScanBase): def scan_report_instructions(self): """Scan report instructions for the progress bar""" - yield from self.stubs.scan_report_instruction({"device_progress": ["rt_flyer"]}) + yield from self.stubs.scan_report_instruction({"device_progress": ["rt_positions"]}) @property def monitor_sync(self) -> str: - return "rt_flyer" + return "rt_positions" def initialize(self): self.scan_motors = [] @@ -294,10 +294,10 @@ class FlomniFermatScan(AsyncFlyScanBase): def scan_core(self): # send off the flyer - yield from self.stubs.kickoff(device="rt_flyer") + yield from self.stubs.kickoff(device="rt_positions") # start the readout loop of the flyer - status = yield from self.stubs.complete(device="rt_flyer", wait=False) + status = yield from self.stubs.complete(device="rt_positions", wait=False) # read the monitors until the flyer is done while not status.done: