Merge pull request #150 from lsst/tickets/DM-10302

DM-10302 Change flux->instFlux
lsst · Sep 19, 2018 · d64ac79 · d64ac79
2 parents bd2d067 + 71a58a6
commit d64ac79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config/forcedPhotCcd.py b/config/forcedPhotCcd.py
@@ -5,4 +5,4 @@
 config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
 config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
 
-config.measurement.slots.instFlux = None
+config.measurement.slots.gaussianFlux = None
diff --git a/config/forcedPhotCoadd.py b/config/forcedPhotCoadd.py
@@ -8,7 +8,7 @@
 config.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "convolvedFluxes.py"))
 config.load(os.path.join(getPackageDir("obs_subaru"), "config", "cmodel.py"))
 
-config.measurement.slots.instFlux = None
+config.measurement.slots.gaussianFlux = None
 
 config.measurement.plugins['base_PixelFlags'].masksFpCenter.append('BRIGHT_OBJECT')
 config.measurement.plugins['base_PixelFlags'].masksFpAnywhere.append('BRIGHT_OBJECT')
@@ -25,12 +25,12 @@ def doUndeblended(config, algName, fluxList=None):
         Algorithm name.
     fluxList : `list` of `str`, or `None`
         List of flux columns to register for aperture correction. If `None`,
-        then this will be the `algName` appended with `_flux`.
+        then this will be the `algName` appended with `_instFlux`.
     """
     if algName not in config.measurement.plugins:
         return
     if fluxList is None:
-        fluxList = [algName + "_flux"]
+        fluxList = [algName + "_instFlux"]
     config.measurement.undeblended.names.add(algName)
     config.measurement.undeblended[algName] = config.measurement.plugins[algName]
     for flux in fluxList:

diff --git a/config/processCcd.py b/config/processCcd.py
@@ -19,7 +19,7 @@
 
 # PSF determination
 config.charImage.measurePsf.reserve.fraction = 0.2
-config.charImage.measurePsf.starSelector["objectSize"].sourceFluxField = 'base_PsfFlux_flux'
+config.charImage.measurePsf.starSelector["objectSize"].sourceFluxField = 'base_PsfFlux_instFlux'
 try:
     import lsst.meas.extensions.psfex.psfexPsfDeterminer
     config.charImage.measurePsf.psfDeterminer["psfex"].spatialOrder = 2