Remove faro from pipelines.

lsst · Oct 24, 2024 · 5ff4eee · 5ff4eee
1 parent f98daa8
commit 5ff4eee
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 458 deletions.
diff --git a/bps/resources/HSC/DRP-RC2.yaml b/bps/resources/HSC/DRP-RC2.yaml
@@ -1,5 +1,5 @@
 # This BPS configuration snippet adds updated requestMemory values for all DRP
-# and faro tasks known to frequently exceed the default in regular HSC RC2
+# tasks known to frequently exceed the default in regular HSC RC2
 # processing.
 #
 # Use it by adding:
@@ -72,37 +72,3 @@ pipetask:
     requestMemory: 8192
   diff_matched_analysis:
     requestMemory: 32000
-
-  # faro tasks
-  matchCatalogsPatch:
-    requestMemory: 8192
-  matchCatalogsPatchMultiBand:
-    requestMemory: 120000
-  matchCatalogsTract:
-    requestMemory: 120000
-  TE1:
-    requestMemory: 46000
-  TE2:
-    requestMemory: 46000
-  TE3:
-    requestMemory: 16000
-  TE4:
-    requestMemory: 16000
-  nsrcMeasVisit:
-    requestMemory: 16000
-  wPerp:
-    requestMemory: 120000
-  matchCatalogsTractMag17to21p5:
-    requestMemory: 200000
-  matchCatalogsTractStarsSNR5to80:
-    requestMemory: 200000
-  matchCatalogsTractGxsSNR5to80:
-    requestMemory: 200000
-  modelPhotRepGal1:
-    requestMemory: 5000
-  modelPhotRepGal2:
-    requestMemory: 5000
-  modelPhotRepGal3:
-    requestMemory: 5000
-  modelPhotRepGal4:
-    requestMemory: 5000
diff --git a/bps/resources/LSSTCam-imSim/DRP-DP0.2.yaml b/bps/resources/LSSTCam-imSim/DRP-DP0.2.yaml
@@ -1,5 +1,5 @@
 # This BPS configuration snippet adds the requestMemory values for all DRP
-# and faro tasks as run in the DP0.2 production.
+# tasks as run in the DP0.2 production.
 #
 # Use it by adding:
 #
@@ -30,20 +30,3 @@ pipetask:
     requestMemory: 120000
   consolidateForcedSourceOnDiaObjectTable:
     requestMemory: 18000
-  # faro tasks
-  matchCatalogsPatch:
-    requestMemory: 4096
-  modelPhotRepGal4:
-    requestMemory: 4096
-  imageDifference:
-    requestMemory: 4096
-  matchCatalogsPatchMultiBand:
-    requestMemory: 120000
-  matchCatalogsTract:
-    requestMemory: 120000
-  wPerp:
-    requestMemory: 120000
-  TE1:
-    requestMemory: 46000
-  TE2:
-    requestMemory: 46000
diff --git a/bps/resources/LSSTCam-imSim/DRP-test-med-1.yaml b/bps/resources/LSSTCam-imSim/DRP-test-med-1.yaml
@@ -1,5 +1,5 @@
 # This BPS configuration snippet adds updated requestMemory values for all DRP
-# and faro tasks known to frequently exceed the default in regular ImSim-DC2
+# asks known to frequently exceed the default in regular ImSim-DC2
 # test-med-1 processing.
 #
 # Use it by adding:
@@ -37,38 +37,7 @@ pipetask:
     requestMemory: 8000
   transformDiaSourceCat:
     requestMemory: 8000
-  # faro tasks
-  matchCatalogsPatch:
-    requestMemory: 4096
-  matchCatalogsPatchMultiBand:
-    requestMemory: 8196
-  modelPhotRepGal4:
-    requestMemory: 4096
-  matchCatalogsTract:
-    requestMemory: 32000
-  wPerp:
-    requestMemory: 32000
-  TE1:
-    requestMemory: 50000
-  TE2:
-    requestMemory: 50000
-  TE3:
-    requestMemory: 16000
-  TE4:
-    requestMemory: 16000
-  nsrcMeasVisit:
-    requestMemory: 16000
-  matchCatalogsTractMag17to21p5:
-    requestMemory: 66000
-  matchCatalogsTractStarsSNR5to80:
-    requestMemory: 32000
-  matchCatalogsTractGxsSNR5to80:
-    requestMemory: 66000
-  consolidateForcedSourceTable:
-    requestMemory: 64000
-  consolidateForcedSourceOnDiaObjectTable:
-    requestMemory: 160000
-  # step8 tasks
+  # analysis_tools tasks
   analyzeObjectTableCore:
     requestMemory: 16000
   analyzeMatchedVisitCore:

diff --git a/pipelines/HSC/DRP-Prod.yaml b/pipelines/HSC/DRP-Prod.yaml
@@ -2,10 +2,6 @@ description: The DRP pipeline specialized for large data release productions
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
   - location: "$DRP_PIPE_DIR/pipelines/_ingredients/HSC/DRP.yaml"
-    exclude:
-      - faro_visit
-      - faro_matched
-      - faro_tract
 tasks:
   fgcmFitCycle:
     class: lsst.fgcmcal.fgcmFitCycle.FgcmFitCycleTask