diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d87d3ad68540f0039ef5191b90196d7c4443df41..a1fb7db76343da76ca9d0e5943a2d28b2fcbcf4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -204,7 +204,6 @@ CDB_correctness:
for hierarchy in Power Control
do
# test environments
- python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t ../LOFAR_ConfigDb.json
python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs001.json testenv_cs001.json
# production environments
python $CI_PROJECT_DIR/tangostationcontrol/tangostationcontrol/toolkit/analyse_dsconfig_hierarchies.py -H ${hierarchy} -a -t common.json l0.json l1.json lba.json h0.json hba_core.json cs001.json
diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
deleted file mode 100644
index 61b2c19452f74235810ccd5400557f20ca78b87d..0000000000000000000000000000000000000000
--- a/CDB/LOFAR_ConfigDb.json
+++ /dev/null
@@ -1,701 +0,0 @@
-{
- "servers": {
- "StationManager": {
- "STAT": {
- "StationManager": {
- "STAT/StationManager/1": {
- "properties": {
- "Station_Name": [
- "DevStation"
- ],
- "Station_Number": [
- "999"
- ],
- "Suppress_State_Transition_Failures": [
- "True"
- ],
- "Power_Children": [
- "STAT/EC/1",
- "STAT/PSOC/1",
- "STAT/PCON/1",
- "STAT/AFH/HBA",
- "STAT/AFL/LBA",
- "STAT/Configuration/1",
- "STAT/ObservationControl/1",
- "STAT/TemperatureManager/1",
- "STAT/Calibration/1"
-
- ],
- "Control_Children": [
- "STAT/CCD/1",
- "STAT/EC/1",
- "STAT/PSOC/1",
- "STAT/AFH/HBA",
- "STAT/AFL/LBA",
- "STAT/PCON/1",
- "STAT/ObservationControl/1",
- "STAT/TemperatureManager/1",
- "STAT/Calibration/1",
- "STAT/Configuration/1",
- "STAT/RECVL/1"
- ]
- }
- }
- }
- }
- },
- "CCD": {
- "STAT": {
- "CCD": {
- "STAT/CCD/1": {
- "properties": {
- "CCD_On_Off_timeout": [
- "1"
- ]
- }
- }
- }
- }
- },
- "Calibration": {
- "STAT": {
- "Calibration": {
- "STAT/Calibration/1": {
- "properties": {
- "Station_Name": [
- "DevStation"
- ]
- }
- }
- }
- }
- },
- "Configuration": {
- "STAT": {
- "Configuration": {
- "STAT/Configuration/1": {
- }
- }
- }
- },
- "EC": {
- "STAT": {
- "EC": {
- "STAT/EC/1": {
- "properties": {
- }
- }
- }
- }
- },
- "ObservationControl": {
- "STAT": {
- "ObservationControl": {
- "STAT/ObservationControl/1": {
- "properties": {
- "Control_Children": [
- ],
- "Power_Children": [
- ]
- }
- }
- }
- }
- },
- "AFH": {
- "STAT": {
- "AFH": {
- "STAT/AFH/HBA": {
- "properties": {
- "Control_Children": [
- "STAT/SDPFirmware/HBA",
- "STAT/TileBeam/HBA",
- "STAT/DigitalBeam/HBA",
- "STAT/APS/H0"
- ],
- "Power_Children": [
- "STAT/TileBeam/HBA",
- "STAT/DigitalBeam/HBA"
- ],
- "RECV_Devices": [
- "STAT/RECVH/1"
- ]
- }
- }
- }
- }
- },
- "AFL": {
- "STAT": {
- "AFL": {
- "STAT/AFL/LBA": {
- "properties": {
- "Control_Children": [
- "STAT/SDPFirmware/LBA",
- "STAT/DigitalBeam/LBA",
- "STAT/APS/L0",
- "STAT/APS/L1"
- ],
- "Power_Children": [
- "STAT/DigitalBeam/LBA"
- ],
- "RECV_Devices": [
- "STAT/RECVL/L0",
- "STAT/RECVL/L1"
- ]
- }
- }
- }
- }
- },
- "PSOC": {
- "STAT": {
- "PSOC": {
- "STAT/PSOC/1": {
- "properties": {
- "SNMP_host": [
- "127.0.0.1"
- ],
- "SNMP_community": [
- "public"
- ],
- "SNMP_mib_dir": [
- "devices/mibs/PowerNet-MIB.mib"
- ],
- "SNMP_timeout": [
- "10.0"
- ],
- "SNMP_version": [
- "1"
- ],
- "SNMP_use_simulators": [
- "False"
- ],
- "PSOC_sockets": [
- "socket_1",
- "socket_2",
- "socket_3",
- "socket_4",
- "socket_5",
- "socket_6",
- "socket_7",
- "socket_8"
- ],
- "Power_Children": [
- "STAT/CCD/1",
- "STAT/SDPFirmware/HBA",
- "STAT/SDPFirmware/LBA"
- ]
- }
- }
- }
- }
- },
- "PCON": {
- "STAT": {
- "PCON": {
- "STAT/PCON/1": {
- "properties": {
- "SNMP_host": [
- "127.0.0.1"
- ],
- "SNMP_community": [
- "public"
- ],
- "SNMP_mib_dir": [
- "devices/mibs/SP2-MIB.mib"
- ],
- "SNMP_timeout": [
- "10.0"
- ],
- "SNMP_version": [
- "1"
- ],
- "SNMP_use_simulators": [
- "False"
- ],
- "Power_Children": [
- "STAT/APS/L0",
- "STAT/APS/L1",
- "STAT/APS/H0"
- ]
- }
- }
- }
- }
- },
- "TemperatureManager": {
- "STAT": {
- "TemperatureManager": {
- "STAT/TemperatureManager/1": {
- "properties": {
- "Alarm_Error_List": [
- "APSCT, APSCT_TEMP_error_R",
- "APSPU, APSPU_TEMP_error_R",
- "UNB2, UNB2_TEMP_error_R",
- "RECVH, RECV_TEMP_error_R",
- "RECVL, RECV_TEMP_error_R"
- ],
- "Shutdown_Device_List": [
- "STAT/SDPFirmware/HBA",
- "STAT/SDP/HBA",
- "STAT/UNB2/1",
- "STAT/RECVH/1",
- "STAT/RECVL/1",
- "STAT/APSCT/1",
- "STAT/CCD/1",
- "STAT/APSPU/1"
- ]
- }
- }
- }
- }
- },
- "TileBeam": {
- "STAT": {
- "TileBeam": {
- "STAT/TileBeam/HBA": {
- }
- }
- }
- },
- "DigitalBeam": {
- "STAT": {
- "DigitalBeam": {
- "STAT/DigitalBeam/HBA": {
- "properties": {
- "Control_Children": [
- "STAT/Beamlet/HBA"
- ],
- "Beam_tracking_interval": [
- "1.0"
- ],
- "Beam_tracking_preparation_period": [
- "0.5"
- ]
- }
- },
- "STAT/DigitalBeam/LBA": {
- "properties": {
- "Control_Children": [
- "STAT/Beamlet/LBA"
- ],
- "Beam_tracking_interval": [
- "1.0"
- ],
- "Beam_tracking_preparation_period": [
- "0.5"
- ]
- }
- }
- }
- }
- },
- "Beamlet": {
- "STAT": {
- "Beamlet": {
- "STAT/Beamlet/HBA": {
- "properties": {
- "FPGA_beamlet_output_hdr_eth_source_mac_RW_default": [
- "00:22:86:08:00:00",
- "00:22:86:08:00:01",
- "00:22:86:08:00:02",
- "00:22:86:08:00:03",
- "00:22:86:08:01:00",
- "00:22:86:08:01:01",
- "00:22:86:08:01:02",
- "00:22:86:08:01:03",
- "00:22:86:08:02:00",
- "00:22:86:08:02:01",
- "00:22:86:08:02:02",
- "00:22:86:08:02:03",
- "00:22:86:08:03:00",
- "00:22:86:08:03:01",
- "00:22:86:08:03:02",
- "00:22:86:08:03:03"
- ],
- "FPGA_beamlet_output_hdr_ip_source_address_RW_default": [
- "192.168.0.1",
- "192.168.0.2",
- "192.168.0.3",
- "192.168.0.4",
- "192.168.1.1",
- "192.168.1.2",
- "192.168.1.3",
- "192.168.1.4",
- "192.168.2.1",
- "192.168.2.2",
- "192.168.2.3",
- "192.168.2.4",
- "192.168.3.1",
- "192.168.3.2",
- "192.168.3.3",
- "192.168.3.4"
- ],
- "FPGA_beamlet_output_hdr_udp_source_port_RW_default": [
- "53248",
- "53249",
- "53250",
- "53251",
- "53252",
- "53253",
- "53254",
- "53255",
- "53256",
- "53257",
- "53258",
- "53259",
- "53260",
- "53261",
- "53262",
- "53263"
- ],
- "FPGA_beamlet_output_hdr_udp_destination_port_RW_default": [
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001"
- ]
- }
- },
- "STAT/Beamlet/LBA": {
- "properties": {
- "FPGA_beamlet_output_hdr_eth_source_mac_RW_default": [
- "00:22:86:08:00:00",
- "00:22:86:08:00:01",
- "00:22:86:08:00:02",
- "00:22:86:08:00:03",
- "00:22:86:08:01:00",
- "00:22:86:08:01:01",
- "00:22:86:08:01:02",
- "00:22:86:08:01:03",
- "00:22:86:08:02:00",
- "00:22:86:08:02:01",
- "00:22:86:08:02:02",
- "00:22:86:08:02:03",
- "00:22:86:08:03:00",
- "00:22:86:08:03:01",
- "00:22:86:08:03:02",
- "00:22:86:08:03:03"
- ],
- "FPGA_beamlet_output_hdr_ip_source_address_RW_default": [
- "192.168.0.1",
- "192.168.0.2",
- "192.168.0.3",
- "192.168.0.4",
- "192.168.1.1",
- "192.168.1.2",
- "192.168.1.3",
- "192.168.1.4",
- "192.168.2.1",
- "192.168.2.2",
- "192.168.2.3",
- "192.168.2.4",
- "192.168.3.1",
- "192.168.3.2",
- "192.168.3.3",
- "192.168.3.4"
- ],
- "FPGA_beamlet_output_hdr_udp_source_port_RW_default": [
- "53248",
- "53249",
- "53250",
- "53251",
- "53252",
- "53253",
- "53254",
- "53255",
- "53256",
- "53257",
- "53258",
- "53259",
- "53260",
- "53261",
- "53262",
- "53263"
- ],
- "FPGA_beamlet_output_hdr_udp_destination_port_RW_default": [
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001",
- "10001"
- ]
- }
- }
- }
- }
- },
- "APS": {
- "STAT": {
- "APS": {
- "STAT/APS/H0": {
- "properties": {
- "Power_Children": [
- "STAT/APSPU/1"
- ],
- "Control_Children": [
- "STAT/APSCT/1",
- "STAT/APSPU/1",
- "STAT/UNB2/1",
- "STAT/RECVH/1"
- ]
- }
- },
- "STAT/APS/L0": {
- "properties": {
- "Control_Children": []
- }
- },
- "STAT/APS/L1": {
- "properties": {
- "Control_Children": []
- }
- }
- }
- }
- },
- "APSCT": {
- "STAT": {
- "APSCT": {
- "STAT/APSCT/1": {
- "properties": {
- "APSCT_On_Off_timeout": [
- "1"
- ]
- }
- }
- }
- }
- },
- "APSPU": {
- "STAT": {
- "APSPU": {
- "STAT/APSPU/1": {
- "properties": {
- "Power_Children": [
- "STAT/APSCT/1",
- "STAT/UNB2/1",
- "STAT/RECVH/1",
- "STAT/RECVL/1"
- ]
- }
- }
- }
- }
- },
- "RECVH": {
- "STAT": {
- "RECVH": {
- "STAT/RECVH/1": {
- "properties": {
- "RCU_On_Off_timeout": [
- "1"
- ],
- "RCU_DTH_On_Off_timeout": [
- "1"
- ]
- }
- }
- }
- }
- },
- "RECVL": {
- "STAT": {
- "RECVL": {
- "STAT/RECVL/1": {
- "properties": {
- "RCU_On_Off_timeout": [
- "1"
- ],
- "RCU_DTH_On_Off_timeout": [
- "1"
- ]
- }
- }
- }
- }
- },
- "SDPFirmware": {
- "STAT": {
- "SDPFirmware": {
- "STAT/SDPFirmware/HBA": {
- "properties": {
- "Control_Children": [
- "STAT/SDP/HBA",
- "STAT/BST/HBA",
- "STAT/SST/HBA",
- "STAT/XST/HBA"
- ],
- "Power_Children": [
- "STAT/SDP/HBA",
- "STAT/BST/HBA",
- "STAT/SST/HBA",
- "STAT/XST/HBA",
- "STAT/Beamlet/HBA"
- ]
- }
- },
- "STAT/SDPFirmware/LBA": {
- "properties": {
- "Control_Children": [],
- "Power_Children": [
- "STAT/Beamlet/LBA"
- ]
- }
- }
- }
- }
- },
- "SDP": {
- "STAT": {
- "SDP": {
- "STAT/SDP/HBA": {
- "properties": {
- "Control_Children": [
- ]
- }
- }
- }
- }
- },
- "BST": {
- "STAT": {
- "BST": {
- "STAT/BST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5003"
- ],
- "Statistics_Client_TCP_Port": [
- "5103"
- ],
- "FPGA_bst_offload_hdr_udp_destination_port_RW_default": [
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003"
- ]
- }
- }
- }
- }
- },
- "SST": {
- "STAT": {
- "SST": {
- "STAT/SST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5001"
- ],
- "Statistics_Client_TCP_Port": [
- "5101"
- ],
- "FPGA_sst_offload_hdr_udp_destination_port_RW_default": [
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001"
- ]
- }
- }
- }
- }
- },
- "XST": {
- "STAT": {
- "XST": {
- "STAT/XST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5002"
- ],
- "Statistics_Client_TCP_Port": [
- "5102"
- ],
- "FPGA_xst_offload_hdr_udp_destination_port_RW_default": [
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002"
- ]
- }
- }
- }
- }
- },
- "UNB2": {
- "STAT": {
- "UNB2": {
- "STAT/UNB2/1": {
- "properties": {
- "UNB2_On_Off_timeout": [
- "1"
- ]
- }
- }
- }
- }
- }
- }
-}
diff --git a/CDB/README.md b/CDB/README.md
index c12f13cb0099701d0f884b0a2a599a7c92bc395a..443481c68c853634b107a2c73f696fcc6ab7420b 100644
--- a/CDB/README.md
+++ b/CDB/README.md
@@ -6,18 +6,16 @@ To load a configuration file, use
```bash
../sbin/dsconfig.sh --update file.json
```
+Or feed the configuration file to the ``dsconfig`` batch job through the Nomad console at
+http://localhost:4646/ui/jobs/dsconfig@default/dispatch.
The tool ``tangostationcontrol.toolkit.analyse_dsconfig_hierarchies`` is provided to check the consistency of
hierarchies defined between the devices in a set of configuration files.
-The following files are provided:
+## Station configurations
-| File | Description | Usage |
-|------------------------------------------|-------------------------------------------------------------|---------------------|
-| `LOFAR_ConfigDb.json` | Generic base configuration, registering all of the devices. | Always |
-| `stations/simulators_ConfigDb.json` | A "station" configuration that points to our simulators. | Tests & development |
-| `stations/dummy_positions_ConfigDb.json` | An antenna configuration, just to have one (it's CS001). | Tests & development |
-| `stations/LTS_ConfigDb.json` | The configuration for the Lab Test Station. | Load on LTS |
-| `stations/DTS_ConfigDb.json` | The configuration for the Dwingeloo Test Station. | Load on DTS-lab |
-| `stations/DTS_Outside_ConfigDb.json` | The configuration for the Dwingeloo Test Station Outside. | Load on DTS-outside |
-| `integrations/` | Configurations required by the integration test suites. | Integration tests |
+The ``stations/`` directory contains the Tango base configurations for each station.
+
+## Integration configurations
+
+The ``integrations/`` directory contains the Tango configuration deltas for the integration test suites.
diff --git a/CDB/stations/LTS_ConfigDb.json b/CDB/stations/LTS_ConfigDb.json
deleted file mode 100644
index fd98d77501860cc79646c43a009e71371925e248..0000000000000000000000000000000000000000
--- a/CDB/stations/LTS_ConfigDb.json
+++ /dev/null
@@ -1,434 +0,0 @@
-{
- "servers": {
- "StationManager": {
- "STAT": {
- "StationManager": {
- "STAT/StationManager/1": {
- "properties": {
- "Station_Name": [
- "LTS"
- ],
- "Station_Number":[
- "901"
- ]
- }
- }
- }
- }
- },
- "Beamlet": {
- "STAT": {
- "Beamlet": {
- "STAT/Beamlet/1": {
- "properties": {
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64",
- "90:e2:ba:7a:a9:64"
- ],
- "FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249",
- "192.168.2.249"
- ],
- "FPGA_beamlet_offload_hdr_udp_destination_port_RW_default": [
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234",
- "1234"
- ]
- }
- }
- }
- }
- },
- "RECVH": {
- "STAT": {
- "RECVH": {
- "STAT/RECVH/1": {
- "properties": {
- "OPC_Server_Name": [
- "ltspi.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Node_Path_prefix": [
- ],
- "OPC_Time_Out": [
- "5.0"
- ]
- }
- }
- }
- }
- },
- "RECVL": {
- "STAT": {
- "RECVL": {
- "STAT/RECVL/1": {
- "properties": {
- "OPC_Server_Name": [
- "ltspi.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Node_Path_prefix": [
- ],
- "OPC_Time_Out": [
- "5.0"
- ]
- }
- }
- }
- }
- },
- "SDPFirmware":{
- "STAT": {
- "SDPFirmware": {
- "STAT/SDPFirmware/HBA": {
- "properties": {
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "TR_fpga_mask_RW_default": [
- "False", "False", "False", "False",
- "False", "False", "False", "False",
- "False", "False", "False", "True",
- "False", "False", "False", "False"
- ]
- }
- }
- }
- }
- },
- "SDP": {
- "STAT": {
- "SDP": {
- "STAT/SDP/HBA": {
- "properties": {
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "FPGA_sdp_info_station_id_RW_default": [
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901",
- "901"
- ]
- }
- }
- }
- }
- },
- "BST": {
- "STAT": {
- "BST": {
- "STAT/BST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5003"
- ],
- "Statistics_Client_TCP_Port": [
- "5103"
- ],
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "FPGA_bst_offload_hdr_eth_destination_mac_RW_default": [
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd"
- ],
- "FPGA_bst_offload_hdr_ip_destination_address_RW_default": [
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250"
- ],
- "FPGA_bst_offload_hdr_udp_destination_port_RW_default": [
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003",
- "5003"
- ]
- }
- }
- }
- }
- },
- "SST": {
- "STAT": {
- "SST": {
- "STAT/SST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5001"
- ],
- "Statistics_Client_TCP_Port": [
- "5101"
- ],
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "FPGA_sst_offload_hdr_eth_destination_mac_RW_default": [
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd"
- ],
- "FPGA_sst_offload_hdr_ip_destination_address_RW_default": [
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250"
- ],
- "FPGA_sst_offload_hdr_udp_destination_port_RW_default": [
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001",
- "5001"
- ]
- }
- }
- }
- }
- },
- "XST": {
- "STAT": {
- "XST": {
- "STAT/XST/HBA": {
- "properties": {
- "Statistics_Client_UDP_Port": [
- "5002"
- ],
- "Statistics_Client_TCP_Port": [
- "5102"
- ],
- "OPC_Server_Name": [
- "dop369.astron.nl"
- ],
- "OPC_Server_Port": [
- "4840"
- ],
- "OPC_Time_Out": [
- "5.0"
- ],
- "FPGA_xst_offload_hdr_eth_destination_mac_RW_default": [
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd",
- "6c:2b:59:97:be:dd"
- ],
- "FPGA_xst_offload_hdr_ip_destination_address_RW_default": [
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250",
- "10.99.250.250"
- ],
- "FPGA_xst_offload_hdr_udp_destination_port_RW_default": [
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002",
- "5002"
- ]
- }
- }
- }
- }
- }
- }
-}
diff --git a/CDB/stations/README.md b/CDB/stations/README.md
index 80213aa55b1509d5ccb2e6eafff12e7f3be9ab86..91b84285747b77ffc6da9813627e14c0707e8051 100644
--- a/CDB/stations/README.md
+++ b/CDB/stations/README.md
@@ -14,18 +14,3 @@ The following stations need the following configurations applied:
- L2TS: common.json + l0.json + l1.json + h0.json + lba.json + hba_remote.json + cs001.json
- DTS: common.json + l0.json + l1.json + h0.json + lba.json + hba_remote.json + DTS.json
-
-## adding support for 2 subracks
-
-These are the required changes that need to be made in order to support multiple subracks.
-
-##### In the config file:
-
- - add all the new devices under the "STAT/DEVICE/2" name with the correct IP addresses, ports and other properties. This includes: APSCT, APSPU, RECV and UNB2.
- - Set the first 8 bools in "STAT/SDPFirmware/1" ... "TR_fpga_mask_RW_default" to True (instead of the first 4 with 1 subrack). This enables the new FPGA's
-
-##### In the jupyter startup script
-
- - Change all "STAT/DEVICE/1" device variable names to end with "_1"
- - Add all new "STAT/DEVICE/2" devices with their names ending in "_2"
- - update the devices list with the new devices and changed names
diff --git a/CDB/stations/dummy_positions_ConfigDb.json b/CDB/stations/dummy_positions_ConfigDb.json
deleted file mode 100644
index 4dfe542f56c976c4fa3ae626d813f00096d7f49b..0000000000000000000000000000000000000000
--- a/CDB/stations/dummy_positions_ConfigDb.json
+++ /dev/null
@@ -1,266 +0,0 @@
-{
- "servers": {
- "AFH": {
- "STAT": {
- "AFH": {
- "STAT/AFH/HBA": {
- "properties": {
- "Antenna_Sets": [
- "INNER",
- "OUTER",
- "SPARSE_EVEN",
- "SPARSE_ODD",
- "ALL"
- ],
- "Antenna_Set_Masks":[
- "111111111111111111111111111111111111111111111111000000000000000000000000000000000000000000000000",
- "000000000000000000000000000000000000000000000000111111111111111111111111111111111111111111111111",
- "101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010",
- "010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101",
- "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
- ],
- "Control_to_RECV_mapping": [
- "1", "0",
- "1", "1",
- "1", "2",
- "1", "3",
- "1", "4",
- "1", "5",
- "1", "6",
- "1", "7",
- "1", "8",
- "1", "9",
- "1", "10",
- "1", "11",
- "1", "12",
- "1", "13",
- "1", "14",
- "1", "15",
- "1", "16",
- "1", "17",
- "1", "18",
- "1", "19",
- "1", "20",
- "1", "21",
- "1", "22",
- "1", "23",
- "1", "24",
- "1", "25",
- "1", "26",
- "1", "27",
- "1", "28",
- "1", "29",
- "1", "30",
- "1", "31",
- "1", "32",
- "1", "33",
- "1", "34",
- "1", "35",
- "1", "36",
- "1", "37",
- "1", "38",
- "1", "39",
- "1", "40",
- "1", "41",
- "1", "42",
- "1", "43",
- "1", "44",
- "1", "45",
- "1", "46",
- "1", "47"
- ],
- "Power_to_RECV_mapping": [
- "1", "48",
- "1", "49",
- "1", "50",
- "1", "51",
- "1", "52",
- "1", "53",
- "1", "54",
- "1", "55",
- "1", "56",
- "1", "57",
- "1", "58",
- "1", "59",
- "1", "60",
- "1", "61",
- "1", "62",
- "1", "63",
- "1", "64",
- "1", "65",
- "1", "66",
- "1", "67",
- "1", "68",
- "1", "69",
- "1", "70",
- "1", "71",
- "1", "72",
- "1", "73",
- "1", "74",
- "1", "75",
- "1", "76",
- "1", "77",
- "1", "78",
- "1", "79",
- "1", "80",
- "1", "81",
- "1", "82",
- "1", "83",
- "1", "84",
- "1", "85",
- "1", "86",
- "1", "87",
- "1", "88",
- "1", "89",
- "1", "90",
- "1", "91",
- "1", "92",
- "1", "93",
- "1", "94",
- "1", "95"
- ],
- "Antenna_to_SDP_Mapping": [
- "0", "0", "0", "1", "0", "2", "0", "3", "0", "4", "0", "5",
- "1", "0", "1", "1", "1", "2", "1", "3", "1", "4", "1", "5",
- "2", "0", "2", "1", "2", "2", "2", "3", "2", "4", "2", "5",
- "3", "0", "3", "1", "3", "2", "3", "3", "3", "4", "3", "5",
- "4", "0", "4", "1", "4", "2", "4", "3", "4", "4", "4", "5",
- "5", "0", "5", "1", "5", "2", "5", "3", "5", "4", "5", "5",
- "6", "0", "6", "1", "6", "2", "6", "3", "6", "4", "6", "5",
- "7", "0", "7", "1", "7", "2", "7", "3", "7", "4", "7", "5"
- ],
- "Antenna_Names": [
- "H0", "H1", "H2", "H3", "H4", "H5",
- "H6", "H7", "H8", "H9", "H10", "H11",
- "H12", "H13", "H14", "H15", "H16", "H17",
- "H18", "H19", "H20", "H21", "H22", "H23",
- "H24", "H25", "H26", "H27", "H28", "H29",
- "H30", "H31", "H32", "H33", "H34", "H35",
- "H36", "H37", "H38", "H39", "H40", "H41",
- "H42", "H43", "H44", "H45", "H46", "H47"
- ],
- "Antenna_Field_Reference_ETRS": [
- "3826896.631", "460979.131", "5064657.943"
- ],
- "Antenna_Reference_ETRS": [
- "3826886.142", "460980.772", "5064665.668",
- "3826887.237", "460985.643", "5064664.406",
- "3826889.022", "460974.271", "5064664.094",
- "3826890.118", "460979.142", "5064662.831",
- "3826891.214", "460984.012", "5064661.568",
- "3826892.311", "460988.883", "5064660.305",
- "3826891.902", "460967.768", "5064662.520",
- "3826892.999", "460972.640", "5064661.256",
- "3826894.094", "460977.511", "5064659.994",
- "3826895.191", "460982.382", "5064658.730",
- "3826896.287", "460987.252", "5064657.467",
- "3826897.383", "460992.123", "5064656.204",
- "3826895.879", "460966.138", "5064659.682",
- "3826896.974", "460971.009", "5064658.419",
- "3826898.071", "460975.880", "5064657.156",
- "3826899.167", "460980.751", "5064655.893",
- "3826900.263", "460985.622", "5064654.630",
- "3826901.359", "460990.493", "5064653.367",
- "3826900.951", "460969.378", "5064655.582",
- "3826902.048", "460974.250", "5064654.319",
- "3826903.143", "460979.120", "5064653.056",
- "3826904.240", "460983.991", "5064651.793",
- "3826906.024", "460972.619", "5064651.481",
- "3826907.120", "460977.490", "5064650.218",
- "3826969.290", "460898.914", "5064610.654",
- "3826970.386", "460903.785", "5064609.392",
- "3826972.171", "460892.413", "5064609.080",
- "3826973.267", "460897.284", "5064607.817",
- "3826974.363", "460902.154", "5064606.554",
- "3826975.459", "460907.025", "5064605.291",
- "3826975.051", "460885.911", "5064607.506",
- "3826976.147", "460890.782", "5064606.242",
- "3826977.243", "460895.653", "5064604.980",
- "3826978.339", "460900.524", "5064603.716",
- "3826979.436", "460905.394", "5064602.453",
- "3826980.532", "460910.265", "5064601.190",
- "3826979.027", "460884.281", "5064604.668",
- "3826980.123", "460889.152", "5064603.405",
- "3826981.220", "460894.022", "5064602.142",
- "3826982.316", "460898.893", "5064600.879",
- "3826983.412", "460903.764", "5064599.616",
- "3826984.508", "460908.635", "5064598.353",
- "3826984.100", "460887.521", "5064600.568",
- "3826985.196", "460892.392", "5064599.305",
- "3826986.292", "460897.262", "5064598.042",
- "3826987.388", "460902.133", "5064596.779",
- "3826989.173", "460890.761", "5064596.467",
- "3826990.269", "460895.632", "5064595.204"
- ],
- "HBAT_PQR_rotation_angles_deg": [
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24",
- "24"
- ],
- "PQR_to_ETRS_rotation_matrix": [
- "-0.1195951054", "-0.7919544517", "0.5987530018",
- " 0.9928227484", "-0.0954186800", "0.0720990002",
- " 0.0000330969", " 0.6030782884", "0.7976820024"
- ]
- }
- }
- }
- }
- },
- "DigitalBeam": {
- "STAT": {
- "DigitalBeam": {
- "STAT/DigitalBeam/HBA": {
- "properties": {
- }
- }
- }
- }
- }
- }
-}
diff --git a/CDB/stations/stream-beamlets-to-cbm201-10GB01.json b/CDB/stations/stream-beamlets-to-cbm201-10GB01.json
deleted file mode 100644
index c0f0299fa9cbf42b3cdb3ae6eb5f0b6b923c968a..0000000000000000000000000000000000000000
--- a/CDB/stations/stream-beamlets-to-cbm201-10GB01.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "servers": {
- "Beamlet": {
- "STAT": {
- "Beamlet": {
- "STAT/Beamlet/LBA": {
- "properties": {
- "FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
- ],
- "FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1"
- ]
- }
- },
- "STAT/Beamlet/HBA0": {
- "properties": {
- "FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
- ],
- "FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1"
- ]
- }
- },
- "STAT/Beamlet/HBA1": {
- "properties": {
- "FPGA_beamlet_output_hdr_eth_destination_mac_RW_default": [
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81",
- "e4:43:4b:3d:89:81"
- ],
- "FPGA_beamlet_output_hdr_ip_destination_address_RW_default": [
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1",
- "10.168.160.1"
- ]
- }
- }
- }
- }
- }
- }
-}