mxcubecore 1.362.0__py3-none-any.whl → 1.363.0__py3-none-any.whl

mxcubecore/HardwareObjects/ESRF/ESRFBeam.py

@@ -33,6 +33,7 @@ Example yml configuration:
  objects:
    aperture: udiff_aperture.yml
    definer: beam_definer.yml
+   monitor_beam: monitor_beam.yaml
 """
 
 __copyright__ = """ Copyright © by the MXCuBE collaboration """
@@ -99,9 +100,10 @@ class ESRFBeam(AbstractBeam):
 
         self._monitorbeam_obj = self.get_object_by_role("monitor_beam")
 
-        beam_check = self.get_property("beam_check_name")
-        if beam_check and _bliss_obj:
-            self._beam_check_obj = getattr(_bliss_obj, beam_check)
+        if self._monitorbeam_obj:
+            beam_check = self._monitorbeam_obj.actuator_name
+            if beam_check and _bliss_obj:
+                self._beam_check_obj = getattr(_bliss_obj, beam_check)
 
     def _re_emit_values(self, value):
         """Redefine as re_emit_values takes no arguments"""
@@ -394,7 +396,6 @@ class ESRFBeam(AbstractBeam):
             try:
                 timeout = timeout or self._beam_check_obj.timeout
                 if self._monitorbeam_obj.get_value().value:
-                    return self._beam_check_obj.wait_for_beam(timeout)
+                    self._beam_check_obj.wait_for_beam(timeout)
             except AttributeError:
-                return True
-        return True
+                pass

mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py

@@ -25,14 +25,12 @@ Example xml_ configuration:
 
  class: ESRF.ESRFPhotonFlux.ESRFPhotonFlux
   configuration:
-    beam_check_name: checkbeam
     counter_name: i0
     threshold: 5000000000.0
     username: Photon flux
   objects:
     aperture: udiff_aperture.yaml
     controller: bliss.yaml
-    monitor_beam: monitor_beam.yaml
 """
 
 import logging
@@ -50,13 +48,10 @@ class ESRFPhotonFlux(AbstractFlux):
         super().__init__(name)
         self._counter = None
         self._flux_calc = None
-        self._beam_check_obj = None
-        self.beam_check_name = None
         self.counter_name = None
         self.threshold = None
         self.aperture = None
         self.controller = None
-        self.monitor_beam = None
 
     def init(self):
         """Initialisation"""
@@ -80,9 +75,6 @@ class ESRFPhotonFlux(AbstractFlux):
                 "Counter to read the flux is not configured"
             )
 
-        if self.beam_check_name:
-            self._beam_check_obj = getattr(self.controller, self.beam_check_name)
-
         try:
             HWR.beamline.safety_shutter.connect("stateChanged", self.update_value)
         except AttributeError as err:
@@ -132,27 +124,3 @@ class ESRFPhotonFlux(AbstractFlux):
             return 0.0
 
         return counts
-
-    @property
-    def check_beam(self):
-        """Check if there is beam
-        Returns:
-            (bool): True if beam present, False otherwise
-        """
-        return self._beam_check_obj.check_beam()
-
-    def wait_for_beam(self, timeout=None):
-        """Wait until beam present.
-        Args:
-            timeout (float): optional - timeout [s],
-                             If timeout == 0: return at once and do not wait
-                                              (default);
-                             if timeout is None: wait forever.
-        """
-        try:
-            if self.monitor_beam.get_value().value is True:
-                if self._beam_check_obj:
-                    return self._beam_check_obj.wait_for_beam(timeout)
-                return True
-        except AttributeError:
-            return True

mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py

@@ -801,7 +801,7 @@ class AbstractMultiCollect(object):
             self.open_safety_shutter()
 
             try:
-                HWR.beamline.flux.wait_for_beam()
+                HWR.beamline.beam.wait_for_beam()
                 HWR.beamline.cryo.wait_temperature()
             except AttributeError:
                 pass

{mxcubecore-1.362.0.dist-info → mxcubecore-1.363.0.dist-info}/METADATA

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

{mxcubecore-1.362.0.dist-info → mxcubecore-1.363.0.dist-info}/RECORD

@@ -137,7 +137,7 @@ mxcubecore/HardwareObjects/EMBLFlexHarvester.py,sha256=N_Kq618WkqlTrRV9skiL9CyuN
 mxcubecore/HardwareObjects/ESRF/BlissHutchTrigger.py,sha256=LTD6X0S8k3NVekxINzPv_BeGAHpsQAQVb9L7MMlrvvs,5371
 mxcubecore/HardwareObjects/ESRF/BlissTurret.py,sha256=PpCItrM2S3SuQtt1xgDN2Bi9x3-D7eZxC8MuDWcwqZY,1400
 mxcubecore/HardwareObjects/ESRF/BlissVolpi.py,sha256=SLLmlUZ7aTcCgsymp_fsbpx5WwgBQ_ug4ihm-dQ3Jr4,1002
-mxcubecore/HardwareObjects/ESRF/ESRFBeam.py,sha256=4n6K9xC0OAKfYpWlcMuajEz6VczEVg6IZ5vmWYNwOW4,13205
+mxcubecore/HardwareObjects/ESRF/ESRFBeam.py,sha256=9B6VgoG5pUIExgY08sUyvL3LYniUW9Bkb5PRVm-1nsY,13251
 mxcubecore/HardwareObjects/ESRF/ESRFBeamDefiner.py,sha256=K9wqsD2sD7HpeC-L6e2AUmpbR8nlPYJOCf9Twmen3j8,3792
 mxcubecore/HardwareObjects/ESRF/ESRFBeamInfo.py,sha256=_JLCOPwhcwd-9REnrBOQlgvJgKqTseaA2aRc4cM_ai8,2298
 mxcubecore/HardwareObjects/ESRF/ESRFBeamlineActions.py,sha256=GGC1_9rEd1RQzGdOoVdIAGAjOPtwpjpoUFVcJHT9oTc,3259
@@ -145,7 +145,7 @@ 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=6LeGXZCZxs9tBwyl4gRej0R85-5U2aFQsw-nJs4IciA,5007
+mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py,sha256=aXold_HC1G9gZJWqEICbheeW0veaKFcCoJ3CUYkG1v0,3884
 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
@@ -353,7 +353,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=lpQYpCTtyGzyk8q1kvn3bfQ68rrQy1rqwhnhJzpWzRI,51580
+mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py,sha256=-Tgb7l_Ovv4IQIFqEis-HnUAZh3-gze16IbdVdKkHBc,51580
 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
@@ -466,8 +466,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=2D1QlTwe8eSs2UYRm4VVxSTosZZHeM-Pfw9KlcLbDAg,1251
-mxcubecore-1.362.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.362.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.362.0.dist-info/METADATA,sha256=edXTUPKTDfnrv-5tFNt9TZgbCrFdNjcEF5ykgNseOJI,4259
-mxcubecore-1.362.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.362.0.dist-info/RECORD,,
+mxcubecore-1.363.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.363.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.363.0.dist-info/METADATA,sha256=dqzXB7A_z-AuuJ12mXQCwwaJfhj6FMzH13j7HAjv3sE,4259
+mxcubecore-1.363.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.363.0.dist-info/RECORD,,