From 3a7b24f94c9bf25ea02b012f0ae5d3a6801a05d3 Mon Sep 17 00:00:00 2001 From: Hsin-Fang Chiang Date: Wed, 4 Nov 2026 15:14:12 -0800 Subject: [PATCH 1/2] Correct makeVisitTable in bps clustering makeVisitTable is global and not per visit. This is a mistake in 19f0ab6a24de1562cc4a71b5d8bc5f822b87ad06 --- bps/clustering/clustering_Daytime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bps/clustering/clustering_Daytime.yaml b/bps/clustering/clustering_Daytime.yaml index 0c981f4a..12ba2c85 100644 --- a/bps/clustering/clustering_Daytime.yaml +++ b/bps/clustering/clustering_Daytime.yaml @@ -41,7 +41,7 @@ cluster: pipetasks: makeSampledImageSubtractionMetrics,analyzeSampledImageSubtractionMetrics dimensions: visit,detector consolidateVisit: - pipetasks: consolidateVisitSummary,makeVisitTable,consolidateDiaSourceTable,analyzeVisitSampledImageSubtractionMetrics,consolidatePromptSource,splitPromptSource + pipetasks: consolidateVisitSummary,consolidateDiaSourceTable,analyzeVisitSampledImageSubtractionMetrics,consolidatePromptSource,splitPromptSource dimensions: visit From 41aefbdceee2eec5f5d65f614ebc0b6e747eadff Mon Sep 17 00:00:00 2001 From: Hsin-Fang Chiang Date: Wed, 4 Nov 2026 15:58:39 -0800 Subject: [PATCH 2/2] Add makeVisitDetectorTable task --- pipelines/_ingredients/ApPipe.yaml | 11 +++++++++++ pipelines/_ingredients/ApPipeWithPreconvolution.yaml | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/pipelines/_ingredients/ApPipe.yaml b/pipelines/_ingredients/ApPipe.yaml index 5112dd3c..ec05d5d1 100644 --- a/pipelines/_ingredients/ApPipe.yaml +++ b/pipelines/_ingredients/ApPipe.yaml @@ -214,6 +214,12 @@ tasks: config: connections.visitSummaries: visit_summary connections.outputCatalog: visit_table + makeVisitDetectorTable: + class: lsst.pipe.tasks.postprocess.MakeCcdVisitTableTask + config: + connections.visitSummaryRefs: visit_summary + connections.outputCatalog: visit_detector_table + idGenerator.release_id: parameters.release_id standardizePromptSource: class: lsst.pipe.tasks.postprocess.TransformSourceTableTask config: @@ -273,6 +279,7 @@ subsets: - analyzePreliminarySummaryStats - consolidateVisitSummary - makeVisitTable + - makeVisitDetectorTable - consolidateDiaSourceTable - analyzeVisitSampledImageSubtractionMetrics - aggregateVisitSummary @@ -316,6 +323,7 @@ subsets: subset: - consolidateVisitSummary - makeVisitTable + - makeVisitDetectorTable - consolidateDiaSourceTable - makeSampledImageSubtractionMetrics - analyzeSampledImageSubtractionMetrics @@ -442,3 +450,6 @@ contracts: - contract: consolidateVisitSummary.connections.ConnectionsClass(config=consolidateVisitSummary).visitSummary.name == makeVisitTable.connections.ConnectionsClass(config=makeVisitTable).visitSummaries.name msg: "consolidateVisitSummary.visitSummary != makeVisitTable.visitSummaries" + - contract: consolidateVisitSummary.connections.ConnectionsClass(config=consolidateVisitSummary).visitSummary.name == + makeVisitDetectorTable.connections.ConnectionsClass(config=makeVisitDetectorTable).visitSummaryRefs.name + msg: "consolidateVisitSummary.visitSummary != makeVisitDetectorTable.visitSummaryRefs" diff --git a/pipelines/_ingredients/ApPipeWithPreconvolution.yaml b/pipelines/_ingredients/ApPipeWithPreconvolution.yaml index e57987da..ab0ae8fe 100644 --- a/pipelines/_ingredients/ApPipeWithPreconvolution.yaml +++ b/pipelines/_ingredients/ApPipeWithPreconvolution.yaml @@ -68,6 +68,7 @@ subsets: - analyzePreliminarySummaryStats - consolidateVisitSummary - makeVisitTable + - makeVisitDetectorTable - consolidateDiaSourceTable - analyzeVisitSampledImageSubtractionMetrics - aggregateVisitSummary @@ -134,3 +135,6 @@ contracts: - contract: consolidateVisitSummary.connections.ConnectionsClass(config=consolidateVisitSummary).visitSummary.name == makeVisitTable.connections.ConnectionsClass(config=makeVisitTable).visitSummaries.name msg: "consolidateVisitSummary.visitSummary != makeVisitTable.visitSummaries" + - contract: consolidateVisitSummary.connections.ConnectionsClass(config=consolidateVisitSummary).visitSummary.name == + makeVisitDetectorTable.connections.ConnectionsClass(config=makeVisitDetectorTable).visitSummaryRefs.name + msg: "consolidateVisitSummary.visitSummary != makeVisitDetectorTable.visitSummaryRefs"