From 802276384818e88b62584c2873b39b4d009d7012 Mon Sep 17 00:00:00 2001 From: gmegh Date: Mon, 21 Oct 2024 06:40:14 -0700 Subject: [PATCH 1/2] Update `take_aos_sequence_comcam.py` to use ComCam instead of ComCamSim. --- doc/news/DM-47007.perf.rst | 1 + .../lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 doc/news/DM-47007.perf.rst diff --git a/doc/news/DM-47007.perf.rst b/doc/news/DM-47007.perf.rst new file mode 100644 index 000000000..0a871949f --- /dev/null +++ b/doc/news/DM-47007.perf.rst @@ -0,0 +1 @@ +Update `take_aos_sequence_comcam.py` to use ComCam instead of ComCamSim. \ No newline at end of file diff --git a/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py b/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py index 4231e9776..d11beb84f 100644 --- a/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py +++ b/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py @@ -288,7 +288,7 @@ async def take_aos_sequence(self) -> None: if self.mode == Mode.TRIPLET: self.log.info("Send processing request to RA OCPS.") config = { - "LSSTComCamSim-FROM-OCS_DONUTPAIR": f"{intra_visit_id[0]},{extra_visit_id[0]}" + "LSSTComCam-FROM-OCS_DONUTPAIR": f"{intra_visit_id[0]},{extra_visit_id[0]}" } ocps_execute_task = asyncio.create_task( self.ocps.cmd_execute.set_start( From 048045cc914b410c588c84860f43a5e18d229d65 Mon Sep 17 00:00:00 2001 From: gmegh Date: Fri, 25 Oct 2024 09:44:28 -0700 Subject: [PATCH 2/2] Fix take_aos_sequence so intra-focal focus Z is negative and extra is positive --- .../ts/standardscripts/maintel/take_aos_sequence_comcam.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py b/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py index d11beb84f..ecb06072d 100644 --- a/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py +++ b/python/lsst/ts/standardscripts/maintel/take_aos_sequence_comcam.py @@ -250,7 +250,7 @@ async def take_aos_sequence(self) -> None: self.log.debug("Moving to intra-focal position") # Move the hexapod to the target z position - z_offset = self.dz - self.current_z_position + z_offset = -self.dz - self.current_z_position await self.mtcs.offset_camera_hexapod(x=0, y=0, z=z_offset, u=0, v=0) self.current_z_position = self.dz @@ -269,7 +269,7 @@ async def take_aos_sequence(self) -> None: self.log.debug("Moving to extra-focal position") # Move the hexapod to the target z position - z_offset = -self.dz - self.current_z_position + z_offset = self.dz - self.current_z_position await self.mtcs.offset_camera_hexapod(x=0, y=0, z=z_offset, u=0, v=0) self.current_z_position = -self.dz