Merge pull request #34 from vshekar/fix-detector-arm-issues

Fixes for detector arming due to DCU updates
NSLS-II-AMX · May 4, 2023 · 24db1be · 24db1be
2 parents e376f15 + 8e61881
commit 24db1be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/mxtools/flyer.py b/mxtools/flyer.py
@@ -179,7 +179,6 @@ def configure_detector(self, **kwargs):
         data_directory_name = kwargs["data_directory_name"]
         self.detector.file.external_name.put(file_prefix)
         self.detector.file.write_path_template = data_directory_name
-        self.detector.file.file_write_images_per_file.put(500)
 
     def configure_vector(self, *args, **kwargs):
         angle_start = kwargs["angle_start"]
@@ -263,6 +262,8 @@ def detector_arm(self, **kwargs):
 
         self.detector.cam.acquire_time.put(exposure_per_image)
         self.detector.cam.acquire_period.put(exposure_per_image)
+        # Trigger mode set before num_images due to updates in Eiger REST API
+        self.detector.cam.trigger_mode.put(eiger.EXTERNAL_SERIES)
         self.detector.cam.num_images.put(num_images)
         self.detector.cam.num_triggers.put(1)
         self.detector.cam.file_path.put(data_directory_name)
@@ -277,7 +278,8 @@ def detector_arm(self, **kwargs):
         self.detector.cam.omega_start.put(start)
         self.detector.cam.wavelength.put(wavelength)
         self.detector.cam.det_distance.put(det_distance_m)
-        self.detector.cam.trigger_mode.put(eiger.EXTERNAL_SERIES)
+
+        self.detector.file.file_write_images_per_file.put(500)
 
         def armed_callback(value, old_value, **kwargs):
             if old_value == 0 and value == 1:

diff --git a/mxtools/raster_flyer.py b/mxtools/raster_flyer.py
@@ -130,6 +130,8 @@ def detector_arm(self, **kwargs):
 
         self.detector.cam.acquire_time.put(exposure_per_image)
         self.detector.cam.acquire_period.put(exposure_per_image)
+        # Setting trigger mode before num_triggers due to change in Eiger REST API change
+        self.detector.cam.trigger_mode.put(eiger.EXTERNAL_ENABLE)
         self.detector.cam.num_triggers.put(total_num_images)
         self.detector.cam.file_path.put(data_directory_name)
         self.detector.cam.fw_name_pattern.put(f"{file_prefix_minus_directory}_$id")
@@ -143,7 +145,6 @@ def detector_arm(self, **kwargs):
         self.detector.cam.omega_start.put(start)
         self.detector.cam.wavelength.put(wavelength)
         self.detector.cam.det_distance.put(det_distance_m)
-        self.detector.cam.trigger_mode.put(eiger.EXTERNAL_ENABLE)
 
         self.detector.file.file_write_images_per_file.put(num_images_per_file)