mxcubecore 1.390.0__tar.gz → 1.392.0__tar.gz

{mxcubecore-1.390.0 → mxcubecore-1.392.0}/PKG-INFO

@@ -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 → mxcubecore-1.392.0}/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-1.390.0 → mxcubecore-1.392.0}/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-1.390.0 → mxcubecore-1.392.0}/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-1.390.0 → mxcubecore-1.392.0}/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.390.0 → mxcubecore-1.392.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-1.390.0 → mxcubecore-1.392.0}/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-1.390.0 → mxcubecore-1.392.0}/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 → mxcubecore-1.392.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxcubecore"
-version = "1.390.0"
+version = "1.392.0"
 license = "LGPL-3.0-or-later"
 description = "Core libraries for the MXCuBE application"
 authors = [