mxcubecore 1.391.0__py3-none-any.whl → 1.392.0__py3-none-any.whl

mxcubecore/HardwareObjects/GenericDiffractometer.py

@@ -610,6 +610,22 @@ class GenericDiffractometer(HardwareObject):
         """
         return self.motor_hwobj_dict.get("phiz")
 
+    @property
+    def zoom(self):
+        """zoom motor object
+
+        NBNB TBD This is supposedly now living in AbstractSampleView,
+        And the property was removed in an earlier PR (20251021, 15:24 Elmir Jagudin)
+        BUT 1) there does not seem to be any mechanism to set it from config there
+        2) it is configured on the diffractometer according to available config files
+        3) accessing diffractometer.zoom is all through the code
+        This needs global refactoring, but meanwhile this property should remain
+
+        Returns:
+            AbstractActuator
+        """
+        return self.motor_hwobj_dict.get("zoom")
+
     def is_ready(self):
         """
         Detects if device is ready

mxcubecore/HardwareObjects/Gphl/GphlMessages.py

@@ -1310,7 +1310,8 @@ class SampleCentred(Payload):
             self._wavelengths = tuple((data_model.wavelengths[0],))
             # if data_model.wftype != "diffractcal":
             #     self._detectorSetting = data_model.detector_setting
-        self._detectorSetting = data_model.detector_setting
+        if data_model.wftype != "diffractcal":
+            self._detectorSetting = data_model.detector_setting
 
     @property
     def imageWidth(self):

mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py

@@ -844,6 +844,7 @@ class GphlWorkflow(HardwareObject):
         HWR.beamline.gphl_connection.open_connection()
 
         if data_model.wftype == "transcal":
+            self._workflow_queue = gevent.queue.Queue()
             return
         elif data_model.automation_mode:
             params = data_model.auto_acq_parameters[0]

{mxcubecore-1.391.0.dist-info → mxcubecore-1.392.0.dist-info}/METADATA

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

{mxcubecore-1.391.0.dist-info → mxcubecore-1.392.0.dist-info}/RECORD

@@ -180,11 +180,11 @@ mxcubecore/HardwareObjects/ExporterMotor.py,sha256=7XjyUcymJjJM7YVyteBxjLutgfSuT
 mxcubecore/HardwareObjects/ExporterNState.py,sha256=BH9jkRoud4bHLiflj_1mgDL0Y-LmMjesfTtTGr7EzJ0,6129
 mxcubecore/HardwareObjects/FlexHCD.py,sha256=NqfBabwNH466WmHZH--UIFZf7XEZkN7QEjO6iXsLq1g,23394
 mxcubecore/HardwareObjects/FlexHCDMaintenance.py,sha256=0fPa-gdp_BNYwz2RawpS-2L99zsuabg8Oc5R8RIRGA8,5008
-mxcubecore/HardwareObjects/GenericDiffractometer.py,sha256=H8zILWvAQ7eznrMz-lfSAdHgBvpu06YtGwAth6-htmI,50027
+mxcubecore/HardwareObjects/GenericDiffractometer.py,sha256=YsvCraZ1Oa-JVQYTqH-MdpBICrYdeGZIsEEHvpZhBqE,50671
 mxcubecore/HardwareObjects/Gphl/CollectEmulator.py,sha256=iiH6EblDwEMdxl44BswHJEwK-6qjsG3tXfdq9kO2j74,13015
-mxcubecore/HardwareObjects/Gphl/GphlMessages.py,sha256=3WSBmUGLka4gilfwpqXyc4SJMlOt9y2sRNrOiE0-DaM,35759
+mxcubecore/HardwareObjects/Gphl/GphlMessages.py,sha256=wUjow_8HeDbxhRPVTzUB6dpJeN8oOEgFdKzRJTtNovE,35810
 mxcubecore/HardwareObjects/Gphl/GphlQueueEntry.py,sha256=Rwu6YL8U4knibWI9yOXBoUVuayL6O0rHQWQuEP2Hu_g,2309
-mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py,sha256=vlNhXkP2Ob-bvOuRY5rYVTSgZ8ZULrSQYYhtSS9V4fA,132177
+mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py,sha256=jd-JZxcFgn4p60VZBPDZzPUuCo2q05M6iM-mA9uXDfc,132233
 mxcubecore/HardwareObjects/Gphl/GphlWorkflowConnection.py,sha256=s6B8BdgU6IYeGxi69QqJiM-ZUu34c-ZlaX3S5yRl4wo,50316
 mxcubecore/HardwareObjects/Gphl/Transcal2MiniKappa.py,sha256=Dzf05WSRC5vtOOluZ69f5xZrr6BmT7ITu-OfrKMqemc,9777
 mxcubecore/HardwareObjects/Gphl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -467,8 +467,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=0lPmqok_oYQZ059kJCq7RWdg490T8YKyRvoZGyWDy4M,14486
 mxcubecore/utils/tango.py,sha256=vwEVrIrWKEFaeaJUz3xbaC7XWHY8ZeJ-pfcSrTfZPIE,2114
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.391.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.391.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.391.0.dist-info/METADATA,sha256=n5ROKNwKg-OEu2PebCYmjcpokufoReFDtS-tl6xFOcA,4259
-mxcubecore-1.391.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.391.0.dist-info/RECORD,,
+mxcubecore-1.392.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.392.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.392.0.dist-info/METADATA,sha256=FTGKtaM_FSJyBNuEo7HzrZwgsBeD7WWQBjLQixJY5RI,4259
+mxcubecore-1.392.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.392.0.dist-info/RECORD,,