From 9fdc1fd6a7860753c92f865c1262302c4ac4acc8 Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Wed, 20 Apr 2022 15:05:57 +0200
Subject: [PATCH] renamed temeprature_manager to termperatureManager
---
CDB/LOFAR_ConfigDb.json | 6 +++---
CDB/stations/simulators_ConfigDb.json | 6 +++---
.../stationcontrol-jupyter/startup/01-devices.py | 4 ++--
.../docs/source/devices/temperature-manager.rst | 2 +-
tangostationcontrol/setup.cfg | 2 +-
tangostationcontrol/tangostationcontrol/devices/boot.py | 2 +-
.../tangostationcontrol/devices/temperature_manager.py | 6 +++---
.../default/devices/test_device_temperature_manager.py | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index b5a725a4d..4a3849f12 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -32,10 +32,10 @@
}
}
},
- "Temperature_manager": {
+ "TemperatureManager": {
"STAT": {
- "Temperature_manager": {
- "STAT/Temperature_manager/1": {}
+ "TemperatureManager": {
+ "STAT/TemperatureManager/1": {}
}
}
},
diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json
index 9806a2ca4..6afb6b21a 100644
--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -116,10 +116,10 @@
}
}
},
- "Temperature_manager": {
+ "TemperatureManager": {
"STAT": {
- "Temperature_manager": {
- "STAT/Temperature_manager/1": {
+ "TemperatureManager": {
+ "STAT/TemperatureManager/1": {
"properties": {
}
}
diff --git a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
index 9856d384c..27ce2a60a 100644
--- a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+++ b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
@@ -13,7 +13,7 @@ beamlet = DeviceProxy("STAT/Beamlet/1")
digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
antennafield = DeviceProxy("STAT/AntennaField/1")
docker = DeviceProxy("STAT/Docker/1")
-temperature_manager = DeviceProxy("STAT/Temperature_manager/1")
+Temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
# Put them in a list in case one wants to iterate
-devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperature_manager, docker]
+devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, Temperaturemanager, docker]
diff --git a/tangostationcontrol/docs/source/devices/temperature-manager.rst b/tangostationcontrol/docs/source/devices/temperature-manager.rst
index a69b807b7..c4f919377 100644
--- a/tangostationcontrol/docs/source/devices/temperature-manager.rst
+++ b/tangostationcontrol/docs/source/devices/temperature-manager.rst
@@ -1,4 +1,4 @@
temperature-manager
====================
-``temperature_manager == DeviceProxy("STAT/Temperature_manager/1")``
+``temperature_manager == DeviceProxy("STAT/TemperatureManager/1")``
diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index 1d52727f7..765212ad6 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -51,7 +51,7 @@ console_scripts =
l2ss-statistics-writer = tangostationcontrol.statistics_writer.statistics_writer:main
l2ss-unb2 = tangostationcontrol.devices.unb2:main
l2ss-xst = tangostationcontrol.devices.sdp.xst:main
- l2ss-temperature-manager = tangostationcontrol.devices.temperature_manager:main
+ l2ss-temperature-manager = tangostationcontrol.devices.TemperatureManager:main
# The following entry points should eventually be removed / replaced
l2ss-cold-start = tangostationcontrol.toolkit.lts_cold_start:main
diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py
index 380093d9d..90daa4954 100644
--- a/tangostationcontrol/tangostationcontrol/devices/boot.py
+++ b/tangostationcontrol/tangostationcontrol/devices/boot.py
@@ -244,7 +244,7 @@ class Boot(lofar_device):
"STAT/Beamlet/1",
"STAT/TileBeam/1", # Accesses RECV and Beamlet
"STAT/DigitalBeam/1",
- "STAT/Temperature_manager/1",
+ "STAT/TemperatureManager/1",
"STAT/AntennaField/1",
],
)
diff --git a/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py b/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
index 8ddbe11e3..c1db80b16 100644
--- a/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
+++ b/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
@@ -16,11 +16,11 @@ import logging
logger = logging.getLogger()
-__all__ = ["temperature_manager", "main"]
+__all__ = ["TemperatureManager", "main"]
@device_logging_to_python()
-class temperature_manager(lofar_device):
+class TemperatureManager(lofar_device):
# -----------------
# Device Properties
# -----------------
@@ -54,4 +54,4 @@ class temperature_manager(lofar_device):
# ----------
def main(**kwargs):
"""Main function of the temperature manager module."""
- return entry(temperature_manager, **kwargs)
+ return entry(TemperatureManager, **kwargs)
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
index 29f13b39c..ea884acf1 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
@@ -9,8 +9,8 @@
# See LICENSE.txt for more info.
from .base import AbstractTestBases
-class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase):
+class TestTemperatureManager(AbstractTestBases.TestDeviceBase):
def setUp(self):
"""Intentionally recreate the device object in each test"""
- super().setUp("STAT/Temperature_manager/1")
+ super().setUp("STAT/TemperatureManager/1")
--
GitLab