diff --git a/tomcat_bec/device_configs/microxas_test_bed.yaml b/tomcat_bec/device_configs/microxas_test_bed.yaml index 8a98eee..dc99dc0 100644 --- a/tomcat_bec/device_configs/microxas_test_bed.yaml +++ b/tomcat_bec/device_configs/microxas_test_bed.yaml @@ -129,6 +129,7 @@ gfcam: deviceTags: - camera - trigger + - gfcam enabled: true onFailure: buffer readOnly: false @@ -144,6 +145,7 @@ gfdaq: data_source_name: 'gfcam' deviceTags: - std-daq + - gfcam enabled: true onFailure: buffer readOnly: false @@ -157,6 +159,7 @@ daq_stream0: url: 'tcp://129.129.95.111:20000' deviceTags: - std-daq + - gfcam enabled: true onFailure: buffer readOnly: false @@ -170,6 +173,7 @@ daq_stream1: url: 'tcp://129.129.95.111:20001' deviceTags: - std-daq + - gfcam enabled: true onFailure: buffer readOnly: false @@ -184,6 +188,7 @@ pcocam: prefix: 'X02DA-CCDCAM2:' deviceTags: - camera + - pcocam enabled: true onFailure: buffer readOnly: false @@ -198,6 +203,7 @@ pcodaq: rest_url: 'http://129.129.95.111:5010' deviceTags: - std-daq + - pcocam enabled: true onFailure: buffer readOnly: false @@ -211,6 +217,7 @@ pco_stream0: url: 'tcp://129.129.95.111:20010' deviceTags: - std-daq + - pcocam enabled: true onFailure: buffer readOnly: false diff --git a/tomcat_bec/devices/gigafrost/stddaq_client.py b/tomcat_bec/devices/gigafrost/stddaq_client.py index e9d51d9..3ad65aa 100644 --- a/tomcat_bec/devices/gigafrost/stddaq_client.py +++ b/tomcat_bec/devices/gigafrost/stddaq_client.py @@ -285,7 +285,7 @@ class StdDaqClient(PSIDeviceBase): # Stop if current status is not idle if self.state() != "idle": - raise RuntimeWarning(f"[{self.name}] stdDAQ reconfiguration might corrupt files") + logger.warning(f"[{self.name}] stdDAQ reconfiguration might corrupt files") # Update retrieved config cfg['image_pixel_height'] = int(self.cfg_pixel_height.get()) diff --git a/tomcat_bec/scans/tutorial_fly_scan.py b/tomcat_bec/scans/tutorial_fly_scan.py index fe0ea53..0aba4e8 100644 --- a/tomcat_bec/scans/tutorial_fly_scan.py +++ b/tomcat_bec/scans/tutorial_fly_scan.py @@ -247,14 +247,14 @@ class AcquireRefs(Acquire): self.num_flats = num_flats self.file_prefix_dark = file_prefix_dark self.file_prefix_white = file_prefix_white - self.exp_time = exp_time, - self.exp_period = exp_period, - self.image_width = image_width, - self.image_height = image_height, - self.acq_mode = acq_mode, - self.file_path = file_path, - self.nr_writers = nr_writers, - self.base_path = base_path, + self.exp_time = exp_time + self.exp_period = exp_period + self.image_width = image_width + self.image_height = image_height + self.acq_mode = acq_mode + self.file_path = file_path + self.nr_writers = nr_writers + self.base_path = base_path def scan_core(self):