mxcubecore 1.383.0__py3-none-any.whl → 1.384.0__py3-none-any.whl

mxcubecore/HardwareObjects/MiniDiff.py

@@ -1010,10 +1010,11 @@ class MiniDiff(HardwareObject):
             time.sleep(0.1)
 
     def take_snapshot(self, image_path_list: list) -> None:
-        if self.get_current_phase() != "Centring":
-            use_custom_snapshot_routine = self.get_property(
-                "custom_snapshot_script_dir", False
-            )
+        if len(image_path_list) > 0:
+            if self.get_current_phase() != "Centring":
+                use_custom_snapshot_routine = self.get_property(
+                    "custom_snapshot_script_dir", False
+                )
 
             if not use_custom_snapshot_routine:
                 self.set_phase("Centring", wait=True, timeout=200)
@@ -1024,7 +1025,9 @@ class MiniDiff(HardwareObject):
                 f"Taking {snapshot_index + 1} sample snapshot(s)"
             )
             HWR.beamline.sample_view.save_snapshot(path=image_path)
-            self.phiMotor.set_value_relative(90, timeout=5)
+            # do not move 90 degrees if not needed
+            if not self.in_plate_mode() and snapshot_index < len(image_path_list) - 1:
+                self.phiMotor.set_value_relative(90, timeout=5)
 
     def snapshotsDone(self, snapshotsProcedure):
         HWR.beamline.sample_view.camera.forceUpdate = False

mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py

@@ -315,6 +315,10 @@ class AbstractMultiCollect(object):
             pass
 
     def take_snapshots(self, dc_params):
+        # do nothing if no snapshots asked
+        if not self.number_of_snapshots:
+            return
+
         snapshot_directory = dc_params["fileinfo"]["archive_directory"]
 
         if HWR.beamline.diffractometer.in_plate_mode():

{mxcubecore-1.383.0.dist-info → mxcubecore-1.384.0.dist-info}/METADATA

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

{mxcubecore-1.383.0.dist-info → mxcubecore-1.384.0.dist-info}/RECORD

@@ -245,7 +245,7 @@ mxcubecore/HardwareObjects/MicrodiffLightBeamstop.py,sha256=yg70YumCOhdlGhT7Jzgm
 mxcubecore/HardwareObjects/MicrodiffMotor.py,sha256=RTY3D2b2hkRuVzfkrzUq-v1fMBuVKwBIjWSIN2znwHM,9409
 mxcubecore/HardwareObjects/MicrodiffSamplePseudo.py,sha256=pWwpNRjnrqLyE0-2JQrJRHc7MqLSbvZuK9f14deTzKo,3675
 mxcubecore/HardwareObjects/MicrodiffZoom.py,sha256=_TaJy-w1zKZg2rlTyVOnMwWcDbYfymovqRwJSewA5Ss,3826
-mxcubecore/HardwareObjects/MiniDiff.py,sha256=3T-9CeixU0FEmIAykW-21G1k23NWVAAtuaS7qHjaMAo,38577
+mxcubecore/HardwareObjects/MiniDiff.py,sha256=xndF_HdSJ5M-tfDWmkso19ff2ekOsf0XDW3o1kxgDh4,38772
 mxcubecore/HardwareObjects/MiniKappaCorrection.py,sha256=qo2bI76hRySjvdOEwidwE09DD748oiqxX7tfsRRecm0,3426
 mxcubecore/HardwareObjects/MinidiffAperture.py,sha256=wIgXXzbMCncF2y3pe0Ygy3K4el5XrsdHCdvE1Dh2yuA,1422
 mxcubecore/HardwareObjects/MotorWPositions.py,sha256=QDX8yF8KTTh75e4H-k0f1AaavGiXF-qce86IgVFLeiU,5633
@@ -354,7 +354,7 @@ mxcubecore/HardwareObjects/abstract/AbstractLims.py,sha256=8EwvJ8xOlmsKgYiSZXuc0
 mxcubecore/HardwareObjects/abstract/AbstractMCA.py,sha256=vqu3RqZ1YYtjYZCyV7iD3Sc5f_Vjbc18qfcNTdoQ3dQ,4443
 mxcubecore/HardwareObjects/abstract/AbstractMachineInfo.py,sha256=vZ1qKSNFrrBP-7xnzu92zThMH-U_Fz5Av-3ml1NWhM8,3959
 mxcubecore/HardwareObjects/abstract/AbstractMotor.py,sha256=EuQwFocgcE2cNjHkwgEQqzz5jSh5vVaJvf3_m7QhArU,3411
-mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py,sha256=-Tgb7l_Ovv4IQIFqEis-HnUAZh3-gze16IbdVdKkHBc,51580
+mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py,sha256=gn3cZ-lBrS77IQWO5ueF8n-cHgQrFNeJ60Eceij4Jqo,51684
 mxcubecore/HardwareObjects/abstract/AbstractNState.py,sha256=JZvD_ZpQu5U8ycaWFiijSfkfo8HfBN84hSDfpq0hyOE,4016
 mxcubecore/HardwareObjects/abstract/AbstractOnlineProcessing.py,sha256=vs_fJsDDLwivu1kYHA7RKJXj1aTH5V6G2tEy7MYGw4c,34104
 mxcubecore/HardwareObjects/abstract/AbstractProcedure.py,sha256=kW2SzN5kYYCeOS2IzpzQ9VAjYAoRU7ZtyDxqrOb8Pbg,7849
@@ -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.383.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.383.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.383.0.dist-info/METADATA,sha256=nrnsJBWuJJo-Js9kkMNx0i9UBzuIPDzKXmLe15D0LiY,4259
-mxcubecore-1.383.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.383.0.dist-info/RECORD,,
+mxcubecore-1.384.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.384.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.384.0.dist-info/METADATA,sha256=66iGNybEYtqpHBGq_qJ5xpvzlYErk-ys5D7XCMh86OY,4259
+mxcubecore-1.384.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.384.0.dist-info/RECORD,,