Merge branch 'develop'

lsst-ts · Apr 23, 2024 · 3833b7f · 3833b7f
2 parents 9f5896c + 2f073d3
commit 3833b7f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/doc/versionHistory.rst b/doc/versionHistory.rst
@@ -6,6 +6,12 @@
 Version History
 ##################
 
+-------------
+1.5.2
+-------------
+
+* Fix ofc_data zmin variable in closed_loop_task.
+
 -------------
 1.5.1
 -------------

diff --git a/python/lsst/ts/imsim/closed_loop_task.py b/python/lsst/ts/imsim/closed_loop_task.py
@@ -198,9 +198,9 @@ def config_ofc_calc(self, cam_type: CamType) -> None:
         """
 
         self.ofc_calc = OFC(OFCData(cam_type.value))
-        self.ofc_calc.ofc_data.znmin = 3
+        self.ofc_calc.ofc_data.znmin = 4
         self.ofc_calc.ofc_data.zn_selected = np.arange(
-            self.ofc_calc.ofc_data.znmin, self.max_noll_index
+            self.ofc_calc.ofc_data.znmin, self.max_noll_index + 1
         )
 
     def map_filter_ref_to_g(self, filter_type_name: str) -> str:
@@ -1376,7 +1376,7 @@ def set_default_parser(parser: ArgumentParser) -> ArgumentParser:
             "--max_noll_index",
             type=int,
             default=28,
-            help="Maximum Noll index to calculate Zernikes. (default: 22)",
+            help="Maximum Noll index to calculate Zernikes. (default: 28)",
         )
 
         parser.add_argument(