Merge branch 'main' into albireox/abort-exposures

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## Next version
+## 1.2.1 - May 28th, 2024
+
+### 🔧 Fixed
+
+* Fix an issue with the new auto-pilot loading a new design during an exposure when a fully loaded one was available.
+* Correctly set the observed configuration if the a new one has been loaded.
+
+
+## 1.2.0 - May 26th, 2024
 
 ### 🚀 New
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sdss-hal"
-version = "1.2.0a0"
+version = "1.2.2a0"
 description = "High-level observing tool for SDSS-V (replaces SOP)"
 authors = ["José Sánchez-Gallego <[email protected]>"]
 license = "BSD-3-Clause"

src/hal/actor/commands/auto_pilot.py

@@ -143,7 +143,7 @@ async def auto_pilot(
             break
 
         await asyncio.sleep(0.1)
-
+        break
         if macro.cancelled:
             # Cancelled macros return result=True
             break

src/hal/macros/auto_pilot.py

@@ -107,10 +107,13 @@ async def prepare(self):
         if self.system_state.boss_exposure_state is None:
             raise MacroError("Cannot determine BOSS exposure state.")
 
-        time_remaining = self.system_state.exposure_time_remaining
-        if time_remaining > 0:
+        # Is there a configuration loaded and has it been observed?
+        configuration = self.helpers.jaeger.configuration
+        observed = configuration and configuration.observed
+
+        if self.system_state.exposure_time_remaining > 0:
             # We are exposing.
-            if self.helpers.jaeger.preloaded:
+            if self.helpers.jaeger.preloaded or not observed:
                 # There is already a preloaded configuration. Just wait
                 # until the exposure is done.
                 self._auto_pilot_message("Waiting for exposure before loading design")