diff --git a/CDB/stations/DTS_Outside_ConfigDb.json b/CDB/stations/DTS_Outside_ConfigDb.json index c45f204de2bfebedb212e6dc0d2b9f15bcdd48e0..96b58936feb2ca06b0f84a6c099603a968f84496 100644 --- a/CDB/stations/DTS_Outside_ConfigDb.json +++ b/CDB/stations/DTS_Outside_ConfigDb.json @@ -156,11 +156,11 @@ "STAT/RECV/1" ], "Antenna_Names": [ - "C0","C0", - "C1","C1", - "C2","C2", - "C3","C3", - "C4","C4" + "C0", + "C1", + "C2", + "C3", + "C4" ], "HBAT_Control_to_RECV_mapping": [ "1","27", @@ -177,26 +177,14 @@ "1","26" ], "Antenna_Field_Reference_ETRS": [ - "3839371.416", - "430339.901", - "5057958.886" + "3839371.416","430339.901","5057958.886" ], "HBAT_reference_ETRS": [ - "3839371.416", - "430339.901", - "5057958.886", - "3839368.919", - "430335.979", - "5057961.1", - "3839365.645", - "430339.299", - "5057963.288", - "3839368.142", - "430343.221", - "5057961.074", - "3839374.094", - "430299.513", - "5057960.017" + "3839371.416","430339.901","5057958.886", + "3839368.919","430335.979","5057961.1", + "3839365.645","430339.299","5057963.288", + "3839368.142","430343.221","5057961.074", + "3839374.094","430299.513","5057960.017" ], "HBAT_PQR_rotation_angles_deg": [ "45.73", @@ -206,15 +194,9 @@ "54.40" ], "HBAT_PQR_to_ETRS_rotation_matrix": [ - "-0.11660087", - "-0.79095632", - "0.60065992", - " 0.99317077", - "-0.09529842", - "0.06730545", - " 0.00400627", - " 0.60440575", - "0.79666658" + "-0.11660087","-0.79095632","0.60065992", + " 0.99317077","-0.09529842","0.06730545", + " 0.00400627"," 0.60440575","0.79666658" ] } }, @@ -224,15 +206,15 @@ "STAT/RECV/1" ], "Antenna_Names": [ - "LBA1","LBA1", - "LBA2","LBA2", - "LBA3","LBA3", - "LBA4","LBA4", - "LBA5","LBA5", - "LBA6","LBA6", - "LBA7","LBA7", - "LBA8","LBA8", - "LBA9","LBA9" + "LBA1", + "LBA2", + "LBA3", + "LBA4", + "LBA5", + "LBA6", + "LBA7", + "LBA8", + "LBA9" ], "HBAT_Control_to_RECV_mapping": [ "1","1", @@ -262,33 +244,15 @@ "5057967.804" ], "HBAT_reference_ETRS": [ - "3839358.189", - "430354.482", - "5057967.804", - "3839359.127", - "430348.074", - "5057967.607", - "3839360.084", - "430341.872", - "5057967.379", - "3839361.024", - "430335.466", - "5057967.180", - "3839361.721", - "430329.482", - "5057967.130", - "3839362.786", - "430323.311", - "5057966.818", - "3839363.705", - "430317.204", - "5057966.611", - "3839364.563", - "430311.056", - "5057966.454", - "3839365.497", - "430304.996", - "5057966.232" + "3839358.189","430354.482","5057967.804", + "3839359.127","430348.074","5057967.607", + "3839360.084","430341.872","5057967.379", + "3839361.024","430335.466","5057967.180", + "3839361.721","430329.482","5057967.130", + "3839362.786","430323.311","5057966.818", + "3839363.705","430317.204","5057966.611", + "3839364.563","430311.056","5057966.454", + "3839365.497","430304.996","5057966.232" ] } } diff --git a/tangostationcontrol/tangostationcontrol/devices/antennafield.py b/tangostationcontrol/tangostationcontrol/devices/antennafield.py index 10f6ea71e7ddd86c3890d9ea12e1fc6c16002e2a..c7d43b9226de469e877cf6bfdc4c728a8afcfd0e 100644 --- a/tangostationcontrol/tangostationcontrol/devices/antennafield.py +++ b/tangostationcontrol/tangostationcontrol/devices/antennafield.py @@ -204,7 +204,7 @@ class AntennaField(lofar_device): ) Antenna_Names_R = attribute(access=AttrWriteType.READ, - dtype=(numpy.str,), max_dim_x=MAX_NUMBER_OF_HBAT) + 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,