mxcubecore 1.410.0__py3-none-any.whl → 1.412.0__py3-none-any.whl

mxcubecore/HardwareObjects/BlissEnergy.py

@@ -152,7 +152,7 @@ class BlissEnergy(AbstractEnergy):
                 if timeout:
                     self._set_value(value)
                 else:
-                    self._cmd_execution = spawn(self._set_value(value))
+                    self._cmd_execution = spawn(self._set_value, value)
             else:
                 self.energy_motor.set_value(value, timeout=timeout)
         else:

mxcubecore/HardwareObjects/abstract/AbstractCollect.py

@@ -101,13 +101,6 @@ class AbstractCollect(HardwareObject, object):
     def init(self):
         self.ready_event = gevent.event.Event()
 
-        undulators = []
-        try:
-            for undulator in self.config.undulators:
-                undulators.append(undulator)
-        except Exception:
-            self.log.exception("")
-
         beam_div_hor, beam_div_ver = HWR.beamline.beam.get_beam_divergence()
 
         self.set_beamline_configuration(
@@ -126,7 +119,7 @@ class AbstractCollect(HardwareObject, object):
             detector_px=HWR.beamline.detector.get_property("px"),
             detector_py=HWR.beamline.detector.get_property("py"),
             detector_binning_mode=HWR.beamline.detector.get_binning_mode(),
-            undulators=undulators,
+            undulators=self.get_property("undulators", []),
             focusing_optic=self.get_property("focusing_optic"),
             monochromator_type=self.get_property("monochromator"),
             beam_divergence_vertical=beam_div_hor,

{mxcubecore-1.410.0.dist-info → mxcubecore-1.412.0.dist-info}/METADATA

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

{mxcubecore-1.410.0.dist-info → mxcubecore-1.412.0.dist-info}/RECORD

@@ -52,7 +52,7 @@ mxcubecore/HardwareObjects/BeamlineActions.py,sha256=5p87RSxBy-raII3_aFsmBUvaGXK
 mxcubecore/HardwareObjects/BeamlineTools.py,sha256=rsvNsKb4ReN_w_OvUbuey_zy0gSYYQy-TfdHASYU0nY,1959
 mxcubecore/HardwareObjects/Bliss.py,sha256=apa2fUXLREwKURq10hYktWnNhC-7ygcSyZWJb1nSPOc,3332
 mxcubecore/HardwareObjects/BlissActuator.py,sha256=4KwrGPkAespCumlCuQtE-iwRL2liKGsYXbXWRL_QDH0,1819
-mxcubecore/HardwareObjects/BlissEnergy.py,sha256=IYSKXL6_N4_5a4uuJ0_UzBrgLOWZGLeYRPmql9vvkWs,5301
+mxcubecore/HardwareObjects/BlissEnergy.py,sha256=_w-AZnAmDT692wUzS6UFkHPRgFt3HRb2PRTVniLBMyc,5301
 mxcubecore/HardwareObjects/BlissHutchTrigger.py,sha256=XDbfLxzL5mbN62WKn2-yNRsEI5pGRFQN9yoZ_1KA324,4055
 mxcubecore/HardwareObjects/BlissMotor.py,sha256=gJvbgGY4_fMBQ9WS3Ws5nNwR3P_zuWaoOCOp5TS2WzE,6494
 mxcubecore/HardwareObjects/BlissMotorWPositions.py,sha256=jB3j6ScQJt4IGyBjUT_IOqOmBAedzQZYsV4JI_yfq5o,4061
@@ -330,7 +330,7 @@ mxcubecore/HardwareObjects/abstract/AbstractAperture.py,sha256=kUaIOGuTrecbXXul7
 mxcubecore/HardwareObjects/abstract/AbstractAuthenticator.py,sha256=F5ONnre9GEcg65hTiEYpTcj0frGojP1QrC2P8rmzcjU,1575
 mxcubecore/HardwareObjects/abstract/AbstractBeam.py,sha256=Fvz5K3ov0Glsw8bO2oXiYbkFMK9L8CX4gldJg73lkr0,10389
 mxcubecore/HardwareObjects/abstract/AbstractCharacterisation.py,sha256=knGIC9GVSY_mJfcpMpU9qP8OfaIngasGEc8PIVFsr_4,4990
-mxcubecore/HardwareObjects/abstract/AbstractCollect.py,sha256=xY8CKbDxxfoS2-Q_93G4OcWsmST_kh_Kjwe-0HFKYk0,33108
+mxcubecore/HardwareObjects/abstract/AbstractCollect.py,sha256=G6VowtuXAFhU5ohcjPHic7s2XU2z_qVGJ6QxD8XAUZM,32936
 mxcubecore/HardwareObjects/abstract/AbstractDetector.py,sha256=4zZdvtNK86jdqoX3vPf9_k3ZX7JXLVr1Nf0oXRERFTU,11454
 mxcubecore/HardwareObjects/abstract/AbstractEnergy.py,sha256=zG6tICqBdWcEMz8gGh7DFvP6CHz5xNlaRdcG4Y8tFps,4553
 mxcubecore/HardwareObjects/abstract/AbstractEnergyScan.py,sha256=d5-BJMZE7qkbtV0m7_huMXgBaEO4ZCirUgN5UkXaH3k,6050
@@ -452,8 +452,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=yL6hLqk2qF-6SVjlVKTg2HTAa9vawPwmPybRPu39Iks,14720
 mxcubecore/utils/tango.py,sha256=vwEVrIrWKEFaeaJUz3xbaC7XWHY8ZeJ-pfcSrTfZPIE,2114
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.410.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.410.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.410.0.dist-info/METADATA,sha256=QovpJuWhRJORDvJ_H35TDoKUIbiBWt9UXB3lbnddRA4,4259
-mxcubecore-1.410.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.410.0.dist-info/RECORD,,
+mxcubecore-1.412.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.412.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.412.0.dist-info/METADATA,sha256=3CALNJbE3MW1Va_DhR3TwcJit8Czayvd69i8KIpKGfI,4259
+mxcubecore-1.412.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.412.0.dist-info/RECORD,,