Resolve L2SS-1410 "Fixes for CS001 after deployment of DTS-lab hardware"

CDB/stations/hba_core.json

@@ -19,20 +19,14 @@
         "DigitalBeam": {
           "STAT/DigitalBeam/HBA0": {
             "properties": {
-              "AntennaField_Device": [
-                "STAT/AntennaField/HBA0"
-              ],
-              "Beamlet_Device": [
+              "Control_Children": [
                 "STAT/Beamlet/HBA0"
               ]
             }
           },
           "STAT/DigitalBeam/HBA1": {
             "properties": {
-              "AntennaField_Device": [
-                "STAT/AntennaField/HBA1"
-              ],
-              "Beamlet_Device": [
+              "Control_Children": [
                 "STAT/Beamlet/HBA1"
               ]
             }
@@ -124,7 +118,7 @@
                 "STAT/TileBeam/HBA0"
               ],
               "Control_Children": [
-                "STAT/SDP/HBA0",
+                "STAT/SDPFirmware/HBA0",
                 "STAT/DigitalBeam/HBA0",
                 "STAT/TileBeam/HBA0"
               ],
@@ -140,7 +134,7 @@
                 "STAT/TileBeam/HBA1"
               ],
               "Control_Children": [
-                "STAT/SDP/HBA1",
+                "STAT/SDPFirmware/HBA1",
                 "STAT/DigitalBeam/HBA1",
                 "STAT/TileBeam/HBA1"
               ],
@@ -164,6 +158,12 @@
                 "STAT/SST/HBA0",
                 "STAT/XST/HBA0"
               ],
+              "Control_Children": [
+                "STAT/SDP/HBA0",
+                "STAT/BST/HBA0",
+                "STAT/SST/HBA0",
+                "STAT/XST/HBA0"
+              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],
@@ -184,6 +184,12 @@
                 "STAT/SST/HBA1",
                 "STAT/XST/HBA1"
               ],
+              "Control_Children": [
+                "STAT/SDP/HBA1",
+                "STAT/BST/HBA1",
+                "STAT/SST/HBA1",
+                "STAT/XST/HBA1"
+              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],
@@ -203,12 +209,6 @@
         "SDP": {
           "STAT/SDP/HBA0": {
             "properties": {
-              "Control_Children": [
-                "STAT/Beamlet/HBA0",
-                "STAT/BST/HBA0",
-                "STAT/SST/HBA0",
-                "STAT/XST/HBA0"
-              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],
@@ -294,12 +294,6 @@
           },
           "STAT/SDP/HBA1": {
             "properties": {
-              "Control_Children": [
-                "STAT/Beamlet/HBA1",
-                "STAT/BST/HBA1",
-                "STAT/SST/HBA1",
-                "STAT/XST/HBA1"
-              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],

CDB/stations/hba_remote.json

@@ -5,9 +5,6 @@
         "TileBeam": {
           "STAT/TileBeam/HBA": {
             "properties": {
-              "Tracking_enabled_RW_default": [
-                "False"
-              ]
             }
           }
         }
@@ -18,14 +15,8 @@
         "DigitalBeam": {
           "STAT/DigitalBeam/HBA": {
             "properties": {
-              "AntennaField_Device": [
-                "STAT/AntennaField/HBA"
-              ],
-              "Beamlet_Device": [
+              "Control_Children": [
                 "STAT/Beamlet/HBA"
-              ],
-              "Tracking_enabled_RW_default": [
-                "False"
               ]
             }
           }
@@ -107,6 +98,12 @@
                 "STAT/SST/HBA",
                 "STAT/XST/HBA"
               ],
+              "Control_Children": [
+                "STAT/SDP/HBA",
+                "STAT/BST/HBA",
+                "STAT/SST/HBA",
+                "STAT/XST/HBA"
+              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],
@@ -126,12 +123,6 @@
         "SDP": {
           "STAT/SDP/HBA": {
             "properties": {
-              "Control_Children": [
-                "STAT/Beamlet/HBA",
-                "STAT/BST/HBA",
-                "STAT/SST/HBA",
-                "STAT/XST/HBA"
-              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],

CDB/stations/lba.json

@@ -5,14 +5,8 @@
         "DigitalBeam": {
           "STAT/DigitalBeam/LBA": {
             "properties": {
-              "AntennaField_Device": [
-                "STAT/AntennaField/LBA"
-              ],
-              "Beamlet_Device": [
+              "Control_Children": [
                 "STAT/Beamlet/LBA"
-              ],
-              "Tracking_enabled_RW_default": [
-                "False"
               ]
             }
           }
@@ -68,7 +62,7 @@
                 "STAT/DigitalBeam/LBA"
               ],
               "Control_Children": [
-                "STAT/SDP/LBA",
+                "STAT/SDPFirmware/LBA",
                 "STAT/DigitalBeam/LBA"
               ],
               "Antenna_Type": [
@@ -91,6 +85,12 @@
                 "STAT/SST/LBA",
                 "STAT/XST/LBA"
               ],
+              "Control_Children": [
+                "STAT/SDP/LBA",
+                "STAT/BST/LBA",
+                "STAT/SST/LBA",
+                "STAT/XST/LBA"
+              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],
@@ -110,12 +110,6 @@
         "SDP": {
           "STAT/SDP/LBA": {
             "properties": {
-              "Control_Children": [
-                "STAT/Beamlet/LBA",
-                "STAT/BST/LBA",
-                "STAT/SST/LBA",
-                "STAT/XST/LBA"
-              ],
               "OPC_Server_Name": [
                 "10.99.0.250"
               ],

docker-compose/jupyter-lab/Dockerfile

@@ -60,8 +60,8 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/
 RUN sudo chmod +x /usr/bin/tini
 
 # Needed to perform certain migration actions during startup
-RUN sudo mkdir -p /home/tango/.jupyter/migrated
-RUN sudo chmod 0777 /home/tango/.jupyter/migrated
+RUN sudo mkdir -p /home/tango/.jupyter/lab/workspaces
+RUN sudo chmod 0777 /home/tango/.jupyter
 
 USER ${CONTAINER_EXECUTION_UID}
 # pyppeteer-install installs in the homedir, so run it as the user that will execute the notebook

docker-compose/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py

@@ -49,6 +49,26 @@ digitalbeam_h = OptionalDeviceProxy("STAT/DigitalBeam/HBA")
 tilebeam_h = OptionalDeviceProxy("STAT/TileBeam/HBA")
 antennafield_h = OptionalDeviceProxy("STAT/AntennaField/HBA")
 
+sdpfirmware_h0 = OptionalDeviceProxy("STAT/SDPFirmware/HBA0")
+sdp_h0 = OptionalDeviceProxy("STAT/SDP/HBA0")
+bst_h0 = OptionalDeviceProxy("STAT/BST/HBA0")
+sst_h0 = OptionalDeviceProxy("STAT/SST/HBA0")
+xst_h0 = OptionalDeviceProxy("STAT/XST/HBA0")
+beamlet_h0 = OptionalDeviceProxy("STAT/Beamlet/HBA0")
+digitalbeam_h0 = OptionalDeviceProxy("STAT/DigitalBeam/HBA0")
+tilebeam_h0 = OptionalDeviceProxy("STAT/TileBeam/HBA0")
+antennafield_h0 = OptionalDeviceProxy("STAT/AntennaField/HBA0")
+
+sdpfirmware_h1 = OptionalDeviceProxy("STAT/SDPFirmware/HBA1")
+sdp_h1 = OptionalDeviceProxy("STAT/SDP/HBA1")
+bst_h1 = OptionalDeviceProxy("STAT/BST/HBA1")
+sst_h1 = OptionalDeviceProxy("STAT/SST/HBA1")
+xst_h1 = OptionalDeviceProxy("STAT/XST/HBA1")
+beamlet_h1 = OptionalDeviceProxy("STAT/Beamlet/HBA1")
+digitalbeam_h1 = OptionalDeviceProxy("STAT/DigitalBeam/HBA1")
+tilebeam_h1 = OptionalDeviceProxy("STAT/TileBeam/HBA1")
+antennafield_h1 = OptionalDeviceProxy("STAT/AntennaField/HBA1")
+
 stationmanager = OptionalDeviceProxy("STAT/StationManager/1")
 boot = OptionalDeviceProxy("STAT/Boot/1")
 ccd = OptionalDeviceProxy("STAT/CCD/1")
@@ -88,6 +108,24 @@ devices = (
         digitalbeam_h,
         tilebeam_h,
         antennafield_h,
+        sdpfirmware_h0,
+        sdp_h0,
+        bst_h0,
+        sst_h0,
+        xst_h0,
+        beamlet_h0,
+        digitalbeam_h0,
+        tilebeam_h0,
+        antennafield_h0,
+        sdpfirmware_h1,
+        sdp_h1,
+        bst_h1,
+        sst_h1,
+        xst_h1,
+        beamlet_h1,
+        digitalbeam_h1,
+        tilebeam_h1,
+        antennafield_h1,
     ]
     + apscts
     + apspus

tangostationcontrol/tangostationcontrol/devices/interfaces/beam_device.py

@@ -232,7 +232,7 @@ class BeamDevice(AsyncDevice):
                 raise ValueError(f"Invalid direction: {pointing}")
 
         # store the new values
-        self._pointing_direction_rw = value
+        self._pointing_direction_rw = numpy.array(value, dtype="<U32")
 
         # force update across tiles if pointing changes
         self.Beam_tracker.force_update()