fix

infra/jobs/station/device-server.levant.nomad

@@ -63,7 +63,7 @@ job "device-servers" {
                 image       = "[[ $.registry.astron.url ]]/mc:latest"
                 entrypoint  = [""]
                 command     = "/bin/bash"
-                args        = ["-c", "mc alias set object-storage http://s3.service.consul:9000 [[.object_storage.user.name]] [[.object_storage.user.pass]] && mc mirror --preserve --watch object-storage/caltables/[[ .station | toUpper ]]/ /opt/caltables/ --monitoring-address 0.0.0.0:8082" ]
+                args        = ["-c", "mc alias set object-storage http://s3.service.consul:9000 [[.object_storage.user.name]] [[.object_storage.user.pass]] && mc mirror --preserve --watch object-storage/caltables/ /opt/caltables/ --monitoring-address 0.0.0.0:8082" ]
             }
 
             resources {

tangostationcontrol/common/calibration.py

@@ -96,6 +96,7 @@ class CalibrationManager:
             """Return the calibration values for the given antenna and RCU band."""
 
             calibration_filename: Path = self._caltable_dir.joinpath(
+                self._station_name,
                 f"CalTable-{self._station_name}-{antenna_type}"
                 f"-{self._band_to_reference_frequency(is_hba, rcu_band)}MHz.h5",
             )

tests/common/test_calibration.py

@@ -65,14 +65,14 @@ class TestCalibrationManager(base.TestCase):
         hdf_reader.assert_has_calls(
             [
                 call(
-                    f"{sut._caltable_dir}/CalTable-unittest-station-HBA-200MHz.h5",
+                    f"{sut._caltable_dir}/unittest-station/CalTable-unittest-station-HBA-200MHz.h5",
                     CalibrationTable,
                 ),
                 call().__enter__(),
                 call().load(caltable_mock.antennas["T1"]),
                 call().__exit__(None, None, None),
                 call(
-                    f"{sut._caltable_dir}/CalTable-unittest-station-HBA-150MHz.h5",
+                    f"{sut._caltable_dir}/unittest-station/CalTable-unittest-station-HBA-150MHz.h5",
                     CalibrationTable,
                 ),
                 call().__enter__(),