mxcubecore 1.382.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.382.0.dist-info → mxcubecore-1.384.0.dist-info}/METADATA

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

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

@@ -141,7 +141,7 @@ mxcubecore/HardwareObjects/ESRF/ESRFBeam.py,sha256=9B6VgoG5pUIExgY08sUyvL3LYniUW
 mxcubecore/HardwareObjects/ESRF/ESRFBeamDefiner.py,sha256=D_dG30DRQNInpfzLlDHPTbhvPq6fExCU4AquzHg8Dw4,3798
 mxcubecore/HardwareObjects/ESRF/ESRFBeamInfo.py,sha256=_JLCOPwhcwd-9REnrBOQlgvJgKqTseaA2aRc4cM_ai8,2298
 mxcubecore/HardwareObjects/ESRF/ESRFBeamlineActions.py,sha256=GGC1_9rEd1RQzGdOoVdIAGAjOPtwpjpoUFVcJHT9oTc,3259
-mxcubecore/HardwareObjects/ESRF/ESRFEnergyScan.py,sha256=FztM1wCtbcqLWaCg34z-IPq_HPd9u2KWuPxdsH7oXiQ,13427
+mxcubecore/HardwareObjects/ESRF/ESRFEnergyScan.py,sha256=XEJGWwKL1ZT1n-GKVNzpboCQ_NCQJPKbG19xvk6hCRA,15513
 mxcubecore/HardwareObjects/ESRF/ESRFMD2SC3.py,sha256=jTbMmwp_HYFD8Vr6Hk-y1Hwi9UcSqsrbhGji7dfRpC4,1469
 mxcubecore/HardwareObjects/ESRF/ESRFMetadataManagerClient.py,sha256=bGFsp6EjU1Xb8iujJ90Tph95F335rnKYvimYTwcp2bE,22122
 mxcubecore/HardwareObjects/ESRF/ESRFMultiCollect.py,sha256=38eXiTn0o3u_hcG5vuZSY-jkySRZkXOAgMH5OuRqIF4,22937
@@ -150,9 +150,7 @@ mxcubecore/HardwareObjects/ESRF/ESRFSC3.py,sha256=Mw2Lj_0w7TapaCesDxhRWSAY1PRG4D
 mxcubecore/HardwareObjects/ESRF/ESRFSession.py,sha256=iIcJUM0cVlwJdqNZo-L7IY_S2KYHQXPQPupbv4JoAkk,4323
 mxcubecore/HardwareObjects/ESRF/ESRFSmallXrayCentring.py,sha256=YJFMtb3VxHchxTWi_pqrEz3ML1YunoYLkAseDZqF1JA,3617
 mxcubecore/HardwareObjects/ESRF/ESRFXRFSpectrum.py,sha256=4zN3F_VsmQWQVfNwIV9qcUlVLeB830FOl8I36y7xClc,12217
-mxcubecore/HardwareObjects/ESRF/ID231EnergyScan.py,sha256=f6Loqqgl5E64-xACuK-6nF2sH9ftpwa7e1It0C1e-s4,1144
 mxcubecore/HardwareObjects/ESRF/ID232BeamDefiner.py,sha256=4Piso4ftMDSBw3rZJpjoJtU-ARkxVa1Vy49BybleCyY,5030
-mxcubecore/HardwareObjects/ESRF/ID29EnergyScan.py,sha256=9Nscojz8KonwWZltpIcRwH06RC2AtZKZGu-oEbMqLLg,2778
 mxcubecore/HardwareObjects/ESRF/ID29HutchTrigger.py,sha256=vKLuCSuKcHQLvTysQ3r2PGlzY5FkVIDRZt5oOZd3cBE,2949
 mxcubecore/HardwareObjects/ESRF/ID30A3BeamDefiner.py,sha256=V7gn4JTYhzG0ajeJwjR68MbJuDt26mHaNROHhd1Z0QI,3996
 mxcubecore/HardwareObjects/ESRF/ID30BBeamDefiner.py,sha256=uZJ0szJFdGysZsgiaxxUYKq1nPVYwK4jZ3xMX74cwqU,5046
@@ -198,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=IUaH_ddqxELDGRsWmw9o2y4vEvhqRBMamvTxDbbs6l8,51290
+mxcubecore/HardwareObjects/ICATLIMS.py,sha256=irvsn5xLy0CZpheFG_UGUzFO1nIKn5Mz3GVGZt9c2ic,53129
 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
@@ -247,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
@@ -356,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
@@ -469,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.382.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.382.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.382.0.dist-info/METADATA,sha256=HQsiDOzX4yiMPim6wg9J1lqYM3u0qCnnQtKXP6HIqS8,4259
-mxcubecore-1.382.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.382.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,,

mxcubecore/HardwareObjects/ESRF/ID231EnergyScan.py

@@ -1,40 +0,0 @@
-from mxcubecore.TaskUtils import task
-
-from .ESRFEnergyScan import (
-    ESRFEnergyScan,
-    TunableEnergy,
-)
-
-
-class ID231EnergyScan(ESRFEnergyScan):
-    def __init__(self, name):
-        ESRFEnergyScan.__init__(self, name, TunableEnergy())
-
-    @task
-    def energy_scan_hook(self, energy_scan_parameters):
-        self.energy = energy_scan_parameters["edgeEnergy"]
-        if self.energy_scan_parameters["findattEnergy"]:
-            ESRFEnergyScan.move_energy(self, energy_scan_parameters["findattEnergy"])
-
-    def calculate_und_gaps(self, energy, undulator="u21d"):
-        GAPS = {}
-        return GAPS
-
-    @task
-    def move_undulators(self, gaps):
-        pass
-
-    @task
-    def set_mca_roi(self, eroi_min, eroi_max):
-        self.execute_command("calculateMcaRoi", eroi_min, eroi_max)
-
-    @task
-    def choose_attenuation(self):
-        self.execute_command("chooseAttenuation")
-        self.energy_scan_parameters["transmissionFactor"] = (
-            self.transmission.get_value()
-        )
-
-    @task
-    def execute_energy_scan(self, energy_scan_parameters):
-        self.execute_command("executeScan", energy_scan_parameters)

mxcubecore/HardwareObjects/ESRF/ID29EnergyScan.py

@@ -1,77 +0,0 @@
-from datetime import datetime
-
-from mxcubecore import HardwareRepository as HWR
-
-from .ESRFEnergyScan import ESRFEnergyScan
-
-
-class ID29EnergyScan(ESRFEnergyScan):
-    def energy_scan_hook(self, energy_scan_parameters):
-        self.energy = energy_scan_parameters["edgeEnergy"]
-        if self.energy_scan_parameters["findattEnergy"]:
-            HWR.beamline.energy.set_value(energy_scan_parameters["findattEnergy"])
-
-    def set_mca_roi(self, eroi_min, eroi_max):
-        """
-        self.mca = self.get_object_by_role("MCA")
-        self.energy_scan_parameters["fluorescenceDetector"] = self.mca.get_property(
-            "username"
-        )
-        """
-        self.energy_scan_parameters["fluorescenceDetector"] = "KETEK_AXAS-A"
-        # check if roi in eV or keV
-        if eroi_min > 1000:
-            eroi_min /= 1000.0
-            eroi_max /= 1000.0
-        self.ctrl.mca.set_roi(
-            eroi_min,
-            eroi_max,
-            channel=1,
-            element=self.energy_scan_parameters["element"],
-            atomic_nb=self.energy_scan_parameters["atomic_nb"],
-        )
-        print(self.ctrl.mca.get_roi())
-
-    def choose_attenuation(self):
-        eroi_min = self.energy_scan_parameters["eroi_min"]
-        eroi_max = self.energy_scan_parameters["eroi_max"]
-        self.ctrl.detcover.set_in()
-        self.ctrl.find_max_attenuation(
-            ctime=2, roi=[eroi_min, eroi_max], datafile="/tmp/abb"
-        )
-        self.energy_scan_parameters["transmissionFactor"] = (
-            HWR.beamline.transmission.get_value()
-        )
-
-    def execute_energy_scan(self, energy_scan_parameters):
-        startE = energy_scan_parameters["startEnergy"]
-        endE = energy_scan_parameters["endEnergy"]
-        dd = datetime.now()
-        fname = "%s/%s_%s_%s_%s.scan" % (
-            energy_scan_parameters["directory"],
-            energy_scan_parameters["prefix"],
-            datetime.strftime(dd, "%d"),
-            datetime.strftime(dd, "%B"),
-            datetime.strftime(dd, "%Y"),
-        )
-        self.ctrl.energy_scan.do_energy_scan(startE, endE, datafile=fname)
-
-        """
-        self.energy_scan_parameters["exposureTime"] = self.ctrl.MONOSCAN_INITSTATE[
-            "exposure_time"
-        ]
-        """
-
-    def escan_prepare(self):
-        self.ctrl = self.get_object_by_role("controller")
-
-        self.ctrl.detcover.set_in()
-        self.ctrl.diffractometer.fldet_in()
-        # self.ctrl.fluodet.IN
-        self.ctrl.diffractometer.set_phase("DataCollection")
-
-        if self.beamsize:
-            # get the aperture size
-            bsX = self.beamsize.get_size(self.beamsize.get_value().name)
-            self.energy_scan_parameters["beamSizeHorizontal"] = bsX
-            self.energy_scan_parameters["beamSizeVertical"] = bsX