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 8138 #21

Merged
merged 3 commits into from
Nov 15, 2016
Merged

Tickets/dm 8138 #21

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
f41dbe5
Changes suggested in RFC-234
pgee2000 Oct 31, 2016
c7a9729
Remove stackExposureId bypass
pgee2000 Nov 5, 2016
06e3f5d
Changes described in RFC-247
pgee2000 Oct 31, 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
104 changes: 0 additions & 104 deletions policy/MegacamMapper.paf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,50 +30,29 @@ exposures: {
template: "raw/%(runId)s/%(object)s/%(date)s/%(filter)s/%(visit)d%(state)1s.fits.fz[%(extension)d]"
python: "lsst.afw.image.DecoratedImageF"
persistable: "DecoratedImageF"
storage: "FitsStorage"
level: "Ccd"
tables: "raw"
columns: "visit"
columns: "state"
columns: "ccd"
}
postISRCCD: {
template: "postISRCCD/%(runId)s/%(object)s/%(date)s/%(filter)s/postISRCCD-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Ccd"
tables: "raw"
columns: "visit"
columns: "ccd"
}
icExp: {
template: "icExp/%(runId)s/%(object)s/%(date)s/%(filter)s/icExp-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Ccd"
tables: "raw"
columns: "visit"
columns: "ccd"
}
calexp: {
template: "calexp/%(runId)s/%(object)s/%(date)s/%(filter)s/calexp-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Ccd"
tables: "raw"
columns: "visit"
columns: "ccd"
}
wcs: {
template: "calexp/%(runId)s/%(object)s/%(date)s/%(filter)s/%(tract)d/wcs-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Ccd"
tables: "raw"
columns: "visit" "ccd"
}

Expand All @@ -83,14 +62,6 @@ exposures: {
template: "deepCoadd/%(filter)s/%(tract)d/%(patch)s/warp-%(filter)s-%(tract)d-%(patch)s-%(visit)d.fits"
}

deep_processCoadd: {
template: "processCoadd/%(filter)s/%(tract)d/%(patch)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Skytile"
tables: "raw"
}


}
Expand Down Expand Up @@ -182,26 +153,8 @@ calibrations: {
}

datasets: {
psf: {
template: "psf/%(runId)s/%(object)s/%(date)s/%(filter)s/PSF-%(visit)d-%(ccd)02d.boost"
python: "lsst.afw.detection.Psf"
persistable: "Psf"
storage: "BoostStorage"
tables: "raw"
}
apCorr: {
template: "apCorr/%(runId)s/%(object)s/%(date)s/%(filter)s/APC-%(visit)d-%(ccd)02d.pickle"
python: "lsst.meas.algorithms.ApertureCorrection"
persistable: "ApertureCorrection"
storage: "PickleStorage"
tables: "raw"
}
src: {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can you put in a more descriptive commit message? Why do these no longer need camera specific overrides?

template: "src/%(runId)s/%(object)s/%(date)s/%(filter)s/SRC-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "SourceCatalog"
storage: "FitsCatalogStorage"
tables: "raw"
}
icMatch: {
template: "icMatch/%(runId)s/%(object)s/%(date)s/%(filter)s/ICMATCH-%(visit)d-%(ccd)02d.fits"
Expand All @@ -212,33 +165,15 @@ datasets: {
}
srcMatch: {
template: "srcMatch/%(runId)s/%(object)s/%(date)s/%(filter)s/SRCMATCH-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.table.BaseCatalog"
persistable: "BaseCatalog"
storage: "FitsCatalogStorage"
tables: "raw"
}
icSrc: {
template: "icSrc/%(runId)s/%(object)s/%(date)s/%(filter)s/ICSRC-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "SourceCatalog"
storage: "FitsCatalogStorage"
tables: "raw"
}
icExpBackground: {
template: "icExp/%(runId)s/%(object)s/%(date)s/%(filter)s/bkgd-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.math.BackgroundList"
persistable: "PurePythonClass"
storage: "FitsCatalogStorage"
tables: raw
tables: raw_skyTile
}
calexpBackground: {
template: "calexp/%(runId)s/%(object)s/%(date)s/%(filter)s/bkgd-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.math.BackgroundList"
persistable: "PurePythonClass"
storage: "FitsCatalogStorage"
tables: raw
tables: raw_skyTile
}
log: {
template: "logs/%(runId)s/%(object)s/%(date)s/%(filter)s/run.log"
Expand All @@ -256,38 +191,18 @@ datasets: {

processCcd_metadata: {
template: "metadata/%(runId)s/%(object)s/%(date)s/%(filter)s/MD-processCcd-%(visit)d-%(ccd)02d.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: "raw"
}
isr_config: {
template: "config/isr.py"
python: "lsst.obs.cfht.cfhtIsrTask.CfhtIsrTaskConfig"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
isr_metadata: {
template: "metadata/%(runId)s/%(object)s/%(date)s/%(filter)s/MD-isr-%(visit)d-%(ccd)02d.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
characterizeImage_metadata: {
template: "metadata/%(runId)s/%(object)s/%(date)s/%(filter)s/MD-characterizeImage-%(visit)d-%(ccd)02d.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
calibrate_metadata: {
template: "metadata/%(runId)s/%(object)s/%(date)s/%(filter)s/MD-calibrate-%(visit)d-%(ccd)02d.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}

deep_makeSkyMap_config: {
Expand Down Expand Up @@ -315,11 +230,6 @@ datasets: {
}
forced_src: {
template: "forced/%(runId)s/%(object)s/%(date)s/%(filter)s/%(tract)d/FORCEDSRC-%(visit)d-%(ccd)02d.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
tables: raw_visit
}
# dataset defined in obs_base modified in this mapper as follows:
forced_src_schema: {
Expand All @@ -331,14 +241,6 @@ datasets: {
persistable: "Config"
storage: "ConfigStorage"
}
forcedPhot_metadata: {
template: "forced/%(runId)s/%(object)s/%(date)s/%(filter)s/%(tract)d/forcedPhotCcd_metadata/%(visit)d-%(ccd)02d.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
tables: raw_visit
}
# Detections on coadds

# Merged detections on coadds
Expand All @@ -347,12 +249,6 @@ datasets: {

# Reference catalog for coadds

multiband_config: {
template: "config/multiband.py"
python: "lsst.pipe.tasks.multiBand.MultiBandConfig"
persistable: "Config"
storage: "ConfigStorage"
}
singleFrameDriver_metadata: {
template: "%(pointing)05d/%(filter)s/singleFrameDriver_metadata/%(visit)07d.boost"
python: "lsst.daf.base.PropertySet"
Expand Down
8 changes: 0 additions & 8 deletions python/lsst/obs/cfht/megacamMapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,6 @@ def _computeStackExposureId(self, dataId):
nPatches = 1000000
return (int(dataId["stack"]) * nPatches + int(dataId["patch"]))

def bypass_stackExposureId(self, datasetType, pythonType, location, dataId):
"""Hook to retrieve identifier for stack/coadd"""
return self._computeStackExposureId(dataId)

def bypass_stackExposureId_bits(self, datasetType, pythonType, location, dataId):
"""Hook to retrieve number of bits in identifier for stack/coadd"""
return 32 # not really, but this leaves plenty of space for sources

def _standardizeDetrend(self, detrend, image, dataId, filter=False):
"""Hack up detrend images to remove troublesome keyword"""
md = image.getMetadata()
Expand Down