mxcubecore 1.355.0__py3-none-any.whl → 1.357.0__py3-none-any.whl

mxcubecore/HardwareObjects/ICATLIMS.py

@@ -1080,6 +1080,7 @@ class ICATLIMS(AbstractLims):
                 "InstrumentMonochromator_wavelength": collection_parameters.get(
                     "wavelength"
                 ),
+                "InstrumentMonochromator_energy": collection_parameters.get("energy"),
                 "Workflow_name": workflow_params.get("workflow_name"),
                 "Workflow_type": workflow_params.get("workflow_type"),
                 "Workflow_id": workflow_params.get("workflow_uid"),

mxcubecore/HardwareObjects/ISARAMaint.py

@@ -6,6 +6,7 @@ from tango import (
 )
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
+from mxcubecore.utils.tango import TangoAttributeReadError, add_attribute_channel
 
 """
 The sample changer maintenance hardware object for ISARA2 robot.
@@ -93,14 +94,7 @@ class ISARAMaint(HardwareObject):
     def init(self):
         tangoname = self.get_property("tangoname")
         self.isara_dev = DeviceProxy(tangoname)
-
-        polling = self._get_polling()
-
-        self._poll_attribute(tangoname, "Powered", polling, self._powered_updated)
-        self._poll_attribute(
-            tangoname, "PositionName", polling, self._position_name_updated
-        )
-        self._poll_attribute(tangoname, "Message", polling, self._message_updated)
+        self._setup_attribute_polling(tangoname)
 
     def _get_polling(self):
         """
@@ -113,18 +107,36 @@ class ISARAMaint(HardwareObject):
             # no polling is specified in the XML, use default polling value
             return DEFAULT_POLLING
 
-    def _poll_attribute(self, tangoname: str, attr_name: str, polling: int, callback):
-        channel = self.add_channel(
-            {
-                "type": "tango",
-                "name": f"_chn{attr_name}",
-                "tangoname": tangoname,
-                "polling": polling,
-            },
-            attr_name,
-        )
+    def _setup_attribute_polling(self, tangoname: str):
+        polling = self._get_polling()
 
-        channel.connect_signal("update", callback)
+        try:
+            add_attribute_channel(
+                self,
+                tangoname,
+                "Powered",
+                polling,
+                self._powered_updated,
+            )
+            add_attribute_channel(
+                self,
+                tangoname,
+                "PositionName",
+                polling,
+                self._position_name_updated,
+            )
+            add_attribute_channel(
+                self,
+                tangoname,
+                "Message",
+                polling,
+                self._message_updated,
+            )
+        except TangoAttributeReadError as ex:
+            self.log.warning(
+                "ISARA: could not connect to '%s' tango attribute",
+                ex.attribute_name,
+            )
 
     def _update_state(self):
         for attr in [self._powered, self._position_name, self._message]:

mxcubecore/utils/tango.py

@@ -0,0 +1,71 @@
+from tango import DevFailed
+
+from mxcubecore.BaseHardwareObjects import HardwareObject
+from mxcubecore.Command.Tango import TangoChannel
+
+
+class TangoAttributeReadError(Exception):
+    def __init__(self, attribute_name: str):
+        super().__init__()
+        self.attribute_name = attribute_name
+
+
+def add_attribute_channel(
+    hwo: HardwareObject,
+    tango_device: str,
+    attribute_name: str,
+    polling: int,
+    update_callback=None,
+) -> TangoChannel:
+    """Utility function to add Tango attribute Channel to a hardware object.
+
+    This function adds a Channel object to specified hardware object and checks
+    that it's possible to read the specified tango attribute.
+
+    If there is errors reading the attribute, the TangoAttributeReadError
+    exception is raised.
+
+    Parameters:
+        hwo: The hardware object where to add the Channel object.
+        tango_device: Tango device name.
+        attribute_name: The tango attribute name.
+        polling: Attribute polling periodicity.
+        update_callback: Optional callback, if provided it is connected to
+           "update" signal of Channel object
+    """
+
+    channel = hwo.add_channel(
+        {
+            "type": "tango",
+            "tangoname": tango_device,
+            "name": attribute_name,
+            "polling": polling,
+        },
+        attribute_name,
+    )
+
+    if not channel.is_connected():
+        raise TangoAttributeReadError(attribute_name)
+
+    #
+    # check if it's possible to read the Attribute
+    #
+    try:
+        val = channel.get_value()
+    except DevFailed:
+        raise TangoAttributeReadError(attribute_name) from None
+
+    #
+    # add "update" callback
+    #
+    if update_callback is not None:
+        channel.connect_signal("update", update_callback)
+        #
+        # We have 'consumed' the initial value of this channel above,
+        # when we were testing if it's readable. The standard polling
+        # will not invoke the callback with that value now.
+        # Make sure initial value is passed to the callback.
+        #
+        update_callback(val)
+
+    return channel

{mxcubecore-1.355.0.dist-info → mxcubecore-1.357.0.dist-info}/METADATA

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

{mxcubecore-1.355.0.dist-info → mxcubecore-1.357.0.dist-info}/RECORD

@@ -197,8 +197,8 @@ mxcubecore/HardwareObjects/GrobMotor.py,sha256=l5A9Us_ceLXlhEF6RNwyXQsI56fJiobWh
 mxcubecore/HardwareObjects/GrobSampleChanger.py,sha256=LMetcL45fWrwP4C8rtENrEDNydelLpJ77SD1JC5C3go,8113
 mxcubecore/HardwareObjects/Harvester.py,sha256=0TYUXmz-Pmfd7Dhz7ToUGHzJRuJmnga8-4BK4B0KGQA,26524
 mxcubecore/HardwareObjects/HarvesterMaintenance.py,sha256=8s4yHDEFG-C1WYyW_RlwrFPSpc8o5hGi14aQuFQFrHs,9405
-mxcubecore/HardwareObjects/ICATLIMS.py,sha256=Jdzs6KWQDvlzqauuIOeeaEkgS9Vs11zDqLJDgxv3sS4,51016
-mxcubecore/HardwareObjects/ISARAMaint.py,sha256=dCfVckK_qo-9m4sUicwyxXjkrRsMxkOWujMG0f4JtDM,8661
+mxcubecore/HardwareObjects/ICATLIMS.py,sha256=kxIkpKhAkU7BeI-v45rMtjOZerO_q9f7-SpCHoj6z84,51103
+mxcubecore/HardwareObjects/ISARAMaint.py,sha256=I8LHXK6wCfzixsxWmmcqWlrdaL3AOX91XmVeAwT7GPk,8959
 mxcubecore/HardwareObjects/LNLS/EPICSActuator.py,sha256=3dDj6aXyTz03m8osdA6udq_a4bch-KNcUMrXSNvbG5Q,2587
 mxcubecore/HardwareObjects/LNLS/EPICSMotor.py,sha256=lRTc1t32rJKNTIcnKCECrqo2m9BhlYvLq9NWg4Y0w0Q,3576
 mxcubecore/HardwareObjects/LNLS/EPICSNState.py,sha256=xZ2sQFeRpZIdn29e7pCFF24KT2cYsoe7VNTD2z-F_IU,3103
@@ -464,9 +464,10 @@ mxcubecore/saferef.py,sha256=lbUbzojjg1XM6gKtGKug48CD_LeuQXpZ7R3r1fMjCKw,7164
 mxcubecore/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUOk,4513
 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.355.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.355.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.355.0.dist-info/METADATA,sha256=5TNx-RSilfDJjx1pkJnY6LCnsYt2Ge5iPQAfN-mEOkY,4262
-mxcubecore-1.355.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.355.0.dist-info/RECORD,,
+mxcubecore-1.357.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.357.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.357.0.dist-info/METADATA,sha256=yjcHeCjBMfKcaWtnkn1l_ZN6MCPAkbn94pzuA1Ls2eg,4262
+mxcubecore-1.357.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.357.0.dist-info/RECORD,,