DM-53893: Run SingleFrameMeasurement on ALL visits

bps/clustering/clustering_ApPipe.yaml

@@ -29,6 +29,9 @@ cluster:
     pipetasks: getRegionTimeFromVisit,mpSkyEphemerisQuery,loadDiaCatalogs,associateApdb,analyzeLoadDiaCatalogsMetrics,analyzeDiaSourceAssociationMetrics,analyzeAssociateDiaSourceTiming
     dimensions: visit,detector
     equalDimensions: visit:group
+  singleFrameMeasurement:
+    pipetasks: singleFrameDetectAndMeasure,associateSolarSystemDirectSource
+    dimensions: visit,detector
   diaSrcDetectorAnalysis:
     pipetasks: analyzeAssociatedDiaSourceTable,analyzeTrailedDiaSourceTable
     dimensions: visit,detector

bps/clustering/clustering_ApPipeWithFakes.yaml

@@ -29,6 +29,9 @@ cluster:
     pipetasks: getRegionTimeFromVisit,mpSkyEphemerisQuery,loadDiaCatalogs,associateApdb,analyzeLoadDiaCatalogsMetrics,analyzeDiaSourceAssociationMetrics,analyzeAssociateDiaSourceTiming
     dimensions: visit,detector
     equalDimensions: visit:group
+  singleFrameMeasurement:
+    pipetasks: singleFrameDetectAndMeasure,associateSolarSystemDirectSource
+    dimensions: visit,detector
   diaSrcDetectorAnalysis:
     pipetasks: analyzeAssociatedDiaSourceTable,injectedMatch,analyzeDiaFakesDetectorVisitCore,analyzeTrailedDiaSourceTable
     dimensions: visit,detector

bps/clustering/clustering_Daytime.yaml

@@ -32,6 +32,9 @@ cluster:
   association:
     pipetasks: associateApdb,analyzeDiaSourceAssociationMetrics,analyzeAssociateDiaSourceTiming
     dimensions: visit,detector
+  singleFrameMeasurement:
+    pipetasks: singleFrameDetectAndMeasure,associateSolarSystemDirectSource
+    dimensions: visit,detector
   diaSrcDetectorAnalysis:
     pipetasks: analyzeAssociatedDiaSourceTable,analyzeTrailedDiaSourceTable
     dimensions: visit,detector

pipelines/LSSTCam/ApPipeWithFakes.yaml

@@ -74,6 +74,8 @@ subsets:
       - analyzeSampledImageSubtractionMetrics
       - analyzePreliminarySummaryStats
       - analyzeVisitSampledImageSubtractionMetrics
+      - singleFrameDetectAndMeasure
+      - associateSolarSystemDirectSource
     description: >
       An alias of ApPipe to use in higher-level pipelines.
   prompt:
@@ -113,6 +115,8 @@ subsets:
     - analyzeSampledImageSubtractionMetrics
     - analyzeDiaFakesVisitCore
     - analyzeVisitSampledImageSubtractionMetrics
+    - singleFrameDetectAndMeasure
+    - associateSolarSystemDirectSource
     description: >
       Tasks for QA and other non-real-time processing.
       Requires prompt subset to be run first.

pipelines/_ingredients/ApPipe.yaml

@@ -179,6 +179,23 @@ tasks:
       connections.diaSources: dia_source_detector
       connections.psfMatchingKernel: difference_kernel
       connections.spatiallySampledMetrics: difference_image_metrics
+  singleFrameDetectAndMeasure:
+    class: lsst.drp.tasks.single_frame_detect_and_measure.SingleFrameDetectAndMeasureTask
+    config:
+      connections.exposure: preliminary_visit_image
+      connections.input_background: preliminary_visit_image_background
+      connections.sources: single_visit_star_reprocessed_unstandardized
+      connections.sources_footprints: single_visit_star_reprocessed_footprints
+      connections.background: preliminary_visit_image_reprocessed_background
+      id_generator.release_id: parameters.release_id
+  associateSolarSystemDirectSource:
+    class: lsst.ap.association.SsSingleFrameAssociationTask
+    config:
+      connections.exposure: preliminary_visit_image
+      connections.sourceTable: single_visit_star_reprocessed_footprints
+      connections.solarSystemObjectTable: preloaded_ss_object
+      connections.associatedSsSources: ss_source_direct_detector
+      connections.unassociatedSsObjects: ss_object_direct_unassociated
 
 subsets:
   apPipeSingleFrame:
@@ -190,12 +207,6 @@ subsets:
       The prompt ApPipe tasks that make up single-frame processing. Not to be confused with the
       SingleFrame.yaml pipeline, which does more than just ApPipe single frame processing, and
       is designed as a standalone alternative to ApPipe.yaml.
-  processCcd:  # TODO: remove on DM-48428
-    subset:
-      - isr
-      - calibrateImage
-      - analyzePreliminarySummaryStats
-    description: Deprecated alias for apPipeSingleFrame, will be removed after v29.
   apPipe:
     subset:
       - loadDiaCatalogs
@@ -223,6 +234,8 @@ subsets:
       - analyzePreliminarySummaryStats
       - consolidateVisitSummary
       - analyzeVisitSampledImageSubtractionMetrics
+      - singleFrameDetectAndMeasure
+      - associateSolarSystemDirectSource
     description: >
       An alias of ApPipe to use in higher-level pipelines.
   preload:
@@ -259,6 +272,8 @@ subsets:
       - makeSampledImageSubtractionMetrics
       - analyzeSampledImageSubtractionMetrics
       - analyzeVisitSampledImageSubtractionMetrics
+      - singleFrameDetectAndMeasure
+      - associateSolarSystemDirectSource
     description: >
       Tasks for QA and other non-real-time processing.
       Requires prompt subset to be run first.

scripts/LSSTCam/submit_ap_daytime.sh

@@ -59,7 +59,7 @@ BAD_DETECTORS_SQL="($(printf '%s,' $BAD_DETECTORS | sed 's/,$//'))"
 BLOCKS_SQL="($(printf "'%s'," $BLOCKS | sed 's/,$//'))"
 
 nohup bps submit "${AP_PIPE_DIR}/bps/LSSTCam/bps_Daytime.yaml" \
-  --extra-qgraph-options "--skip-existing-in LSSTCam/prompt/output-${DATE} -c parameters:release_id=1 -c parameters:apdb_config=${TMP_APDB} --dataset-query-constraint template_coadd" \
+  --extra-qgraph-options "--skip-existing-in LSSTCam/prompt/output-${DATE} -c parameters:release_id=1 -c parameters:apdb_config=${TMP_APDB} -c associateApdb:doRunForcedMeasurement=False --dataset-query-constraint off" \
   --extra-run-quantum-options "--no-raise-on-partial-outputs" \
   --input "LSSTCam/defaults,LSSTCam/templates,LSSTCam/prompt/output-${DATE}" \
   --output "$OUTPUT_COLLECTION" \