make subtask, need to be tested

Author: PFLeget

python/lsst/pipe/tasks/computeExposureSummaryStats.py

@@ -138,22 +138,38 @@ class ComputeExposureSummaryStatsConfig(pexConfig.Config):
         doc="Signal-to-noise ratio for computing the magnitude limit depth.",
         default=5.0
     )
-    psfTE1TreecorrConfig = pexConfig.ConfigField(
-        dtype=ComputeExPsfConfig,
-        doc="Treecorr config for computing scalar value of TE1.",
+    psfTE1Task = pexConfig.ConfigurableField(
+        target=ComputeExPsfTask,
+        doc="Use treecorr for computing scalar value of TE1.",
     )
-    psfTE2TreecorrConfig = pexConfig.ConfigField(
-        dtype=ComputeExPsfConfig,
-        doc="Treecorr config for computing scalar value of TE2.",
+    psfTE2Task = pexConfig.ConfigurableField(
+        target=ComputeExPsfTask,
+        doc="Use treecorr for computing scalar value of TE2.",
     )
-    psfTE3TreecorrConfig = pexConfig.ConfigField(
-        dtype=ComputeExPsfConfig,
-        doc="Treecorr config for computing scalar value of TE3.",
+    psfTE3Task = pexConfig.ConfigurableField(
+        target=ComputeExPsfTask,
+        doc="Use treecorr for computing scalar value of TE3.",
     )
-    psfTE4TreecorrConfig = pexConfig.ConfigField(
-        dtype=ComputeExPsfConfig,
-        doc="Treecorr config for computing scalar value of TE4.",
+    psfTE4Task = pexConfig.ConfigurableField(
+        target=ComputeExPsfTask,
+        doc="Use treecorr for computing scalar value of TE4.",
     )
+    #psfTE1TreecorrConfig = pexConfig.ConfigField(
+    #    dtype=ComputeExPsfConfig,
+    #    doc="Treecorr config for computing scalar value of TE1.",
+    #)
+    #psfTE2TreecorrConfig = pexConfig.ConfigField(
+    #    dtype=ComputeExPsfConfig,
+    #    doc="Treecorr config for computing scalar value of TE2.",
+    #)
+    #psfTE3TreecorrConfig = pexConfig.ConfigField(
+    #    dtype=ComputeExPsfConfig,
+    #    doc="Treecorr config for computing scalar value of TE3.",
+    #)
+    #psfTE4TreecorrConfig = pexConfig.ConfigField(
+    #    dtype=ComputeExPsfConfig,
+    #    doc="Treecorr config for computing scalar value of TE4.",
+    #)
 
     def setDefaults(self):
         super().setDefaults()
@@ -178,19 +194,36 @@ def setDefaults(self):
 
         min_theta = [1e-6, 5.0, 1e-6, 5.0]
         max_theta = [1.0, 180.0, 5.0, 12.0]
-        TExTreecorrConfig = [
-            self.psfTE1TreecorrConfig,
-            self.psfTE2TreecorrConfig,
-            self.psfTE3TreecorrConfig,
-            self.psfTE4TreecorrConfig,
+        psfTExTask = [
+            self.psfTE1Task,
+            self.psfTE2Task,
+            self.psfTE3Task,
+            self.psfTE4Task,
         ]
 
-        for tex_config, mint, maxt in zip(TExTreecorrConfig, min_theta, max_theta):
-            tex_config.treecorr.min_sep = mint / 60.0
-            tex_config.treecorr.max_sep = maxt / 60.0
-            tex_config.treecorr.nbins = 1
-            tex_config.treecorr.bin_type = "Linear"
-            tex_config.treecorr.sep_units = "degree"
+        for tex_task, mint, maxt in zip(psfTExTask, min_theta, max_theta):
+            tex_task.config.setDefaults()
+            tex_task.config.treecorr.min_sep = mint / 60.0
+            tex_task.config.treecorr.max_sep = maxt / 60.0
+            tex_task.config.treecorr.nbins = 1
+            tex_task.config.treecorr.bin_type = "Linear"
+            tex_task.config.treecorr.sep_units = "degree"
+
+        #min_theta = [1e-6, 5.0, 1e-6, 5.0]
+        #max_theta = [1.0, 180.0, 5.0, 12.0]
+        #TExTreecorrConfig = [
+        #    self.psfTE1TreecorrConfig,
+        #    self.psfTE2TreecorrConfig,
+        #    self.psfTE3TreecorrConfig,
+        #    self.psfTE4TreecorrConfig,
+        #]
+
+        #for tex_config, mint, maxt in zip(TExTreecorrConfig, min_theta, max_theta):
+        #    tex_config.treecorr.min_sep = mint / 60.0
+        #    tex_config.treecorr.max_sep = maxt / 60.0
+        #    tex_config.treecorr.nbins = 1
+        #    tex_config.treecorr.bin_type = "Linear"
+        #    tex_config.treecorr.sep_units = "degree"
 
 
 class ComputeExposureSummaryStatsTask(pipeBase.Task):
@@ -268,6 +301,10 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
         self.makeSubtask("starSelector")
+        self.makeSubtask("psfTE1Task")
+        self.makeSubtask("psfTE2Task")
+        self.makeSubtask("psfTE3Task")
+        self.makeSubtask("psfTE4Task")
         self._isTEXComputationDone = False
 
     @timeMethod
@@ -571,9 +608,9 @@ def comp_psf_TEX_visit_level(self, summary, sources, sources_is_astropy=False):
             ra = psf_cat["coord_ra"].to(units.deg)
             dec = psf_cat["coord_dec"].to(units.deg)
 
-            TExTreecorrConfig = {
-                "TE1": self.config.psfTE1TreecorrConfig,
-                "TE2": self.config.psfTE2TreecorrConfig,
+            psfTExTask = {
+                "TE1": self.psfTE1Task,
+                "TE2": self.psfTE2Task,
             }
 
             gatherE12Stat = {
@@ -591,8 +628,7 @@ def comp_psf_TEX_visit_level(self, summary, sources, sources_is_astropy=False):
                 # TE1 and TE2 computation, over visit.
                 for TEX in ["TE1", "TE2"]:
 
-                    task = ComputeExPsfTask(TExTreecorrConfig[TEX])
-                    output = task.run(
+                    output = psfTExTask[TEX].run(
                         e1Residuals[isNotNan], e2Residuals[isNotNan],
                         ra[isNotNan], dec[isNotNan],
                         units="degree",
@@ -604,9 +640,9 @@ def comp_psf_TEX_visit_level(self, summary, sources, sources_is_astropy=False):
 
                 # TE3 and TE4 loop over detector and then median on visit.
 
-                TExTreecorrConfig = {
-                    "TE3": self.config.psfTE3TreecorrConfig,
-                    "TE4": self.config.psfTE4TreecorrConfig,
+                psfTExTask = {
+                "TE3": self.psfTE3Task,
+                "TE4": self.psfTE4Task,
                 }
 
                 gatherE34Stat = {
@@ -622,8 +658,7 @@ def comp_psf_TEX_visit_level(self, summary, sources, sources_is_astropy=False):
                             isccdId = (ccdId == psf_cat["detector"])
                             mask = (isccdId & isNotNan)
                             if np.sum(mask) >= 2:
-                                task = ComputeExPsfTask(TExTreecorrConfig[TEX])
-                                output = task.run(
+                                output = psfTExTask[TEX].run(
                                     e1Residuals[mask], e2Residuals[mask],
                                     ra[mask], dec[mask],
                                     units="degree",