Skip to content

Add B+ derived data creator. Improve debugging commands. #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vkucera merged 2 commits into from
Nov 18, 2024
Merged

Add B+ derived data creator. Improve debugging commands. #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9f22c6
Add B+ derived data creator
vkucera Nov 12, 2024
ea2ccf4
Improve debugging commands
vkucera Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions codeHF/config_input.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions codeHF/config_tasks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
17 changes: 15 additions & 2 deletions codeHF/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions exec/debug.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" && {
Expand Down
2 changes: 1 addition & 1 deletion exec/run_o2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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