Merge branch 'tickets/DM-37727-fix'

lsst · Dec 1, 2023 · 48b3c8f · 48b3c8f
2 parents 7ae8de8 + f09161f
commit 48b3c8f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml b/pipelines/LSSTCam-imSim/DRP-ci_imsim.yaml
@@ -23,6 +23,24 @@ tasks:
     config:
       # Only run the deblender on a small subset of blended parents
       deblend.useCiLimits: true
+  catalogMatchVisit:
+    class: lsst.analysis.tools.tasks.astrometricCatalogMatch.AstrometricCatalogMatchVisitTask
+    config:
+      connections.refCat: cal_ref_cat_2_2
+      connections.refCatalog: cal_ref_cat_2_2
+  photometricMatchVisit:
+    class: lsst.analysis.tools.tasks.photometricCatalogMatch.PhotometricCatalogMatchVisitTask
+    config:
+      connections.refCatalog: cal_ref_cat_2_2
+      connections.matchedCatalog: sourceTable_visit_cal_ref_cat_2_2_photoMatch
+  astrometricRefCatSourceVisit:
+    class: lsst.analysis.tools.tasks.refCatSourceAnalysis.RefCatSourceAnalysisTask
+    config:
+      connections.data: sourceTable_visit_cal_ref_cat_2_2_match
+  photometricRefCatSourceVisit:
+    class: lsst.analysis.tools.tasks.refCatSourcePhotometricAnalysis.RefCatSourcePhotometricAnalysisTask
+    config:
+      connections.data: sourceTable_visit_cal_ref_cat_2_2_photoMatch
 subsets:
   analysis_tools:
     subset:

diff --git a/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml b/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
@@ -91,11 +91,19 @@ tasks:
     class: lsst.analysis.tools.tasks.astrometricCatalogMatch.AstrometricCatalogMatchTask
     config:
       connections.refCatalog: "cal_ref_cat_2_2"
+  photometricCatalogMatch:
+    class: lsst.analysis.tools.tasks.photometricCatalogMatch.PhotometricCatalogMatchTask
+    config:
+      connections.refCatalog: cal_ref_cat_2_2
+      connections.matchedCatalog: objectTable_tract_cal_ref_cat_2_2_photoMatch
   refCatObjectTract:
     class: lsst.analysis.tools.tasks.refCatObjectAnalysis.RefCatObjectAnalysisTask
     config:
-      connections.outputName: "objectTable_tract_cal_ref_cat_2_2_match"
       connections.refCatalog: "cal_ref_cat_2_2"
+  photometricRefCatObjectTract:
+    class: lsst.analysis.tools.tasks.refCatObjectPhotometricAnalysis.RefCatObjectPhotometricAnalysisTask
+    config:
+      connections.data: objectTable_tract_cal_ref_cat_2_2_photoMatch
 subsets:
   step1:
     subset: