From 54f592e0da4eae109abb776ddc37637323df3b2d Mon Sep 17 00:00:00 2001
From: "Maja Karwowska (Kabus)" <mkabus@cern.ch>
Date: Tue, 21 Nov 2023 22:17:47 +0100
Subject: [PATCH] Update configurables and workflow (#430)

---
 codeHF/config_tasks.sh      | 12 +++++-------
 codeHF/dpl-config_run3.json |  6 +++++-
 codeHF/workflows.yml        | 16 ++++++++++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh
index 12b8d096..fd800074 100644
--- a/codeHF/config_tasks.sh
+++ b/codeHF/config_tasks.sh
@@ -212,12 +212,6 @@ function AdjustJson {
     ReplaceString "\"processNoTrigSel\": \"false\"" "\"processNoTrigSel\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
   fi
 
-  # hf-track-index-skim-creator-tag-sel-tracks, hf-track-index-skim-creator-cascades
-  if [ "$INPUT_RUN" -eq 3 ]; then
-    # do not perform track quality cuts for Run 3 until they are updated
-    ReplaceString "\"doCutQuality\": \"true\"" "\"doCutQuality\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
-  fi
-
   # hf-track-index-skim-creator-cascades
   if [[ $DOO2_CAND_CASC -eq 1 || $DOO2_SEL_LCK0SP -eq 1 || $DOO2_TASK_LCK0SP -eq 1 || $DOO2_TREE_LCK0SP -eq 1 ]]; then
     ReplaceString "\"processCascades\": \"false\"" "\"processCascades\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
@@ -254,9 +248,13 @@ function AdjustJson {
 
   # tof-event-time
   if [ "$INPUT_RUN" -eq 3 ]; then
-    ReplaceString "\"processNoFT0\": \"false\"" "\"processNoFT0\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processFT0\": \"false\"" "\"processFT0\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processNoFT0\": \"true\"" "\"processNoFT0\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processOnlyFT0\": \"true\"" "\"processOnlyFT0\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
   else
+    ReplaceString "\"processFT0\": \"true\"" "\"processFT0\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
     ReplaceString "\"processNoFT0\": \"true\"" "\"processNoFT0\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
+    ReplaceString "\"processOnlyFT0\": \"true\"" "\"processOnlyFT0\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
   fi
 
   # hf-task-flow
diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json
index 467aaedc..53ecfc31 100644
--- a/codeHF/dpl-config_run3.json
+++ b/codeHF/dpl-config_run3.json
@@ -48,7 +48,10 @@
         "debug": "false",
         "doCutQuality": "true",
         "useIsGlobalTrack": "false",
-        "useIsGlobalTrackWoDCA": "false",
+        "useIsGlobalTrackWoDCA": "true",
+        "useIsGlobalTrackForSoftPion": "false",
+        "useIsGlobalTrackWoDCAForSoftPion": "true",
+        "useIsQualityTrackITSForSoftPion": "false",
         "tpcNClsFoundMin": "70",
         "binsPtTrack": {
             "values": [
@@ -2972,6 +2975,7 @@
         "etaMax": "0.8"
     },
     "track-propagation": {
+        "minPropagationDistance": "5",
         "processStandard": "false",
         "processCovariance": "true"
     },
diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
index 4f0c30a7..4461b202 100644
--- a/codeHF/workflows.yml
+++ b/codeHF/workflows.yml
@@ -475,6 +475,8 @@ workflows:
     executable: o2-analysis-multiplicity-table
     dependencies: o2-analysis-event-selection
 
+  o2-analysis-ft0-corrected-table: {}
+
   # PID
 
   o2-analysis-pid-tpc-base: {}
@@ -482,15 +484,21 @@ workflows:
   o2-analysis-pid-tpc-full:
     dependencies: [o2-analysis-pid-tpc-base, o2-analysis-timestamp]
 
-  o2-analysis-pid-tof-base:
+  o2-analysis-pid-tof-base_run2:
+    executable: o2-analysis-pid-tof-base
     dependencies: o2-analysis-event-selection
 
-  o2-analysis-pid-tof-full_run2: &tof_full
+  o2-analysis-pid-tof-base_run3:
+    executable: o2-analysis-pid-tof-base
+    dependencies: [o2-analysis-event-selection, o2-analysis-ft0-corrected-table]
+
+  o2-analysis-pid-tof-full_run2:
     executable: o2-analysis-pid-tof-full
-    dependencies: [o2-analysis-pid-tof-base, o2-analysis-timestamp]
+    dependencies: [o2-analysis-pid-tof-base_run2, o2-analysis-timestamp]
 
   o2-analysis-pid-tof-full_run3:
-    <<: *tof_full
+    executable: o2-analysis-pid-tof-full
+    dependencies: [o2-analysis-pid-tof-base_run3, o2-analysis-timestamp]
 
   o2-analysis-pid-tof-full_run5:
     executable: o2-analysis-alice3-pid-tof