DM-6640: IsrTask is not a valid CmdLineTask #152
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PaulPrice
approved these changes
Sep 7, 2018
| @@ -13,6 +14,9 @@ | |||
| config.doDark = True # Required especially around CCD 33 | |||
| config.doFringe = True | |||
| config.fringe.filters = ['y', 'N921', 'N926', 'N973', 'N1010'] | |||
|
|
|||
| # Do not use NO_DATA pixels for fringe subtraction. | |||
| config.fringe.stats.badMaskPlanes = ['SAT', 'NO_DATA'] | |||
There was a problem hiding this comment.
This looks like an unrelated functional change that should be in a separate commit and justified.
There was a problem hiding this comment.
This was pulled from config/hsc/processCcd.py, which listed these values for config.isr.fringe.stats.badMaskPlanes. Rereading the version on master, I'm now not convinced that the += ["SUSPECT"] line isn't the change in functionality. I will try to find a test.
config/hsc/isrWrap.py
Outdated
| from lsst.utils import getPackageDir | ||
| from lsst.obs.subaru.isr import SubaruIsrTask | ||
|
|
||
| ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "hsc") |
There was a problem hiding this comment.
Leading Uppercase is reserved for class names.
| config.charImage.measurePsf.starSelector["objectSize"].widthMin = 0.9 | ||
| config.charImage.measurePsf.starSelector["objectSize"].fluxMin = 4000 | ||
| for refObjLoader in (config.calibrate.astromRefObjLoader, | ||
| config.calibrate.photoRefObjLoader, | ||
| config.charImage.refObjLoader, | ||
| ): | ||
| refObjLoader.load(os.path.join(hscConfigDir, "filterMap.py")) | ||
| refObjLoader.load(os.path.join(ObsConfigDir, "filterMap.py")) |
There was a problem hiding this comment.
The changes in this file seem unnecessary.
| config.calibrate.measurement.load(os.path.join(configDir, "hsm.py")) | ||
| config.calibrate.measurement.load(os.path.join(ObsConfigDir, "apertures.py")) | ||
| config.calibrate.measurement.load(os.path.join(ObsConfigDir, "kron.py")) | ||
| config.calibrate.measurement.load(os.path.join(ObsConfigDir, "hsm.py")) |
There was a problem hiding this comment.
Again, changes in this file are unnecessary.
config/suprimecam-mit/isrWrap.py
Outdated
| from lsst.utils import getPackageDir | ||
| from lsst.obs.subaru.isr import SuprimeCamIsrTask | ||
|
|
||
| ObsConfigDir = os.path.join(getPackageDir("obs_subaru"), "config", "suprimecam") |
There was a problem hiding this comment.
Thanks for catching this.
czwa
force-pushed
the
tickets/DM-6640
branch
2 times, most recently
from
5e4d42a
to
5bc46c5
Compare
czwa
force-pushed
the
tickets/DM-6640
branch
from
5bc46c5
to
a4cc1af
Compare
The IsrTask was not usable as a CmdLineTask, as it was written to be called as a subtask of ProcessCcdTask. This allows the default IsrTask to be retargeted to camera-specific versions of the ISR processing. A new RunIsrTask now exists to hold IsrTask for retargetting in standalone processing, and both processCcd.py and runIsr.py now read from the same configuration files for each obs_ package. This has involved migrating configuration values from config/processCcd.py to config/isr.py for many obs_ packages.
czwa
force-pushed
the
tickets/DM-6640
branch
from
a4cc1af
to
8a466cd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ticket adds a stand-alone runIsr.py script, as well as ensuring that runIsr.py and processCcd.py read the same ISR configuration files.