diff --git a/tangostationcontrol/README.md b/tangostationcontrol/README.md index 0604c3a4d1d90b7d99ab1f35cee1922c6ee99371..0fef1b58aa82065b03353315cdd63ded8e2a3cd2 100644 --- a/tangostationcontrol/README.md +++ b/tangostationcontrol/README.md @@ -3,7 +3,7 @@ This code provides an attribute_wrapper class in place of attributes for tango devices. the attribute wrappers contain additional code that moves a lot of the complexity and redundant code to the background. -The tango Device class is also abstracted further to a "hardware_device" class. This class wraps +The tango Device class is also abstracted further to a "lofar_device" class. This class wraps The only things required on the users part are to declare the attributes using the attribute_wrapper (see `example/example_device`), declare what client the attribute has to use in the initialisation and provide support for the used clients. diff --git a/tangostationcontrol/tangostationcontrol/devices/abstract_device.py b/tangostationcontrol/tangostationcontrol/devices/abstract_device.py index 5b65c3a6c02fd487920e02efed2394de275f1a9d..8250e4e481dc9d27ec88654b6fef777d0e9bc4e4 100644 --- a/tangostationcontrol/tangostationcontrol/devices/abstract_device.py +++ b/tangostationcontrol/tangostationcontrol/devices/abstract_device.py @@ -20,7 +20,7 @@ logger = logging.getLogger() class AbstractDeviceMetas(DeviceMeta, ABCMeta): - """Collects meta classes to allow hardware_device to be both a Device and an ABC. """ + """Collects meta classes to allow lofar_device to be both a Device and an ABC. """ def __new__(mcs, name, bases, namespace, **kwargs): cls = ABCMeta.__new__(mcs, name, bases, namespace, **kwargs) diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py index 40fb6f5f4fb6f8648adf8897340278fed2040f43..897f2cfb557c4f3a24464360309eba4226fe19cf 100644 --- a/tangostationcontrol/tangostationcontrol/devices/boot.py +++ b/tangostationcontrol/tangostationcontrol/devices/boot.py @@ -24,7 +24,7 @@ import numpy from device_decorators import * from tangostationcontrol.common.entry import entry -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions import logging @@ -184,7 +184,7 @@ class DevicesInitialiser(Thread): self.set_status(f"[restarting {device_name}] Succesfully started.") @device_logging_to_python() -class Boot(hardware_device): +class Boot(lofar_device): # ----------------- # Device Properties # ----------------- diff --git a/tangostationcontrol/tangostationcontrol/devices/docker_device.py b/tangostationcontrol/tangostationcontrol/devices/docker_device.py index d00ce507d85fcb6333ab913c5c9678da47736108..b7193ecb1408e58394e84de1e317dbae5e569a5f 100644 --- a/tangostationcontrol/tangostationcontrol/devices/docker_device.py +++ b/tangostationcontrol/tangostationcontrol/devices/docker_device.py @@ -25,13 +25,13 @@ from device_decorators import * from tangostationcontrol.common.entrypoint import entry from tangostationcontrol.clients.docker_client import DockerClient from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions __all__ = ["Docker", "main"] @device_logging_to_python() -class Docker(hardware_device): +class Docker(lofar_device): # ----------------- # Device Properties # ----------------- diff --git a/tangostationcontrol/tangostationcontrol/devices/hardware_device.py b/tangostationcontrol/tangostationcontrol/devices/lofar_device.py similarity index 99% rename from tangostationcontrol/tangostationcontrol/devices/hardware_device.py rename to tangostationcontrol/tangostationcontrol/devices/lofar_device.py index 9ebff00d7554040425e3fdd6630e0a833d48fa4f..5a2cc74136514d0aa4a2f2ce16fb1609d9a219ec 100644 --- a/tangostationcontrol/tangostationcontrol/devices/hardware_device.py +++ b/tangostationcontrol/tangostationcontrol/devices/lofar_device.py @@ -28,12 +28,12 @@ from tangostationcontrol.devices.abstract_device import AbstractDeviceMetas from tangostationcontrol.devices.device_decorators import only_in_states, fault_on_error -__all__ = ["hardware_device"] +__all__ = ["lofar_device"] import logging logger = logging.getLogger() -class hardware_device(Device, metaclass=AbstractDeviceMetas): +class lofar_device(Device, metaclass=AbstractDeviceMetas): """ **Properties:** diff --git a/tangostationcontrol/tangostationcontrol/devices/opcua_device.py b/tangostationcontrol/tangostationcontrol/devices/opcua_device.py index 801c71c09a96fd631db23a57ca123f3ceaebd843..c88cedfb840ad434fa80d9435b36045e0070d334 100644 --- a/tangostationcontrol/tangostationcontrol/devices/opcua_device.py +++ b/tangostationcontrol/tangostationcontrol/devices/opcua_device.py @@ -28,11 +28,11 @@ import asyncio from tangostationcontrol.common.lofar_logging import device_logging_to_python, log_exceptions from tangostationcontrol.clients.opcua_client import OPCUAConnection from tangostationcontrol.devices.device_decorators import * -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device __all__ = ["opcua_device", "main"] -class opcua_device(hardware_device): +class opcua_device(lofar_device): """ **Properties:** diff --git a/tangostationcontrol/tangostationcontrol/examples/HW_device_template.py b/tangostationcontrol/tangostationcontrol/examples/HW_device_template.py index 4645488405ac1dc23acde36a7659e3b9182c57a7..abb08a06a6cdbfbef0215df1d37552ff12b11931 100644 --- a/tangostationcontrol/tangostationcontrol/examples/HW_device_template.py +++ b/tangostationcontrol/tangostationcontrol/examples/HW_device_template.py @@ -13,15 +13,15 @@ from tango.server import run # Additional import -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device __all__ = ["HW_dev"] -class HW_dev(hardware_device): +class HW_dev(lofar_device): """ - This class is the minimal (read empty) implementation of a class using 'hardware_device' + This class is the minimal (read empty) implementation of a class using 'lofar_device' """ # ---------- diff --git a/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py b/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py index 1f65d3ccd5f0827305a2d1a91e958b6e6241bc85..6195ff8a51544173554da24f046945ff8c2e6917 100644 --- a/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py +++ b/tangostationcontrol/tangostationcontrol/examples/load_from_disk/ini_device.py @@ -18,7 +18,7 @@ import numpy # Additional import from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device from tangostationcontrol.examples.load_from_disk.ini_client import * __all__ = ["ini_device"] @@ -50,9 +50,9 @@ def write_ini_file(filename): -class ini_device(hardware_device): +class ini_device(lofar_device): """ - This class is the minimal (read empty) implementation of a class using 'hardware_device' + This class is the minimal (read empty) implementation of a class using 'lofar_device' """ # ---------- diff --git a/tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py b/tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py index 845ff0937ccaaf3ad120fe6c96acfce581417f0f..ddcba3910b1780b040737f153bb83894be59b72c 100644 --- a/tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py +++ b/tangostationcontrol/tangostationcontrol/examples/snmp/snmp.py @@ -19,14 +19,14 @@ from tango import AttrWriteType # Additional import from tangostationcontrol.examples.snmp.snmp_client import SNMP_client from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper -from tangostationcontrol.devices.hardware_device import hardware_device +from tangostationcontrol.devices.lofar_device import lofar_device import numpy __all__ = ["SNMP", "main"] -class SNMP(hardware_device): +class SNMP(lofar_device): """ **Properties:** diff --git a/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py b/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py index f1c5b652c545b31f897388ddce0c8f66df37912e..38ad2cce666f5bb435d8f58e2810cf3d62ad7475 100644 --- a/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py +++ b/tangostationcontrol/tangostationcontrol/test/clients/test_attr_wrapper.py @@ -12,7 +12,7 @@ from tango import DevState # Internal imports from tangostationcontrol.test.clients.test_client import test_client from tangostationcontrol.clients.attribute_wrapper import * -from tangostationcontrol.devices.hardware_device import * +from tangostationcontrol.devices.lofar_device import * # Test imports from tango.test_context import DeviceTestContext @@ -39,252 +39,252 @@ def dev_init(device): class TestAttributeTypes(base.TestCase): - class str_scalar_device(hardware_device): + class str_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="str_scalar_R", datatype=numpy.str) scalar_RW = attribute_wrapper(comms_annotation="str_scalar_RW", datatype=numpy.str, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class bool_scalar_device(hardware_device): + class bool_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="bool_scalar_R", datatype=numpy.bool_) scalar_RW = attribute_wrapper(comms_annotation="bool_scalar_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class float32_scalar_device(hardware_device): + class float32_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="float32_scalar_R", datatype=numpy.float32) scalar_RW = attribute_wrapper(comms_annotation="float32_scalar_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class float64_scalar_device(hardware_device): + class float64_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="float64_scalar_R", datatype=numpy.float64) scalar_RW = attribute_wrapper(comms_annotation="float64_scalar_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class double_scalar_device(hardware_device): + class double_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="double_scalar_R", datatype=numpy.double) scalar_RW = attribute_wrapper(comms_annotation="double_scalar_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class uint8_scalar_device(hardware_device): + class uint8_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="uint8_scalar_R", datatype=numpy.uint8) scalar_RW = attribute_wrapper(comms_annotation="uint8_scalar_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class uint16_scalar_device(hardware_device): + class uint16_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="uint16_scalar_R", datatype=numpy.uint16) scalar_RW = attribute_wrapper(comms_annotation="uint16_scalar_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class uint32_scalar_device(hardware_device): + class uint32_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="uint32_scalar_R", datatype=numpy.uint32) scalar_RW = attribute_wrapper(comms_annotation="uint32_scalar_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class uint64_scalar_device(hardware_device): + class uint64_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="uint64_scalar_R", datatype=numpy.uint64) scalar_RW = attribute_wrapper(comms_annotation="uint64_scalar_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class int16_scalar_device(hardware_device): + class int16_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="int16_scalar_R", datatype=numpy.int16) scalar_RW = attribute_wrapper(comms_annotation="int16_scalar_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class int32_scalar_device(hardware_device): + class int32_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="int32_scalar_R", datatype=numpy.int32) scalar_RW = attribute_wrapper(comms_annotation="int32_scalar_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class int64_scalar_device(hardware_device): + class int64_scalar_device(lofar_device): scalar_R = attribute_wrapper(comms_annotation="int64_scalar_R", datatype=numpy.int64) scalar_RW = attribute_wrapper(comms_annotation="int64_scalar_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE) def configure_for_initialise(self): dev_init(self) - class str_spectrum_device(hardware_device): + class str_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="str_spectrum_R", datatype=numpy.str, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="str_spectrum_RW", datatype=numpy.str, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class bool_spectrum_device(hardware_device): + class bool_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="bool_spectrum_R", datatype=numpy.bool_, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="bool_spectrum_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class float32_spectrum_device(hardware_device): + class float32_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="float32_spectrum_R", datatype=numpy.float32, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="float32_spectrum_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class float64_spectrum_device(hardware_device): + class float64_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="float64_spectrum_R", datatype=numpy.float64, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="float64_spectrum_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class double_spectrum_device(hardware_device): + class double_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="double_spectrum_R", datatype=numpy.double, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="double_spectrum_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class uint8_spectrum_device(hardware_device): + class uint8_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="uint8_spectrum_R", datatype=numpy.uint8, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="uint8_spectrum_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class uint16_spectrum_device(hardware_device): + class uint16_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="uint16_spectrum_R", datatype=numpy.uint16, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="uint16_spectrum_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class uint32_spectrum_device(hardware_device): + class uint32_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="uint32_spectrum_R", datatype=numpy.uint32, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="uint32_spectrum_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class uint64_spectrum_device(hardware_device): + class uint64_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="uint64_spectrum_R", datatype=numpy.uint64, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="uint64_spectrum_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class int16_spectrum_device(hardware_device): + class int16_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="int16_spectrum_R", datatype=numpy.int16, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="int16_spectrum_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class int32_spectrum_device(hardware_device): + class int32_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="int32_spectrum_R", datatype=numpy.int32, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="int32_spectrum_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class int64_spectrum_device(hardware_device): + class int64_spectrum_device(lofar_device): spectrum_R = attribute_wrapper(comms_annotation="int64_spectrum_R", datatype=numpy.int64, dims=spectrum_dims) spectrum_RW = attribute_wrapper(comms_annotation="int64_spectrum_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims) def configure_for_initialise(self): dev_init(self) - class str_image_device(hardware_device): + class str_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="str_image_R", datatype=numpy.str, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="str_image_RW", datatype=numpy.str, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class bool_image_device(hardware_device): + class bool_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="bool_image_R", datatype=numpy.bool_, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="bool_image_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class float32_image_device(hardware_device): + class float32_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="float32_image_R", datatype=numpy.float32, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="float32_image_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class float64_image_device(hardware_device): + class float64_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="float64_image_R", datatype=numpy.float64, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="float64_image_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class double_image_device(hardware_device): + class double_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="double_image_R", datatype=numpy.double, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="double_image_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class uint8_image_device(hardware_device): + class uint8_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="uint8_image_R", datatype=numpy.uint8, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="uint8_image_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class uint16_image_device(hardware_device): + class uint16_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="uint16_image_R", datatype=numpy.uint16, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="uint16_image_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class uint32_image_device(hardware_device): + class uint32_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="uint32_image_R", datatype=numpy.uint32, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="uint32_image_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class uint64_image_device(hardware_device): + class uint64_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="uint64_image_R", datatype=numpy.uint64, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="uint64_image_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class int16_image_device(hardware_device): + class int16_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="int16_image_R", datatype=numpy.int16, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="int16_image_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class int32_image_device(hardware_device): + class int32_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="int32_image_R", datatype=numpy.int32, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="int32_image_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE, dims=(2,3)) def configure_for_initialise(self): dev_init(self) - class int64_image_device(hardware_device): + class int64_image_device(lofar_device): image_R = attribute_wrapper(comms_annotation="int64_image_R", datatype=numpy.int64, dims=(2,3)) image_RW = attribute_wrapper(comms_annotation="int64_image_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE, dims=(2,3))