diff --git a/CDB/stations/cs001.json b/CDB/stations/cs001.json
index 9451938597f0b060fbadcee1e44e7bd4c814b970..c9a55f03b274d6d377ea5a68254eb3ad337dcacc 100644
--- a/CDB/stations/cs001.json
+++ b/CDB/stations/cs001.json
@@ -786,22 +786,22 @@
"15", "5"
],
"Antenna_Names": [
- "L1", "L2", "L3", "L4", "L5", "L6",
- "L7", "L8", "L9", "L10", "L11", "L12",
- "L13", "L14", "L15", "L16", "L17", "L18",
- "L19", "L20", "L21", "L22", "L23", "L24",
- "L25", "L26", "L27", "L28", "L29", "L30",
- "L31", "L32", "L33", "L34", "L35", "L36",
- "L37", "L38", "L39", "L40", "L41", "L42",
- "L43", "L44", "L45", "L46", "L47", "L48",
- "L49", "L50", "L51", "L52", "L53", "L54",
- "L55", "L56", "L57", "L58", "L59", "L60",
- "L61", "L62", "L63", "L64", "L65", "L66",
- "L67", "L68", "L69", "L70", "L71", "L72",
- "L73", "L74", "L75", "L76", "L77", "L78",
- "L79", "L80", "L81", "L82", "L83", "L84",
- "L85", "L86", "L87", "L88", "L89", "L90",
- "L91", "L92", "L93", "L94", "L95", "L96"
+ "L0", "L1", "L2", "L3", "L4", "L5",
+ "L6", "L7", "L8", "L9", "L10", "L11",
+ "L12", "L13", "L14", "L15", "L16", "L17",
+ "L18", "L19", "L20", "L21", "L22", "L23",
+ "L24", "L25", "L26", "L27", "L28", "L29",
+ "L30", "L31", "L32", "L33", "L34", "L35",
+ "L36", "L37", "L38", "L39", "L40", "L41",
+ "L42", "L43", "L44", "L45", "L46", "L47",
+ "L48", "L49", "L50", "L51", "L52", "L53",
+ "L54", "L55", "L56", "L57", "L58", "L59",
+ "L60", "L61", "L62", "L63", "L64", "L65",
+ "L66", "L67", "L68", "L69", "L70", "L71",
+ "L72", "L73", "L74", "L75", "L76", "L77",
+ "L78", "L79", "L80", "L81", "L82", "L83",
+ "L84", "L85", "L86", "L87", "L88", "L89",
+ "L90", "L91", "L92", "L93", "L94", "L95"
],
"Antenna_Cables": [
"80m", "80m", "80m", "80m", "80m", "80m",
@@ -1008,10 +1008,10 @@
"3", "5"
],
"Antenna_Names": [
- "H1", "H2", "H3", "H4", "H5", "H6",
- "H7", "H8", "H9", "H10", "H11", "H12",
- "H13", "H14", "H15", "H16", "H17", "H18",
- "H19", "H20", "H21", "H22", "H23", "H24"
+ "H0", "H1", "H2", "H3", "H4", "H5",
+ "H6", "H7", "H8", "H9", "H10", "H11",
+ "H12", "H13", "H14", "H15", "H16", "H17",
+ "H18", "H19", "H20", "H21", "H22", "H23"
],
"Antenna_Cables": [
"115m", "115m", "115m", "115m", "115m", "115m",
@@ -1145,10 +1145,10 @@
"3", "5"
],
"Antenna_Names": [
- "H25", "H26", "H27", "H28", "H29", "H30",
- "H31", "H32", "H33", "H34", "H35", "H36",
- "H37", "H38", "H39", "H40", "H41", "H42",
- "H43", "H44", "H45", "H46", "H47", "H48"
+ "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_Cables": [
"115m", "115m", "115m", "115m", "115m", "115m",
diff --git a/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-150MHz.h5 b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-150MHz.h5
new file mode 100644
index 0000000000000000000000000000000000000000..0cb1af7b0cc5b0517a00de2b41a294643138aed7
Binary files /dev/null and b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-150MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-200MHz.h5 b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-200MHz.h5
new file mode 100644
index 0000000000000000000000000000000000000000..8af326794446c05ce57a1b548146346dc3b8fae3
Binary files /dev/null and b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-200MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-250MHz.h5 b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-250MHz.h5
new file mode 100644
index 0000000000000000000000000000000000000000..af5980a9fbabf0f5aa9ef3cd55e89fea3cbeea2f
Binary files /dev/null and b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-HBA-250MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/CS001/CalTable-CS001-LBA-50MHz.h5 b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-LBA-50MHz.h5
new file mode 100644
index 0000000000000000000000000000000000000000..baef10d555c1b0101146cca088bcac9c37365d67
Binary files /dev/null and b/docker-compose/object-storage/caltables/CS001/CalTable-CS001-LBA-50MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-150MHz.h5 b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-150MHz.h5
index 0cb1af7b0cc5b0517a00de2b41a294643138aed7..90214085fa7e7d0d002cc9246405955fc53e0851 100644
Binary files a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-150MHz.h5 and b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-150MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-200MHz.h5 b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-200MHz.h5
index 8af326794446c05ce57a1b548146346dc3b8fae3..1a499f5f1b29ca494bb568345d1b1797f6752f86 100644
Binary files a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-200MHz.h5 and b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-200MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-250MHz.h5 b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-250MHz.h5
index af5980a9fbabf0f5aa9ef3cd55e89fea3cbeea2f..0a5db47ad5b068cbececefe683d4761f14df99de 100644
Binary files a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-250MHz.h5 and b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-HBA-250MHz.h5 differ
diff --git a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-LBA-50MHz.h5 b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-LBA-50MHz.h5
index baef10d555c1b0101146cca088bcac9c37365d67..2e422c3efa4dc370ae9a3e52fb4afdc807185eda 100644
Binary files a/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-LBA-50MHz.h5 and b/docker-compose/object-storage/caltables/DevStation/CalTable-DevStation-LBA-50MHz.h5 differ
diff --git a/tangostationcontrol/tangostationcontrol/common/calibration.py b/tangostationcontrol/tangostationcontrol/common/calibration.py
index 31ee7adf1a9213a8cea773f24a2eaa8720abd041..84119459ad55b1db427e10f08fbf33331b03ab5f 100644
--- a/tangostationcontrol/tangostationcontrol/common/calibration.py
+++ b/tangostationcontrol/tangostationcontrol/common/calibration.py
@@ -121,6 +121,7 @@ class CalibrationManager:
for antenna_nr, rcu_band in enumerate(rcu_bands):
fpga_nr, input_nr = antenna_to_sdp_mapping[antenna_nr]
+ antenna_name = antenna_names[antenna_nr]
if input_nr == -1:
# skip unconnected antennas
@@ -137,19 +138,22 @@ class CalibrationManager:
table.observation_station.casefold()
!= self._station_name.casefold()
):
- logger.error(
- "Expected calibration table for %s, but got %s",
- self._station_name,
- table.observation_station,
+ raise ValueError(
+ f"Expected calibration table for station {self._station_name}, but got {table.observation_station} in calibration file {calibration_filename}"
+ )
+
+ if antenna_name not in table.antennas:
+ raise ValueError(
+ f"Could not find calibration values for field {antennafield_name} antenna {antenna_name} (index {antenna_nr}) in calibration file {calibration_filename}"
)
# set weights, converted from complex to packed uint32
fpga_subband_weights[fpga_nr, input_nr, 0] = complex_to_weights(
- table.antennas[antenna_names[antenna_nr]].x
+ table.antennas[antenna_name].x
)
fpga_subband_weights[fpga_nr, input_nr, 1] = complex_to_weights(
- table.antennas[antenna_names[antenna_nr]].y
+ table.antennas[antenna_name].y
)
# TODO(L2SS-1312): This should use atomic_read_modify_write