Rename outputs of isolatedStarAssociation

After the great calibration refactor, PreSources
will always be generated in single frame processing
and have fewer rows than Sources based on a second
round of more complete detection:

    - isolated_star_cat -> isolated_star_presource_associations
    - isolated_star_sources -> isolated_star_presources

pipelines/HSC/DRP-Prod.yaml

@@ -46,6 +46,7 @@ subsets:
   step2b:
     subset:
       - isolatedStarAssociation
+      - analyzeMatchedPreVisitCore
       - gbdesAstrometricFit
     description: |
       Tract-level tasks
@@ -119,6 +120,7 @@ subsets:
       - catalogMatchTract
       - refCatObjectTract
       - validateObjectTableCore
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - photometricCatalogMatch
       - photometricRefCatObjectTract

pipelines/HSC/DRP-RC2.yaml

@@ -65,10 +65,6 @@ tasks:
     class: lsst.fgcmcal.fgcmOutputProducts.FgcmOutputProductsTask
     config:
       connections.cycleNumber: 4
-  isolatedStarAssociation:
-    class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
-    config:
-      band_order: ['i', 'r', 'g', 'z', 'y', 'N921']
   matchedVisitCoreWholeSkyPlot:
     class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
     config:
@@ -179,6 +175,7 @@ subsets:
       # per-tract Tasks
       - consolidateObjectTable
       - analyzeMatchedVisitCore
+      - isolatedStarSourceAssociation
       - analyzeMatchedPreVisitCore
       - analyzeObjectTableCore
       - catalogMatchTract

pipelines/HSC/DRP-RC2_subset.yaml

@@ -380,6 +380,7 @@ subsets:
       - psfPhotRepStar3
       - psfPhotRepStar4
       - objectEpochTable
+      - isolatedStarSourceAssociation
     description: |
       Tasks that can be run together, but only after the 'step1' and 'step2'
       subsets.

pipelines/HSC/DRP-ci_hsc.yaml

@@ -46,10 +46,6 @@ tasks:
     class: lsst.pipe.tasks.postprocess.WriteRecalibratedSourceTableTask
     config:
       connections.outputCatalog: source
-  isolatedStarAssociation:
-    class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
-    config:
-      band_order: ['i', 'r']
   matchedVisitCoreWholeSkyPlot:
     class: lsst.analysis.tools.tasks.WholeSkyAnalysisTask
     config:

pipelines/LATISS/DRP.yaml

@@ -84,6 +84,9 @@ tasks:
     class: lsst.analysis.tools.tasks.AssociatedSourcesTractAnalysisTask
     config:
       connections.outputName: matchedVisitCore
+      connections.sourceCatalogs: sourceTable_visit
+      connections.associatedSources: isolated_star_sources
+      connections.associatedSourcesInputName: isolated_star_sources
       atools.stellarPhotometricRepeatability: StellarPhotometricRepeatability
       atools.stellarPhotometricResiduals: StellarPhotometricResidualsFocalPlane
       atools.stellarPhotometricResiduals.produce.plot.nBins: 80
@@ -213,6 +216,7 @@ subsets:
       - photometricCatalogMatch
       - photometricRefCatObjectTract
       - validateObjectTableCore
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - analyzeAmpOffsetMetadata
       # The following are from analysis_drp

pipelines/LSSTComCam/DRP.yaml

@@ -24,7 +24,6 @@ subsets:
       select partial visits that overlap that region.
   step2a:
     subset:
-      - analyzeMatchedPreVisitCore
       - consolidatePreSourceTable
       - consolidateVisitSummary
     description: |
@@ -37,6 +36,7 @@ subsets:
       TODO: Evaluate SkyCorr after intial DRP
   step2b:
     subset:
+      - analyzeMatchedPreVisitCore
       - isolatedStarAssociation
       - gbdesAstrometricFit
     description: |
@@ -94,6 +94,7 @@ subsets:
       - selectGoodSeeingVisits
       - templateGen
       # analysis_tools tasks
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
       - catalogMatchTract

pipelines/LSSTComCam/nightly-validation.yaml

@@ -119,6 +119,7 @@ subsets:
       - consolidateObjectTable
       - healSparsePropertyMaps
       # analysis_tools tasks
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
       - analyzeObjectTableExtended

pipelines/LSSTComCamSim/DRP.yaml

@@ -96,6 +96,7 @@ subsets:
       - templateGen
       # analysis_tools tasks
       - analyzeAmpOffsetMetadata
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
       - catalogMatchTract

pipelines/LSSTComCamSim/nightly-validation.yaml

@@ -116,6 +116,7 @@ subsets:
       - healSparsePropertyMaps
       # analysis_tools tasks
       - analyzeAmpOffsetMetadata
+      - isolatedStarSourceAssociation
       - analyzeMatchedVisitCore
       - analyzeObjectTableCore
       - analyzeObjectTableExtended

pipelines/_ingredients/DECam/DRP.yaml

@@ -105,7 +105,9 @@ tasks:
   isolatedStarAssociation:
     class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
     config:
-      connections.source_table_visit: preSourceTable_visit
+      # connections.source_table_visit: preSourceTable_visit
+      # connections.isolated_star_sources: isolated_star_presources
+      # connections.isolated_star_cat: isolated_star_presource_associations
       python:
         config.band_order += ["N708", "N540"]
   writeRecalibratedSourceTable:

pipelines/_ingredients/DRP-full.yaml

@@ -19,13 +19,32 @@ tasks:
   skyCorr:
     class: lsst.pipe.tasks.skyCorrection.SkyCorrectionTask
   isolatedStarAssociation:
+    # for global calibration and PSF estimates on preSources
     class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
     config:
+      # TODO DM-43077: delete these three overrides
       connections.source_table_visit: preSourceTable_visit
+      connections.isolated_star_sources: isolated_star_presources
+      connections.isolated_star_cat: isolated_star_presource_associations
+  isolatedStarSourceAssociation:
+    # for final repeatability metrics on final source table
+    class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
+    config:
+      connections.source_table_visit: sourceTable_visit
+      connections.isolated_star_sources: isolated_star_sources
+      connections.isolated_star_cat: isolated_star_source_associations
+  finalizeCharacterization:
+    class: lsst.pipe.tasks.finalizeCharacterization.FinalizeCharacterizationTask
+    config:
+      connections.isolated_star_cats: isolated_star_presource_associations
+      connections.isolated_star_sources: isolated_star_presources
   gbdesAstrometricFit:
     class: lsst.drp.tasks.gbdesAstrometricFit.GbdesAstrometricFitTask
   fgcmBuildFromIsolatedStars:
     class: lsst.fgcmcal.fgcmBuildFromIsolatedStars.FgcmBuildFromIsolatedStarsTask
+    config:
+      connections.isolated_star_cats: isolated_star_presources
+      connections.isolated_star_sources: isolated_star_presource_associations
   fgcmFitCycle:
     class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
   fgcmOutputProducts:

pipelines/_ingredients/DRP-minimal-calibration.yaml

@@ -13,8 +13,23 @@ tasks:
   transformSourceTable: lsst.pipe.tasks.postprocess.TransformSourceTableTask
   consolidateSourceTable: lsst.pipe.tasks.postprocess.ConsolidateSourceTableTask
   consolidateVisitSummary: lsst.pipe.tasks.postprocess.ConsolidateVisitSummaryTask
-  isolatedStarAssociation: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
-  finalizeCharacterization: lsst.pipe.tasks.finalizeCharacterization.FinalizeCharacterizationTask
+  isolatedStarAssociation:
+    class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
+    config:
+      # TODO DM-43077: Remove all three connections overrides.
+      # DM-43077 introduces presources to the imSim pipelines
+      # presource are the default catalog to match on
+      connections.source_table_visit: sourceTable_visit
+      connections.isolated_star_sources: isolated_star_sources
+      connections.isolated_star_cat: isolated_star_source_associations
+  finalizeCharacterization:
+    class: lsst.pipe.tasks.finalizeCharacterization.FinalizeCharacterizationTask
+    config:
+      # TODO DM-43077: Remove both connections overrides.
+      # DM-43077 introduces presources to the imSim pipelines
+      # presources are the default catalog to match on
+      connections.isolated_star_cats: isolated_star_source_associations
+      connections.isolated_star_sources: isolated_star_sources
   updateVisitSummary: lsst.drp.tasks.update_visit_summary.UpdateVisitSummaryTask
   makeCcdVisitTable: lsst.pipe.tasks.postprocess.MakeCcdVisitTableTask
   makeVisitTable: lsst.pipe.tasks.postprocess.MakeVisitTableTask

pipelines/_ingredients/HSC/DRP.yaml

@@ -17,10 +17,6 @@ tasks:
     config:
       doAmpOffset: true
       ampOffset.doApplyAmpOffset: true
-  isolatedStarAssociation:
-    class: lsst.pipe.tasks.isolatedStarAssociation.IsolatedStarAssociationTask
-    config:
-      band_order: ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]
   fgcmFitCycle:
     class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask
     config:

tests/test_pipelines.py

@@ -108,8 +108,6 @@
     "icExp",
     "icExpBackground",
     "icSrc",
-    "isolated_star_cat",
-    "isolated_star_sources",
     "objectTable",
     "objectTable_tract",
     "postISRCCD",
@@ -134,6 +132,11 @@
     "preSourceTable_visit",
     "skyCorr",
     "srcMatchFull",
+    # DM-43077 move 2 presource associations and friends to COMMON_OUTPUTS
+    "isolated_star_presource_associations",
+    "isolated_star_presources",
+    "isolated_star_source_associations",
+    "isolated_star_sources",
 }
 
 # LATISS common outputs, in addition to COMMON_OUTPUTS
@@ -176,6 +179,11 @@
     "mergedForcedSource",
     "mergedForcedSourceOnDiaObject",
     "transmission_atmosphere_fgcm",
+    # DM-43077 move 2 presource associations and friends to COMMON_OUTPUTS
+    "isolated_star_presource_associations",
+    "isolated_star_presources",
+    "isolated_star_source_associations",
+    "isolated_star_sources",
 }
 
 # LSSTCam-imSim common outputs, in addition to COMMON_OUTPUTS
@@ -207,6 +215,9 @@
     "goodSeeingVisits",
     "mergedForcedSource",
     "mergedForcedSourceOnDiaObject",
+    # TODO DM-43077: remove these two
+    "isolated_star_source_associations",
+    "isolated_star_sources",
 }