From 1bb9011518b7a5a33dd1455ccaa9a75eda2dcffb Mon Sep 17 00:00:00 2001 From: rbovill Date: Tue, 16 Jul 2024 12:00:21 -0700 Subject: [PATCH 1/3] Changed all empty-list configs to empty-strings. --- python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py | 2 +- .../auxtel_latiss_acquire_and_take_sequence.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_latiss_calibrations.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py | 2 +- .../lsst/ts/IntegrationTests/auxtel_latiss_take_sequence.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_prepare_for_onsky.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_shutdown.py | 2 +- .../IntegrationTests/auxtel_slew_and_take_image_checkout.py | 2 +- python/lsst/ts/IntegrationTests/auxtel_stop.py | 2 +- .../ts/IntegrationTests/auxtel_telescope_and_dome_checkout.py | 2 +- python/lsst/ts/IntegrationTests/comcam_calibrations.py | 2 +- python/lsst/ts/IntegrationTests/enabled_offline.py | 4 ++-- python/lsst/ts/IntegrationTests/lsstcam_calibrations.py | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py b/python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py index 84d12e60..3263f507 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py +++ b/python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py @@ -35,7 +35,7 @@ class AuxTelEnableATCS(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/enable_atcs.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py b/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py index ee5d43fb..f3777f9d 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py +++ b/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py @@ -46,7 +46,7 @@ class AuxTelLatissAcquire(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/latiss_acquire.py", BaseScript.is_external), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire_and_take_sequence.py b/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire_and_take_sequence.py index 1971546c..6ad49191 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire_and_take_sequence.py +++ b/python/lsst/ts/IntegrationTests/auxtel_latiss_acquire_and_take_sequence.py @@ -46,7 +46,7 @@ class AuxTelLatissAcquireTakeSequence(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/latiss_acquire_and_take_sequence.py", BaseScript.is_external), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_latiss_calibrations.py b/python/lsst/ts/IntegrationTests/auxtel_latiss_calibrations.py index 5d799071..4499a304 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_latiss_calibrations.py +++ b/python/lsst/ts/IntegrationTests/auxtel_latiss_calibrations.py @@ -44,7 +44,7 @@ class AuxTelLatissCalibrations(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/make_latiss_calibrations.py", BaseScript.is_external), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py b/python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py index bfa5dcc7..90fdfc32 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py +++ b/python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py @@ -34,7 +34,7 @@ class AuxTelLatissCheckout(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ( "auxtel/daytime_checkout/latiss_checkout.py", diff --git a/python/lsst/ts/IntegrationTests/auxtel_latiss_take_sequence.py b/python/lsst/ts/IntegrationTests/auxtel_latiss_take_sequence.py index 37354dae..2381dc26 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_latiss_take_sequence.py +++ b/python/lsst/ts/IntegrationTests/auxtel_latiss_take_sequence.py @@ -46,7 +46,7 @@ class AuxTelLatissTakeSequence(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/latiss_take_sequence.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py b/python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py index 435df233..d95dafcd 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py +++ b/python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py @@ -35,7 +35,7 @@ class AuxTelPrepareFlat(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/prepare_for/flat.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_prepare_for_onsky.py b/python/lsst/ts/IntegrationTests/auxtel_prepare_for_onsky.py index 4ddb83d2..79bb35eb 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_prepare_for_onsky.py +++ b/python/lsst/ts/IntegrationTests/auxtel_prepare_for_onsky.py @@ -35,7 +35,7 @@ class AuxTelPrepareOnSky(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/prepare_for/onsky.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_shutdown.py b/python/lsst/ts/IntegrationTests/auxtel_shutdown.py index 62584d2b..a93d8dee 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_shutdown.py +++ b/python/lsst/ts/IntegrationTests/auxtel_shutdown.py @@ -35,7 +35,7 @@ class AuxTelShutdown(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/shutdown.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_slew_and_take_image_checkout.py b/python/lsst/ts/IntegrationTests/auxtel_slew_and_take_image_checkout.py index 3aad6330..d0e92a02 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_slew_and_take_image_checkout.py +++ b/python/lsst/ts/IntegrationTests/auxtel_slew_and_take_image_checkout.py @@ -34,7 +34,7 @@ class SlewAndTakeImageCheckout(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ( "auxtel/daytime_checkout/slew_and_take_image_checkout.py", diff --git a/python/lsst/ts/IntegrationTests/auxtel_stop.py b/python/lsst/ts/IntegrationTests/auxtel_stop.py index 3ca9f2ad..568050cb 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_stop.py +++ b/python/lsst/ts/IntegrationTests/auxtel_stop.py @@ -35,7 +35,7 @@ class AuxTelStop(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("auxtel/stop.py", BaseScript.is_standard), ] diff --git a/python/lsst/ts/IntegrationTests/auxtel_telescope_and_dome_checkout.py b/python/lsst/ts/IntegrationTests/auxtel_telescope_and_dome_checkout.py index e05f8e84..97218f53 100644 --- a/python/lsst/ts/IntegrationTests/auxtel_telescope_and_dome_checkout.py +++ b/python/lsst/ts/IntegrationTests/auxtel_telescope_and_dome_checkout.py @@ -34,7 +34,7 @@ class AuxTelTelescopeAndDomeCheckout(BaseScript): """ index: int = 2 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ( "auxtel/daytime_checkout/telescope_and_dome_checkout.py", diff --git a/python/lsst/ts/IntegrationTests/comcam_calibrations.py b/python/lsst/ts/IntegrationTests/comcam_calibrations.py index cc66d3a9..78038c0f 100644 --- a/python/lsst/ts/IntegrationTests/comcam_calibrations.py +++ b/python/lsst/ts/IntegrationTests/comcam_calibrations.py @@ -44,7 +44,7 @@ class ComCamCalibrations(BaseScript): """ index: int = 1 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("maintel/make_comcam_calibrations.py", BaseScript.is_external), ] diff --git a/python/lsst/ts/IntegrationTests/enabled_offline.py b/python/lsst/ts/IntegrationTests/enabled_offline.py index 49b1ce29..8a5d330d 100644 --- a/python/lsst/ts/IntegrationTests/enabled_offline.py +++ b/python/lsst/ts/IntegrationTests/enabled_offline.py @@ -40,8 +40,8 @@ class EnabledOffline(BaseScript): configs: tuple = ( registry["watcher_enabled_offline"], registry["sched_ocps_enabled_offline"], - [], - [], + "", + "", registry["mtcs_enabled_offline"], registry["eas_enabled_offline"], registry["maintel_enabled_offline"], diff --git a/python/lsst/ts/IntegrationTests/lsstcam_calibrations.py b/python/lsst/ts/IntegrationTests/lsstcam_calibrations.py index 75adb14a..71ea8946 100644 --- a/python/lsst/ts/IntegrationTests/lsstcam_calibrations.py +++ b/python/lsst/ts/IntegrationTests/lsstcam_calibrations.py @@ -44,7 +44,7 @@ class LsstCamCalibrations(BaseScript): """ index: int = 1 - configs: tuple = ([],) + configs: tuple = ("",) scripts: list = [ ("maintel/make_lsstcam_calibrations.py", BaseScript.is_external), ] From feb551c66c26f838609d29526b6f65965c6f4422 Mon Sep 17 00:00:00 2001 From: rbovill Date: Tue, 16 Jul 2024 15:02:09 -0700 Subject: [PATCH 2/3] Added logic to the wait_for_done routine, to handle the first iteration, where the list of scripts is not yet populated, which causes an IndexError. --- python/lsst/ts/IntegrationTests/base_script.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/lsst/ts/IntegrationTests/base_script.py b/python/lsst/ts/IntegrationTests/base_script.py index 3de1c384..8c1322aa 100644 --- a/python/lsst/ts/IntegrationTests/base_script.py +++ b/python/lsst/ts/IntegrationTests/base_script.py @@ -144,7 +144,11 @@ async def wait_for_done(self, data: salobj.BaseMsgType) -> None: f"{ScriptProcessState(data.processState).name}" ) return - print(f"Waiting for script ID {self.temp_script_indexes[0]} to finish...") + if self.temp_script_indexes: + print(f"Waiting for script ID {self.temp_script_indexes[0]} to finish...") + else: + print("No scripts to wait for") + return if data.processState in utils.terminal_states and data.timestampProcessEnd > 0: print( f"Script {data.scriptSalIndex} terminal processing state: " From e557adfc8833559b929f959ec4a334abe34b5f6c Mon Sep 17 00:00:00 2001 From: Rob Bovill Date: Tue, 23 Jul 2024 15:15:32 -0700 Subject: [PATCH 3/3] Updated version-history. --- doc/version-history.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/version-history.rst b/doc/version-history.rst index 8629b2b5..fc210278 100644 --- a/doc/version-history.rst +++ b/doc/version-history.rst @@ -10,10 +10,14 @@ Version History .. No new work should be required in order to complete this section. .. Below is an example of a version history format. +v0.25.0 +------- +* Pre-Kafka improvements. + v0.24.0 ------- * Added ESS:205 to the EAS state transition configurations. -* Added ESS:107, ESS:108, Scheduler:3 and ScriptQueue:3 CSCs +* Added ESS:107, ESS:108, Scheduler:3 and ScriptQueue:3 CSCs. * Set EPM:1 and MTPtg to individual state transition. * Added an ignore parameter for the MTPtg to the enabled_offline script. * Removed Authorize CSC.