Update pipeline subdirectories in response to RFC-775.

lsst · Jan 29, 2024 · eeaa9ff · eeaa9ff
1 parent 5bc294f
commit eeaa9ff
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/pipelines/DarkEnergyCamera/ApVerify.yaml → pipelines/DECam/ApVerify.yaml b/pipelines/DarkEnergyCamera/ApVerify.yaml → pipelines/DECam/ApVerify.yaml
@@ -8,7 +8,7 @@ imports:
     # a metrics subset because it would require constant micromanagement.
     exclude:
       - apPipe
-  - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipe.yaml
+  - location: $AP_PIPE_DIR/pipelines/DECam/ApPipe.yaml
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/...kEnergyCamera/ApVerifyCalibrateImage.yaml → pipelines/DECam/ApVerifyCalibrateImage.yaml b/...kEnergyCamera/ApVerifyCalibrateImage.yaml → pipelines/DECam/ApVerifyCalibrateImage.yaml
@@ -9,7 +9,7 @@ imports:
     # a metrics subset because it would require constant micromanagement.
     exclude:
       - apPipe
-  - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipeCalibrateImage.yaml
+  - location: $AP_PIPE_DIR/pipelines/DECam/ApPipeCalibrateImage.yaml
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/...s/DarkEnergyCamera/ApVerifyWithFakes.yaml → pipelines/DECam/ApVerifyWithFakes.yaml b/...s/DarkEnergyCamera/ApVerifyWithFakes.yaml → pipelines/DECam/ApVerifyWithFakes.yaml
@@ -1,7 +1,7 @@
 # Verification pipeline specialized for DECam with fake source inejection.
 # This concatenates various lsst.verify metrics to an AP pipeline
 
-# This pipeline assumes $AP_PIPE_DIR/pipelines/DarkEnergyCamera/RunIsrForCrosstalkSources.yaml
+# This pipeline assumes $AP_PIPE_DIR/pipelines/DECam/RunIsrForCrosstalkSources.yaml
 # has already been run.
 
 instrument: lsst.obs.decam.DarkEnergyCamera
@@ -10,7 +10,7 @@ imports:
   - location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml
     exclude:
       - processCcd
-  - location: $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ProcessCcd.yaml
-  # Can't use $AP_PIPE_DIR/pipelines/DarkEnergyCamera/ApPipeWithFakes.yaml here
+  - location: $AP_PIPE_DIR/pipelines/DECam/ProcessCcd.yaml
+  # Can't use $AP_PIPE_DIR/pipelines/DECam/ApPipeWithFakes.yaml here
   # because the changes made by that file and _ingredients/ApVerifyWithFakes.yaml
   # are hard to separate.
diff --git a/pipelines/HyperSuprimeCam/ApVerify.yaml → pipelines/HSC/ApVerify.yaml b/pipelines/HyperSuprimeCam/ApVerify.yaml → pipelines/HSC/ApVerify.yaml
@@ -8,7 +8,7 @@ imports:
     # a metrics subset because it would require constant micromanagement.
     exclude:
       - apPipe
-  - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipe.yaml
+  - location: $AP_PIPE_DIR/pipelines/HSC/ApPipe.yaml
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/...perSuprimeCam/ApVerifyCalibrateImage.yaml → pipelines/HSC/ApVerifyCalibrateImage.yaml b/...perSuprimeCam/ApVerifyCalibrateImage.yaml → pipelines/HSC/ApVerifyCalibrateImage.yaml
@@ -9,7 +9,7 @@ imports:
     # a metrics subset because it would require constant micromanagement.
     exclude:
       - apPipe
-  - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipeCalibrateImage.yaml
+  - location: $AP_PIPE_DIR/pipelines/HSC/ApPipeCalibrateImage.yaml
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/...es/HyperSuprimeCam/ApVerifyWithFakes.yaml → pipelines/HSC/ApVerifyWithFakes.yaml b/...es/HyperSuprimeCam/ApVerifyWithFakes.yaml → pipelines/HSC/ApVerifyWithFakes.yaml
@@ -7,7 +7,7 @@ imports:
   - location: $AP_VERIFY_DIR/pipelines/_ingredients/ApVerifyWithFakes.yaml
     exclude:
       - processCcd
-  - location: $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ProcessCcd.yaml
-  # Can't use $AP_PIPE_DIR/pipelines/HyperSuprimeCam/ApPipeWithFakes.yaml here
+  - location: $AP_PIPE_DIR/pipelines/HSC/ProcessCcd.yaml
+  # Can't use $AP_PIPE_DIR/pipelines/HSC/ApPipeWithFakes.yaml here
   # because the changes made by that file and _ingredients/ApVerifyWithFakes.yaml
   # are hard to separate.
diff --git a/python/lsst/ap/verify/pipeline_driver.py b/python/lsst/ap/verify/pipeline_driver.py
@@ -106,7 +106,7 @@ def runApPipeGen3(workspace, parsedCmdLine, processes=1):
     # processing pipeline (DM-31492).
     instruments = {id["instrument"] for id in workspace.workButler.registry.queryDataIds("instrument")}
     if "DECam" in instruments:
-        crosstalkPipeline = "${AP_PIPE_DIR}/pipelines/DarkEnergyCamera/RunIsrForCrosstalkSources.yaml"
+        crosstalkPipeline = "${AP_PIPE_DIR}/pipelines/DECam/RunIsrForCrosstalkSources.yaml"
         crosstalkArgs = ["pipetask", "run",
                          "--butler-config", workspace.repo,
                          "--pipeline", crosstalkPipeline,