Merge pull request #35 from lsst-ts/tickets/DM-43221

Change imSim camera name LsstComCam to LsstComCamSim.
lsst-ts · Mar 14, 2024 · 38f45a1 · 38f45a1
2 parents f61f94f + c260dc9
commit 38f45a1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 5 deletions.
diff --git a/doc/versionHistory.rst b/doc/versionHistory.rst
@@ -6,6 +6,13 @@
 Version History
 ##################
 
+-------------
+1.3.1
+-------------
+
+* Change imSim camera name LsstComCam to LsstComCamSim.
+* Fix stamp size when using LSST_Silicon.
+
 -------------
 1.3.0
 -------------

diff --git a/policy/config/input/telescope/lsstComCamLargePert.yaml b/policy/config/input/telescope/lsstComCamLargePert.yaml
@@ -1,5 +1,5 @@
 telescope:
-  camera: LsstComCam
+  camera: LsstComCamSim
   file_name:
     type: FormattedStr
     format: ComCam_%s.yaml

diff --git a/policy/config/input/telescope/lsstComCamNoPert.yaml b/policy/config/input/telescope/lsstComCamNoPert.yaml
@@ -1,5 +1,5 @@
 telescope:
-  camera: LsstComCam
+  camera: LsstComCamSim
   file_name:
     type: FormattedStr
     format: ComCam_%s.yaml

diff --git a/policy/config/output/lsstComCamDefault.yaml b/policy/config/output/lsstComCamDefault.yaml
@@ -7,7 +7,7 @@ output:
     mjd: *mjd
     seqnum: *seqnum
 
-  camera: LsstComCam
+  camera: LsstComCamSim
 
   exptime: $exptime
 

diff --git a/policy/config/stamp/lsstCamLsstSilicon.yaml b/policy/config/stamp/lsstCamLsstSilicon.yaml
@@ -1,4 +1,5 @@
 stamp:
+  size: 500
   type: LSST_Silicon
   det_name: "$det_name"
   world_pos:

diff --git a/policy/config/stamp/lsstCamLsstSiliconWithDiffraction.yaml b/policy/config/stamp/lsstCamLsstSiliconWithDiffraction.yaml
@@ -1,4 +1,5 @@
 stamp:
+  size: 500
   type: LSST_Silicon
   det_name: "$det_name"
   world_pos:

diff --git a/python/lsst/ts/imsim/closed_loop_task.py b/python/lsst/ts/imsim/closed_loop_task.py
@@ -775,7 +775,7 @@ def _get_butler_inst_name(self, cam_type: CamType) -> str:
         if cam_type in [CamType.LsstCam, CamType.LsstFamCam]:
             butler_inst_name = "Cam"
         elif cam_type == CamType.ComCam:
-            butler_inst_name = "ComCam"
+            butler_inst_name = "ComCamSim"
 
         return butler_inst_name
 

diff --git a/tests/testData/imsimConfig/imsimConfigLsstCam.yaml b/tests/testData/imsimConfig/imsimConfigLsstCam.yaml
@@ -274,6 +274,7 @@ psf:
 
 
 stamp:
+  size: 500
   type: LSST_Silicon
   det_name: "$det_name"
   world_pos:

diff --git a/tests/test_closed_loop_task.py b/tests/test_closed_loop_task.py
@@ -183,4 +183,4 @@ def test_get_butler_inst_name(self):
 
         self.assertEqual(lsstcam_str, "Cam")
         self.assertEqual(lsstfam_str, "Cam")
-        self.assertEqual(comcam_str, "ComCam")
+        self.assertEqual(comcam_str, "ComCamSim")