Skip to content
Snippets Groups Projects
Commit e88250d2 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'auto-sync-caltables' into 'master'

Auto sync caltables

See merge request !987
parents 0c266663 8d49f9cd
No related branches found
No related tags found
1 merge request!987Auto sync caltables
...@@ -151,6 +151,7 @@ Next change the version in the following places: ...@@ -151,6 +151,7 @@ Next change the version in the following places:
# Release Notes # Release Notes
* 0.42.9 Use latest tables from S3 to calibrate antenna fields
* 0.42.8 Emit metrics even if attribute is polled by AttributePoller as well as Tango * 0.42.8 Emit metrics even if attribute is polled by AttributePoller as well as Tango
* 0.42.7 Prevent Prometheus name collision in ProtectionControl state attribute * 0.42.7 Prevent Prometheus name collision in ProtectionControl state attribute
* 0.42.6 Fix crash caused by emitting change events for attributes polled by Tango * 0.42.6 Fix crash caused by emitting change events for attributes polled by Tango
......
0.42.8 0.42.9
...@@ -86,6 +86,10 @@ class Calibration(LOFARDevice): ...@@ -86,6 +86,10 @@ class Calibration(LOFARDevice):
logger.warning("Device not active. Ignore AntennaField changed event") logger.warning("Device not active. Ignore AntennaField changed event")
return return
# make sure we have the latest tables
logger.debug("Syncing calibration tables")
self._calibration_manager.sync_calibration_tables()
# frequencies changed, so we need to recalibrate # frequencies changed, so we need to recalibrate
self._calibrate_antenna_field(device.name()) self._calibrate_antenna_field(device.name())
...@@ -96,6 +100,10 @@ class Calibration(LOFARDevice): ...@@ -96,6 +100,10 @@ class Calibration(LOFARDevice):
logger.warning("Device not active. Ignore clock changed event") logger.warning("Device not active. Ignore clock changed event")
return return
# make sure we have the latest tables
logger.debug("Syncing calibration tables")
self._calibration_manager.sync_calibration_tables()
found = False found = False
for k, ant in self.ant_proxies.items(): for k, ant in self.ant_proxies.items():
# Recalibrate associated AntennaField # Recalibrate associated AntennaField
...@@ -279,8 +287,8 @@ class Calibration(LOFARDevice): ...@@ -279,8 +287,8 @@ class Calibration(LOFARDevice):
) )
def configure_for_on(self): def configure_for_on(self):
# Calibrate all antennafields, as we did not receive # (Re)calibrate all antennafields, as we did not receive
# any events yet. # any events yet.
self.calibrate_all() self.download_calibration_tables()
super().configure_for_on() super().configure_for_on()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment