Fix enabled instruments configuration

src/hal/__main__.py

@@ -17,7 +17,7 @@
 from clu.tools import cli_coro
 from sdsstools.daemonizer import DaemonGroup
 
-from hal import __version__
+from hal import __version__, config
 from hal.actor import HALActor
 
 
@@ -67,10 +67,11 @@ def hal(
 async def actor(ctx: click.Context):
     """Runs the actor."""
 
-    default_config_file = os.path.join(os.path.dirname(__file__), "etc/hal.yml")
-    config_file: str = ctx.obj["config_file"] or default_config_file
-
-    hal_obj = HALActor.from_config(config_file)
+    if ctx.obj["config_file"] is not None:
+        config_file: str = ctx.obj["config_file"]
+        hal_obj = HALActor.from_config(config_file)
+    else:
+        hal_obj = HALActor.from_config(config)
 
     if ctx.obj["verbose"]:
         hal_obj.log.sh.setLevel(0)

src/hal/actor/actor.py

@@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
 
         HALActor._instance = self
 
-        instruments = self.helpers.macros["expose"].config["enabled_instruments"]
+        instruments = self.config["enabled_instruments"]
         self.log.info(f"Enabled instruments: {instruments!r}")
 
     @staticmethod

src/hal/actor/commands/expose.py

@@ -269,7 +269,7 @@ async def expose(
 
     selected_stages = cast(list[StageType], stages or flatten(macro.__STAGES__.copy()))
 
-    enabled_instuments = macro.config["enabled_instruments"]
+    enabled_instuments = config["enabled_instruments"]
     apogee = apogee and "apogee" in enabled_instuments
     boss = boss and "boss" in enabled_instuments
 

src/hal/etc/hal.yml

@@ -44,6 +44,8 @@ lamp_warmup:
   HgCd: 108
   Ne: 20
 
+enabled_instruments: ['apogee', 'boss']
+
 macros:
   goto_field:
     fvc:
@@ -148,7 +150,6 @@ macros:
           - guide
 
   expose:
-    enabled_instruments: ['apogee', 'boss']
     boss_exptime: null
     apogee_exptime: null
     count_apogee: null

src/hal/macros/goto_field.py

@@ -76,13 +76,14 @@ async def prepare(self):
                     await self.helpers.cherno.stop_guiding(self.command)
 
         # Ensure the APOGEE shutter is closed but don't wait for it.
-        asyncio.create_task(
-            self.helpers.apogee.shutter(
-                self.command,
-                open=False,
-                shutter="apogee",
+        if "apogee" in self.actor.config["enabled_instruments"]:
+            asyncio.create_task(
+                self.helpers.apogee.shutter(
+                    self.command,
+                    open=False,
+                    shutter="apogee",
+                )
             )
-        )
 
         # Reset cherno offsets.
         self.command.debug("Resetting cherno offsets.")