From 09c0ae35f553cba631957e0cdd7436cf8fbdec01 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 15 Jun 2021 10:46:23 +0200
Subject: [PATCH] L2SS-244: Statistics -> SST as this class is large enough not
to further expand into XST/BST.
---
CDB/LOFAR_ConfigDb.json | 6 +++---
devices/{Statistics.py => SST.py} | 14 +++++++-------
.../{SDP_statistics.py => StatisticsPacket.py} | 0
devices/clients/sst_client.py | 2 +-
.../{device-statistics.yml => device-sst.yml} | 8 ++++----
.../stationcontrol-jupyter/startup/01-devices.py | 4 ++--
6 files changed, 17 insertions(+), 17 deletions(-)
rename devices/{Statistics.py => SST.py} (92%)
rename devices/clients/{SDP_statistics.py => StatisticsPacket.py} (100%)
rename docker-compose/{device-statistics.yml => device-sst.yml} (82%)
diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index e6c6e0587..a0757924b 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -710,10 +710,10 @@
}
}
},
- "Statistics": {
+ "SST": {
"LTS": {
- "Statistics": {
- "LTS/Statistics/1": {
+ "SST": {
+ "LTS/SST/1": {
"properties": {
"SST_Port": [
"5001"
diff --git a/devices/Statistics.py b/devices/SST.py
similarity index 92%
rename from devices/Statistics.py
rename to devices/SST.py
index d599a9dbe..f7387b5ad 100644
--- a/devices/Statistics.py
+++ b/devices/SST.py
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-
#
-# This file is part of the Statistics project
+# This file is part of the SST project
#
#
#
# Distributed under the terms of the APACHE license.
# See LICENSE.txt for more info.
-""" Statistics Device Server for LOFAR2.0
+""" SST Device Server for LOFAR2.0
"""
@@ -27,10 +27,10 @@ from util.lofar_logging import device_logging_to_python, log_exceptions
import numpy
-__all__ = ["Statistics", "main"]
+__all__ = ["SST", "main"]
-@device_logging_to_python({"device": "Statistics"})
-class Statistics(hardware_device):
+@device_logging_to_python({"device": "SST"})
+class SST(hardware_device):
# -----------------
# Device Properties
@@ -99,13 +99,13 @@ class Statistics(hardware_device):
# Run server
# ----------
def main(args=None, **kwargs):
- """Main function of the Statistics Device module."""
+ """Main function of the SST Device module."""
from util.lofar_logging import configure_logger
import logging
configure_logger(logging.getLogger())
- return run((Statistics,), args=args, **kwargs)
+ return run((SST,), args=args, **kwargs)
if __name__ == '__main__':
diff --git a/devices/clients/SDP_statistics.py b/devices/clients/StatisticsPacket.py
similarity index 100%
rename from devices/clients/SDP_statistics.py
rename to devices/clients/StatisticsPacket.py
diff --git a/devices/clients/sst_client.py b/devices/clients/sst_client.py
index d4823c165..4ebf4a9aa 100644
--- a/devices/clients/sst_client.py
+++ b/devices/clients/sst_client.py
@@ -2,7 +2,7 @@ import queue
from threading import Thread
import socket
from util.comms_client import CommClient
-from clients.SDP_statistics import StatisticsPacket
+from clients.StatisticsPacket import StatisticsPacket
from queue import Queue
diff --git a/docker-compose/device-statistics.yml b/docker-compose/device-sst.yml
similarity index 82%
rename from docker-compose/device-statistics.yml
rename to docker-compose/device-sst.yml
index 4cd533b8e..5d5b2501f 100644
--- a/docker-compose/device-statistics.yml
+++ b/docker-compose/device-sst.yml
@@ -13,15 +13,15 @@
version: '2'
services:
- device-statistics:
- image: device-statistics
+ device-sst:
+ image: device-sst
# build explicitly, as docker-compose does not understand a local image
# being shared among services.
build:
context: lofar-device-base
args:
SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
- container_name: ${CONTAINER_NAME_PREFIX}device-statistics
+ container_name: ${CONTAINER_NAME_PREFIX}device-sst
network_mode: ${NETWORK_MODE}
ports:
- 5001:5001/udp
@@ -35,5 +35,5 @@ services:
- --timeout=30
- --strict
- --
- - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/devices/Statistics.py LTS -v
+ - python3 -u ${TANGO_LOFAR_CONTAINER_DIR}/devices/SST.py LTS -v
restart: on-failure
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 441ef50f0..bc56f8b05 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
@@ -1,7 +1,7 @@
# Create shortcuts for our devices
pcc = DeviceProxy("LTS/PCC/1")
sdp = DeviceProxy("LTS/SDP/1")
-statistics = DeviceProxy("LTS/Statistics/1")
+sst = DeviceProxy("LTS/SST/1")
# Put them in a list in case one wants to iterate
-devices = [pcc, sdp, statistics]
+devices = [pcc, sdp, sst]
--
GitLab