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

DM-21919: Run ap_verify end-to-end in Gen 3 #97

Merged
merged 2 commits into from
Aug 19, 2020
Merged

DM-21919: Run ap_verify end-to-end in Gen 3 #97

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
0486fcd
Reconcile names of template input to DiaPipelineTask.
kfindeisen Jul 27, 2020
7422b92
Let PPDB metrics take instrument-level inputs.
kfindeisen Aug 3, 2020
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
6 changes: 3 additions & 3 deletions python/lsst/ap/association/diaPipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
butlerQC.put(outputs, outputRefs)

@pipeBase.timeMethod
def run(self, diaSourceCat, diffIm, exposure, template, ccdExposureIdBits):
def run(self, diaSourceCat, diffIm, exposure, warpedExposure, ccdExposureIdBits):
"""Process DiaSources and DiaObjects.

Load previous DiaObjects and their DiaSource history. Calibrate the
Expand All @@ -208,7 +208,7 @@ def run(self, diaSourceCat, diffIm, exposure, template, ccdExposureIdBits):
exposure : `lsst.afw.image.ExposureF`
Calibrated exposure differenced with a template to create
``diffIm``.
template : `lsst.afw.image.ExposureF`
warpedExposure : `lsst.afw.image.ExposureF`
Template exposure used to create diffIm.
ccdExposureIdBits : `int`
Number of bits used for a unique ``ccdVisitId``.
Expand Down Expand Up @@ -262,7 +262,7 @@ def run(self, diaSourceCat, diffIm, exposure, template, ccdExposureIdBits):
loaderResult.diaSources,
diaForcedSources,
diffIm,
template,
warpedExposure,
ccdExposureIdBits)

return pipeBase.Struct(apdbMarker=self.config.apdb.value)
6 changes: 3 additions & 3 deletions python/lsst/ap/association/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ def makeMeasurement(self, dbHandle, outputDataId):
Raised if outputDataId is not empty
"""
# All data ID types define keys()
if outputDataId.keys():
raise ValueError("%s must not be associated with specific data IDs."
% self.config.metricName)
if outputDataId.keys() - {'instrument'}:
raise ValueError("%s must not be associated with specific data IDs (gave %s)."
% (self.config.metricName, outputDataId))

try:
nUnassociatedDiaObjects = dbHandle.countUnassociatedObjects()
Expand Down