Merge branch 'L2SS-921-antenna-names' into 'master'

Resolve L2SS-921 "Antenna names"

Closes L2SS-921

See merge request !405

CDB/stations/DTS_Outside_ConfigDb.json

@@ -92,19 +92,6 @@
                 }
             }
         },
-        "DigitalBeam": {
-            "STAT": {
-                "DigitalBeam": {
-                    "STAT/DigitalBeam/1": {
-                        "properties": {
-                            "Tracking_enabled_RW_default": [
-                                "False"
-                            ]
-                        }
-                    }
-                }
-            }
-        },
         "Beamlet": {
             "STAT": {
                 "Beamlet": {
@@ -168,6 +155,13 @@
                             "RECV_devices": [
                                 "STAT/RECV/1"
                             ],
+                            "Antenna_Names": [
+                                "C0",
+                                "C1",
+                                "C2",
+                                "C3",
+                                "C4"
+                            ],
                             "HBAT_Control_to_RECV_mapping": [
                                 "1","27",
                                 "0","-1",
@@ -211,6 +205,17 @@
                             "RECV_devices": [
                                 "STAT/RECV/1"
                             ],
+                            "Antenna_Names": [
+                                "LBA1",
+                                "LBA2",
+                                "LBA3",
+                                "LBA4",
+                                "LBA5",
+                                "LBA6",
+                                "LBA7",
+                                "LBA8",
+                                "LBA9"
+                            ],
                             "HBAT_Control_to_RECV_mapping": [
                                 "1","1",
                                 "1","3",
@@ -234,7 +239,9 @@
                                 "1","17"
                             ],
                             "Antenna_Field_Reference_ETRS": [
-				"3839358.189", "430354.482", "5057967.804"
+                                "3839358.189",
+                                "430354.482",
+                                "5057967.804"
                             ],
                             "HBAT_reference_ETRS": [
                                 "3839358.189","430354.482","5057967.804",
@@ -302,6 +309,9 @@
                                 "-1", "-1", "-1", "-1", "-1", "-1",
                                 "-1", "-1", "-1", "-1", "-1", "-1",
                                 "-1", "-1", "-1", "-1", "-1", "-1"
+                            ],
+                            "Tracking_enabled_RW_default": [
+                                "False"
                             ]
                         }
                     }
@@ -555,7 +565,9 @@
                 "PSOC": {
                     "STAT/PSOC/1": {
                         "properties": {
-                            "SNMP_host": ["10.87.2.145"],
+                            "SNMP_host": [
+                                "10.87.2.145"
+                            ],
                             "PSOC_sockets": [
                                 "ccd_socket",
                                 "sdptr0_socket",
@@ -576,7 +588,9 @@
                 "PCON": {
                     "STAT/PCON/1": {
                         "properties": {
-                            "SNMP_host": ["10.151.225.5"]
+                            "SNMP_host": [
+                                "10.151.225.5"
+                            ]
                         }
                     }
                 }

tangostationcontrol/tangostationcontrol/devices/antennafield.py

@@ -85,6 +85,14 @@ class AntennaField(lofar_device):
         calculated, as well as the geohash.
     """
 
+    # ----- Antenna names
+
+    Antenna_Names = device_property(
+        doc="Name of each antenna",
+        dtype='DevVarStringArray',
+        mandatory=False
+    )
+
     # ----- Antenna states
 
     Antenna_Quality = device_property(
@@ -195,6 +203,8 @@ class AntennaField(lofar_device):
         default_value = []
     )
 
+    Antenna_Names_R = attribute(access=AttrWriteType.READ,
+        dtype=(str,), max_dim_x=MAX_NUMBER_OF_HBAT)
     Antenna_Quality_R = attribute(access=AttrWriteType.READ,
         dtype=(numpy.uint16,), max_dim_x=MAX_NUMBER_OF_HBAT)
     Antenna_Use_R = attribute(access=AttrWriteType.READ,
@@ -247,6 +257,9 @@ class AntennaField(lofar_device):
         doc='Number of HBAT in this field',
         dtype=numpy.int32)
 
+    def read_Antenna_Names_R(self):
+        return self.Antenna_Names
+    
     def read_Antenna_Use_R(self):
         return self.Antenna_Use
     

tangostationcontrol/tangostationcontrol/test/devices/test_antennafield_device.py

@@ -389,3 +389,11 @@ class TestAntennafieldDevice(device_base.DeviceTestCase):
         antenna_properties = {'Antenna_Quality': antenna_qualities, 'Antenna_Use': antenna_use}
         with DeviceTestContext(antennafield.AntennaField, properties={**self.AT_PROPERTIES, **antenna_properties}, process=True) as proxy:
             numpy.testing.assert_equal(numpy.array([True] + [False] * 95), proxy.Antenna_Usage_Mask_R)
+    
+    def test_read_Antenna_Names(self):
+       """ Verify if Antenna_Names_R is correctly retrieved """
+       antenna_names = ["C0","C1","C2","C3","C4"]
+       antenna_properties = {'Antenna_Names' : antenna_names}
+       with DeviceTestContext(antennafield.AntennaField, properties={**self.AT_PROPERTIES, **antenna_properties}, process=True) as proxy:
+        for i in range(len(antenna_names)):
+            self.assertTrue(proxy.Antenna_Names_R[i]==f"C{i}")