fix: propagate config through daq

scripts/demo_scan_ingest.py

@@ -1,21 +0,0 @@
-from aarecommon.config.beamline import mx_beamline
-
-from aare.daq.aaredb import AareWrapper
-from aare.daq.config import BeamlineConfig
-from aare.daq.daq import AareDAQ
-from aare.daq.devices import BeamlineDevices
-from aare.devices.jfjoch import JFJochWrapper
-
-bl = mx_beamline()
-j = JFJochWrapper(bl)
-a = AareWrapper(bl)
-c = BeamlineConfig(bl)
-d = BeamlineDevices(bl)
-daq = AareDAQ(bl=bl, cfg=c)
-result = j.wait_till_done(60)
-a.ingest_scan(
-    sample=c.current_sample,
-    result=result,
-    geom=daq.sample_geometry,
-    beam_mark_pxl=c.get_beam_mark(d.zoom),
-)

src/aare/daq/daq.py

@@ -291,7 +291,7 @@ class AareDAQ:
         self.last_time = 0.0
         self._dispatch = dispatch
         self._cfg = cfg
-        self._devs = BeamlineDevices(bl, dispatch)
+        self._devs = BeamlineDevices(bl, dispatch, cfg)
         self._mlbox = MlBox(bl)
         self._jfjoch = JFJochWrapper(bl)
         self._bl = bl.value.upper()

src/aare/daq/devices.py

@@ -375,16 +375,3 @@ class BeamlineDevices:
 
     def read_current_state_from_bec(self) -> BeamlineStateEnum:
         return self.bec_worker.read_current_state()
-
-
-if __name__ == "__main__":
-    from aarecommon.config.beamline import mx_beamline
-
-    beamline = mx_beamline()
-    devs = BeamlineDevices(beamline)
-    devs.bec_worker.scilog_msg(
-        message="Testing DAQ hijack of BEC sci log communication channel", color="blue"
-    )
-    # devs.aerotech_pos = Coordinate(x=124.0, y=1.0, z=1.0)
-    # print(devs.aerotech_pos)
-    # devs.aerotech_omega = 0.0

src/aare/daq/workflows.py

@@ -3,6 +3,7 @@ import time
 from aarecommon.config.logger import setup_logger
 from aarecommon.models.models import SampleCameraSettings
 
+from aare.beamline_dispatch.beamline_dispatch import get_beamline_dispatch
 from aare.daq.config import ABR_OMEGA_MOUNT, ABR_POS_MOUNT, BeamlineConfig
 from aare.daq.devices import BeamlineDevices
 from aare.devices.area_detector import AutoEnum
@@ -284,7 +285,7 @@ if __name__ == "__main__":
 
     beamline = mx_beamline()
     config = BeamlineConfig(beamline)
-    devices = BeamlineDevices(beamline)
+    devices = BeamlineDevices(beamline, get_beamline_dispatch(), config)
     common_2rse(devices, config)
     time.sleep(10.0)
     rse2sa(devices, config)