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.

Sign up for GitHub

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

Jump to bottom

Tickets/dm 7117 #32

Merged
merged 3 commits into from
Sep 2, 2016
Merged

Tickets/dm 7117 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70edbc4
config: adapt to usage of new MatchTask in measureCoaddSources
PaulPrice Aug 4, 2016
e7c7457
config: fix syntax mistake in exception catching
PaulPrice Sep 1, 2016
176d85f
remove merge conflict file accidentally added
PaulPrice Sep 1, 2016
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
2 changes: 1 addition & 1 deletion config/cmodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
config.measurement.plugins.names |= ["modelfit_DoubleShapeletPsfApprox", "modelfit_CModel"]
config.measurement.slots.modelFlux = 'modelfit_CModel'
config.catalogCalculation.plugins['base_ClassificationExtendedness'].fluxRatio = 0.985
except KeyError, ImportError:
except (KeyError, ImportError):
print "Cannot import lsst.meas.modelfit: disabling CModel measurements"
10 changes: 2 additions & 8 deletions config/hsc/measureCoaddSources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import os
from lsst.utils import getPackageDir

try:
# AstrometryTask has a refObjLoader subtask which accepts the filter map.
config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc",
"filterMap.py"))
except AttributeError:
# ANetAstrometryTask does not have a retargetable refObjLoader, but its
# solver subtask can load the filter map.
config.astrometry.solver.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc", "filterMap.py"))
config.match.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "hsc",
"filterMap.py"))
9 changes: 2 additions & 7 deletions config/measureCoaddSources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@

config.deblend.load(os.path.join(getPackageDir("obs_subaru"), "config", "deblend.py"))

try:
# AstrometryTask has a refObjLoader subtask which accepts the filter map.
config.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
except AttributeError:
# ANetAstrometryTask does not have a retargetable refObjLoader, but its
# solver subtask can load the filter map.
config.astrometry.solver.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))
# AstrometryTask has a refObjLoader subtask which accepts the filter map.
config.match.refObjLoader.load(os.path.join(getPackageDir("obs_subaru"), "config", "filterMap.py"))

#
# This isn't good! There appears to be no way to configure the base_PixelFlags measurement
Expand Down