Use HDU in instcal templates instead of ccdnum. #41
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
hsinfang
approved these changes
Jan 5, 2017
| infoList.append(info) | ||
| extnames.discard(ext) | ||
| phuInfo, infoList = super(DecamParseTask, self).getInfo(filename) | ||
| for idx, info in enumerate(infoList): |
| @@ -160,6 +159,7 @@ def getInfo(self, filename, filetype="raw"): | |||
| info[self.instcalPrefix] = self.expnumMapper[expnum][self.instcalPrefix] | |||
| info[self.dqmaskPrefix] = self.expnumMapper[expnum][self.dqmaskPrefix] | |||
| info[self.wtmapPrefix] = self.expnumMapper[expnum][self.wtmapPrefix] | |||
|
|
|||
| elif filetype == "raw": | |||
| md = afwImage.readMetadata(filename, self.config.hdu) | |||
| phuInfo = self.getInfoFromMetadata(md) | |||
There was a problem hiding this comment.
Maybe remove the two lines above, and move the following six lines to after line 172 (the call to the base method)?
hsinfang
reviewed
Jan 10, 2017
| @@ -68,7 +68,8 @@ def __init__(self, inputPolicy=None, **kwargs): | |||
| # The data ID key ccdnum is not directly used in the current policy | |||
| # template of the raw dataset, so is not in its keyDict automatically. | |||
| # Add it so raw dataset know about the data ID key ccdnum. | |||
| self.mappings["raw"].keyDict.update({'ccdnum': int}) | |||
| for datasetType in ("raw", "instcal", "dqmask", "wtmap"): | |||
| self.mappings[datasetType].keyDict.update({'ccdnum': int}) | |||
There was a problem hiding this comment.
May you please update the comments above these lines as well?
Since an HDU's position in an instcal file does not necessarily correspond to its CCD number, this template had been mislabling CCDs. Also removes special handling of decam raw files that was required to track the hdu field. This code was largely a duplication of the pipe_tasks ingest task, and can be alleviated with the minor changes to that task (also implemented on this ticket.)
ctslater
force-pushed
the
tickets/DM-8690
branch
from
02088b4
to
0a13fd3
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.
Since an HDU's position in an instcal file does not necessarily correspond to
its CCD number, this template had been mislabling CCDs.
Also removes special handling of decam raw files that was required to track the
hdu field. This code was largely a duplication of the pipe_tasks ingest task,
and can be alleviated with the minor changes to that task (also implemented on
this ticket.)