mxcubecore 1.362.0__tar.gz → 1.363.0__tar.gz

{mxcubecore-1.362.0 → mxcubecore-1.363.0}/PKG-INFO

@@ -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 → mxcubecore-1.363.0}/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-1.362.0 → mxcubecore-1.363.0}/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-1.362.0 → mxcubecore-1.363.0}/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 → mxcubecore-1.363.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxcubecore"
-version = "1.362.0"
+version = "1.363.0"
 license = "LGPL-3.0-or-later"
 description = "Core libraries for the MXCuBE application"
 authors = [