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.

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

Tickets/dm 8128 #29

Merged
merged 2 commits into from
Nov 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
205 changes: 0 additions & 205 deletions policy/LsstSimMapper.paf
Original file line number Diff line number Diff line change
Expand Up @@ -84,53 +84,10 @@ exposures: {
level: "Ccd"
tables: raw
}
biasOut: {
template: "bias/v0/R%(raft)s/S%(sensor)s/imsim_0_R%(raft)s_S%(sensor)s_C%(channel)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Amp"
tables: raw
}
darkOut: {
template: "dark/v1/R%(raft)s/S%(sensor)s/imsim_1_R%(raft)s_S%(sensor)s_C%(channel)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Amp"
tables: raw
}
flatOut: {
template: "flat/v2-f%(filter)s/R%(raft)s/S%(sensor)s/imsim_2_R%(raft)s_S%(sensor)s_C%(channel)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Amp"
tables: raw
}
fringeOut: {
template: "fringe/v2-f%(filter)s/R%(raft)s/S%(sensor)s/imsim_2_R%(raft)s_S%(sensor)s_C%(channel)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "Amp"
tables: raw
}

# dataset defined in obs_base modified in this mapper as follows:
deepCoadd_tempExp: {
template: "deepCoadd/%(filter)s/%(tract)d/%(patch)stempExp/v%(visit)d-f%(filter)s.fits"
}
deepCoadd_calexp_det: {
template: "deepCoadd-results/%(filter)s/%(tract)d/%(patch)s/calexp_det-%(filter)s-%(tract)d-%(patch)s.fits"
python: "lsst.afw.image.ExposureF"
persistable: "ExposureF"
storage: "FitsStorage"
level: "None"
tables: raw
}


wcs: {
template: "wcs/v%(visit)d-f%(filter)s/R%(raft)s/S%(sensor)s.wcs.fits"
python: "lsst.afw.image.ExposureI"
Expand All @@ -140,7 +97,6 @@ exposures: {
tables: "raw"
tables: "raw_visit"
}

fcr: {
template: "fcr/v%(visit)d-f%(filter)s/R%(raft)s/S%(sensor)s.fcr.fits"
python: "lsst.afw.image.ExposureI"
Expand Down Expand Up @@ -308,76 +264,6 @@ datasets: {
storage: "FitsCatalogStorage"
tables: raw
}
sourceHist: {
template: "results/st%(skyTile)d/sourceHist.fits"
python: "lsst.afw.image.DecoratedImageU"
persistable: "DecoratedImageU"
storage: "FitsStorage"
tables: raw
}
badSourceHist: {
template: "results/st%(skyTile)d/badSourceHist.fits"
python: "lsst.afw.image.DecoratedImageU"
persistable: "DecoratedImageU"
storage: "FitsStorage"
tables: raw
}
source: {
template: "results/st%(skyTile)d/source.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
source_schema: {
template: "schema/source.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
badSource: {
template: "results/st%(skyTile)d/badSource.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
badSource_schema: {
template: "schema/badSource.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
invalidSource: {
template: "results/st%(skyTile)d/invalidSource.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
invalidSource_schema: {
template: "schema/invalidSource.fits"
python: "lsst.afw.table.SourceCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
object: {
template: "results/st%(skyTile)d/object.fits"
python: "lsst.ap.cluster.SourceClusterCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
object_schema: {
template: "schema/object.fits"
python: "lsst.ap.cluster.SourceClusterCatalog"
persistable: "ignored"
storage: "FitsCatalogStorage"
tables: raw
}
Mosaic_metadata: {
template: "metadata/Mosaic.boost"
python: "lsst.daf.base.PropertySet"
Expand Down Expand Up @@ -434,84 +320,20 @@ datasets: {
storage: "BoostStorage"
tables: raw
}
measureCcd_config: {
template: "config/measureCcd.py"
python: "lsst.meas.multifit.measureCcd.MeasureCcdConfig"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
measureCcd_metadata: {
template: "measureCcd_metadata/v%(visit)d-f%(filter)s/R%(raft)s/S%(sensor)s.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
deep_measureCoadd_config: {
template: "config/deep_measureCoadd.py"
python: "lsst.meas.multifit.measureCoadd.MeasureCoaddConfig"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
deep_measureCoadd_metadata: {
template: "deep_measureCoadd_metadata/%(filter)s/%(tract)d/%(patch)s/metadata-%(filter)s-%(tract)d-%(patch)s.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
deep_measureMulti_config: {
template: "config/deep_measureMulti.py"
python: "lsst.meas.multifit.measureMulti.MeasureMultiConfig"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
deep_measureMulti_metadata: {
template: "deep_measureMulti_metadata/%(filter)s/%(tract)d/%(patch)s/metadata-%(filter)s-%(tract)d-%(patch)s.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
sourceAssoc_config: {
template: "config/sourceAssoc.py"
python: "lsst.ap.tasks.sourceAssoc.SourceAssocConfig"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
sourceAssoc_metadata: {
template: "sourceAssoc_metadata/st%(skyTile)d/metadata.boost"
python: "lsst.daf.base.PropertySet"
persistable: "PropertySet"
storage: "BoostStorage"
tables: raw
}
deep_makeSkyMap_config: {
template: "config/deep_makeSkyMap.py"
python: "lsst.pipe.tasks.makeSkyMap.MakeSkyMapTask.ConfigClass"
persistable: "Config"
storage: "ConfigStorage"
tables: raw
}
# dataset defined in obs_base modified in this mapper as follows:
deep_safeClipAssembleCoadd_metadata: {
template: "deep_safeClipAssembleCoadd_metadata/%(filter)s/%(tract)d/%(patch)s.boost"
}
deepCoadd_calexp_detBackground: {
template: "deepCoadd-results/%(filter)s/%(tract)d/%(patch)s/det_bkgd-%(filter)s-%(tract)d-%(patch)s.fits"
python: "lsst.afw.math.BackgroundList"
persistable: "PurePythonClass"
storage: "FitsCatalogStorage"
tables: raw
}
# dataset defined in obs_base modified in this mapper as follows:
deepCoadd_srcMatch: {
template: "deepCoadd-results/%(filter)s/%(tract)d/%(patch)s/srcMatch-%(filter)s-%(tract)d-%(patch)s.fits"
persistable: "ignored"
}
# dataset defined in obs_base modified in this mapper as follows:
deepCoadd_forced_src: {
Expand All @@ -520,7 +342,6 @@ datasets: {
# dataset defined in obs_base modified in this mapper as follows:
deepCoadd_forced_config: {
template: "config/deepCoadd_forced.py"
python: "lsst.meas.base.forcedCoadd.ForcedCoaddMeasurementConfig"
}
# dataset defined in obs_base modified in this mapper as follows:
deepCoadd_forced_metadata: {
Expand All @@ -542,30 +363,4 @@ datasets: {
deepDiff_metadata: {
template: "deepDiff/v%(visit)d-f%(filter)s/R%(raft)s/metadata-S%(sensor)s.boost"
}




refcat: {
template: "refcat.fits"
python: "lsst.afw.table.SimpleCatalog"
persistable: "SimpleCatalog"
storage: "FitsCatalogStorage"
tables: raw
}
# Detections on coadds

# Merged detections on coadds

# Measurements on coadds

# Reference catalog for coadds

multiband_config: {
template: "config/multiband.py"
python: "lsst.pipe.tasks.multiBand.MultiBandConfig"
persistable: "Config"
storage: "ConfigStorage"
}

}
14 changes: 2 additions & 12 deletions python/lsst/obs/lsstSim/lsstSimMapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,22 +298,12 @@ def bypass_ccdExposureId(self, datasetType, pythonType, location, dataId):
def bypass_ccdExposureId_bits(self, datasetType, pythonType, location, dataId):
return 41

def bypass_goodSeeingCoaddId(self, datasetType, pythonType, location, dataId):
def bypass_deepCoaddId(self, datasetType, pythonType, location, dataId):
return self._computeCoaddExposureId(dataId, True)

def bypass_goodSeeingCoaddId_bits(self, datasetType, pythonType, location, dataId):
def bypass_deepCoaddId_bits(self, datasetType, pythonType, location, dataId):
return 1 + 7 + 13*2 + 3

# Deep coadds use tract, patch, and filter just like good-seeing coadds
bypass_deepCoaddId = bypass_goodSeeingCoaddId
bypass_deepCoaddId_bits = bypass_goodSeeingCoaddId_bits

def bypass_chiSquaredCoaddId(self, datasetType, pythonType, location, dataId):
return self._computeCoaddExposureId(dataId, False)

def bypass_chiSquaredCoaddId_bits(self, datasetType, pythonType, location, dataId):
return 1 + 7 + 13*2

###############################################################################

def add_sdqaAmp(self, dataId):
Expand Down