Config inception (to squash)

lsst · Mar 23, 2018 · 33fdd1b · 33fdd1b
1 parent 4dc0c02
commit 33fdd1b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/config/processCcd.py b/config/processCcd.py
@@ -1,18 +1,12 @@
+import os.path
+
+from lsst.utils import getPackageDir
 from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
 from lsst.obs.decam.isr import DecamIsrTask
-from lsst.obs.decam.crosstalk import DecamCrosstalkTask
 config.isr.retarget(DecamIsrTask)
-config.isr.crosstalk.retarget(DecamCrosstalkTask)
 
-config.isr.doCrosstalk = True
-config.isr.doDark = False
-config.isr.doAddDistortionModel = False  # rely on the TPV terms instead
-config.isr.fringe.filters = ['z', 'y']
-config.isr.assembleCcd.keysToRemove = ['DATASECA', 'DATASECB',
-                                       'TRIMSECA', 'TRIMSECB',
-                                       'BIASSECA', 'BIASSECB',
-                                       'PRESECA', 'PRESECB',
-                                       'POSTSECA', 'POSTSECB']
+decamConfigDir = os.path.join(getPackageDir('obs_decam'), 'config')
+config.isr.load(os.path.join(decamConfigDir, 'isr.py'))
 
 config.charImage.repair.cosmicray.nCrPixelMax = 100000
 
@@ -29,4 +23,4 @@
 
 config.calibrate.photoCal.photoCatName = "ps1_pv3_3pi_20170110"
 # this was the default prior to DM-11521.  New default is 2000.
-config.calibrate.deblend.maxFootprintSize=0
+config.calibrate.deblend.maxFootprintSize = 0
diff --git a/config/processCcdCpIsr.py b/config/processCcdCpIsr.py
@@ -1,18 +1,12 @@
+import os.path
+
+from lsst.utils import getPackageDir
 from lsst.meas.algorithms import LoadIndexedReferenceObjectsTask
 from lsst.obs.decam.decamCpIsr import DecamCpIsrTask
-from lsst.obs.decam.crosstalk import DecamCrosstalkTask
 config.isr.retarget(DecamCpIsrTask)
-config.isr.crosstalk.retarget(DecamCrosstalkTask)
 
-config.isr.doCrosstalk = True
-config.isr.doDark = False
-config.isr.doAddDistortionModel = False  # rely on the TPV terms instead
-config.isr.fringe.filters = ['z', 'y']
-config.isr.assembleCcd.keysToRemove = ['DATASECA', 'DATASECB',
-                                       'TRIMSECA', 'TRIMSECB',
-                                       'BIASSECA', 'BIASSECB',
-                                       'PRESECA', 'PRESECB',
-                                       'POSTSECA', 'POSTSECB']
+decamConfigDir = os.path.join(getPackageDir('obs_decam'), 'config')
+config.isr.load(os.path.join(decamConfigDir, 'isr.py'))
 
 config.charImage.repair.cosmicray.nCrPixelMax = 100000