Tickets/DM-47497 Adding CBP to MTCalsys

python/lsst/ts/observatory/control/data/mtcalsys.yaml

@@ -87,3 +87,20 @@ laser_functional:
   use_fiberspectrograph_blue: false
   exposure_times:
     - 15.0
+
+cbp_calibration:
+  calib_type: CBPCalibration
+  use_camera: false
+  wavelength: 700
+  wavelength_width: 800
+  wavelength_resolution: 50
+  use_cbpelectrometer: true 
+  use_cbpcalelectrometer: true
+  use_fiberspectrograph_red: false
+  use_fiberspectrograph_blue: false
+  electrometer_integration_time: 0.001
+  electrometer_mode: CHARGE
+  electrometer_range: 2e-6
+  laser_mode: BURST
+  optical_configuration: F1_SCU
+  exposure_times: 30

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

@@ -130,12 +130,15 @@ def __init__(
     ) -> None:
 
         self.electrometer_projector_index = 103
+        self.electrometer_cbp_index = 101
+        self.electrometer_cbpcal_index = 102
         self.fiberspectrograph_blue_index = 1
         self.fiberspectrograph_red_index = 2
         self.linearstage_led_select_index = 1
         self.linearstage_led_focus_index = 2
         self.linearstage_laser_focus_index = 3
         self.linearstage_select_index = 4
+        self.cbp_index = 1
 
         super().__init__(
             components=[
@@ -144,10 +147,13 @@ def __init__(
                 f"FiberSpectrograph:{self.fiberspectrograph_blue_index}",
                 f"FiberSpectrograph:{self.fiberspectrograph_red_index}",
                 f"Electrometer:{self.electrometer_projector_index}",
+                f"ElectrometerCBP:{self.electrometer_cbp_index}",
+                f"ElectrometerCBPCal:{self.electrometer_cbpcal_index}",
                 f"LinearStage:{self.linearstage_led_select_index}",
                 f"LinearStage:{self.linearstage_led_focus_index}",
                 f"LinearStage:{self.linearstage_laser_focus_index}",
                 f"LinearStage:{self.linearstage_select_index}",
+                f"CBP:{self.cbp_index}",
             ],
             domain=domain,
             log=log,
@@ -200,6 +206,27 @@ async def setup_calsys(self, sequence_name: str) -> None:
             await self.linearstage_projector_select.cmd_moveAbsolute.set_start(
                 distance=self.ls_select_led_location, timeout=self.long_timeout
             )
+        elif (calibration_type == CalibrationType.CBPCalibration) or (
+            calibration_type == CalibrationType.CBP
+        ):
+            await self.setup_cbp(
+                config_data["cbp_azimuth"],
+                config_data["cbp_elevation"],
+                config_data["cbp_mask"],
+                config_data["cbp_focus"],
+                config_data["cbp_rotation"],
+            )
+            await self.setup_electrometers(
+                mode=str(config_data["electrometer_mode"]),
+                range=float(config_data["electrometer_range"]),
+                integration_time=float(config_data["electrometer_integration_time"]),
+            )
+            await self.setup_laser(
+                config_data["laser_mode"],
+                config_data["wavelength"],
+                config_data["optical_configuration"],
+            )
+            await self.laser_start_propagate()
         else:
             await self.linearstage_led_select.cmd_moveAbsolute.set_start(
                 distance=self.led_rest_position, timeout=self.long_timeout
@@ -339,6 +366,47 @@ async def setup_laser(
         await self.change_laser_optical_configuration(optical_configuration)
         await self.change_laser_wavelength(wavelength, use_projector)
 
+    async def setup_cbp(
+        self,
+        azimuth: float,
+        elevation: float,
+        mask: typing.Optional[int] = None,
+        focus: typing.Optional[float] = None,
+        rotation: typing.Optional[int] = None,
+    ) -> None:
+        """Perform all steps for preparing the CBP for measurements.
+
+        Parameters
+        ----------
+        az : `float`
+            Azimuth of CBP in degrees
+        el : `float`
+            Elevation of CBP in degrees
+        mask : `int`
+            Mask number to use
+        focus: `float`
+            Focus position in um
+        rot: `int`
+            Rotator position of mask in degrees
+            Default 0
+        use_projector : `bool`
+            identifies if you are using the projector while
+            changing the wavelength
+            Default True
+        """
+        timeout = 60
+        await self.rem.cbp.cmd_move.set_start(
+            azimuth=azimuth, elevation=elevation, timeout=timeout
+        )
+        if focus is not None:
+            await self.rem.cbp.cmd_setFocus.set_start(focus=focus, timeout=timeout)
+        if mask is not None:
+            await self.rem.cmd_changeMask.set_start(mask=mask, timeout=timeout)
+        if rotation is not None:
+            await self.rem.cmd_changeMaskRotation.set_start(
+                mask_rotation=rotation, timeout=timeout
+            )
+
     async def get_laser_parameters(self) -> tuple:
         """Get laser configuration
 
@@ -854,6 +922,14 @@ async def take_fiber_spectrum(
     def electrometer(self) -> salobj.Remote:
         return getattr(self.rem, f"electrometer_{self.electrometer_projector_index}")
 
+    @property
+    def electrometerCBP(self) -> salobj.Remote:
+        return getattr(self.rem, f"electrometer_{self.electrometer_cbp_index}")
+
+    @property
+    def electrometerCBPCal(self) -> salobj.Remote:
+        return getattr(self.rem, f"electrometer_{self.electrometer_cbpcal_index}")
+
     @property
     def fiberspectrograph_red(self) -> salobj.Remote:
         return getattr(

python/lsst/ts/observatory/control/utils/enums.py

@@ -158,6 +158,8 @@ class CalibrationType(enum.IntEnum):
 
     WhiteLight = 1
     Mono = 2
+    CBP = 3
+    CBPCalibration = 4
 
 
 # TODO: (DM-46168) Revert workaround for TunableLaser XML changes