Skip to content
Snippets Groups Projects
Commit 05b88c82 authored by Corné Lukken's avatar Corné Lukken
Browse files

L2SS-1046: Rename to indicate HBA and LBA

parent 5659e147
No related branches found
No related tags found
1 merge request!497L2SS-1046: Rename to indicate HBA and LBA
Show whitespace changes
Inline Side-by-side
Showing
with 78 additions and 81 deletions
CDB/LOFAR_ConfigDb.json
+ 3
− 3
View file @ 05b88c82
......@@ -40,7 +40,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/1": {
"STAT/AntennaField/HBA": {
"properties": {
"RECV_devices": ["STAT/RECV/1"]
}
......@@ -110,7 +110,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/1": {
"STAT/TileBeam/HBA": {
}
}
}
......@@ -200,7 +200,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
"Beam_tracking_interval": [
"1.0"
......
CDB/integrations/recvcluster_ConfigDb.json
+ 8
− 7
View file @ 05b88c82
......@@ -3,16 +3,17 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/2": {},
"STAT/TileBeam/3": {},
"STAT/TileBeam/4": {}
"STAT/TileBeam/HBA0": {},
"STAT/TileBeam/HBA1": {},
"STAT/TileBeam/HBA2": {},
"STAT/TileBeam/HBA3": {}
}
}
},
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/1": {
"STAT/AntennaField/HBA0": {
"properties": {
"Antenna_Field_Reference_ETRS": [
"3826896.631", "460979.131", "5064657.943"
......@@ -124,7 +125,7 @@
]
}
},
"STAT/AntennaField/2": {
"STAT/AntennaField/HBA1": {
"properties": {
"Antenna_Field_Reference_ETRS": [
"3826896.631", "460979.131", "5064657.943"
......@@ -236,7 +237,7 @@
]
}
},
"STAT/AntennaField/3": {
"STAT/AntennaField/HBA2": {
"properties": {
"Antenna_Field_Reference_ETRS": [
"3826896.631", "460979.131", "5064657.943"
......@@ -348,7 +349,7 @@
]
}
},
"STAT/AntennaField/4": {
"STAT/AntennaField/HBA3": {
"properties": {
"Antenna_Field_Reference_ETRS": [
"3826896.631", "460979.131", "5064657.943"
......
CDB/stations/CS001_ConfigDb.json
+ 12
− 10
View file @ 05b88c82
......@@ -32,9 +32,11 @@
"STAT/SST/1",
"STAT/XST/1",
"STAT/Beamlet/1",
"STAT/AntennaField/1",
"STAT/TileBeam/2",
"STAT/DigitalBeam/1",
"STAT/AntennaField/HBA",
"STAT/AntennaField/LBA",
"STAT/TileBeam/HBA",
"STAT/DigitalBeam/HBA",
"STAT/DigitalBeam/LBA",
"STAT/TemperatureManager/1"
]
}
......@@ -102,7 +104,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/2": {
"STAT/TileBeam/HBA": {
"properties": {
"Tracking_enabled_RW_default": [
"False"
......@@ -224,7 +226,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/2": {
"STAT/AntennaField/HBA": {
"properties": {
"Antenna_Type": [
"HBA"
......@@ -352,7 +354,7 @@
]
}
},
"STAT/AntennaField/1": {
"STAT/AntennaField/LBA": {
"properties": {
"Antenna_Type": [
"LBA"
......@@ -559,17 +561,17 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/2": {
"STAT/DigitalBeam/HBA": {
"properties": {
"AntennaField_Device": [
"STAT/AntennaField/2"
"STAT/AntennaField/HBA"
]
}
},
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/LBA": {
"properties": {
"AntennaField_Device": [
"STAT/AntennaField/1"
"STAT/AntennaField/LBA"
],
"Tracking_enabled_RW_default": [
"False"
......
CDB/stations/DTS_ConfigDb.json
+ 4
− 4
View file @ 05b88c82
......@@ -64,7 +64,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/1": {
"STAT/TileBeam/HBA": {
"properties": {
"Tracking_enabled_RW_default": [
"False"
......@@ -77,7 +77,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
"Tracking_enabled_RW_default": [
"False"
......@@ -145,7 +145,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/1": {
"STAT/AntennaField/HBA": {
"properties": {
"Antenna_Type": [
"HBA"
......@@ -204,7 +204,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
}
}
......
CDB/stations/DTS_Outside_ConfigDb.json
+ 12
− 10
View file @ 05b88c82
......@@ -32,9 +32,11 @@
"STAT/SST/1",
"STAT/XST/1",
"STAT/Beamlet/1",
"STAT/AntennaField/1",
"STAT/TileBeam/2",
"STAT/DigitalBeam/1",
"STAT/AntennaField/HBA",
"STAT/AntennaField/LBA",
"STAT/TileBeam/HBA",
"STAT/DigitalBeam/HBA",
"STAT/DigitalBeam/LBA",
"STAT/TemperatureManager/1"
]
}
......@@ -102,7 +104,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/2": {
"STAT/TileBeam/HBA": {
"properties": {
"Tracking_enabled_RW_default": [
"False"
......@@ -170,7 +172,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/2": {
"STAT/AntennaField/HBA": {
"properties": {
"Antenna_Type": [
"HBA"
......@@ -230,7 +232,7 @@
]
}
},
"STAT/AntennaField/1": {
"STAT/AntennaField/LBA": {
"properties": {
"Antenna_Type": [
"LBA"
......@@ -306,17 +308,17 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/2": {
"STAT/DigitalBeam/HBA": {
"properties": {
"AntennaField_Device": [
"STAT/AntennaField/2"
"STAT/AntennaField/HBA"
]
}
},
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/LBA": {
"properties": {
"AntennaField_Device": [
"STAT/AntennaField/1"
"STAT/AntennaField/LBA"
],
"Tracking_enabled_RW_default": [
"False"
......
CDB/stations/dummy_positions_ConfigDb.json
+ 2
− 2
View file @ 05b88c82
......@@ -3,7 +3,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/1": {
"STAT/AntennaField/HBA": {
"properties": {
"Control_to_RECV_mapping": [
"1", "0",
......@@ -231,7 +231,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
}
}
......
CDB/stations/simulators_ConfigDb.json
+ 1
− 1
View file @ 05b88c82
......@@ -128,7 +128,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
}
}
......
CDB/test_environment_ConfigDb.json
+ 1
− 1
View file @ 05b88c82
......@@ -3,7 +3,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/1": {
"STAT/TileBeam/HBA": {
"properties": {
"Tracking_enabled_RW_default": [ "True" ]
}
......
docker-compose/Makefile
+ 1
− 0
View file @ 05b88c82
......@@ -244,6 +244,7 @@ await: ## Await every container with total max timeout of 300, do not reset tim
time=$$(expr $$time + 1); \
if [ $${time} -gt $(TIMEOUT) ]; then \
echo "Timeout reached waiting for $${i} to become healthy"; \
docker logs $${i}; \
exit 1; \
fi; \
done; \
......
docker-compose/device-antennafield.yml
+ 1
− 1
View file @ 05b88c82
......@@ -46,7 +46,7 @@ services:
- TANGO_ZMQ_EVENT_PORT=5815
- TANGO_ZMQ_HEARTBEAT_PORT=5915
healthcheck:
test: l2ss-health STAT/AntennaField/1
test: l2ss-health STAT/AntennaField/HBA
interval: 1m
timeout: 30s
retries: 3
......
docker-compose/device-digitalbeam.yml
+ 1
− 1
View file @ 05b88c82
......@@ -45,7 +45,7 @@ services:
- TANGO_ZMQ_EVENT_PORT=5813
- TANGO_ZMQ_HEARTBEAT_PORT=5913
healthcheck:
test: l2ss-health STAT/DigitalBeam/1
test: l2ss-health STAT/DigitalBeam/HBA
interval: 1m
timeout: 30s
retries: 3
......
docker-compose/device-tilebeam.yml
+ 1
− 1
View file @ 05b88c82
......@@ -41,7 +41,7 @@ services:
- TANGO_ZMQ_EVENT_PORT=5811
- TANGO_ZMQ_HEARTBEAT_PORT=5911
healthcheck:
test: l2ss-health STAT/TileBeam/1
test: l2ss-health STAT/TileBeam/HBA
interval: 1m
timeout: 30s
retries: 3
......
docker-compose/jupyterlab/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+ 3
− 3
View file @ 05b88c82
......@@ -9,12 +9,12 @@ sst = DeviceProxy("STAT/SST/1")
xst = DeviceProxy("STAT/XST/1")
unb2 = DeviceProxy("STAT/UNB2/1")
boot = DeviceProxy("STAT/Boot/1")
tilebeam = DeviceProxy("STAT/TileBeam/1")
tilebeam = DeviceProxy("STAT/TileBeam/HBA")
pcon = DeviceProxy("STAT/PCON/1")
psoc = DeviceProxy("STAT/PSOC/1")
beamlet = DeviceProxy("STAT/Beamlet/1")
digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
antennafield = DeviceProxy("STAT/AntennaField/1")
digitalbeam = DeviceProxy("STAT/DigitalBeam/HBA")
antennafield = DeviceProxy("STAT/AntennaField/HBA")
docker = DeviceProxy("STAT/Docker/1")
temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
configuration = DeviceProxy("STAT/Configuration/1")
......
docker-compose/tango-prometheus-exporter/lofar2-policy.json
+ 3
− 3
View file @ 05b88c82
......@@ -5,7 +5,7 @@
},
"devices": {
"stat/antennafield/1": {
"stat/antennafield/hba": {
"include": [
"ANT_mask_RW"
],
......@@ -29,7 +29,7 @@
},
"stat/boot/1": {
},
"stat/digitalbeam/1": {
"stat/digitalbeam/hba": {
},
"stat/docker/1": {
},
......@@ -79,7 +79,7 @@
"subbands_calibrated_R"
]
},
"stat/tilebeam/1": {
"stat/tilebeam/hba": {
},
"stat/unb2/1": {
"include": [
......
sbin/run_integration_test.sh
+ 0
− 6
View file @ 05b88c82
......@@ -11,12 +11,6 @@ function usage {
echo ""
echo "./$(basename "$0") -h
displays this help message"
echo ""
echo "./$(basename "$0") import-path.<class><function-name>
A specific test can be defined by specifying the entire an import path
and optionally extending this with a specific class and function. For
instance tangostationcontrol.integration_test.observations.test_archiver.TestArchiver.test_get_multimember_devices"
echo ""
}
# Configure the config database, restart containers and run a specific
......
tangostationcontrol/tangostationcontrol/devices/boot.py
+ 14
− 19
View file @ 05b88c82
......@@ -246,31 +246,26 @@ class Boot(LOFARDevice):
dtype="DevVarStringArray",
mandatory=False,
default_value=[
"STAT/Docker/1",
# Docker controls the device containers, so it goes before anything else
"STAT/Configuration/1",
# Configuration device loads and update station configuration
"STAT/PSOC/1",
# PSOC boot early to detect power delivery failure as fast as possible
"STAT/PCON/1",
# PCON boot early because it is responsible for power delivery.
"STAT/APSPU/1",
# APS Power Units control other hardware we want to initialise
"STAT/Docker/1", # Docker controls the device containers, so it goes before anything else
"STAT/Configuration/1", # Configuration device loads and update station configuration
"STAT/PSOC/1", # PSOC boot early to detect power delivery failure as fast as possible
"STAT/PCON/1", # PCON boot early because it is responsible for power delivery.
"STAT/APSPU/1", # APS Power Units control other hardware we want to initialise
"STAT/APSCT/1",
"STAT/CCD/1",
"STAT/RECV/1",
# RCUs are input for SDP, so initialise them first
"STAT/UNB2/1",
# Uniboards host SDP, so initialise them first
"STAT/SDP/1",
# SDP controls the mask for SST/XST/BST/Beamlet, so initialise it first
"STAT/RECV/1", # RCUs are input for SDP, so initialise them first
"STAT/UNB2/1", # Uniboards host SDP, so initialise them first
"STAT/SDP/1", # SDP controls the mask for SST/XST/BST/Beamlet, so initialise it first
"STAT/BST/1",
"STAT/SST/1",
"STAT/XST/1",
"STAT/Beamlet/1",
"STAT/AntennaField/1", # Accesses RECV
"STAT/TileBeam/1", # Accesses AntennaField
"STAT/DigitalBeam/1", # Accessed SDP and Beamlet
"STAT/AntennaField/HBA", # Accesses RECV
# "STAT/AntennaField/LBA", # Accesses RECV
"STAT/TileBeam/HBA", # Accesses AntennaField
# "STAT/TileBeam/LBA", # Accesses AntennaField
"STAT/DigitalBeam/HBA", # Accessed SDP and Beamlet
# "STAT/DigitalBeam/LBA", # Accessed SDP and Beamlet
"STAT/TemperatureManager/1",
],
)
......
tangostationcontrol/tangostationcontrol/devices/observation.py
+ 5
− 3
View file @ 05b88c82
......@@ -112,7 +112,7 @@ class Observation(LOFARDevice):
# TODO(Stefano): set a proper policy for the devices instance number
# It cannot be inherited from the Observation instance number (i.e. Observation_id)
self.antennafield_proxy = DeviceProxy(
f"{util.get_ds_inst_name()}/AntennaField/1"
f"{util.get_ds_inst_name()}/AntennaField/HBA"
)
self.antennafield_proxy.set_source(DevSource.DEV)
......@@ -121,11 +121,13 @@ class Observation(LOFARDevice):
self.beamlet_proxy.set_source(DevSource.DEV)
# Set a reference of DigitalBeam device that is correlated to this device
self.digitalbeam_proxy = DeviceProxy(f"{util.get_ds_inst_name()}/DigitalBeam/1")
self.digitalbeam_proxy = DeviceProxy(
f"{util.get_ds_inst_name()}/DigitalBeam/HBA"
)
self.digitalbeam_proxy.set_source(DevSource.DEV)
# Set a reference of TileBeam device that is correlated to this device
self.tilebeam_proxy = DeviceProxy(f"{util.get_ds_inst_name()}/Tilebeam/1")
self.tilebeam_proxy = DeviceProxy(f"{util.get_ds_inst_name()}/Tilebeam/HBA")
self.tilebeam_proxy.set_source(DevSource.DEV)
# Collect static information
......
tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
+ 1
− 1
View file @ 05b88c82
......@@ -57,7 +57,7 @@ class DigitalBeam(BeamDevice):
dtype=str,
doc="Which AntennaField represents the FPGA inputs to beamform.",
mandatory=False,
default_value="STAT/AntennaField/1",
default_value="STAT/AntennaField/HBA",
)
Beamlet_Device = device_property(
......
tangostationcontrol/tangostationcontrol/devices/tilebeam.py
+ 2
− 2
View file @ 05b88c82
......@@ -48,9 +48,9 @@ class TileBeam(BeamDevice):
def configure_for_initialise(self):
# Set a reference of AntennaField device that is correlated to this BEAM device
util = Util.instance()
instance_number = self.get_name().split("/")[2]
instance_type = self.get_name().split("/")[2]
self.antennafield_proxy = DeviceProxy(
f"{util.get_ds_inst_name()}/AntennaField/{instance_number}"
f"{util.get_ds_inst_name()}/AntennaField/{instance_type}"
)
self.antennafield_proxy.set_source(DevSource.DEV)
......
tangostationcontrol/tangostationcontrol/integration_test/configuration/configDB/LOFAR_ConfigDb.json
+ 3
− 3
View file @ 05b88c82
......@@ -40,7 +40,7 @@
"AntennaField": {
"STAT": {
"AntennaField": {
"STAT/AntennaField/1": {
"STAT/AntennaField/HBA": {
"properties": {
"RECV_devices": ["STAT/RECV/1"]
}
......@@ -110,7 +110,7 @@
"TileBeam": {
"STAT": {
"TileBeam": {
"STAT/TileBeam/1": {
"STAT/TileBeam/HBA": {
}
}
}
......@@ -200,7 +200,7 @@
"DigitalBeam": {
"STAT": {
"DigitalBeam": {
"STAT/DigitalBeam/1": {
"STAT/DigitalBeam/HBA": {
"properties": {
"Beam_tracking_interval": [
"1.0"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment