Merge pull request #189 from lsst/tickets/DM-47952

DM-47952: Add Real/Bogus to drp_pipe
lsst · Dec 11, 2024 · 18018a1 · 18018a1
2 parents fd476ca + ac891be
commit 18018a1
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/pipelines/HSC/DRP-RC2.yaml b/pipelines/HSC/DRP-RC2.yaml
@@ -204,6 +204,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - writeForcedSourceTable
     description: |

diff --git a/pipelines/LATISS/DRP.yaml b/pipelines/LATISS/DRP.yaml
@@ -244,6 +244,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - writeForcedSourceTable
     description: |

diff --git a/pipelines/LSSTComCam/DRP.yaml b/pipelines/LSSTComCam/DRP.yaml
@@ -117,6 +117,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - writeForcedSourceTable
     description: |

diff --git a/pipelines/LSSTComCamSim/DRP.yaml b/pipelines/LSSTComCamSim/DRP.yaml
@@ -120,6 +120,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - writeForcedSourceTable
     description: |

diff --git a/pipelines/_ingredients/DRP-minimal-calibration.yaml b/pipelines/_ingredients/DRP-minimal-calibration.yaml
@@ -159,9 +159,19 @@ tasks:
       connections.matchedTemplate: goodSeeingDiff_matchedExp
       connections.difference: goodSeeingDiff_differenceTempExp
       connections.subtractedMeasuredExposure: goodSeeingDiff_differenceExp
+  rbClassify:
+    class: lsst.meas.transiNet.RBTransiNetTask
+    config:
+      modelPackageStorageMode: butler
+      connections.science: pvi
+      connections.coaddName: goodSeeing
+      connections.template: goodSeeingDiff_templateExp
+      connections.difference: goodSeeingDiff_differenceTempExp
+      connections.diaSources: goodSeeingDiff_diaSrc
   transformDiaSourceCat:
     class: lsst.ap.association.TransformDiaSourceCatalogTask
     config:
+      doIncludeReliability: True
       connections.coaddName: goodSeeing
       connections.diaSourceSchema: goodSeeingDiff_diaSrc_schema
       connections.diaSourceCat: goodSeeingDiff_diaSrc
@@ -301,6 +311,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - consolidateDiaSourceTable
       - drpAssociation

diff --git a/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml b/pipelines/_ingredients/LSSTCam-imSim/DRP.yaml
@@ -203,6 +203,7 @@ subsets:
       - getTemplate
       - subtractImages
       - detectAndMeasureDiaSources
+      - rbClassify
       - transformDiaSourceCat
       - writeForcedSourceTable
     description: |

diff --git a/tests/test_pipelines.py b/tests/test_pipelines.py
@@ -51,6 +51,7 @@
     "ptc",
     "linearizer",
     "bfk",
+    "pretrainedModelPackage",
 }
 
 # HSC common inputs, in addition to COMMON_INPUTS

diff --git a/ups/drp_pipe.table b/ups/drp_pipe.table
@@ -12,6 +12,7 @@ setupRequired(pipe_tasks)
 setupRequired(meas_base)
 setupRequired(jointcal)
 setupRequired(fgcmcal)
+setupRequired(meas_transiNet)
 
 # Faro is no longer included in any pipelines, but we're keeping it as a
 # dependency until all of its plots and metrics have analysis_tools
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ @@
         "ptc",
         "linearizer",
         "bfk",
+        "pretrainedModelPackage",
     }
     # HSC common inputs, in addition to COMMON_INPUTS
@@ Expand Down @@