From 22ce28be413e8b6bee19eabb300079a781f73231 Mon Sep 17 00:00:00 2001 From: John Parejko Date: Fri, 26 Apr 2024 12:17:39 -0700 Subject: [PATCH] Match new TransformDiaSourceCatalog API --- python/lsst/ap/verify/testPipeline.py | 10 +++++----- tests/test_testPipeline.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/lsst/ap/verify/testPipeline.py b/python/lsst/ap/verify/testPipeline.py index 02d0b646..23b89376 100644 --- a/python/lsst/ap/verify/testPipeline.py +++ b/python/lsst/ap/verify/testPipeline.py @@ -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 @@ -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. diff --git a/tests/test_testPipeline.py b/tests/test_testPipeline.py index ccdbbe81..45a14765 100644 --- a/tests/test_testPipeline.py +++ b/tests/test_testPipeline.py @@ -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)