Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

obs_subaru DM-1954: HeavyFootprints in forced coadd photometry #4

Merged
merged 3 commits into from
Aug 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions config/cmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# 'root' is a SourceMeasurementConfig.
import os
try:
root.load(os.path.join(os.environ['MEAS_MULTIFIT_DIR'], 'config', 'enable.py'))
root.algorithms['classification.extendedness'].fluxRatio = 0.985
import lsst.meas.modelfit
root.algorithms.names |= ["modelfit_ShapeletPsfApprox", "modelfit_CModel"]
root.algorithms['base_ClassificationExtendedness'].fluxRatio = 0.985
except KeyError, ImportError:
print "Cannot import lsst.meas.multifit: disabling CModel measurements"
print "Cannot import lsst.meas.modelfit: disabling CModel measurements"
5 changes: 0 additions & 5 deletions config/forcedCcd.py

This file was deleted.

2 changes: 0 additions & 2 deletions config/forcedCoadd.py

This file was deleted.

5 changes: 2 additions & 3 deletions config/forcedPhotCcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

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'))
root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.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'))

# Disable Gaussian mags (which aren't really forced)
root.measurement.algorithms.names -= ["base_GaussianFlux"]
root.measurement.slots.instFlux = None
5 changes: 2 additions & 3 deletions config/forcedPhotCoadd.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

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'))
root.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.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'))

# Disable Gaussian mags (which aren't really forced)
root.measurement.algorithms.names -= ["base_GaussianFlux"]
root.measurement.slots.instFlux = None
2 changes: 1 addition & 1 deletion config/kron.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

try:
import lsst.meas.extensions.photometryKron
root.algorithms.names |= ["flux.kron"]
root.algorithms.names |= ["ext_photometryKron_KronFlux"]
except ImportError:
print "Cannot import lsst.meas.extensions.photometryKron: disabling Kron measurements"
3 changes: 2 additions & 1 deletion config/measureCoaddSources.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "apertures.py"))
root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "kron.py"))
root.measurement.load(os.path.join(getPackageDir("obs_subaru"), "config", "cmodel.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"))

root.deblend.maxNumberOfPeaks = 20
3 changes: 2 additions & 1 deletion config/processCcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@

# Activate calibration of measurements: required for aperture corrections
root.calibrate.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'apertures.py'))
root.calibrate.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
# Turn off cmodel until latest fixes (large blends, footprint merging, etc.) are in
# root.calibrate.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'cmodel.py'))
root.calibrate.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'kron.py'))
root.calibrate.measurement.load(os.path.join(os.environ['OBS_SUBARU_DIR'], 'config', 'hsm.py'))
if "shape.hsm.regauss" in root.calibrate.measurement.algorithms:
Expand Down
8 changes: 4 additions & 4 deletions policy/HscMapper.paf
Original file line number Diff line number Diff line change
Expand Up @@ -889,13 +889,13 @@ datasets: {
persistable: "ignored"
storage: "FitsCatalogStorage"
}
deep_forcedPhotCoadd_config: {
deepCoadd_forced_config: {
template: "config/forcedPhotCoadd.py"
python: "lsst.pipe.tasks.forcedPhotCoadd.ForcedPhotCoaddConfig"
python: "lsst.meas.base.forcedPhotCoadd.ForcedPhotCoaddConfig"
persistable: "Config"
storage: "ConfigStorage"
}
deep_forcedPhotCoadd_metadata: {
deepCoadd_forced_metadata: {
template: "deepCoadd_forcedPhotCoadd_metadata/%(filter)s/%(tract)d/%(patch)s.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
Expand All @@ -920,7 +920,7 @@ datasets: {
}
forcedPhotCcd_config: {
template: "config/forcedPhotCcd.py"
python: "lsst.pipe.tasks.forcedPhotCcd.ForcedPhotCcdConfig"
python: "lsst.meas.base.forcedPhotCcd.ForcedPhotCcdConfig"
persistable: "Config"
storage: "ConfigStorage"
}
Expand Down