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

mxcubecore/HardwareObjects/ESRF/ESRFSession.py

@@ -27,7 +27,7 @@ class ESRFSession(Session.Session):
                 archive_base_directory, archive_folder
             )
 
-    def get_full_path(self, subdir: str, tag: str) -> Tuple[str, str]:
+    def get_full_paths(self, subdir: str, tag: str) -> Tuple[str, str]:
         """
         Returns the full path to both image and processed data.
         The path(s) returned will follow the convention:

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/HardwareObjects/ICATLIMS.py

@@ -325,31 +325,30 @@ class ICATLIMS(AbstractLims):
                     self.__get_sample_information_by(sample_sheet_id)
                 )
                 if sample_information is not None:
-                    if len(HWR.beamline.session.get_full_path("", "")) > 0:
-                        destination_folder = (
-                            HWR.beamline.session.get_base_process_directory()
-                        )
-                        msg = "Download restource: "
-                        msg += f"sample_sheet_id={sample_sheet_id} "
-                        msg += f"destination_folder={destination_folder}"
-                        logger.debug(msg)
-                        downloads = self._download_resources(
-                            sample_sheet_id,
-                            sample_information.resources,
-                            destination_folder,
-                            sample_name,
-                        )
-                        msg = f"downloaded {len(downloads)} resources"
-                        logger.debug(msg)
-                        if len(downloads) > 0:
-                            try:
-                                self.__add_download_path_to_processing_plan(
-                                    processing_plan, downloads
-                                )
-                            except RuntimeError:
-                                logger.exception(
-                                    "Failed __add_download_path_to_processing_plan"
-                                )
+                    destination_folder = (
+                        HWR.beamline.session.get_base_process_directory()
+                    )
+                    msg = "Download resource: "
+                    msg += f"sample_sheet_id={sample_sheet_id} "
+                    msg += f"destination_folder={destination_folder}"
+                    logger.debug(msg)
+                    downloads = self._download_resources(
+                        sample_sheet_id,
+                        sample_information.resources,
+                        destination_folder,
+                        sample_name,
+                    )
+                    msg = f"downloaded {len(downloads)} resources"
+                    logger.debug(msg)
+                    if len(downloads) > 0:
+                        try:
+                            self.__add_download_path_to_processing_plan(
+                                processing_plan, downloads
+                            )
+                        except RuntimeError:
+                            logger.exception(
+                                "Failed __add_download_path_to_processing_plan"
+                            )
 
                 processing_plan = {
                     item["key"]: item["value"] for item in processing_plan

mxcubecore/HardwareObjects/Native/__init__.py

@@ -106,9 +106,9 @@ def queue_update_result(server_hwobj, node_id, html_report):
     return result
 
 
-def queue_get_full_path(server_hwobj, subdir, tag):
+def queue_get_full_paths(server_hwobj, subdir, tag):
     """ """
-    return HWR.beamline.session.get_full_path(subdir, tag)
+    return HWR.beamline.session.get_full_paths(subdir, tag)
 
 
 def queue_get_model_code(server_hwobj):

mxcubecore/HardwareObjects/Session.py

@@ -262,7 +262,7 @@ class Session(HardwareObject):
 
         return f"{directory}/"
 
-    def get_full_path(self, subdir: str = "", tag: str = "") -> Tuple[str, str]:
+    def get_full_paths(self, subdir: str = "", tag: str = "") -> Tuple[str, str]:
         """
         Returns the full path to both image and processed data.
         The path(s) returned will follow the convention:

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

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

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

@@ -147,7 +147,7 @@ mxcubecore/HardwareObjects/ESRF/ESRFMetadataManagerClient.py,sha256=bGFsp6EjU1Xb
 mxcubecore/HardwareObjects/ESRF/ESRFMultiCollect.py,sha256=38eXiTn0o3u_hcG5vuZSY-jkySRZkXOAgMH5OuRqIF4,22937
 mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py,sha256=PXJJJO-GfxrTfpw5tgc_dHh5b5kyYbiq-zUXyG7_8tQ,3948
 mxcubecore/HardwareObjects/ESRF/ESRFSC3.py,sha256=Mw2Lj_0w7TapaCesDxhRWSAY1PRG4DJCoLWgYdP_qV4,9545
-mxcubecore/HardwareObjects/ESRF/ESRFSession.py,sha256=iIcJUM0cVlwJdqNZo-L7IY_S2KYHQXPQPupbv4JoAkk,4323
+mxcubecore/HardwareObjects/ESRF/ESRFSession.py,sha256=KnZ__trc7GE2eTpNTQ8B7ex1XQ4aRbq0cZHS7hZKRm0,4324
 mxcubecore/HardwareObjects/ESRF/ESRFSmallXrayCentring.py,sha256=YJFMtb3VxHchxTWi_pqrEz3ML1YunoYLkAseDZqF1JA,3617
 mxcubecore/HardwareObjects/ESRF/ESRFXRFSpectrum.py,sha256=4zN3F_VsmQWQVfNwIV9qcUlVLeB830FOl8I36y7xClc,12217
 mxcubecore/HardwareObjects/ESRF/ID232BeamDefiner.py,sha256=4Piso4ftMDSBw3rZJpjoJtU-ARkxVa1Vy49BybleCyY,5030
@@ -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
@@ -196,7 +196,7 @@ mxcubecore/HardwareObjects/GrobMotor.py,sha256=l5A9Us_ceLXlhEF6RNwyXQsI56fJiobWh
 mxcubecore/HardwareObjects/GrobSampleChanger.py,sha256=LMetcL45fWrwP4C8rtENrEDNydelLpJ77SD1JC5C3go,8113
 mxcubecore/HardwareObjects/Harvester.py,sha256=0TYUXmz-Pmfd7Dhz7ToUGHzJRuJmnga8-4BK4B0KGQA,26524
 mxcubecore/HardwareObjects/HarvesterMaintenance.py,sha256=8s4yHDEFG-C1WYyW_RlwrFPSpc8o5hGi14aQuFQFrHs,9405
-mxcubecore/HardwareObjects/ICATLIMS.py,sha256=YMlha9sg6U1EWSiKZ1Uy8fbud9XdfYNH9-oHESwPD34,54814
+mxcubecore/HardwareObjects/ICATLIMS.py,sha256=AaCIqI54DtwV8y82_a3aJbbQ3EFUfG26JBi0l94nM2U,54641
 mxcubecore/HardwareObjects/ISARAMaint.py,sha256=I8LHXK6wCfzixsxWmmcqWlrdaL3AOX91XmVeAwT7GPk,8959
 mxcubecore/HardwareObjects/LNLS/EPICSActuator.py,sha256=3dDj6aXyTz03m8osdA6udq_a4bch-KNcUMrXSNvbG5Q,2587
 mxcubecore/HardwareObjects/LNLS/EPICSMotor.py,sha256=lRTc1t32rJKNTIcnKCECrqo2m9BhlYvLq9NWg4Y0w0Q,3576
@@ -252,7 +252,7 @@ mxcubecore/HardwareObjects/MotorWPositions.py,sha256=QDX8yF8KTTh75e4H-k0f1AaavGi
 mxcubecore/HardwareObjects/MotorsNPosition.py,sha256=TvxC4yiAVzu962x7I1ZdqoUXihI6JsP37ifpNOiRqZ4,8636
 mxcubecore/HardwareObjects/MultiplePositions.py,sha256=03L8P4q2-4JnsczLO95L9ASUkQ3bmBb5PewUdBIGH4I,11661
 mxcubecore/HardwareObjects/NState.py,sha256=GKjlPEbc7XsTGjI228ESl61CwYFz6pbBXYrUVmG0i64,1772
-mxcubecore/HardwareObjects/Native/__init__.py,sha256=vamSkuv4qx2u7uizZ2TXWB6Rz3meil72WOiSNT2YF7w,4198
+mxcubecore/HardwareObjects/Native/__init__.py,sha256=gq9QKYuZXqDzNPomA4PBu-cxhP-_9jD9qYxlcPsQKdw,4200
 mxcubecore/HardwareObjects/ObjectsController.py,sha256=Oh5G7yqdlcv5TAQzu0myRFAdmnhM1OFnI-auGzlTzxY,697
 mxcubecore/HardwareObjects/PlateManipulator.py,sha256=OMe33zhhVy0RO8_iTVsnKfDrRP27SqcqUynECRgH1vY,24734
 mxcubecore/HardwareObjects/PlateManipulatorMaintenance.py,sha256=-bZ4gvFo4-ept0VSeDZLsDGGTQU4GSWgbYJU_lJ6VNc,3313
@@ -312,7 +312,7 @@ mxcubecore/HardwareObjects/SampleStage.py,sha256=GykGZfus7B_0qeHvMT7pU0MZ8CBjVaA
 mxcubecore/HardwareObjects/SampleView.py,sha256=zTgn15AXgzKw0RtxQCl-sLqwqTWyJGgPsiJ8FPQfJZY,19418
 mxcubecore/HardwareObjects/SardanaMotor.py,sha256=-A7-45LzGV_Ghpzta8yDsJGw-RCZpVnc77Bk_96iOzc,7470
 mxcubecore/HardwareObjects/SecureXMLRpcRequestHandler.py,sha256=cpcSYcKU25_mBENUJ1oFBual9NRdg0VPnBhbTdYghGY,4215
-mxcubecore/HardwareObjects/Session.py,sha256=P6VjQPJPDwrTWjqRkolkh0wwJFr7p81ROJ_GnqYLDH8,13076
+mxcubecore/HardwareObjects/Session.py,sha256=33HneK_kzF91QVClblYlL6tD42WwGnv4ue-u0Sc5Owk,13077
 mxcubecore/HardwareObjects/SimpleHTML.py,sha256=OOGN4ljwn2QtM9ZESDUHSTYvj7xsOOlMyrYs6p2XVDU,9175
 mxcubecore/HardwareObjects/SpecMotor.py,sha256=J-92iDpbUK7Odm1ZBMF3ywUtCR3q-9_-s8AfyWkJ-us,2134
 mxcubecore/HardwareObjects/SpecMotorWPositions.py,sha256=yHvb-iNTMIGrGPXi1EZD1X3XUwDz0FmbpsU22UZeHi8,3818
@@ -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.390.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.390.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.390.0.dist-info/METADATA,sha256=XaujJyIEQcdICz8jo7vzzvabSnlwrQpY2pL3z5ePvhE,4259
-mxcubecore-1.390.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.390.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,,