mxcubecore 1.340.0__tar.gz → 1.342.0__tar.gz

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/PKG-INFO

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

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/Command/Mockup.py

@@ -18,15 +18,6 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with MXCuBE. If not, see <http://www.gnu.org/licenses/>.
 
-# import time
-# import logging
-# import weakref
-
-# try:
-#     import Queue as queue
-# except ImportError:
-#     import queue
-
 
 from mxcubecore.CommandContainer import (
     ChannelObject,

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/Command/Pool.py

@@ -251,7 +251,6 @@ class PoolChannel(ChannelObject):
             s = self.device.State()
         except Exception:
             pass
-            # logging.getLogger("HWR").exception("Could not read State attribute")
         else:
             if s == PyTango.DevState.OFF:
                 return
@@ -278,9 +277,6 @@ class PoolChannel(ChannelObject):
         return self.value
 
     def set_value(self, new_value):
-        # newval = PyTango.AttributeValue()
-        # newval.value = newValue
-        # self.device.write_attribute(self.attribute_name, newval)
         attr = PyTango.AttributeProxy(self.device_name + "/" + self.attribute_name)
         a = attr.read()
         a.value = new_value

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/Command/Sardana.py

@@ -29,8 +29,6 @@ import os
 import gevent
 from gevent.event import Event
 
-# import time
-# import types
 from mxcubecore.dispatcher import saferef
 
 try:
@@ -156,17 +154,6 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
         self.door.set_timeout_millis(10000)
         self.doorstate = self.door.state.name.upper()
 
-        #
-        # DIRTY FIX to make compatible taurus listeners and existence of Tango channels/commands
-        # as defined in Command/Tango.py
-        #
-        # if self.door.__class__ == taurus.core.tango.tangodevice.TangoDevice:
-        #    dp = self.door.getHWObj()
-        #    try:
-        #        dp.subscribe_event = dp._subscribe_event
-        #    except AttributeError:
-        #        pass
-
         if self.macroStatusAttr is None:
             self.macroStatusAttr = self.door.getAttribute("State")
             self.macroStatusAttr.addListener(self.object_listener)
@@ -261,9 +248,8 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
 
         try:
             if not isinstance(data, PyTango.DeviceAttribute):
-                # Events different than a value changed on attribute.  Taurus sends an event with attribute info
-                # logging.getLogger('HWR').debug("==========. Got an event, but it is not an attribute . it is %s" % type(data))
-                # logging.getLogger('HWR').debug("doorstate event. type is %s" % str(type(data)))
+                # Events different than a value changed on attribute.
+                # Taurus sends an event with attribute info.
                 return
 
             # Handling macro state changed event
@@ -275,18 +261,14 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
             if doorstate != self.doorstate:
                 self.doorstate = doorstate
 
-                # logging.getLogger('HWR').debug("self.doorstate is %s" % self.canExecute())
                 self.emit("commandCanExecute", (self.can_execute(),))
 
                 if doorstate in ["ON", "ALARM"]:
-                    # logging.getLogger('HWR').debug("Macroserver ready for commands")
                     self.emit("commandReady", ())
                 else:
-                    # logging.getLogger('HWR').debug("Macroserver busy ")
                     self.emit("commandNotReady", ())
 
             if self.macrostate == SardanaMacro.STARTED and doorstate == "RUNNING":
-                # logging.getLogger('HWR').debug("Macro server is running")
                 self.macrostate = SardanaMacro.RUNNING
             elif self.macrostate == SardanaMacro.RUNNING and (
                 doorstate in ["ON", "ALARM"]
@@ -323,7 +305,6 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
         if self.door is not None:
             logging.getLogger("HWR").debug("SardanaMacro / aborting macro")
             self.door.abortMacro()
-            # self.emit('commandReady', ())
 
     def is_connected(self):
         return self.door is not None
@@ -417,18 +398,6 @@ class SardanaChannel(ChannelObject, SardanaObject):
     def init_device(self):
         try:
             self.attribute = Attribute(self.model)
-            #
-            # DIRTY FIX to make compatible taurus listeners and existence of Tango channels/commands
-            # as defined in Command/Tango.py
-            #
-            # if self.attribute.__class__ == taurus.core.tango.tangoattribute.TangoAttribute:
-            #    dev = self.attribute.getParentObj()
-            #    dp = dev.getHWObj()
-            #    try:
-            #        dp.subscribe_event = dp._subscribe_event
-            #    except AttributeError:
-            #        pass
-            # logging.getLogger("HWR").debug("initialized")
         except DevFailed as traceback:
             self.imported = False
             return

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/Command/Tine.py

@@ -62,11 +62,9 @@ class TineCommand(CommandObject):
         else:
             commandArgument = args[0]
         try:
-            # logging.getLogger("HWR").info("Tine command %s sent" % self.commandName)
             ret = tine.set(
                 self.tineName, self.commandName, commandArgument, self.timeout
             )
-            # logging.getLogger("HWR").info("Tine command %s reply arrived" % self.commandName)
             self.emit("commandReplyArrived", (ret, str(self.name())))
         except IOError as strerror:
             logging.getLogger("user_level_log").exception("TINE: %s" % strerror)
@@ -122,9 +120,6 @@ class TineChannel(ChannelObject):
     attach = {"timer": tine.attach, "event": tine.notify, "datachange": tine.update}
 
     updates = queue.Queue()
-    # updates_emitter = QtCore.QTimer()
-    # QtCore.QObject.connect(updates_emitter, QtCore.SIGNAL('timeout()'), emitTineChannelUpdates)
-    # updates_emitter.start(20)
     updates_emitter = gevent.spawn(do_tine_channel_update, 0.1)
 
     def __init__(
@@ -167,10 +162,6 @@ class TineChannel(ChannelObject):
             self.linkid = TineChannel.attach[kwargs.get("attach", "timer")](
                 self.tineName, self.attributeName, self.tineEventCallback, self.timeout
             )
-        # except IOError as strerror:
-        #   logging.getLogger("HWR").error("%s" %strerror)
-        # except ValueError:
-        #   logging.getLogger("HWR").error("TINE attach object is not callable")
 
         if self.linkid > 0 and kwargs.get("attach", "timer") == "datachange":
             tolerance = kwargs.get("tolerance", 0.0)
@@ -180,9 +171,6 @@ class TineChannel(ChannelObject):
                 if tolerance != 0.0:
                     tine.tolerance(self.linkid, float(tolerance), 0.0)
 
-        # TODO Remove this sleep. Tine lib bug when after attach directly get is called
-        # time.sleep(0.025)
-
         atexit.register(self.__del__)
 
     def __del__(self):
@@ -232,9 +220,6 @@ class TineChannel(ChannelObject):
             """
 
     def update(self, value=None):
-        # if self.tineName.split("/")[2] == 'ics':
-        #   print '>>>>>>>>>>>>>>>>>>', self.attributeName, value, self.value, self.oldvalue
-
         if value is None:
             logging.getLogger("HWR").warning(
                 "Update with value None on: %s %s" % (self.tineName, self.attributeName)
@@ -245,14 +230,8 @@ class TineChannel(ChannelObject):
         if value != self.oldvalue:
             TineChannel.updates.put((weakref.ref(self), value))
             self.oldvalue = value
-            # if self.tineName == "/P14/BCUIntensity/Device0":
-            #    logging.getLogger("HWR").debug('----------------- %s %s' %(self.attributeName,self.value))
 
     def get_value(self, force=False):
-        # logging.getLogger("HWR").debug('TINE channel %s, %s get at val=%s'%(self.tineName,self.attributeName,self.value))
-        # if self.tineName == "/P14/BCUIntensity/Device0":
-        #   print self.attributeName, self.value
-
         # GB: if forced while having a value already, i.e. well after connecting a channel, do a real synchronous get and return
         if force:
             if self.value is not None:
@@ -279,7 +258,6 @@ class TineChannel(ChannelObject):
             # but now tine lib should be standing the get, so we try....
 
             self.value = self._synchronous_get()
-            # time.sleep(0.02)
             _counter += 1
         if self.value is None:
             logging.getLogger("HWR").warning(

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/CommandContainer.py

@@ -329,7 +329,6 @@ class CommandContainer:
         if channel is None and not optional:
             msg = "%s: Unable to get channel %s" % (self.id, channel_name)
             logging.getLogger("user_level_log").error(msg)
-            # raise Exception(msg)
         return channel
 
     def get_channel_names_list(self) -> List[str]:

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/mxcubecore/model/queue_model_objects.py

@@ -24,6 +24,7 @@ Any object that inherits from TaskNode can be added to and handled by
 the QueueModel.
 """
 
+import ast
 import copy
 import logging
 import os
@@ -1705,6 +1706,7 @@ class AcquisitionParameters(object):
         self.skip_existing_images = False
         self.detector_binning_mode = str()
         self.detector_roi_mode = str()
+        self.detector_mode_list = self.get_detector_mode_list()
         self.induce_burn = False
         self.mesh_range = ()
         self.cell_counting = "zig-zag"
@@ -1753,6 +1755,7 @@ class AcquisitionParameters(object):
             "skip_existing_images": self.skip_existing_images,
             "detector_binning_mode": self.detector_binning_mode,
             "detector_roi_mode": self.detector_roi_mode,
+            "detector_mode_list": self.detector_mode_list,
             "induce_burn": self.induce_burn,
             "mesh_range": self.mesh_range,
             "mesh_snapshot": self.mesh_snapshot,
@@ -1771,6 +1774,11 @@ class AcquisitionParameters(object):
     def copy(self):
         return copy.deepcopy(self)
 
+    def get_detector_mode_list(self):
+        return ast.literal_eval(
+            HWR.beamline.detector.get_property("roi_mode_list", "[]")
+        )
+
 
 class XrayImagingParameters(object):
     def __init__(self):

{mxcubecore-1.340.0 → mxcubecore-1.342.0}/pyproject.toml

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