From c9f22c6e9a6b4436844588088803139eb398667b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <vit.kucera@cern.ch>
Date: Tue, 12 Nov 2024 17:04:08 +0100
Subject: [PATCH 1/2] Add B+ derived data creator

---
 codeHF/config_input.sh |  1 +
 codeHF/config_tasks.sh |  2 ++
 codeHF/workflows.yml   | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh
index eed80480..7943939d 100644
--- a/codeHF/config_input.sh
+++ b/codeHF/config_input.sh
@@ -152,5 +152,6 @@ case $INPUT_CASE in
     INPUT_RUN=3
     INPUT_IS_O2=1
     INPUT_IS_MC=1
+    INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1"
     ;;
   esac
diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh
index 069167e7..70b6f727 100644
--- a/codeHF/config_tasks.sh
+++ b/codeHF/config_tasks.sh
@@ -97,6 +97,7 @@ DOO2_TREE_XIC_XIPIPI=0  # hf-tree-creator-xic-to-xi-pi-pi
 # Derived-data creators
 DOO2_DATA_D0=0      # hf-derived-data-creator-d0-to-k-pi
 DOO2_DATA_LC=0      # hf-derived-data-creator-lc-to-p-k-pi
+DOO2_DATA_BPLUS=0   # hf-derived-data-creator-bplus-to-d0-pi
 # Correlations
 DOO2_CORR_D0D0BAR_DATA=0       # hf-correlator-d0-d0bar
 DOO2_CORR_D0D0BAR_MCREC=0      # hf-correlator-d0-d0bar_mc-rec
@@ -497,6 +498,7 @@ function MakeScriptO2 {
   # Derive-data creators
   [ $DOO2_DATA_D0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-d0-to-k-pi"
   [ $DOO2_DATA_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-lc-to-p-k-pi"
+  [ $DOO2_DATA_BPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-bplus-to-d0-pi"
   # Correlations
   WF_CORR=""
   [ $DOO2_CORR_D0D0BAR_DATA -eq 1 ] && WF_CORR="o2-analysis-hf-correlator-d0-d0bar o2-analysis-hf-task-correlation-d-dbar"
diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
index 191ac87f..3c0b6bdd 100644
--- a/codeHF/workflows.yml
+++ b/codeHF/workflows.yml
@@ -373,7 +373,7 @@ workflows:
       - o2-analysis-track-dca_runX
       - o2-analysis-pid-tof-full_runX
       - o2-analysis-pid-tpc
-    tables: [HFD0COLLBASE, HFD0COLLID, HFD0BASE, HFD0PAR, HFD0PARE, HFD0SEL, HFD0ML, HFD0ID, HFD0MC, HFD0PBASE, HFD0PID]
+    tables: [HFD0COLLBASE, HFD0COLLID, HFD0MCCOLLBASE, HFD0MCCOLLID, HFD0MCRCOLLID, HFD0BASE, HFD0PAR, HFD0PARE, HFD0SEL, HFD0ML, HFD0ID, HFD0MC, HFD0PBASE, HFD0PID]
 
   o2-analysis-hf-derived-data-creator-lc-to-p-k-pi:
     dependencies:
@@ -385,7 +385,20 @@ workflows:
       - o2-analysis-track-dca_runX
       - o2-analysis-pid-tof-full_runX
       - o2-analysis-pid-tpc
-    tables: [HF3PCOLLBASE, HF3PCOLLID, HF3PBASE, HF3PPAR, HF3PPARE, HF3PSEL, HF3PML, HF3PID, HF3PMC, HF3PPBASE, HF3PPID]
+    tables: [HF3PCOLLBASE, HF3PCOLLID, HF3PMCCOLLBASE, HF3PMCCOLLID, HF3PMCRCOLLID, HF3PBASE, HF3PPAR, HF3PPARE, HF3PSEL, HF3PML, HF3PID, HF3PMC, HF3PPBASE, HF3PPID]
+
+  o2-analysis-hf-derived-data-creator-bplus-to-d0-pi:
+    dependencies:
+      - o2-analysis-hf-candidate-selector-bplus-to-d0-pi
+      - o2-analysis-hf-candidate-creator-bplus
+      - o2-analysis-hf-derived-data-creator-d0-to-k-pi
+      - o2-analysis-hf-pid-creator
+      - o2-analysis-centrality_runX
+      - o2-analysis-multiplicity-table_runX
+      - o2-analysis-track-dca_runX
+      - o2-analysis-pid-tof-full_runX
+      - o2-analysis-pid-tpc
+    tables: [HFCOLLBASE, HFCOLLID, HFMCCOLLBASE, HFMCCOLLID, HFMCRCOLLID, HFBPBASE, HFBPPAR, HFBPPARD0, HFBPPARE, HFBPML, HFBPID, HFBPMC, HFBPPBASE, HFBPPID]
 
   # D meson correlations
 

From ea2ccf4829b56c2805ed4fd607c98dffb093bf09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <vit.kucera@cern.ch>
Date: Mon, 18 Nov 2024 04:40:08 +0100
Subject: [PATCH 2/2] Improve debugging commands

---
 exec/debug.sh  | 4 ++--
 exec/run_o2.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/exec/debug.sh b/exec/debug.sh
index 77cc2d1b..6f9b211a 100644
--- a/exec/debug.sh
+++ b/exec/debug.sh
@@ -45,9 +45,9 @@ PrintWarnings() {
 # Print errors in the log.
 PrintErrors() {
   if [ "$TYPE" == "o2" ]; then
-    grep -q -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "command not found" -e "Error:" -e "Error in " "$LOG" && {
+    grep -q -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "SEGMENTATION" -e "command not found" -e "Program crashed" -e "Error:" -e "Error in " "$LOG" && {
       [ "$PRINTDIR" -eq 1 ] || { echo -e "\n$DIRJOB"; PRINTDIR=1; }
-      grep -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "command not found" -e "Error:" -e "Error in " "$LOG" | sort -u
+      grep -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "SEGMENTATION" -e "command not found" -e "Program crashed" -e "Error:" -e "Error in " "$LOG" | sort -u
     }
   elif [ "$TYPE" == "ali" ]; then
     grep -q -e '^'"E-" -e '^'"Error" -e '^'"F-" -e '^'"Fatal" -e "segmentation" -e "Segmentation" "$LOG" && {
diff --git a/exec/run_o2.sh b/exec/run_o2.sh
index 83ebbe76..60fdd68c 100644
--- a/exec/run_o2.sh
+++ b/exec/run_o2.sh
@@ -10,6 +10,6 @@ bash "$SCRIPT" "$FILEIN" "$JSON" > "$LOGFILE" 2>&1
 ExitCode=$?
 
 # Show warnings and errors in the log file.
-grep -e "\\[WARN\\]" -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "command not found" -e "Error:" -e "Error in " -e "Warning in " "$LOGFILE" | sort -u
+grep -e "\\[ERROR\\]" -e "\\[FATAL\\]" -e "segmentation" -e "Segmentation" -e "SEGMENTATION" -e "command not found" -e "Program crashed" -e "Error:" -e "Error in " -e "\\[WARN\\]" -e "Warning in " "$LOGFILE" | sort -u
 
 exit $ExitCode