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

DM-42435: Migrate DM schemas from ccdVisitId to (visit, detector) #223

Merged
merged 1 commit into from
May 6, 2024
Merged

DM-42435: Migrate DM schemas from ccdVisitId to (visit, detector) #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions python/lsst/ap/verify/testPipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,15 +514,15 @@ def __init__(self, initInputs, **kwargs):

def runQuantum(self, butlerQC, inputRefs, outputRefs):
inputs = butlerQC.get(inputRefs)
idGenerator = self.config.idGenerator.apply(butlerQC.quantum.dataId)
inputs["ccdVisitId"] = idGenerator.catalog_id
inputs["band"] = butlerQC.quantum.dataId["band"]
inputs["visit"] = butlerQC.quantum.dataId["visit"]
inputs["detector"] = butlerQC.quantum.dataId["detector"]

outputs = self.run(**inputs)

butlerQC.put(outputs, outputRefs)

def run(self, diaSourceCat, diffIm, band, ccdVisitId, funcs=None):
def run(self, diaSourceCat, diffIm, band, visit, detector, funcs=None):
"""Produce transformation outputs with no processing.

Parameters
Expand All @@ -533,8 +533,8 @@ def run(self, diaSourceCat, diffIm, band, ccdVisitId, funcs=None):
An image, to provide supplementary information.
band : `str`
The band in which the sources were observed.
ccdVisitId : `int`
The exposure ID in which the sources were observed.
visit, detector: `int`
Visit and detector the sources were detected on.
funcs, optional
Unused.

Expand Down
2 changes: 1 addition & 1 deletion tests/test_testPipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ def testMockRBTransiNetTask(self):
def testMockTransformDiaSourceCatalogTask(self):
task = MockTransformDiaSourceCatalogTask(initInputs=afwTable.SourceCatalog())
pipelineTests.assertValidInitOutput(task)
result = task.run(afwTable.SourceCatalog(), afwImage.ExposureF(), 'k', 42)
result = task.run(afwTable.SourceCatalog(), afwImage.ExposureF(), 'k', 42, 2)
pipelineTests.assertValidOutput(task, result)

self.butler.put(afwTable.SourceCatalog(), "deepDiff_candidateDiaSrc", self.visitId)
Expand Down
Loading