Merge pull request #38 from lsst-dm/tickets/DM-42624

DM-42624: Remove extraneous content from cm_prod bps yaml files and enable clustering in DC2
lsst-dm · Jan 24, 2024 · d065406 · d065406
2 parents 8fc11ac + 23af828
commit d065406
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml b/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml
@@ -3,6 +3,8 @@ imports:
 
 includeConfigs:
   - ${CTRL_BPS_PANDA_DIR}/config/bps_usdf.yaml
+# To use clustering, leave the following line uncommented:
+  - ${DRP_PIPE_DIR}/bps/clustering/LSSTCam-imSim/DRP-DC2-clustering.yaml
   - ${DRP_PIPE_DIR}/bps/resources/LSSTCam-imSim/DRP-test-med-1.yaml
 # The above is all that's needed to request only the memory specified in the
 # drp_pipe defaults which should be updated regularly. To use custom memory
@@ -11,17 +13,6 @@ includeConfigs:
 
 custom_lsst_setup: ""
 
-# turn off the -o option in pipetask commands
-pipetaskOutput: ""
-
-executionButler:
-  requestMemory: 64000
-  queue: "SLAC_Rubin_Merge"
-  # turn off chaining in the execution butler because
-  # no output collection
-  command2: ""
-  command3: ""
-
 numberOfRetries: 3
 
 priority: 1000
diff --git a/src/lsst/cm/prod/configs/DC2/test/dc2_test-med-1.yaml b/src/lsst/cm/prod/configs/DC2/test/dc2_test-med-1.yaml
@@ -68,7 +68,7 @@ step4:
     pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/LSSTCam-imSim/DRP-test-med-1.yaml#step4"
     data_query_base: "instrument='LSSTCam-imSim' and skymap='DC2' and tract in (3828, 3829)"
     split_args:
-        dataset: calexp # test or research the reasonable arguments here
+        dataset: calexp         # test or research the reasonable arguments here
         field: visit
         min_queries: 4
 step5:
@@ -87,7 +87,7 @@ step6:
     pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/LSSTCam-imSim/DRP-test-med-1.yaml#step6"
     data_query_base: "instrument='LSSTCam-imSim' and skymap='DC2' and tract in (3828, 3829)"
     split_args:
-        dataset: calexp # could also be DiaSource_something
+        dataset: calexp                      # could also be DiaSource_something
         field: visit
         min_queries: 4
 step7:

diff --git a/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml b/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml
@@ -6,23 +6,10 @@ includeConfigs:
 # The above is all that's needed to request only the memory specified in the
 # drp_pipe defaults which should be updated regularly. To use custom memory
 # requests, uncomment the following:
-#- ${CM_PROD_DIR}/src/lsst/cm/prod/configs/HSC/test/requestMemory.yaml
+# - ${CM_PROD_DIR}/src/lsst/cm/prod/configs/HSC/test/requestMemory.yaml
 
 numberOfRetries: 3
 
 custom_lsst_setup: ""
 
-# turn off the -o option in pipetask commands
-pipetaskOutput: ""
-
-executionButler:
-  requestMemory: 64000
-  queue: "SLAC_Rubin_Merge"
-  # turn off chaining in the execution butler because
-  # no output collection
-  command2: ""
-  command3: ""
-
 priority: 1000
-
-fileDistributionEndPoint: "file:///sdf/data/rubin/panda_jobs/panda_cache/{operator}/panda_cache_box/{payloadFolder}/{uniqProcName}/"