mxcubecore 1.379.0__py3-none-any.whl → 1.381.0__py3-none-any.whl

mxcubecore/HardwareObjects/ICATLIMS.py

@@ -1112,6 +1112,11 @@ class ICATLIMS(AbstractLims):
                 collection_parameters.get("blSampleId")
             )
 
+            try:
+                metadata["lims"] = HWR.beamline.lims.get_active_lims()
+            except Exception:
+                logger.exception("Failed to read get_active_lims.")
+
             try:
                 metadata["InstrumentSource_current"] = (
                     HWR.beamline.machine_info.get_value().get("current")

mxcubecore/HardwareObjects/abstract/AbstractSampleChanger.py

@@ -816,22 +816,14 @@ class SampleChanger(Container, HardwareObject):
         self._trigger_loaded_sample_changed_event(None)
 
     def _set_loaded_sample(self, sample):
-        previous_loaded = None
-
-        for smp in self.get_sample_list():
-            if smp.is_loaded():
-                previous_loaded = smp
-                break
-
-        for smp in self.get_sample_list():
-            if smp != sample:
-                smp._set_loaded(False)
+        for s in self.get_sample_list():
+            if s != sample:
+                s._set_loaded(False)
             else:
-                if self.get_loaded_sample() == smp:
-                    smp._set_loaded(True)
+                if self.get_loaded_sample() != s:
+                    s._set_loaded(True)
 
-        if previous_loaded != self.get_loaded_sample():
-            self._trigger_loaded_sample_changed_event(sample)
+        self._trigger_loaded_sample_changed_event(sample)
 
     def _set_selected_sample(self, sample):
         cur = self.get_selected_sample()

{mxcubecore-1.379.0.dist-info → mxcubecore-1.381.0.dist-info}/METADATA

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

{mxcubecore-1.379.0.dist-info → mxcubecore-1.381.0.dist-info}/RECORD

@@ -198,7 +198,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=kxIkpKhAkU7BeI-v45rMtjOZerO_q9f7-SpCHoj6z84,51103
+mxcubecore/HardwareObjects/ICATLIMS.py,sha256=IUaH_ddqxELDGRsWmw9o2y4vEvhqRBMamvTxDbbs6l8,51290
 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
@@ -361,7 +361,7 @@ mxcubecore/HardwareObjects/abstract/AbstractNState.py,sha256=JZvD_ZpQu5U8ycaWFii
 mxcubecore/HardwareObjects/abstract/AbstractOnlineProcessing.py,sha256=vs_fJsDDLwivu1kYHA7RKJXj1aTH5V6G2tEy7MYGw4c,34104
 mxcubecore/HardwareObjects/abstract/AbstractProcedure.py,sha256=kW2SzN5kYYCeOS2IzpzQ9VAjYAoRU7ZtyDxqrOb8Pbg,7849
 mxcubecore/HardwareObjects/abstract/AbstractResolution.py,sha256=eLoymf-i637FbwfZwOtTmKOeSqCQjE2OnpSMdl8oIEg,8524
-mxcubecore/HardwareObjects/abstract/AbstractSampleChanger.py,sha256=ZHMjR4DBmkL7H-KY2QHg-yywMT95mN6N6UuTJLN8Ovc,26956
+mxcubecore/HardwareObjects/abstract/AbstractSampleChanger.py,sha256=h9j7XF8KrRtVQpthF_424fsEIR2LqsEZLNPrLaQB4TI,26718
 mxcubecore/HardwareObjects/abstract/AbstractSampleView.py,sha256=-E9cTMW-gw2vY91OeL2V5wg1icduLeYFOX50vo2_NEA,7774
 mxcubecore/HardwareObjects/abstract/AbstractShutter.py,sha256=OeHSr3N9x-a9QmGdQEu3usN23TYspJGDnZjAkShqk3w,2798
 mxcubecore/HardwareObjects/abstract/AbstractSlits.py,sha256=1fymQFlxJ9naOVT9A8THszEkHm7VxQSGJJWPQV0v3Hs,3839
@@ -469,8 +469,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.379.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.379.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.379.0.dist-info/METADATA,sha256=Hw8bAfncOB3DfUvGPo_2AYfoxKx2Y9soX1q6A18Pmrk,4259
-mxcubecore-1.379.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.379.0.dist-info/RECORD,,
+mxcubecore-1.381.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.381.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.381.0.dist-info/METADATA,sha256=UYzNglby5VrZiVEIAIuLHm2H7yZFTsmWRTNc8Qcqvaw,4259
+mxcubecore-1.381.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.381.0.dist-info/RECORD,,