From 2003e7162608cd7b29c378e376f4e8a2ac47f21a Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Thu, 9 Feb 2023 12:53:19 +0100 Subject: [PATCH] introduced distinction between ID and name (like for Adjustables) --- slic/core/sensor/bssensor.py | 6 +++--- slic/core/sensor/pvsensor.py | 6 +++--- slic/core/sensor/sensor.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/slic/core/sensor/bssensor.py b/slic/core/sensor/bssensor.py index 49413a1e..1b04defe 100644 --- a/slic/core/sensor/bssensor.py +++ b/slic/core/sensor/bssensor.py @@ -11,9 +11,9 @@ MSG_MISSING_TYPE = "'type' channel field not found. Parse as 64-bit floating-poi class BSSensor(Sensor): - def __init__(self, name, **kwargs): - super().__init__(name, **kwargs) - self.thread = thread = BSMonitorThread(name, self._collect) + def __init__(self, ID, **kwargs): + super().__init__(ID, **kwargs) + self.thread = thread = BSMonitorThread(ID, self._collect) thread.start() def get_current_value(self): diff --git a/slic/core/sensor/pvsensor.py b/slic/core/sensor/pvsensor.py index dacecdc4..ac72c13e 100644 --- a/slic/core/sensor/pvsensor.py +++ b/slic/core/sensor/pvsensor.py @@ -4,9 +4,9 @@ from .sensor import Sensor class PVSensor(Sensor): - def __init__(self, name, **kwargs): - super().__init__(name, **kwargs) - self.pv = PV(name) + def __init__(self, ID, **kwargs): + super().__init__(ID, **kwargs) + self.pv = PV(ID) self._cb_index = None diff --git a/slic/core/sensor/sensor.py b/slic/core/sensor/sensor.py index 38fbe104..7e8e2111 100644 --- a/slic/core/sensor/sensor.py +++ b/slic/core/sensor/sensor.py @@ -5,8 +5,9 @@ from .basesensor import BaseSensor class Sensor(BaseSensor): - def __init__(self, name, units=None, aggregation=np.mean): - self.name = name + def __init__(self, ID, name=None, units=None, aggregation=np.mean): + self.ID = ID + self.name = name or ID self.units = units self.aggregation = aggregation self._cache = []