mxcubecore 1.373.0__py3-none-any.whl → 1.375.0__py3-none-any.whl

mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py

@@ -50,7 +50,6 @@ class ESRFPhotonFlux(AbstractFlux):
         self._flux_calc = None
         self.counter_name = None
         self.threshold = None
-        self.aperture = None
         self.controller = None
 
     def init(self):
@@ -111,13 +110,16 @@ class ESRFPhotonFlux(AbstractFlux):
             calib = 0
 
         factor = 1.0
-        if self.aperture:
-            label = self.aperture.get_value().name
-            aperture_factor = self.aperture.get_factor(label)
+        try:
+            aperture = HWR.beamline.diffractometer.aperture
+            label = aperture.get_value().name
+            aperture_factor = aperture.get_factor(label)
             if isinstance(aperture_factor, tuple):
                 factor = aperture_factor[0] + aperture_factor[1] * egy
             else:
                 factor = float(aperture_factor)
+        except AttributeError:
+            factor = 1.0
 
         counts = abs(counts * calib * factor)
         if counts < self.threshold:

mxcubecore/HardwareObjects/ESRF/ID232BeamDefiner.py

@@ -66,18 +66,16 @@ class ID232BeamDefiner(ESRFBeamDefiner):
     def __init__(self, *args):
         super().__init__(*args)
         self.tf_cfg = {}
-        self.controller = None
         self.tf1 = None
         self.tf2 = None
 
     def init(self):
         """Initialisation"""
         super().init()
-
-        self.controller = self.get_object_by_role("controller")
-        self.tf1 = self.controller.config.get(self.get_property("tf1"))
-        self.tf2 = self.controller.config.get(self.get_property("tf2"))
-        for beam_cfg in self.config:
+        controller = self.get_object_by_role("controller")
+        self.tf1 = getattr(controller, self.get_property("tf1"))
+        self.tf2 = getattr(controller, self.get_property("tf2"))
+        for beam_cfg in self.bd_config:
             name = beam_cfg.get_property("name")
             tf1 = [int(x) for x in beam_cfg.get_property("tf1").split()]
             tf2 = [int(x) for x in beam_cfg.get_property("tf2").split()]

mxcubecore/HardwareObjects/ESRF/ID30A3BeamDefiner.py

@@ -65,7 +65,7 @@ class ID30A3BeamDefiner(ESRFBeamDefiner):
 
         self.controller = self.get_object_by_role("controller")
         _dict = {}
-        for beam_cfg in self.config:
+        for beam_cfg in self.bd_config:
             name = beam_cfg.get_property("name")
             _ap_size = beam_cfg.get_property("aperture_size")
             _aperture = self.controller.value_to_enum(_ap_size, idx=1)
@@ -96,8 +96,8 @@ class ID30A3BeamDefiner(ESRFBeamDefiner):
             (str): Current beam size name.
         """
         _aperture = self.controller.get_value()
-        for name in self.beam_config:
-            if self.beam_config[name][1] == _aperture:
+        for name, val in self.beam_config.items():
+            if val[1] == _aperture:
                 return name
         return "UNKNOWN"
 

{mxcubecore-1.373.0.dist-info → mxcubecore-1.375.0.dist-info}/METADATA

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

{mxcubecore-1.373.0.dist-info → mxcubecore-1.375.0.dist-info}/RECORD

@@ -145,16 +145,16 @@ mxcubecore/HardwareObjects/ESRF/ESRFEnergyScan.py,sha256=FztM1wCtbcqLWaCg34z-IPq
 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
-mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py,sha256=aXold_HC1G9gZJWqEICbheeW0veaKFcCoJ3CUYkG1v0,3884
+mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py,sha256=PXJJJO-GfxrTfpw5tgc_dHh5b5kyYbiq-zUXyG7_8tQ,3948
 mxcubecore/HardwareObjects/ESRF/ESRFSC3.py,sha256=Mw2Lj_0w7TapaCesDxhRWSAY1PRG4DJCoLWgYdP_qV4,9545
 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=AivYp-Ty_hz19ytzMoN9Y-W7J30CaMZSMT0OW-ORw18,5078
+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=8-hUvKuI2yi8IUMqIN2FN5CrsJKpnEH5pLpz0rufEYU,3999
+mxcubecore/HardwareObjects/ESRF/ID30A3BeamDefiner.py,sha256=V7gn4JTYhzG0ajeJwjR68MbJuDt26mHaNROHhd1Z0QI,3996
 mxcubecore/HardwareObjects/ESRF/ID30BBeamDefiner.py,sha256=uZJ0szJFdGysZsgiaxxUYKq1nPVYwK4jZ3xMX74cwqU,5046
 mxcubecore/HardwareObjects/ESRF/MD2MultiCollect.py,sha256=vJwZvNPu0MDUdN0NK_JrDBDChIcEUVmsoIOkwTqn7RQ,7980
 mxcubecore/HardwareObjects/ESRF/OxfordCryostream.py,sha256=JA6Gkz3AChV3H5hlW6o-oTw9rllFN6VCq6_5QOKItdc,7339
@@ -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=lAl7Su_GgyXFEEKZ1yu_2gU18wXHVaBbGR8RYcIOVYk,2100
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.373.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.373.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.373.0.dist-info/METADATA,sha256=RxlY3zEk1cyD3sj9-jwKNlZvic6m6yEchwnJxsRWlhg,4259
-mxcubecore-1.373.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.373.0.dist-info/RECORD,,
+mxcubecore-1.375.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.375.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.375.0.dist-info/METADATA,sha256=lBTQp0spEaVMOQ1zYROULm8XZKumWhEacg58cAuOTgo,4259
+mxcubecore-1.375.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.375.0.dist-info/RECORD,,