From 955a2fe4d19056ef51b1dedb9d1ac959892ba874 Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Wed, 1 May 2024 14:42:33 -0700 Subject: [PATCH 1/3] Moved the callback definition to a point after the script indexes list definition, since the callback references that list. --- python/lsst/ts/IntegrationTests/base_script.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/lsst/ts/IntegrationTests/base_script.py b/python/lsst/ts/IntegrationTests/base_script.py index 8c1322aa..8d670241 100644 --- a/python/lsst/ts/IntegrationTests/base_script.py +++ b/python/lsst/ts/IntegrationTests/base_script.py @@ -184,9 +184,6 @@ async def run(self) -> None: # Since `async with` is used, # you do NOT have to wait for the remote to start - # Create the callback to the ScriptQueue Script Event that - # will wait for all the scripts to complete. - self.remote.evt_script.callback = self.wait_for_done # Convert the queue_placement parameter to the approprirate # ScriptQueue.Location Enum object. queue_placement = getattr(Location, self.queue_placement.upper()) @@ -213,6 +210,9 @@ async def run(self) -> None: # Copy the script_indexes list to use in the Script Event callback. # This maintains the integrity of the real script_indexes list. self.temp_script_indexes = copy.deepcopy(script_indexes) + # Create the callback to the ScriptQueue Script Event that + # will wait for all the scripts to complete. + self.remote.evt_script.callback = self.wait_for_done # Resume the ScriptQueue to begin script execution. await self.remote.cmd_resume.set_start(timeout=10) # Wait for the scripts to complete. From 239823e936b7ffe052bcd5c5d40a0f12e92c001b Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Mon, 23 Sep 2024 15:58:41 -0700 Subject: [PATCH 2/3] Updated the empty config in auxtel_housekeeping.py to use double-quotes. --- python/lsst/ts/IntegrationTests/auxtel_housekeeping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lsst/ts/IntegrationTests/auxtel_housekeeping.py b/python/lsst/ts/IntegrationTests/auxtel_housekeeping.py index b708620d..9b03500f 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_housekeeping.py +++ b/python/lsst/ts/IntegrationTests/auxtel_housekeeping.py @@ -38,7 +38,7 @@ class AuxTelHousekeeping(BaseScript): index: int = 2 configs: tuple = ( - [], + "", registry["atdome_home"], registry["atdome_park"], registry["atptg_park"], From 31a1afeea537a3669e953588d46522977442803e Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Mon, 23 Sep 2024 16:32:25 -0700 Subject: [PATCH 3/3] Updated version-history. --- doc/version-history.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/version-history.rst b/doc/version-history.rst index fa9ba06f..a298155b 100644 --- a/doc/version-history.rst +++ b/doc/version-history.rst @@ -14,6 +14,8 @@ v0.28.0 ------- * Removed MainTel Camera state transition scripts and configs. * Add MTRotator to ignore list in enabled_offline_state_transition_configs.py. +* Moved the callback definition in base_script.py. +* Fixed an empty-config definition. v0.27.0 -------