Skip to content

Commit

Permalink
Merge pull request #122 from lsst-ts/tickets/DM-45238
Browse files Browse the repository at this point in the history
Tickets/dm45238: Pre-Kafka improvements
  • Loading branch information
rbovill authored Jul 17, 2024
2 parents 0b9294c + feb551c commit a4880be
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_enable_atcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuxTelEnableATCS(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/enable_atcs.py", BaseScript.is_standard),
]
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_latiss_acquire.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class AuxTelLatissAcquire(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/latiss_acquire.py", BaseScript.is_external),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class AuxTelLatissCalibrations(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/make_latiss_calibrations.py", BaseScript.is_external),
]
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_latiss_checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AuxTelLatissCheckout(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
(
"auxtel/daytime_checkout/latiss_checkout.py",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class AuxTelLatissTakeSequence(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/latiss_take_sequence.py", BaseScript.is_standard),
]
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_prepare_for_flat.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuxTelPrepareFlat(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/prepare_for/flat.py", BaseScript.is_standard),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuxTelPrepareOnSky(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/prepare_for/onsky.py", BaseScript.is_standard),
]
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_shutdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuxTelShutdown(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/shutdown.py", BaseScript.is_standard),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/auxtel_stop.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AuxTelStop(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("auxtel/stop.py", BaseScript.is_standard),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AuxTelTelescopeAndDomeCheckout(BaseScript):
"""

index: int = 2
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
(
"auxtel/daytime_checkout/telescope_and_dome_checkout.py",
Expand Down
6 changes: 5 additions & 1 deletion python/lsst/ts/IntegrationTests/base_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/comcam_calibrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ComCamCalibrations(BaseScript):
"""

index: int = 1
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("maintel/make_comcam_calibrations.py", BaseScript.is_external),
]
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/ts/IntegrationTests/enabled_offline.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ts/IntegrationTests/lsstcam_calibrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LsstCamCalibrations(BaseScript):
"""

index: int = 1
configs: tuple = ([],)
configs: tuple = ("",)
scripts: list = [
("maintel/make_lsstcam_calibrations.py", BaseScript.is_external),
]
Expand Down

0 comments on commit a4880be

Please sign in to comment.