Merge pull request #121 from lsst-ts/develop

Release v0.24.0
lsst-ts · Jun 5, 2024 · a2e5274 · a2e5274
2 parents 7384857 + 0b9294c
commit a2e5274
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 6 deletions.
diff --git a/doc/version-history.rst b/doc/version-history.rst
@@ -10,6 +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.24.0
+-------
+* Added ESS:205 to the EAS state transition configurations.
+* 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.
+
 v0.23.0
 -------
 * Fixed the csc_state_transition.py script to add the csc_index to the Class instantiation.

diff --git a/python/lsst/ts/IntegrationTests/configs/eas_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/eas_state_transition_configs.py
@@ -40,10 +40,13 @@
     - [ESS:104, DISABLED]
     - [ESS:105, DISABLED]
     - [ESS:106, DISABLED]
+    - [ESS:107, DISABLED]
+    - [ESS:108, DISABLED]
     - [ESS:201, DISABLED]
     - [ESS:202, DISABLED]
     - [ESS:203, DISABLED]
     - [ESS:204, DISABLED]
+    - [ESS:205, DISABLED]
     - [ESS:301, DISABLED]
     """
 )
@@ -65,10 +68,13 @@
     - [ESS:104, ENABLED]
     - [ESS:105, ENABLED]
     - [ESS:106, ENABLED]
+    - [ESS:107, ENABLED]
+    - [ESS:108, ENABLED]
     - [ESS:201, ENABLED]
     - [ESS:202, ENABLED]
     - [ESS:203, ENABLED]
     - [ESS:204, ENABLED]
+    - [ESS:205, ENABLED]
     - [ESS:301, ENABLED]
     """
 )

diff --git a/python/lsst/ts/IntegrationTests/configs/enabled_offline_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/enabled_offline_state_transition_configs.py
@@ -45,6 +45,7 @@
     data:
     - [Scheduler:1, OFFLINE]
     - [Scheduler:2, OFFLINE]
+    - [Scheduler:3, OFFLINE]
     - [OCPS:1, OFFLINE]
     """
 )
@@ -68,10 +69,13 @@
     - [ESS:104, OFFLINE]
     - [ESS:105, OFFLINE]
     - [ESS:106, OFFLINE]
+    - [ESS:107, OFFLINE]
+    - [ESS:108, OFFLINE]
     - [ESS:201, OFFLINE]
     - [ESS:202, OFFLINE]
     - [ESS:203, OFFLINE]
     - [ESS:204, OFFLINE]
+    - [ESS:205, OFFLINE]
     - [ESS:301, OFFLINE]
     - [WeatherForecast, OFFLINE]
     """
@@ -85,17 +89,29 @@
 yaml_string = yaml.safe_load(
     """
     data:
-    - [Authorize, OFFLINE]
     - [Test:42, OFFLINE]
     - [ScriptQueue:1, OFFLINE]
     - [ScriptQueue:2, OFFLINE]
+    - [ScriptQueue:3, OFFLINE]
     """
 )
 
 registry["sq_enabled_offline"] = yaml.safe_dump(
     yaml_string, explicit_start=True, canonical=True
 )
 
+# MTCS enabled_offline
+yaml_string = yaml.safe_load(
+    """
+    ignore:
+        - mtptg
+    """
+)
+
+registry["mtcs_enabled_offline"] = yaml.safe_dump(
+    yaml_string, explicit_start=True, canonical=True
+)
+
 # MainTel enabled_offline
 yaml_string = yaml.safe_load(
     """

diff --git a/python/lsst/ts/IntegrationTests/configs/love_stress_test_configs.py b/python/lsst/ts/IntegrationTests/configs/love_stress_test_configs.py
@@ -48,7 +48,6 @@
             "MTAirCompressor:1",
             "MTAirCompressor:2",
             "MTMount:0",
-            "MTPtg:0",
             "MTDome:0",
             "MTDomeTrajectory:0",
             "MTAOS:0",

diff --git a/python/lsst/ts/IntegrationTests/configs/maintel_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/maintel_state_transition_configs.py
@@ -39,7 +39,6 @@
     - [MTDome, DISABLED]
     - [MTDomeTrajectory, DISABLED]
     - [MTM2, DISABLED]
-    - [MTPtg, DISABLED]
     - [MTAOS, DISABLED]
     """
 )
@@ -75,7 +74,6 @@
     - [MTDome, ENABLED]
     - [MTDomeTrajectory, ENABLED]
     - [MTM2, ENABLED]
-    - [MTPtg, ENABLED]
     - [MTAOS, ENABLED]
     """
 )

diff --git a/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py b/python/lsst/ts/IntegrationTests/configs/obssys_state_transition_configs.py
@@ -33,6 +33,7 @@
     data:
     - [Scheduler:1, DISABLED]
     - [Scheduler:2, DISABLED]
+    - [Scheduler:3, DISABLED]
     - [OCPS:1, DISABLED]
     - [Watcher, DISABLED]
     """
@@ -48,6 +49,7 @@
     data:
     - [Scheduler:1, ENABLED]
     - [Scheduler:2, ENABLED]
+    - [Scheduler:3, ENABLED]
     - [OCPS:1, ENABLED]
     - [Watcher, ENABLED]
     """

diff --git a/python/lsst/ts/IntegrationTests/enabled_offline.py b/python/lsst/ts/IntegrationTests/enabled_offline.py
@@ -42,7 +42,7 @@ class EnabledOffline(BaseScript):
         registry["sched_ocps_enabled_offline"],
         [],
         [],
-        [],
+        registry["mtcs_enabled_offline"],
         registry["eas_enabled_offline"],
         registry["maintel_enabled_offline"],
         registry["maintel_camera_enabled_offline"],

diff --git a/python/lsst/ts/IntegrationTests/utils.py b/python/lsst/ts/IntegrationTests/utils.py
@@ -45,7 +45,6 @@
         "ATPtg",
         "ATSpectrograph",
         "ATWhiteLight",
-        "Authorize",
         "GCHeaderService",
         "CCCamera",
         "CCHeaderService",
@@ -56,6 +55,7 @@
         "DSM",
         "EAS",
         "Electrometer",
+        "EPM",
         "ESS",
         "FiberSpectrograph",
         "GenericCamera",