Skip to content
Snippets Groups Projects
Commit 09c0ae35 authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-244: Statistics -> SST as this class is large enough not to further expand into XST/BST.

parent ae351682
No related branches found
No related tags found
1 merge request!56L2SS-244: Expose the SSTs in MPs
...@@ -710,10 +710,10 @@ ...@@ -710,10 +710,10 @@
} }
} }
}, },
"Statistics": { "SST": {
"LTS": { "LTS": {
"Statistics": { "SST": {
"LTS/Statistics/1": { "LTS/SST/1": {
"properties": { "properties": {
"SST_Port": [ "SST_Port": [
"5001" "5001"
......
# -*- coding: utf-8 -*- # -*- 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. # Distributed under the terms of the APACHE license.
# See LICENSE.txt for more info. # 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 ...@@ -27,10 +27,10 @@ from util.lofar_logging import device_logging_to_python, log_exceptions
import numpy import numpy
__all__ = ["Statistics", "main"] __all__ = ["SST", "main"]
@device_logging_to_python({"device": "Statistics"}) @device_logging_to_python({"device": "SST"})
class Statistics(hardware_device): class SST(hardware_device):
# ----------------- # -----------------
# Device Properties # Device Properties
...@@ -99,13 +99,13 @@ class Statistics(hardware_device): ...@@ -99,13 +99,13 @@ class Statistics(hardware_device):
# Run server # Run server
# ---------- # ----------
def main(args=None, **kwargs): 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 from util.lofar_logging import configure_logger
import logging import logging
configure_logger(logging.getLogger()) configure_logger(logging.getLogger())
return run((Statistics,), args=args, **kwargs) return run((SST,), args=args, **kwargs)
if __name__ == '__main__': if __name__ == '__main__':
......
...@@ -2,7 +2,7 @@ import queue ...@@ -2,7 +2,7 @@ import queue
from threading import Thread from threading import Thread
import socket import socket
from util.comms_client import CommClient from util.comms_client import CommClient
from clients.SDP_statistics import StatisticsPacket from clients.StatisticsPacket import StatisticsPacket
from queue import Queue from queue import Queue
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
version: '2' version: '2'
services: services:
device-statistics: device-sst:
image: device-statistics image: device-sst
# build explicitly, as docker-compose does not understand a local image # build explicitly, as docker-compose does not understand a local image
# being shared among services. # being shared among services.
build: build:
context: lofar-device-base context: lofar-device-base
args: args:
SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7 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} network_mode: ${NETWORK_MODE}
ports: ports:
- 5001:5001/udp - 5001:5001/udp
...@@ -35,5 +35,5 @@ services: ...@@ -35,5 +35,5 @@ services:
- --timeout=30 - --timeout=30
- --strict - --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 restart: on-failure
# Create shortcuts for our devices # Create shortcuts for our devices
pcc = DeviceProxy("LTS/PCC/1") pcc = DeviceProxy("LTS/PCC/1")
sdp = DeviceProxy("LTS/SDP/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 # Put them in a list in case one wants to iterate
devices = [pcc, sdp, statistics] devices = [pcc, sdp, sst]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment