Merge pull request #401 from lsst/tickets/DM-34502

DM-34502: Move slow measurements from base config to imsim
lsst · May 19, 2022 · 286942a · 286942a
2 parents 2707824 + b641038
commit 286942a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/config/characterizeImage.py b/config/characterizeImage.py
@@ -49,31 +49,13 @@
 config.detection.isotropicGrow = True
 
 # Activate calibration of measurements: required for aperture corrections
-config.load(os.path.join(obsConfigDir, "cmodel.py"))
 config.measurement.load(os.path.join(obsConfigDir, "apertures.py"))
-config.measurement.load(os.path.join(obsConfigDir, "kron.py"))
-config.measurement.load(os.path.join(obsConfigDir, "convolvedFluxes.py"))
-config.measurement.load(os.path.join(obsConfigDir, "gaap.py"))
-config.measurement.load(os.path.join(obsConfigDir, "hsm.py"))
-if "ext_shapeHSM_HsmShapeRegauss" in config.measurement.plugins:
-    # no deblending has been done
-    config.measurement.plugins["ext_shapeHSM_HsmShapeRegauss"].deblendNChild = ""
 
 # Deblender
 config.deblend.maskLimits["NO_DATA"] = 0.25 # Ignore sources that are in the vignetted region
 config.deblend.maxFootprintArea = 10000
 
 config.measurement.plugins.names |= ["base_Jacobian", "base_FPPosition"]
-
-# Convolved fluxes can fail for small target seeing if the observation seeing is larger
-if "ext_convolved_ConvolvedFlux" in config.measurement.plugins:
-    names = config.measurement.plugins["ext_convolved_ConvolvedFlux"].getAllResultNames()
-    config.measureApCorr.allowFailure += names
-
-if "ext_gaap_GaapFlux" in config.measurement.plugins:
-    names = config.measurement.plugins["ext_gaap_GaapFlux"].getAllGaapResultNames()
-    config.measureApCorr.allowFailure += names
-
 config.measurement.plugins["base_Jacobian"].pixelScale = 0.2
 
 # Prevent spurious detections in vignetting areas

diff --git a/config/imsim/characterizeImage.py b/config/imsim/characterizeImage.py
@@ -27,6 +27,25 @@
 
 obsConfigDir = os.path.join(os.path.dirname(__file__))
 
+config.load(os.path.join(obsConfigDir, "..", "cmodel.py"))
+config.measurement.load(os.path.join(obsConfigDir, "..", "kron.py"))
+config.measurement.load(os.path.join(obsConfigDir, "..", "convolvedFluxes.py"))
+config.measurement.load(os.path.join(obsConfigDir, "..", "gaap.py"))
+config.measurement.load(os.path.join(obsConfigDir, "..", "hsm.py"))
+
+if "ext_shapeHSM_HsmShapeRegauss" in config.measurement.plugins:
+    # no deblending has been done
+    config.measurement.plugins["ext_shapeHSM_HsmShapeRegauss"].deblendNChild = ""
+
+# Convolved fluxes can fail for small target seeing if the observation seeing is larger
+if "ext_convolved_ConvolvedFlux" in config.measurement.plugins:
+    names = config.measurement.plugins["ext_convolved_ConvolvedFlux"].getAllResultNames()
+    config.measureApCorr.allowFailure += names
+
+if "ext_gaap_GaapFlux" in config.measurement.plugins:
+    names = config.measurement.plugins["ext_gaap_GaapFlux"].getAllGaapResultNames()
+    config.measureApCorr.allowFailure += names
+
 # Reduce Chebyshev polynomial order for background fitting (DM-30820)
 config.background.approxOrderX = 1
 config.detection.background.approxOrderX = 1