mxcubecore 1.341.0__py3-none-any.whl → 1.342.0__py3-none-any.whl

mxcubecore/model/queue_model_objects.py

@@ -24,6 +24,7 @@ Any object that inherits from TaskNode can be added to and handled by
 the QueueModel.
 """
 
+import ast
 import copy
 import logging
 import os
@@ -1705,6 +1706,7 @@ class AcquisitionParameters(object):
         self.skip_existing_images = False
         self.detector_binning_mode = str()
         self.detector_roi_mode = str()
+        self.detector_mode_list = self.get_detector_mode_list()
         self.induce_burn = False
         self.mesh_range = ()
         self.cell_counting = "zig-zag"
@@ -1753,6 +1755,7 @@ class AcquisitionParameters(object):
             "skip_existing_images": self.skip_existing_images,
             "detector_binning_mode": self.detector_binning_mode,
             "detector_roi_mode": self.detector_roi_mode,
+            "detector_mode_list": self.detector_mode_list,
             "induce_burn": self.induce_burn,
             "mesh_range": self.mesh_range,
             "mesh_snapshot": self.mesh_snapshot,
@@ -1771,6 +1774,11 @@ class AcquisitionParameters(object):
     def copy(self):
         return copy.deepcopy(self)
 
+    def get_detector_mode_list(self):
+        return ast.literal_eval(
+            HWR.beamline.detector.get_property("roi_mode_list", "[]")
+        )
+
 
 class XrayImagingParameters(object):
     def __init__(self):

{mxcubecore-1.341.0.dist-info → mxcubecore-1.342.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.341.0
+Version: 1.342.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.341.0.dist-info → mxcubecore-1.342.0.dist-info}/RECORD

@@ -444,7 +444,7 @@ mxcubecore/model/protocols/exporter.py,sha256=uY-O7lFlRKL8A0SWB_VRI22nAxq1KqIFmE
 mxcubecore/model/protocols/sardana.py,sha256=eeuqM0C4JU4mm1WPVqwAR52nWgWamJNh5KLnde_7Wqw,1260
 mxcubecore/model/protocols/tango.py,sha256=izmX-V_rKFmwYTJToWkyBONSZdEQsHVbi6CWHTBhBFs,2241
 mxcubecore/model/queue_model_enumerables.py,sha256=hSOp77Xn0wzUGDl5EaLtblr8ND9FXytqadtW40VFDcA,2330
-mxcubecore/model/queue_model_objects.py,sha256=05QWGFdJlLBoQuOFgcnE7Jv72zZElNEAMALIA3l7_UI,100464
+mxcubecore/model/queue_model_objects.py,sha256=ooEdMEGO-jfuL0GVyKvwbcHiEjfeLvUcPW5b_XpgMuM,100750
 mxcubecore/protocols_config.py,sha256=0ujkNkTteeSvY3gNjsdhRzQw9FND2S8jNO_ZdrHNPR8,5703
 mxcubecore/queue_entry/__init__.py,sha256=fQLLDdLhLlRdV_pisyb9-G4dbqrGx_iroE4048p2sR8,4087
 mxcubecore/queue_entry/advanced_connector.py,sha256=l0GFbAu64p5mIwRL5ZEJOr08NXAdRvYLR-DXoN-DyUs,3177
@@ -465,8 +465,8 @@ mxcubecore/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUOk,4513
 mxcubecore/utils/qt_import.py,sha256=hQkBVZLUDZtktX7DSyoH88GAK_mK9Ghlsj4k9pFJeAQ,14415
 mxcubecore/utils/units.py,sha256=2D1QlTwe8eSs2UYRm4VVxSTosZZHeM-Pfw9KlcLbDAg,1251
-mxcubecore-1.341.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.341.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.341.0.dist-info/METADATA,sha256=QiP1KW6bLixc0er0-IlhH_BVw0XkhkKQTx4iiAhzrhU,4262
-mxcubecore-1.341.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.341.0.dist-info/RECORD,,
+mxcubecore-1.342.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.342.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.342.0.dist-info/METADATA,sha256=3WwGYbWufoChUInGV1A1Mr_aQ-9hQWujYeipivkL86s,4262
+mxcubecore-1.342.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.342.0.dist-info/RECORD,,