config: adapt to split of reference catalog loader

The reference catalog loader has been split into separate astrometry and photometry versions.
lsst · Jan 5, 2017 · 7a9d062 · 7a9d062
1 parent effe4d0
commit 7a9d062
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/config/hsc/processCcd.py b/config/hsc/processCcd.py
@@ -11,16 +11,18 @@
 config.calibrate.photoCal.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
 config.charImage.measurePsf.starSelector["objectSize"].widthMin = 0.9
 config.charImage.measurePsf.starSelector["objectSize"].fluxMin = 4000
-config.calibrate.refObjLoader.load(os.path.join(hscConfigDir, "filterMap.py"))
+for refObjLoader in (config.calibrate.astromRefObjLoader,
+                     config.calibrate.photoRefObjLoader,
+                     config.charImage.refObjLoader,
+                     ):
+    refObjLoader.load(os.path.join(hscConfigDir, "filterMap.py"))
 
 # Set to match defaults curretnly used in HSC production runs (e.g. S15B)
 config.calibrate.astrometry.matcher.sourceFluxType = 'Psf'
 config.calibrate.astrometry.matcher.allowedNonperpDeg = 0.2
 config.calibrate.astrometry.matcher.maxRotationDeg = 1.145916
 config.calibrate.astrometry.wcsFitter.numRejIter = 3
-
-for subTask in (config.charImage, config.calibrate):
-    subTask.astrometry.wcsFitter.order = 3
+config.calibrate.astrometry.wcsFitter.order = 3
 config.calibrate.astrometry.matcher.maxMatchDistArcSec = 2.0
 config.calibrate.astrometry.matcher.maxOffsetPix = 750
 

diff --git a/config/processCcd.py b/config/processCcd.py
@@ -28,8 +28,11 @@
     config.charImage.measurePsf.psfDeterminer.name = "pca"
 
 # Astrometry
-config.calibrate.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config",
-                                                "filterMap.py"))
+for refObjLoader in (config.calibrate.astromRefObjLoader,
+                     config.calibrate.photoRefObjLoader,
+                     config.charImage.refObjLoader,
+                     ):
+    refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
 
 # Set to match defaults curretnly used in HSC production runs (e.g. S15B)
 config.charImage.catalogCalculation.plugins['base_ClassificationExtendedness'].fluxRatio = 0.95
@@ -39,8 +42,10 @@
 
 from lsst.pipe.tasks.setConfigFromEups import setConfigFromEups
 menu = {"ps1*": {}, # Defaults are fine
-        "sdss*": {"refObjLoader.filterMap": {"y": "z"}}, # No y-band, use z instead
-        "2mass*": {"refObjLoader.filterMap": {ff: "J" for ff in "grizy"}}, # No optical bands, use J instead
+        "sdss*": {"photoRefObjLoader.filterMap": {"y": "z"},
+                  "astromRefObjLoader.filterMap": {"y": "z"}}, # No y-band, use z instead
+        "2mass*": {"photoRefObjLoader.filterMap": {ff: "J" for ff in "grizy"},
+                   "astromRefObjLoader.filterMap": {ff: "J" for ff in "grizy"}}, # No optical, use J instead
         "10*": {}, # Match the empty astrometry_net_data version for use without a ref catalog
         }
 setConfigFromEups(config.calibrate.photoCal, config.calibrate, menu)