Update O2 workflow configuration

Author: vkucera

codeHF/config_tasks.sh

@@ -180,11 +180,6 @@ function AdjustJson {
   cp "$JSON" "$JSON_EDIT" || ErrExit "Failed to cp $JSON $JSON_EDIT."
   JSON="$JSON_EDIT"
 
-  # Derived AO2D input
-  if [ "$INPUT_PARENT_MASK" ]; then
-    ReplaceString "PARENT_PATH_MASK" "$INPUT_PARENT_MASK" "$JSON" || ErrExit "Failed to edit $JSON."
-  fi
-
   # Collision system
   MsgWarn "Setting collision system $INPUT_SYS"
 
@@ -563,6 +558,10 @@ function MakeScriptO2 {
   ReplaceString "$SUFFIX_RUN_MASK" "$SUFFIX_RUN" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
   ReplaceString "$SUFFIX_SKIM_MASK" "$SUFFIX_SKIM" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
   ReplaceString "$SUFFIX_DER_MASK" "$SUFFIX_DER" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
+  # Derived AO2D input
+  if [ "$INPUT_PARENT_MASK" ]; then
+    ReplaceString "PARENT_PATH_MASK" "$INPUT_PARENT_MASK" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
+  fi
 
   # Generate the O2 command.
   MAKECMD="python3 $DIR_EXEC/make_command_o2.py $DATABASE_O2 $OPT_MAKECMD"

codeHF/dpl-config_run3.json

@@ -6,10 +6,7 @@
         "start-value-enumeration": "0",
         "end-value-enumeration": "-1",
         "step-value-enumeration": "1",
-        "aod-file-private": "@list_o2.txt",
-        "aod-file": "@list_o2.txt",
-        "aod-parent-base-path-replacement": "PARENT_PATH_MASK",
-        "aod-parent-access-level": 1
+        "aod-file-private": "@list_o2.txt"
     },
     "hf-track-index-skim-creator-tag-sel-collisions": {
         "fillHistograms": "true",

codeHF/workflows.yml

@@ -1,12 +1,14 @@
 ---
 options:
-  global: ""  # used once at the end of the command
-  local:      # used for every workflow
-    - "-b"
-    - "--configuration json://$JSON"
+  global:  # used once at the end of the command
     - "--aod-memory-rate-limit 2000000000"
     - "--shm-segment-size 16000000000"
+    - "--aod-parent-base-path-replacement PARENT_PATH_MASK"
+    - "--aod-parent-access-level 1"
     - "--resources-monitoring 2"
+  local:  # used for every workflow
+    - "-b"
+    - "--configuration json://$JSON"
     # - "--min-failure-level error"
 
 workflows: