added LaserDetailedState

doc/news/DM-46276.feature.1.rst

@@ -0,0 +1 @@
+In ``mtcalsys.yaml``, Added laser configuration information to all tests, including laser mode and optical configuration.

doc/news/DM-46276.feature.rst

@@ -1 +1,8 @@
-Changed change_laser_wavelength and setup_laser functions to be more useful in a variety of sal scripts
+Add features to allow ``MTCalSys`` to better handle the laser
+- In ``mtcalsys.py`` made the following changes: 
+ - Added ``laser_start_propagate`` and ``laser_stop_propagate()``
+ - Added ``get_laser_parameters()``
+ - Improved ``setup_laser()`` to change the wavelength and the optical configuration
+ - Changed ``change_laser_wavelength()`` so it can be used for the laser or whitelight system 
+- In ``mtcalsys.yaml`` added a laser functional setup
+- In ``mtcalsys_schema.yaml`` added laser mode and optical configuration

python/lsst/ts/observatory/control/maintel/mtcalsys.py

@@ -352,8 +352,8 @@ async def get_laser_parameters(self) -> tuple:
             self.rem.tunablelaser.evt_opticalConfiguration.aget(
                 timeout=self.long_timeout
             ),
-            self.rem.tunableevt_wavelengthChanged.aget(timeout=self.long_timeout),
-            self.rem.tunableevt_interlockState.aget(timeout=self.long_timeout),
+            self.rem.tunablelaser.evt_wavelengthChanged.aget(timeout=self.long_timeout),
+            self.rem.tunablelaser.evt_interlockState.aget(timeout=self.long_timeout),
             self.rem.tunablelaser.evt_burstModeSet.aget(timeout=self.long_timeout),
             self.rem.tunablelaser.evt_continuousModeSet.aget(timeout=self.long_timeout),
         )

tests/maintel/test_mtcalsys.py

@@ -28,6 +28,7 @@
 from lsst.ts.observatory.control.maintel.mtcalsys import MTCalsys, MTCalsysUsages
 from lsst.ts.observatory.control.mock import RemoteGroupAsyncMock
 from lsst.ts.utils import index_generator
+from lsst.ts.xml.enums.TunableLaser import LaserDetailedState
 
 
 class TestMTCalsys(RemoteGroupAsyncMock):
@@ -112,6 +113,52 @@ async def test_change_laser_wavelength(self) -> None:
 
         await self.mtcalsys.change_laser_wavelength(wavelength=500.0)
 
+    async def test_setup_laser(self) -> None:
+        config_data = self.mtcalsys.get_calibration_configuration("laser_functional")
+
+        await self.mtcalsys.setup_laser(
+            mode=config_data["laser_mode"],
+            wavelength=config_data["wavelength"],
+            optical_configuration=config_data["optical_configuration"],
+            use_projector=config_data["false"],
+        )
+
+        self.mtcalsys.rem.tunablelaser.cmd_setOpticalConfiguration.set_start.assert_awaited_with(
+            configuration=config_data["optical_configuration"],
+            timeout=self.mtcalsys.long_timeout,
+        )
+
+        assert (
+            self.mtcalsys.rem.tunablelaser.evt_opticalConfiguration.aget().configuration
+            == config_data["optical_configuration"]
+        )
+
+    async def test_laser_start_propagation(self) -> None:
+        await self.mtcalsys.laser_start_propagate()
+
+        self.mtcalsys.rem.tunablelaser.cmd_startPropagateLaser.start.assert_awaited_with(
+            timeout=self.mtcalsys.laser_warmup
+        )
+
+        laser_state = self.mtcalsys.rem.tunablelaser.evt_detailedState.next()
+        assert laser_state.DetailedState in {
+            LaserDetailedState.PROPAGATING_CONTINUOUS_MODE,
+            LaserDetailedState.PROPAGATING_BURST_MODE,
+        }
+
+    async def test_laser_stop_propagation(self) -> None:
+        await self.mtcalsys.laser_stop_propagate()
+
+        self.mtcalsys.rem.tunablelaser.cmd_stopPropagateLaser.start.assert_awaited_with(
+            timeout=self.mtcalsys.laser_warmup
+        )
+
+        laser_state = self.mtcalsys.rem.tunablelaser.evt_detailedState.next()
+        assert laser_state.DetailedState in {
+            LaserDetailedState.NONPROPAGATING_CONTINUOUS_MODE,
+            LaserDetailedState.NONPROPAGATING_BURST_MODE,
+        }
+
     async def test_prepare_for_whitelight_flat(self) -> None:
         mock_comcam = ComCam(
             "FakeDomain", log=self.log, intended_usage=ComCamUsages.DryTest