add addNoise task

mr-superonion · Dec 19, 2024 · a1bb891 · a1bb891
1 parent 0355bdd
commit a1bb891
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/examples/anacal_dm/hsc_calibration/shear_config.yaml b/examples/anacal_dm/hsc_calibration/shear_config.yaml
@@ -43,63 +43,63 @@ tasks:
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot0_
 
   DetectTask2:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot1_
 
   DetectTask3:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot0_
 
   DetectTask4:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot1_
 
   ForceTask1:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot0_
 
   ForceTask2:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot1_
 
   ForceTask3:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot0_
 
   ForceTask4:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot1_
 
   SelectBiasTask:

diff --git a/examples/anacal_dm/lsst_halo_highshear/shear_config.yaml b/examples/anacal_dm/lsst_halo_highshear/shear_config.yaml
@@ -51,31 +51,31 @@ tasks:
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.dataType: _test_0_rot0
 
   FpfsTask2:
     class: xlens.process_pipe.fpfs_multiband.FpfsMultibandPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.dataType: _test_0_rot1
 
   FpfsTask3:
     class: xlens.process_pipe.fpfs_multiband.FpfsMultibandPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.dataType: _test_1_rot0
 
   FpfsTask4:
     class: xlens.process_pipe.fpfs_multiband.FpfsMultibandPipe
     config:
       do_dm_detection: False
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.dataType: _test_1_rot1
 
   SummaryTask:

diff --git a/tests/calibration_halo/halo_config.yaml b/tests/calibration_halo/halo_config.yaml
@@ -32,14 +32,14 @@ tasks:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot0_
 
   FpfsTask2:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot1_
 
   SummaryTask:

diff --git a/tests/calibration_shear/shear_config.yaml b/tests/calibration_shear/shear_config.yaml
@@ -42,60 +42,60 @@ tasks:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot0_
 
   DetectTask2:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot1_
 
   DetectTask3:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot0_
 
   DetectTask4:
     class: xlens.process_pipe.fpfs_joint.FpfsJointPipe
     config:
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot1_
 
   ForceTask1:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot0_
 
   ForceTask2:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_0_rot1_
 
   ForceTask3:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot0_
 
   ForceTask4:
     class: xlens.process_pipe.fpfs_force.FpfsForcePipe
     config:
       fpfs.sigma_arcsec1: 0.52
       fpfs.use_average_psf: True
-      fpfs.do_adding_noise: False
+      fpfs.do_noise_bias_correction: False
       connections.coaddName: sim_1_rot1_
 
   SelectBiasTask:

diff --git a/xlens/processor/fpfs_simplesim.py b/xlens/processor/fpfs_simplesim.py
@@ -39,7 +39,7 @@
 from lsst.pipe.base import Task
 from numpy.typing import NDArray
 
-from ..processor.fpfs import FpfsMeasurementTask
+from .fpfs import FpfsMeasurementTask
 from ..simulator.simplesim import SimpleSimShearTask
 
 
@@ -78,9 +78,11 @@ def validate(self):
             )
         if not os.path.isdir(self.simulator.root_dir):
             raise FileNotFoundError("Cannot find root_dir")
-        if self.simulator.draw_image_noise != self.fpfs.do_adding_noise:
+        if self.simulator.draw_image_noise != \
+                self.fpfs.do_noise_bias_correction:
             raise ValueError(
-                "simulator.draw_image noise should equal fpfs.do_adding_noise"
+                "simulator.draw_image noise not equal"
+                "fpfs.do_noise_bias_correction"
             )
 
     def setDefaults(self):