Merge branch 'develop' into main

bin.src/img_closed_loop.py

@@ -62,4 +62,5 @@
         args.num_proc,
         args.raw_seeing,
         args.imsim_log_file,
+        args.wep_estimator,
     )

doc/versionHistory.rst

@@ -6,6 +6,13 @@
 Version History
 ##################
 
+-------------
+1.4.0
+-------------
+
+* Add WepEstimator enum class to utility.py.
+* Add wep_estimator option to img_closed_loop to enable switching between tie and danish in WEP.
+
 -------------
 1.3.1
 -------------

python/lsst/ts/imsim/closed_loop_task.py

@@ -39,6 +39,7 @@
 from lsst.ts.imsim.utils import (
     CamType,
     SensorWavefrontError,
+    WepEstimator,
     get_camera,
     get_config_dir,
     make_dir,
@@ -324,6 +325,7 @@ def _run_sim(
         self,
         cam_type: CamType,
         obs_metadata: ObsMetadata,
+        wep_estimator: WepEstimator,
         base_output_dir: str,
         butler_root_path: str,
         sky_seed: int,
@@ -344,6 +346,8 @@ def _run_sim(
             Camera type.
         obs_metadata : lsst.ts.imsim.ObsMetadata object
             Observation metadata.
+        wep_estimator : enum 'WepEstimator' in lsst.ts.wep.utility
+            Specify the method used to calculate Zernikes in ts_wep.
         base_output_dir : str
             Base output directory.
         butler_root_path : str
@@ -477,6 +481,7 @@ def _run_sim(
                         obs_metadata,
                         butler_root_path=butler_root_path,
                         cam_type=cam_type,
+                        wep_estimator=wep_estimator,
                         num_pro=num_pro,
                         pipeline_file=pipeline_file,
                     )
@@ -714,6 +719,7 @@ def _calc_wf_err_from_img(
         obs_metadata: ObsMetadata,
         butler_root_path: str,
         cam_type: CamType,
+        wep_estimator: WepEstimator,
         num_pro: int = 1,
         pipeline_file: str | None = None,
         filter_type_name: str = "",
@@ -728,6 +734,8 @@ def _calc_wf_err_from_img(
             Path to the butler repository.
         cam_type : lsst.ts.imsim.utils.CamType
             Camera type.
+        wep_estimator : enum 'WepEstimator' in lsst.ts.wep.utility
+            Specify the method used to calculate Zernikes in ts_wep.
         num_pro : int, optional
             Number of processor to run DM pipeline. (the default is 1.)
         pipeline_file : str or None, optional
@@ -750,6 +758,7 @@ def _calc_wf_err_from_img(
             obs_metadata.seq_num,
             butler_root_path,
             cam_type,
+            wep_estimator,
             num_pro=num_pro,
             pipeline_file=pipeline_file,
             filter_type_name=filter_type_name,
@@ -784,6 +793,7 @@ def run_wep(
         seq_num: int,
         butler_root_path: str,
         cam_type: CamType,
+        wep_estimator: WepEstimator,
         num_pro: int = 1,
         pipeline_file: str | None = None,
         filter_type_name: str = "",
@@ -798,6 +808,8 @@ def run_wep(
             Path to the butler gen3 repos.
         cam_type : lsst.ts.imsim.utils.CamType
             Camera type.
+        wep_estimator : enum 'WepEstimator' in lsst.ts.wep.utility
+            Specify the method used to calculate Zernikes in ts_wep.
         num_pro : int, optional
             Number of processor to run DM pipeline. (the default is 1.)
         pipeline_file : str or None, optional
@@ -818,7 +830,9 @@ def run_wep(
         if pipeline_file is None:
             pipeline_yaml = f"{cam_type.value}Pipeline.yaml"
             pipeline_yaml_path = os.path.join(butler_root_path, pipeline_yaml)
-            self.write_wep_configuration(cam_type, pipeline_yaml_path, filter_type_name)
+            self.write_wep_configuration(
+                cam_type, pipeline_yaml_path, filter_type_name, wep_estimator
+            )
         else:
             pipeline_yaml_path = pipeline_file
 
@@ -894,7 +908,11 @@ def run_wep(
         return list_of_wf_err
 
     def write_wep_configuration(
-        self, cam_type: CamType, pipeline_yaml_path: str, filter_type_name: str
+        self,
+        cam_type: CamType,
+        pipeline_yaml_path: str,
+        filter_type_name: str,
+        wep_estimator: WepEstimator,
     ) -> None:
         """Write wavefront estimation pipeline task configuration.
 
@@ -907,6 +925,8 @@ def write_wep_configuration(
             should be saved.
         filter_type_name : str
             Filter type name: ref (or ''), u, g, r, i, z, or y.
+        wep_estimator : enum 'WepEstimator' in lsst.ts.wep.utility
+            Specify the method used to calculate Zernikes in ts_wep.
         """
 
         butler_inst_name = self._get_butler_inst_name(cam_type)
@@ -962,6 +982,10 @@ def write_wep_configuration(
     class: lsst.ts.wep.task.cutOutDonuts{cut_out_task}Task.CutOutDonuts{cut_out_task}Task
   calcZernikesTask:
     class: lsst.ts.wep.task.calcZernikesTask.CalcZernikesTask
+    config:
+      python: |
+        from lsst.ts.wep.task import EstimateZernikesTieTask, EstimateZernikesDanishTask
+        config.estimateZernikes.retarget(EstimateZernikes{wep_estimator.value.title()}Task)
 """
             )
 
@@ -987,6 +1011,7 @@ def run_img(
         num_pro: int,
         raw_seeing: float,
         imsim_log_file: str,
+        wep_estimator_method: str,
     ) -> None:
         """Run the simulation of images.
 
@@ -1037,8 +1062,12 @@ def run_img(
             Raw seeing in arcsec.
         imsim_log_file : str
             Location to save imsim log output.
+        wep_estimator_method : str
+            Specify the method used to calculate Zernikes in ts_wep.
+            Options are "tie" or "danish".
         """
         cam_type = CamType(inst)
+        wep_estimator = WepEstimator(wep_estimator_method)
         base_output_dir = self.check_and_create_base_output_dir(base_output_dir)
         if do_erase_dir_content:
             self.erase_directory_content(base_output_dir)
@@ -1089,6 +1118,7 @@ def run_img(
         self._run_sim(
             cam_type,
             obs_metadata,
+            wep_estimator,
             base_output_dir,
             butler_root_path,
             sky_seed,
@@ -1326,6 +1356,18 @@ def set_default_parser(parser: ArgumentParser) -> ArgumentParser:
             help="Number of processor to run imSim and DM pipeline. (default: 1)",
         )
 
+        parser.add_argument(
+            "--wep_estimator",
+            type=str,
+            default="tie",
+            choices=["tie", "danish"],
+            help="""
+            Method to use within Wavefront Estimation Pipeline to perform
+            the estimateZernikes task. Options are "tie" and "danish".
+            (default: "tie")
+            """,
+        )
+
         return parser
 
     @staticmethod

python/lsst/ts/imsim/utils/utility.py

@@ -28,6 +28,7 @@
     "get_zk_from_file",
     "ModifiedEnvironment",
     "CamType",
+    "WepEstimator",
 ]
 
 import os
@@ -51,6 +52,15 @@ class CamType(StrEnum):
     ComCam = "comcam"
 
 
+class WepEstimator(StrEnum):
+    """
+    Define allowed WEP Zernike estimator methods.
+    """
+
+    Tie = "tie"
+    Danish = "danish"
+
+
 def get_module_path() -> str:
     """Get the path of module.
 

tests/test_closed_loop_task.py

@@ -133,6 +133,23 @@ def test_set_default_parser(self):
         self.assertEqual(args.pipeline_file, "")
         self.assertEqual(args.sky_seed, 42)
         self.assertEqual(args.pert_seed, 11)
+        self.assertEqual(args.wep_estimator, "tie")
+
+    def test_wep_estimator_args(self):
+        parser = argparse.ArgumentParser()
+        parser = ClosedLoopTask.set_default_parser(parser)
+
+        test_tie_arg = ["--wep_estimator", "tie"]
+        args = parser.parse_known_args(args=test_tie_arg)[0]
+        self.assertEqual(args.wep_estimator, "tie")
+
+        test_danish_arg = ["--wep_estimator", "danish"]
+        args = parser.parse_known_args(args=test_danish_arg)[0]
+        self.assertEqual(args.wep_estimator, "danish")
+
+        test_invalid_arg = ["--wep_estimator", "wrong"]
+        with self.assertRaises(SystemExit):
+            parser.parse_known_args(args=test_invalid_arg)
 
     def test_set_img_parser(self):
         parser = argparse.ArgumentParser()