DM-47906 fix to pass processing_type to different jobs

lsst · Dec 20, 2024 · ba07eb2 · ba07eb2
1 parent 28d841b
commit ba07eb2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/doc/changes/DM-47906.fix.rst b/doc/changes/DM-47906.fix.rst
@@ -0,0 +1 @@
+fix to pass processing_type to different jobs
diff --git a/python/lsst/ctrl/bps/panda/utils.py b/python/lsst/ctrl/bps/panda/utils.py
@@ -250,9 +250,13 @@ def _make_doma_work(
     cvals = {"curr_cluster": gwjob.label}
     _, site = config.search("computeSite", opt={"curvals": cvals, "required": True})
     cvals["curr_site"] = site
+    cvals["curr_pipetask"] = gwjob.label
     _, processing_type = config.search(
-        "processing_type", opt={"curvals": cvals, "default": PANDA_DEFAULT_PROCESSING_TYPE}
+        "processingType", opt={"curvals": cvals, "default": PANDA_DEFAULT_PROCESSING_TYPE}
     )
+    if gwjob.label == "finalJob":
+        _, final_job = config.search(gwjob.label)
+        processing_type = final_job["processingType"] if final_job["processingType"] else "merge"
     _, task_type = config.search("taskType", opt={"curvals": cvals, "default": PANDA_DEFAULT_TASK_TYPE})
     _, prod_source_label = config.search(
         "prodSourceLabel", opt={"curvals": cvals, "default": PANDA_DEFAULT_PROD_SOURCE_LABEL}