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 12480 #6

Merged
merged 2 commits into from
Nov 16, 2017
Merged

Tickets/dm 12480 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
623d026
Update yaml policy file.
mfisherlevine Nov 9, 2017
2845ced
Remove raft from ingest.
mfisherlevine Nov 9, 2017
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
1 change: 0 additions & 1 deletion config/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
'date': 'text',
'dateObs': 'text',
'expTime': 'double',
'raft': 'text',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm glad you could get rid of raft.

'ccd': 'text',
'object': 'text',
'imageType': 'text',
Expand Down
78 changes: 26 additions & 52 deletions policy/comCamMapper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exposures:
python: lsst.daf.base.PropertyList
storage: FitsStorage
tables: raw
template: raw/%(run)s/%(raft)s/%(ccd)s/%(raft)s-%(ccd)s-%(visit)06d.fits[0]
template: raw/%(run)s/%(ccd)s/%(ccd)s-%(visit)06d.fits[0]
raw:
assembler: lsst.obs.comCam.comCamMapper.assemble_raw
composite:
Expand All @@ -26,122 +26,96 @@ exposures:
inputOnly: true
raw_amp:
level: Amp
# NB If type is changed to an exposureI then constructDark breaks. If changing this be sure to test calibs
persistable: DecoratedImageI
python: lsst.afw.image.DecoratedImageI
storage: FitsStorage
tables: raw
template: raw/%(run)s/%(raft)s/%(ccd)s/%(raft)s-%(ccd)s-%(visit)06d.fits[%(channel)d]
template: raw/%(run)s/%(ccd)s/%(ccd)s-%(visit)06d.fits[%(channel)d]
postISRCCD:
level: Ccd
persistable: ExposureF
python: lsst.afw.image.ExposureF
storage: FitsStorage
tables: raw
template: postISRCCD/postISRCCD_v%(visit)d_f%(filter)s.fits
template: 'postISRCCD/postISRCCD_v%(visit)d_%(ccd)s_f%(filter)s.fits'
calexp:
level: Ccd
persistable: ExposureF
python: lsst.afw.image.ExposureF
storage: FitsStorage
tables: raw
template: calexp/calexp_v%(visit)d_f%(filter)s.fits
fcr:
level: Ccd
persistable: ExposureI
python: lsst.afw.image.ExposureI
storage: FitsStorage
template: calexp/calexp_v%(visit)d_%(ccd)s_f%(filter)s.fits
icExp:
template: icExp/icExp_v%(visit)d_%(ccd)s_f%(filter)s.fits
wcs:
tables:
- raw
- raw_visit
template: fcr/v%(visit)d_f%(filter)s.fcr.fits
icExp:
level: Ccd
persistable: ExposureF
python: lsst.afw.image.ExposureF
storage: FitsStorage
tables: raw
template: icExp/icExp_v%(visit)d_f%(filter)s.fits
wcs:
template: wcs/v%(visit)d_%(ccd)s_f%(filter)s.wcs.fits
fcr:
level: Ccd
persistable: ExposureI
python: lsst.afw.image.ExposureI
storage: FitsStorage
tables:
- raw
- raw_visit
template: wcs/v%(visit)d_f%(filter)s.wcs.fits
template: fcr/v%(visit)d_%(ccd)s_f%(filter)s.fcr.fits

calibrations:
bias:
columns: date
columns:
- date
level: Ccd
obsTimeName: date
persistable: DecoratedImageF
python: lsst.afw.image.DecoratedImageF
persistable: ExposureF
python: lsst.afw.image.ExposureF
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these entries needed for the cals? I would have expected obs_base to provide suitable defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would expect so too, but couldn't find any. I agree, all these very standard calibration types should be moved to obs_base at some point.

refCols:
- visit
- filter
reference: raw_visit
storage: FitsStorage
tables: bias
template: bias/%(calibDate)s/bias-%(ccd)s-%(calibDate)s.fits
validEndName: validEnd
validRange: true
validStartName: validStart
dark:
columns: date
columns:
- date
level: Ccd
obsTimeName: date
persistable: DecoratedImageF
python: lsst.afw.image.DecoratedImageF
persistable: ExposureF
python: lsst.afw.image.ExposureF
refCols:
- visit
- filter
reference: raw_visit
storage: FitsStorage
tables: dark
template: dark/%(calibDate)s/dark-%(ccd)s-%(calibDate)s.fits
validEndName: validEnd
validRange: true
validStartName: validStart
flat:
columns:
- filter
- date
- filter
filter: true
level: Ccd
obsTimeName: date
persistable: DecoratedImageF
python: lsst.afw.image.DecoratedImageF
persistable: ExposureF
python: lsst.afw.image.ExposureF
refCols:
- visit
- filter
reference: raw_visit
storage: FitsStorage
tables: flat
template: flat/%(filter)s/%(calibDate)s/flat_%(ccd)s-%(filter)s_%(calibDate)s.fits
validEndName: validEnd
validRange: true
validStartName: validStart
fringe:
columns:
- filter
- date
- filter
filter: true
level: Ccd
obsTimeName: date
persistable: MaskedImageF
python: lsst.afw.image.MaskedImageF
persistable: ExposureF
python: lsst.afw.image.ExposureF
refCols:
- visit
- filter
reference: raw_visit
storage: FitsStorage
tables: flat
template: fringe/%(filter)s/%(calibDate)s/fringe_%(ccd)s-%(filter)s_%(calibDate)s.fits
validEndName: validEnd
validRange: true
validStartName: validStart

datasets:
IngestIndexedReferenceTask_config:
Expand Down Expand Up @@ -379,7 +353,7 @@ datasets:
python: lsst.daf.base.propertyList
storage: FitsStorage
tables: raw
template: raw/%(run)s/%(raft)s/%(ccd)s/%(raft)s-%(ccd)s-%(visit)06d.fits[0]
template: raw/%(run)s/%(ccd)s/%(ccd)s-%(visit)06d.fits[0]
refcat:
persistable: SimpleCatalog
python: lsst.afw.table.SimpleCatalog
Expand Down