mxcubecore 1.344.0__py3-none-any.whl → 1.346.0__py3-none-any.whl

mxcubecore/HardwareObjects/MAXIV/MachInfo.py

@@ -57,8 +57,8 @@ class MachInfo(AbstractMachineInfo):
         parameters (str): topics to export, see AbstractMachineInfo class for details
     """
 
-    def __init__(self, *args):
-        super().__init__(*args)
+    def __init__(self, name):
+        super().__init__(name)
         self.mach_info = None
         self.mach_curr = None
 

mxcubecore/HardwareObjects/abstract/AbstractDetector.py

@@ -76,10 +76,31 @@ class AbstractDetector(HardwareObject):
         self._roi_mode = 0
         self._images_per_file = 0
         self._roi_modes_list = []
+        self._exposure_time_limits = (None, None)
 
         self._threshold_energy = None
         self._distance_motor_hwobj = None
 
+        self._width = None  # [pixel]
+        self._height = None  # [pixel]
+        self._metadata = {}
+
+    def init(self):
+        """Initialise some common parameters"""
+        super().init()
+
+        self._metadata = self.get_property("beam", {})
+
+        self._images_per_file = self.get_property("images_per_file", 100)
+
+        self._distance_motor_hwobj = self.get_object_by_role("detector_distance")
+
+        self._roi_modes_list = ast.literal_eval(self.get_property("roiModes", "()"))
+
+        self._pixel_size = (self.get_property("px"), self.get_property("py"))
+        self._width = self.get_property("width")
+        self._height = self.get_property("height")
+
         min_exp_time = self.get_property("minimum_exposure_time", None)
         max_exp_time = self.get_property("maximum_exposure_time", None)
 
@@ -102,26 +123,6 @@ class AbstractDetector(HardwareObject):
             max_exp_time,
         )
 
-        self._width = None  # [pixel]
-        self._height = None  # [pixel]
-        self._metadata = {}
-
-    def init(self):
-        """Initialise some common parameters"""
-        super().init()
-
-        self._metadata = self.get_property("beam", {})
-
-        self._images_per_file = self.get_property("images_per_file", 100)
-
-        self._distance_motor_hwobj = self.get_object_by_role("detector_distance")
-
-        self._roi_modes_list = ast.literal_eval(self.get_property("roiModes", "()"))
-
-        self._pixel_size = (self.get_property("px"), self.get_property("py"))
-        self._width = self.get_property("width")
-        self._height = self.get_property("height")
-
     def force_emit_signals(self):
         """Emit all hardware object signals."""
         self.emit("detectorRoiModeChanged", (self._roi_mode,))

{mxcubecore-1.344.0.dist-info → mxcubecore-1.346.0.dist-info}/METADATA

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

{mxcubecore-1.344.0.dist-info → mxcubecore-1.346.0.dist-info}/RECORD

@@ -222,7 +222,7 @@ mxcubecore/HardwareObjects/LimaEigerDetector.py,sha256=Z8XRt6-uNdJy10HZbQdcTYDB8
 mxcubecore/HardwareObjects/LimaPilatusDetector.py,sha256=yUcUi7OXdoy4TU2aZN21kc6R9ivdQ5sYyEKoIqYOmkg,11589
 mxcubecore/HardwareObjects/MAXIV/ISPyBLims.py,sha256=iKgpb0NVGIN-iRgjIpV2eh12PJoAZvo3NFyKwo-458Q,7565
 mxcubecore/HardwareObjects/MAXIV/MAXIVAutoProcessing.py,sha256=kgTSnOLoumPtOUazJeg6N_no1WOScPeLwus3iR1xMPw,9201
-mxcubecore/HardwareObjects/MAXIV/MachInfo.py,sha256=8ujVk-f3dPZBTXOAkqL0ewTB9swDn97Lm3Dx3rsSXKM,2985
+mxcubecore/HardwareObjects/MAXIV/MachInfo.py,sha256=Wkj5JHP_8tOgRGNXiKPfImTsX-O67_CrWH3wP14AsSI,2983
 mxcubecore/HardwareObjects/MAXIV/MaxIVSession.py,sha256=UvTOzOaXX9IipN4UK1q9avEjc6goswF5uvXmnm4btgI,7749
 mxcubecore/HardwareObjects/MAXIV/MicroMAX/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/MAXIV/MicroMAX/beamline_actions.py,sha256=TT_0bTbfb8kZxF09vp618yPBEbBGY1KOHNj3wUiaPjs,2099
@@ -345,7 +345,7 @@ mxcubecore/HardwareObjects/abstract/AbstractAuthenticator.py,sha256=F5ONnre9GEcg
 mxcubecore/HardwareObjects/abstract/AbstractBeam.py,sha256=Fvz5K3ov0Glsw8bO2oXiYbkFMK9L8CX4gldJg73lkr0,10389
 mxcubecore/HardwareObjects/abstract/AbstractCharacterisation.py,sha256=knGIC9GVSY_mJfcpMpU9qP8OfaIngasGEc8PIVFsr_4,4990
 mxcubecore/HardwareObjects/abstract/AbstractCollect.py,sha256=L9xyT1IgtiRCIR303Nw9fe_TN7azKcLKMGtvCN7de_0,33360
-mxcubecore/HardwareObjects/abstract/AbstractDetector.py,sha256=p3pblv8Qu6_SASiz7fi6H8kzcFERuaJwhf--eb1hy_c,11511
+mxcubecore/HardwareObjects/abstract/AbstractDetector.py,sha256=oLUrZuMjj3uujyODqXgBuxNl_6WieBv5MFHfyQN7c64,11561
 mxcubecore/HardwareObjects/abstract/AbstractEnergy.py,sha256=zG6tICqBdWcEMz8gGh7DFvP6CHz5xNlaRdcG4Y8tFps,4553
 mxcubecore/HardwareObjects/abstract/AbstractEnergyScan.py,sha256=OnUXHBNm5kt7Lud0UmReZzs9Jv4d1cCJTlB4JRlvBOc,6066
 mxcubecore/HardwareObjects/abstract/AbstractFlux.py,sha256=1RbuFdD8QsRDwGj94mz4PffoiElgDV5OZUxjyTCYieA,3442
@@ -465,8 +465,8 @@ mxcubecore/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUOk,4513
 mxcubecore/utils/qt_import.py,sha256=hQkBVZLUDZtktX7DSyoH88GAK_mK9Ghlsj4k9pFJeAQ,14415
 mxcubecore/utils/units.py,sha256=2D1QlTwe8eSs2UYRm4VVxSTosZZHeM-Pfw9KlcLbDAg,1251
-mxcubecore-1.344.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.344.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.344.0.dist-info/METADATA,sha256=x1S9CPBarcN7QT-Xh0p7JRNt7dNe5dJB9VEKC7k_udc,4262
-mxcubecore-1.344.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.344.0.dist-info/RECORD,,
+mxcubecore-1.346.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.346.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.346.0.dist-info/METADATA,sha256=eq_UZO9BC8AO25OQHIWYfnAe_IAtDACOWSt4CYiGqVo,4262
+mxcubecore-1.346.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.346.0.dist-info/RECORD,,