Add check for old matcher config parameter.

lsst · Jan 4, 2019 · b6476f1 · b6476f1
1 parent 62fdbae
commit b6476f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/processCcd.py b/config/processCcd.py
@@ -7,6 +7,7 @@
 from lsst.obs.cfht.cfhtIsrTask import CfhtIsrTask
 
 from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
+from lsst.meas.astrom import MatchOptimisticBTask
 
 cfhtConfigDir = os.path.join(getPackageDir("obs_cfht"), "config")
 config.calibrate.photoCal.colorterms.load(os.path.join(cfhtConfigDir, 'colorterms.py'))
@@ -34,7 +35,8 @@
     refObjLoader.ref_dataset_name = "ps1_pv3_3pi_20170110"
 
 config.calibrate.astrometry.wcsFitter.order = 3
-config.calibrate.astrometry.matcher.maxMatchDistArcSec = 5
+if isinstance(config.calibrate.astrometry.matcher, MatchOptimisticBTask):
+    config.calibrate.astrometry.matcher.maxMatchDistArcSec = 5
 
 config.calibrate.photoCal.applyColorTerms = True
 config.calibrate.photoCal.photoCatName = "ps1_pv3_3pi_20170110"

diff --git a/ups/obs_cfht.table b/ups/obs_cfht.table
@@ -1,6 +1,7 @@
 setupRequired(daf_persistence)
 setupRequired(obs_base)
 setupRequired(meas_algorithms)
+setupRequired(meas_astrom)
 setupRequired(pipe_tasks)
 setupRequired(astropy)
 setupRequired(astro_metadata_translator)