mxcubecore 1.343.0__py3-none-any.whl → 1.345.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mxcubecore/HardwareObjects/ISARAMaint.py +9 -6
- mxcubecore/HardwareObjects/MAXIV/MachInfo.py +2 -2
- {mxcubecore-1.343.0.dist-info → mxcubecore-1.345.0.dist-info}/METADATA +1 -1
- {mxcubecore-1.343.0.dist-info → mxcubecore-1.345.0.dist-info}/RECORD +7 -7
- {mxcubecore-1.343.0.dist-info → mxcubecore-1.345.0.dist-info}/COPYING +0 -0
- {mxcubecore-1.343.0.dist-info → mxcubecore-1.345.0.dist-info}/COPYING.LESSER +0 -0
- {mxcubecore-1.343.0.dist-info → mxcubecore-1.345.0.dist-info}/WHEEL +0 -0
|
@@ -91,13 +91,16 @@ class ISARAMaint(HardwareObject):
|
|
|
91
91
|
self._message = None
|
|
92
92
|
|
|
93
93
|
def init(self):
|
|
94
|
-
|
|
94
|
+
tangoname = self.get_property("tangoname")
|
|
95
|
+
self.isara_dev = DeviceProxy(tangoname)
|
|
95
96
|
|
|
96
97
|
polling = self._get_polling()
|
|
97
98
|
|
|
98
|
-
self._poll_attribute("Powered", polling, self._powered_updated)
|
|
99
|
-
self._poll_attribute(
|
|
100
|
-
|
|
99
|
+
self._poll_attribute(tangoname, "Powered", polling, self._powered_updated)
|
|
100
|
+
self._poll_attribute(
|
|
101
|
+
tangoname, "PositionName", polling, self._position_name_updated
|
|
102
|
+
)
|
|
103
|
+
self._poll_attribute(tangoname, "Message", polling, self._message_updated)
|
|
101
104
|
|
|
102
105
|
def _get_polling(self):
|
|
103
106
|
"""
|
|
@@ -110,12 +113,12 @@ class ISARAMaint(HardwareObject):
|
|
|
110
113
|
# no polling is specified in the XML, use default polling value
|
|
111
114
|
return DEFAULT_POLLING
|
|
112
115
|
|
|
113
|
-
def _poll_attribute(self, attr_name: str, polling: int, callback):
|
|
116
|
+
def _poll_attribute(self, tangoname: str, attr_name: str, polling: int, callback):
|
|
114
117
|
channel = self.add_channel(
|
|
115
118
|
{
|
|
116
119
|
"type": "tango",
|
|
117
120
|
"name": f"_chn{attr_name}",
|
|
118
|
-
"tangoname":
|
|
121
|
+
"tangoname": tangoname,
|
|
119
122
|
"polling": polling,
|
|
120
123
|
},
|
|
121
124
|
attr_name,
|
|
@@ -57,8 +57,8 @@ class MachInfo(AbstractMachineInfo):
|
|
|
57
57
|
parameters (str): topics to export, see AbstractMachineInfo class for details
|
|
58
58
|
"""
|
|
59
59
|
|
|
60
|
-
def __init__(self,
|
|
61
|
-
super().__init__(
|
|
60
|
+
def __init__(self, name):
|
|
61
|
+
super().__init__(name)
|
|
62
62
|
self.mach_info = None
|
|
63
63
|
self.mach_curr = None
|
|
64
64
|
|
|
@@ -198,7 +198,7 @@ mxcubecore/HardwareObjects/GrobSampleChanger.py,sha256=LMetcL45fWrwP4C8rtENrEDNy
|
|
|
198
198
|
mxcubecore/HardwareObjects/Harvester.py,sha256=0TYUXmz-Pmfd7Dhz7ToUGHzJRuJmnga8-4BK4B0KGQA,26524
|
|
199
199
|
mxcubecore/HardwareObjects/HarvesterMaintenance.py,sha256=8s4yHDEFG-C1WYyW_RlwrFPSpc8o5hGi14aQuFQFrHs,9405
|
|
200
200
|
mxcubecore/HardwareObjects/ICATLIMS.py,sha256=Jdzs6KWQDvlzqauuIOeeaEkgS9Vs11zDqLJDgxv3sS4,51016
|
|
201
|
-
mxcubecore/HardwareObjects/ISARAMaint.py,sha256=
|
|
201
|
+
mxcubecore/HardwareObjects/ISARAMaint.py,sha256=dCfVckK_qo-9m4sUicwyxXjkrRsMxkOWujMG0f4JtDM,8661
|
|
202
202
|
mxcubecore/HardwareObjects/LNLS/EPICSActuator.py,sha256=L5vhJnLjx0cawBeAQbTtZ39nVIHp30hqKCBfIaIKRds,2601
|
|
203
203
|
mxcubecore/HardwareObjects/LNLS/EPICSMotor.py,sha256=lRTc1t32rJKNTIcnKCECrqo2m9BhlYvLq9NWg4Y0w0Q,3576
|
|
204
204
|
mxcubecore/HardwareObjects/LNLS/EPICSNState.py,sha256=xZ2sQFeRpZIdn29e7pCFF24KT2cYsoe7VNTD2z-F_IU,3103
|
|
@@ -222,7 +222,7 @@ mxcubecore/HardwareObjects/LimaEigerDetector.py,sha256=Z8XRt6-uNdJy10HZbQdcTYDB8
|
|
|
222
222
|
mxcubecore/HardwareObjects/LimaPilatusDetector.py,sha256=yUcUi7OXdoy4TU2aZN21kc6R9ivdQ5sYyEKoIqYOmkg,11589
|
|
223
223
|
mxcubecore/HardwareObjects/MAXIV/ISPyBLims.py,sha256=iKgpb0NVGIN-iRgjIpV2eh12PJoAZvo3NFyKwo-458Q,7565
|
|
224
224
|
mxcubecore/HardwareObjects/MAXIV/MAXIVAutoProcessing.py,sha256=kgTSnOLoumPtOUazJeg6N_no1WOScPeLwus3iR1xMPw,9201
|
|
225
|
-
mxcubecore/HardwareObjects/MAXIV/MachInfo.py,sha256=
|
|
225
|
+
mxcubecore/HardwareObjects/MAXIV/MachInfo.py,sha256=Wkj5JHP_8tOgRGNXiKPfImTsX-O67_CrWH3wP14AsSI,2983
|
|
226
226
|
mxcubecore/HardwareObjects/MAXIV/MaxIVSession.py,sha256=UvTOzOaXX9IipN4UK1q9avEjc6goswF5uvXmnm4btgI,7749
|
|
227
227
|
mxcubecore/HardwareObjects/MAXIV/MicroMAX/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
228
228
|
mxcubecore/HardwareObjects/MAXIV/MicroMAX/beamline_actions.py,sha256=TT_0bTbfb8kZxF09vp618yPBEbBGY1KOHNj3wUiaPjs,2099
|
|
@@ -465,8 +465,8 @@ mxcubecore/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
|
|
|
465
465
|
mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUOk,4513
|
|
466
466
|
mxcubecore/utils/qt_import.py,sha256=hQkBVZLUDZtktX7DSyoH88GAK_mK9Ghlsj4k9pFJeAQ,14415
|
|
467
467
|
mxcubecore/utils/units.py,sha256=2D1QlTwe8eSs2UYRm4VVxSTosZZHeM-Pfw9KlcLbDAg,1251
|
|
468
|
-
mxcubecore-1.
|
|
469
|
-
mxcubecore-1.
|
|
470
|
-
mxcubecore-1.
|
|
471
|
-
mxcubecore-1.
|
|
472
|
-
mxcubecore-1.
|
|
468
|
+
mxcubecore-1.345.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
|
|
469
|
+
mxcubecore-1.345.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
|
|
470
|
+
mxcubecore-1.345.0.dist-info/METADATA,sha256=BpE5mnHq5oWJdGfoiCkHyNOCZBNVXZk0dqMfVXfFa2A,4262
|
|
471
|
+
mxcubecore-1.345.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
|
472
|
+
mxcubecore-1.345.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|