Merge branch 'tickets/DM-3630'

config/Mosaic.py

@@ -1,4 +1,4 @@
-root.astrom.filterMap = { 'B': 'g',
+config.astrom.filterMap = { 'B': 'g',
                           'V': 'r',
                           'R': 'r',
                           'I': 'i',

config/apertures.py

@@ -1,10 +1,10 @@
 # Set up aperture photometry
-# 'root' should be a SourceMeasurementConfig
+# 'config' should be a SourceMeasurementConfig
 
-root.algorithms.names |= ["base_CircularApertureFlux"]
+config.algorithms.names |= ["base_CircularApertureFlux"]
 # Roughly (1.0, 1.4, 2.0, 2.8, 4.0, 5.7, 8.0, 11.3, 16.0, 22.6 arcsec) in diameter: 2**(0.5*i)
 # (assuming plate scale of 0.168 arcsec pixels)
-root.algorithms["base_CircularApertureFlux"].radii = [3.0, 4.5, 6.0, 9.0, 12.0, 17.0, 25.0, 35.0, 50.0, 70.0]
+config.algorithms["base_CircularApertureFlux"].radii = [3.0, 4.5, 6.0, 9.0, 12.0, 17.0, 25.0, 35.0, 50.0, 70.0]
 
 # Use a large aperture to be independent of seeing in calibration
-root.algorithms["base_CircularApertureFlux"].maxSincRadius = 12.0
+config.algorithms["base_CircularApertureFlux"].maxSincRadius = 12.0

config/assembleCoadd.py

@@ -1,2 +1,2 @@
-root.badMaskPlanes = ("BAD", "EDGE", "SAT", "INTRP", "NO_DATA",)
-root.doMatchBackgrounds = False
+config.badMaskPlanes = ("BAD", "EDGE", "SAT", "INTRP", "NO_DATA",)
+config.doMatchBackgrounds = False

config/cmodel.py

@@ -1,9 +1,9 @@
 # Enable CModel mags (unsetup meas_multifit or use $MEAS_MULTIFIT_DIR/config/disable.py to disable)
-# 'root' is a SourceMeasurementConfig.
+# 'config' is a SourceMeasurementConfig.
 import os
 try:
     import lsst.meas.modelfit
-    root.algorithms.names |= ["modelfit_ShapeletPsfApprox", "modelfit_CModel"]
-    root.algorithms['base_ClassificationExtendedness'].fluxRatio = 0.985
+    config.algorithms.names |= ["modelfit_ShapeletPsfApprox", "modelfit_CModel"]
+    config.algorithms['base_ClassificationExtendedness'].fluxRatio = 0.985
 except KeyError, ImportError:
     print "Cannot import lsst.meas.modelfit: disabling CModel measurements"

config/forcedPhotCcd.py

@@ -1,8 +1,8 @@
 import os
 
-root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'apertures.py'))
-root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'kron.py'))
+config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'apertures.py'))
+config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'kron.py'))
 # Turn off cmodel until latest fixes (large blends, footprint merging, etc.) are in
-# root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
+# config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
 
-root.measurement.slots.instFlux = None
+config.measurement.slots.instFlux = None

config/forcedPhotCoadd.py

@@ -1,10 +1,10 @@
 import os
 
-root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'apertures.py'))
-root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'kron.py'))
+config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'apertures.py'))
+config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'kron.py'))
 # Turn off cmodel until latest fixes (large blends, footprint merging, etc.) are in
-# root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
+# config.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
 
-root.measurement.slots.instFlux = None
+config.measurement.slots.instFlux = None
 
-root.deblend.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "deblend.py"))
+config.deblend.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "deblend.py"))

config/hsc/Mosaic.py

@@ -1,10 +1,10 @@
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'colorterms.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'colorterms.py'))
 
-root.fittingOrder = 9
-root.fluxFitOrder = 7
-root.fluxFitAbsolute = True
-root.internalFitting = True
-root.commonFluxCorr = False
-root.minNumMatch = 5
-root.fluxFitSolveCcd = True
+config.fittingOrder = 9
+config.fluxFitOrder = 7
+config.fluxFitAbsolute = True
+config.internalFitting = True
+config.commonFluxCorr = False
+config.minNumMatch = 5
+config.fluxFitSolveCcd = True

config/hsc/bias.py

@@ -1,2 +1,2 @@
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))

config/hsc/colorterms.py

@@ -2,7 +2,7 @@
 
 from lsst.pipe.tasks.colorterms import Colorterm, ColortermDict
 
-root.data = {
+config.data = {
     "hsc*": ColortermDict(data={
         'g': Colorterm(primary="g", secondary="g"),
         'r': Colorterm(primary="r", secondary="r"),

config/hsc/dark.py

@@ -1,9 +1,9 @@
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
 
-root.darkTime = None
+config.darkTime = None
 
-root.isr.doBias = True
-root.repair.cosmicray.nCrPixelMax = 1000000
-root.repair.cosmicray.minSigma = 5.0
-root.repair.cosmicray.min_DN = 50.0
+config.isr.doBias = True
+config.repair.cosmicray.nCrPixelMax = 1000000
+config.repair.cosmicray.minSigma = 5.0
+config.repair.cosmicray.min_DN = 50.0

config/hsc/flat.py

@@ -1,8 +1,8 @@
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
 
 from lsst.obs.hsc.detrends import HscFlatCombineTask
-root.combination.retarget(HscFlatCombineTask)
-root.combination.xCenter = -100
-root.combination.yCenter = 100
-root.combination.radius = 17500
+config.combination.retarget(HscFlatCombineTask)
+config.combination.xCenter = -100
+config.combination.yCenter = 100
+config.combination.radius = 17500

config/hsc/fringe.py

@@ -1,2 +1,2 @@
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'isr.py'))

config/hsc/isr.py

@@ -1,22 +1,22 @@
 # Configuration for HSC ISR
 
 from lsst.obs.subaru.isr import SubaruIsrTask
-root.isr.retarget(SubaruIsrTask)
+config.isr.retarget(SubaruIsrTask)
 from lsst.obs.subaru.crosstalk import CrosstalkTask
-root.isr.crosstalk.retarget(CrosstalkTask)
+config.isr.crosstalk.retarget(CrosstalkTask)
 
-root.isr.overscanFitType = "AKIMA_SPLINE"
-root.isr.overscanOrder = 30
-root.isr.doBias = True # Overscan is fairly efficient at removing bias level, but leaves a line in the middle
-root.isr.doDark = True # Required especially around CCD 33
-root.isr.doFringe = True
-root.isr.fringe.filters = ['y',]
-root.isr.doWrite = False
-root.isr.doCrosstalk = True
-root.isr.doGuider = False
+config.isr.overscanFitType = "AKIMA_SPLINE"
+config.isr.overscanOrder = 30
+config.isr.doBias = True # Overscan is fairly efficient at removing bias level, but leaves a line in the middle
+config.isr.doDark = True # Required especially around CCD 33
+config.isr.doFringe = True
+config.isr.fringe.filters = ['y',]
+config.isr.doWrite = False
+config.isr.doCrosstalk = True
+config.isr.doGuider = False
 
 # These values from RHL's report on "HSC July Commissioning Data" (2013-08-23)
-root.isr.crosstalk.coeffs.values = [
+config.isr.crosstalk.coeffs.values = [
        0.0e-6, -125.0e-6, -149.0e-6, -156.0e-6,
     -124.0e-6,    0.0e-6, -132.0e-6, -157.0e-6,
     -171.0e-6, -134.0e-6,    0.0e-6, -153.0e-6,

config/hsc/makeDiscreteSkyMap.py

@@ -1 +1 @@
-root.skyMap.pixelScale = 0.168
+config.skyMap.pixelScale = 0.168

config/hsc/makeSkyMap.py

@@ -1,5 +1,5 @@
-root.skyMap.name = "rings"
-root.skyMap["rings"].numRings = 120
-root.skyMap["rings"].projection = "TAN"
-root.skyMap["rings"].tractOverlap = 1.0/60 # Overlap between tracts (degrees)
-root.skyMap["rings"].pixelScale = 0.168
+config.skyMap.name = "rings"
+config.skyMap["rings"].numRings = 120
+config.skyMap["rings"].projection = "TAN"
+config.skyMap["rings"].tractOverlap = 1.0/60 # Overlap between tracts (degrees)
+config.skyMap["rings"].pixelScale = 0.168

config/hsc/multiband.py

@@ -5,4 +5,4 @@
             "forcedPhotCoadd"):
     path = os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "hsc", sub + ".py")
     if os.path.exists(path):
-        getattr(root, sub).load(path)
+        getattr(config, sub).load(path)

config/hsc/processCcd.py

@@ -8,15 +8,15 @@
 from lsst.utils import getPackageDir
 
 hscConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
-root.load(os.path.join(hscConfigDir, 'isr.py'))
-root.calibrate.photocal.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
-root.calibrate.measurePsf.starSelector.name='objectSize'
-root.calibrate.measurePsf.starSelector['objectSize'].widthMin=0.9
-root.calibrate.measurePsf.starSelector['objectSize'].fluxMin=4000
+config.load(os.path.join(hscConfigDir, 'isr.py'))
+config.calibrate.photocal.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
+config.calibrate.measurePsf.starSelector.name='objectSize'
+config.calibrate.measurePsf.starSelector['objectSize'].widthMin=0.9
+config.calibrate.measurePsf.starSelector['objectSize'].fluxMin=4000
 
-root.calibrate.astrometry.wcsFitter.order = 3
-root.calibrate.astrometry.matcher.maxMatchDistArcSec = 2.0
-root.calibrate.astrometry.matcher.maxOffsetPix = 750
+config.calibrate.astrometry.wcsFitter.order = 3
+config.calibrate.astrometry.matcher.maxMatchDistArcSec = 2.0
+config.calibrate.astrometry.matcher.maxOffsetPix = 750
 
 # Do not use NO_DATA pixels for fringe subtraction.
-root.isr.fringe.stats.badMaskPlanes=['SAT', 'NO_DATA']
+config.isr.fringe.stats.badMaskPlanes=['SAT', 'NO_DATA']

config/hsc/processCcdOnsiteDb.py

@@ -1,6 +1,6 @@
 from hsc.pipe.tasks.onsiteDb import HscOnsiteDbTask
-root.onsiteDb.retarget(HscOnsiteDbTask)
+config.onsiteDb.retarget(HscOnsiteDbTask)
 
 # Load regular processCcd configuration
 import os
-root.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'processCcd.py'))
+config.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsc', 'processCcd.py'))

config/hsc/processCoadd.py

@@ -8,18 +8,18 @@
 from lsst.utils import getPackageDir
 
 hscConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc")
-root.calibrate.photocal.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
+config.calibrate.photocal.colorterms.load(os.path.join(hscConfigDir, 'colorterms.py'))
 
 useApprox = False
 bgSize = 4096
 bgUndersample = 'REDUCE_INTERP_ORDER'
-root.calibrate.background.useApprox = useApprox
-root.calibrate.background.binSize = bgSize
-root.calibrate.background.undersampleStyle = bgUndersample
-root.calibrate.detection.background.useApprox = useApprox
-root.calibrate.detection.background.binSize = bgSize
-root.calibrate.detection.background.undersampleStyle = bgUndersample
-root.detection.background.useApprox = useApprox
-root.detection.background.binSize = bgSize
-root.detection.background.undersampleStyle = bgUndersample
+config.calibrate.background.useApprox = useApprox
+config.calibrate.background.binSize = bgSize
+config.calibrate.background.undersampleStyle = bgUndersample
+config.calibrate.detection.background.useApprox = useApprox
+config.calibrate.detection.background.binSize = bgSize
+config.calibrate.detection.background.undersampleStyle = bgUndersample
+config.detection.background.useApprox = useApprox
+config.detection.background.binSize = bgSize
+config.detection.background.undersampleStyle = bgUndersample
 

config/hsc/processExposure.py

@@ -1,4 +1,4 @@
 import os
-root.processCcd.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "hsc", "processCcd.py"))
+config.processCcd.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "hsc", "processCcd.py"))
 
-root.instrument = "hsc"
+config.instrument = "hsc"

config/hsc/processStack.py

@@ -3,4 +3,4 @@
 (applied after Subaru overrides in ../processStack.py).
 """
 
-root.calibrate.measurePsf.starSelector.name = "secondMoment" # "objectSize" has problems with corner CCDs
+config.calibrate.measurePsf.starSelector.name = "secondMoment" # "objectSize" has problems with corner CCDs

config/hsc/stacker.py

@@ -3,4 +3,4 @@
 for sub in ("makeCoaddTempExp", "backgroundReference", "assembleCoadd", "processCoadd"):
     path = os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "hsc", sub + ".py")
     if os.path.exists(path):
-        getattr(root, sub).load(path)
+        getattr(config, sub).load(path)

config/hsm.py

@@ -1,9 +1,9 @@
 # Enable HSM shapes (unsetup meas_extensions_shapeHSM to disable)
-# 'root' is a SourceMeasurementConfig.
+# 'config' is a SourceMeasurementConfig.
 import os
 try:
-    root.load(os.path.join(os.environ['MEAS_EXTENSIONS_SHAPEHSM_DIR'], 'config', 'enable.py'))
-    root.algorithms["shape.hsm.regauss"].deblendNChild = "deblend.nchild"
-    root.slots.shape = "shape.hsm.moments"
+    config.load(os.path.join(os.environ['MEAS_EXTENSIONS_SHAPEHSM_DIR'], 'config', 'enable.py'))
+    config.algorithms["shape.hsm.regauss"].deblendNChild = "deblend.nchild"
+    config.slots.shape = "shape.hsm.moments"
 except Exception as e:
     print "Cannot enable shapeHSM (%s): disabling HSM shape measurements" % (e,)

config/ingest.py

@@ -1,7 +1,7 @@
 from lsst.obs.subaru.ingest import HscParseTask
-root.parse.retarget(HscParseTask)
+config.parse.retarget(HscParseTask)
 
-root.parse.translation = {'proposal': 'PROP-ID',
+config.parse.translation = {'proposal': 'PROP-ID',
                           'dataType': 'DATA-TYP',
                           'expTime': 'EXPTIME',
                           'ccd': 'DET-ID',
@@ -14,15 +14,15 @@
                           'dateObs': 'DATE-OBS',
                           'taiObs': 'DATE-OBS',
 }
-root.parse.defaults = {'ccdTemp': "0", # Added in commissioning run 3
+config.parse.defaults = {'ccdTemp': "0", # Added in commissioning run 3
                        }
-root.parse.translators = {'field': 'translate_field',
+config.parse.translators = {'field': 'translate_field',
                           'visit': 'translate_visit',
                           'pointing': 'translate_pointing',
                           'filter': 'translate_filter',
 }
 
-root.register.columns = {'field': 'text',
+config.register.columns = {'field': 'text',
                          'visit': 'int',
                          'ccd': 'int',
                          'pointing': 'int',
@@ -39,5 +39,5 @@
                          'expId': 'text',
                          'dataType': 'text',
                          }
-root.register.unique = ['visit', 'ccd',]
-root.register.visit = ['visit', 'field', 'filter', 'dateObs', 'taiObs']
+config.register.unique = ['visit', 'ccd',]
+config.register.visit = ['visit', 'field', 'filter', 'dateObs', 'taiObs']

config/kron.py

@@ -1,8 +1,8 @@
 # Enable Kron mags
-# 'root' is a SourceMeasurementConfig
+# 'config' is a SourceMeasurementConfig
 
 try:
     import lsst.meas.extensions.photometryKron
-    root.algorithms.names |= ["ext_photometryKron_KronFlux"]
+    config.algorithms.names |= ["ext_photometryKron_KronFlux"]
 except ImportError:
     print "Cannot import lsst.meas.extensions.photometryKron: disabling Kron measurements"

config/makeCoaddTempExp.py

@@ -1,3 +1,3 @@
-root.warpAndPsfMatch.warp.warpingKernelName = "lanczos3"
-root.warpAndPsfMatch.warp.cacheSize = 1000000
-root.bgSubtracted = True
+config.warpAndPsfMatch.warp.warpingKernelName = "lanczos3"
+config.warpAndPsfMatch.warp.cacheSize = 1000000
+config.bgSubtracted = True

config/makeDiscreteSkyMap.py

@@ -1,2 +1,2 @@
 # n.b. pixel sizes are set in per-camera overrides
-root.skyMap.projection = "TAN"
+config.skyMap.projection = "TAN"

config/makeSkyMap.py

@@ -1,16 +1,16 @@
-root.skyMap = "discrete"
+config.skyMap = "discrete"
 
 # Configuration for HealpixSkyMap
-root.skyMap["healpix"].log2NSide = 5
-root.skyMap["healpix"].pixelScale = 0.18
-root.skyMap["healpix"].patchBorder = 333 # Pixels
-root.skyMap["healpix"].tractOverlap = 2.0/60 # Degrees
-root.skyMap["healpix"].projection = "TAN"
+config.skyMap["healpix"].log2NSide = 5
+config.skyMap["healpix"].pixelScale = 0.18
+config.skyMap["healpix"].patchBorder = 333 # Pixels
+config.skyMap["healpix"].tractOverlap = 2.0/60 # Degrees
+config.skyMap["healpix"].projection = "TAN"
 
 # Configuration for DiscreteSkyMap
 # 0: ACTJ0022M0036
 # 1: M31
-root.skyMap["discrete"].raList = [5.5, 10.7]
-root.skyMap["discrete"].decList = [-0.6, 41.3]
-root.skyMap["discrete"].radiusList = [0.5, 0.8]
-root.skyMap["discrete"].pixelScale = 0.168
+config.skyMap["discrete"].raList = [5.5, 10.7]
+config.skyMap["discrete"].decList = [-0.6, 41.3]
+config.skyMap["discrete"].radiusList = [0.5, 0.8]
+config.skyMap["discrete"].pixelScale = 0.168

config/measureCoaddSources.py

@@ -4,10 +4,10 @@
 
 from lsst.utils import getPackageDir
 
-root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
-root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
+config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
+config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
 # Turn off cmodel until latest fixes (large blends, footprint merging, etc.) are in
-# root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "cmodel.py"))
-root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsm.py"))
+# config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "cmodel.py"))
+config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsm.py"))
 
-root.deblend.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "deblend.py"))
+config.deblend.load(os.path.join(os.environ["OBS_SUBARU_DIR"], "config", "deblend.py"))

config/mergeCoaddDetections.py

@@ -1 +1 @@
-root.priorityList = ["HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G",]
+config.priorityList = ["HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G",]

config/mergeCoaddMeasurements.py

@@ -1,2 +1,2 @@
-root.priorityList = ["HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G",]
+config.priorityList = ["HSC-I", "HSC-R", "HSC-Z", "HSC-Y", "HSC-G",]
 

config/multiband.py

@@ -8,4 +8,4 @@
             "forcedPhotCoadd"):
     path = os.path.join(getPackageDir("obs_subaru"), "config", sub + ".py")
     if os.path.exists(path):
-        getattr(root, sub).load(path)
+        getattr(config, sub).load(path)