Skip to content

Update configuration. Update Run 2 conversion. #480

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 8 commits into from
Dec 13, 2024
Merged

Update configuration. Update Run 2 conversion. #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3482d8b
Fix B+ config
vkucera Nov 19, 2024
3b59f63
Update O2 workflow configuration
vkucera Dec 11, 2024
a4f3b63
Add missing cuts in Lc selector
vkucera Dec 11, 2024
e22e668
Add lf-mc-centrality
vkucera Dec 12, 2024
0027a11
Add converters extra-tracks-v2 and mft-tracks. Update JSON for multip…
vkucera Dec 12, 2024
d16eef6
Disable skimming and candidate creators by default
vkucera Dec 12, 2024
42ff01c
Update Run 2 conversion
vkucera Dec 12, 2024
0e44bc1
Add setup of processMcAll
vkucera Dec 13, 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
30 changes: 15 additions & 15 deletions codeHF/config_input.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,54 +40,54 @@ case $INPUT_CASE in
1)
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, real"
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/real/LHC17p_pass1_CENT_woSDD"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
2) # reference
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282099"
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
3)
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282341"
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
4)
INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, real"
INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/real/LHC15o"
INPUT_SYS="PbPb"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
5)
INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, MC LHC15k1a3"
INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/sim/LHC15k1a3"
INPUT_SYS="PbPb"
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
6)
INPUT_LABEL="Run 2, p-p 13 TeV LHC16p, MC LHC19g6f3, dedicated Ξc"
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC19g6f3"
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
7)
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o, real"
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22o_pass4_minBias_small"
INPUT_FILES="AO2D.root"
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1 DOO2_CONV_MFT=1"
;;
8)
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22r, real, low interaction rate (100 kHz)"
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22r"
INPUT_FILES="AO2D.root"
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
;;
9)
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC21k6, general purpose"
Expand All @@ -96,28 +96,28 @@ case $INPUT_CASE in
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
;;
10)
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (ESD)"
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC20f4a"
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
;;
11)
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (AO2D)"
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim_converted/LHC20f4a"
INPUT_FILES="AO2D.root"
INPUT_IS_O2=1
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
;;
12)
INPUT_LABEL="Run 2, p-p 13 TeV, LHC17j (AO2D)"
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/real_converted/LHC17j_20220601" # converted good AO2Ds
INPUT_FILES="AO2D.root"
INPUT_IS_O2=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
;;
13)
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC22b1b, D2H enriched"
Expand All @@ -126,7 +126,7 @@ case $INPUT_CASE in
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1"
;;
14)
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC23f4b2, general purpose"
Expand All @@ -135,7 +135,7 @@ case $INPUT_CASE in
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1"
;;
15)
INPUT_LABEL="Run 3, Pb-Pb 5.36 TeV LHC23zzi_pass2"
Expand All @@ -152,6 +152,6 @@ case $INPUT_CASE in
INPUT_RUN=3
INPUT_IS_O2=1
INPUT_IS_MC=1
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1"
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_1_2=1"
;;
esac
49 changes: 32 additions & 17 deletions codeHF/config_tasks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ MAKE_PERF_STATS=0 # Produce performance profiling stats.
# Trigger selection
DOO2_TRIGSEL=0 # event-selection
# Vertexing
DOO2_SKIM=1 # hf-track-index-skim-creator
DOO2_CAND_2PRONG=1 # hf-candidate-creator-2prong
DOO2_CAND_3PRONG=1 # hf-candidate-creator-3prong
DOO2_SKIM=0 # hf-track-index-skim-creator
DOO2_CAND_2PRONG=0 # hf-candidate-creator-2prong
DOO2_CAND_3PRONG=0 # hf-candidate-creator-3prong
DOO2_CAND_CASC=0 # hf-candidate-creator-cascade
DOO2_CAND_LB=0 # hf-candidate-creator-lb
DOO2_CAND_X=0 # hf-candidate-creator-x
Expand Down Expand Up @@ -127,14 +127,17 @@ DOO2_PID_TOF=0 # pid-tof-full/alice3-pid-tof
DOO2_PID_TOF_QA=0 # pid-tof-qa-mc
DOO2_PID_BAYES=0 # pid-bayes
# Converters (Consider setting these per input case via INPUT_TASK_CONFIG.)
DOO2_CONV_MC=0 # mc-converter
DOO2_CONV_FDD=0 # fdd-converter
DOO2_CONV_COLL=0 # collision-converter
DOO2_CONV_MCCOLL=0 # mccollision-converter
DOO2_CONV_ZDC=0 # zdc-converter
DOO2_CONV_BC=0 # bc-converter
DOO2_CONV_TRKEX=0 # tracks-extra-converter
DOO2_CONV_V0=0 # v0converter
DOO2_CONV_MC=0 # mc-converter
DOO2_CONV_FDD=0 # fdd-converter
DOO2_CONV_COLL=0 # collision-converter
DOO2_CONV_MCCOLL=0 # mccollision-converter
DOO2_CONV_ZDC=0 # zdc-converter
DOO2_CONV_BC=0 # bc-converter
DOO2_CONV_TRKEX_0_1=0 # tracks-extra-converter (0→1)
DOO2_CONV_TRKEX_0_2=0 # tracks-extra-v002-converter (0→2)
DOO2_CONV_TRKEX_1_2=0 # tracks-extra-v002-converter (1→2)
DOO2_CONV_V0=0 # v0converter
DOO2_CONV_MFT=0 # mft-tracks-converter

# Selection cuts
APPLYCUTS_D0=1 # Apply D0 selection cuts.
Expand Down Expand Up @@ -180,11 +183,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"

Expand All @@ -210,6 +208,7 @@ function AdjustJson {
ReplaceString "\"processMcStd\": \"false\"" "\"processMcStd\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterAll\": \"false\"" "\"processMcWithDCAFitterAll\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterN\": \"false\"" "\"processMcWithDCAFitterN\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcAll\": \"false\"" "\"processMcAll\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"0\"" "\"processMC\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processData\": \"true\"" "\"processData\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
Expand All @@ -222,6 +221,7 @@ function AdjustJson {
ReplaceString "\"processMcStd\": \"true\"" "\"processMcStd\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterAll\": \"true\"" "\"processMcWithDCAFitterAll\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcWithDCAFitterN\": \"true\"" "\"processMcWithDCAFitterN\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMcAll\": \"true\"" "\"processMcAll\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processMC\": \"1\"" "\"processMC\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processData\": \"false\"" "\"processData\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
Expand Down Expand Up @@ -270,6 +270,15 @@ function AdjustJson {
ReplaceString "\"isRun3\": \"true\"" "\"isRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
fi

# tracks-extra-v002-converter
if [ $DOO2_CONV_TRKEX_0_2 -eq 1 ]; then
ReplaceString "\"processV000ToV002\": \"false\"" "\"processV000ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processV001ToV002\": \"true\"" "\"processV001ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
elif [ $DOO2_CONV_TRKEX_1_2 -eq 1 ]; then
ReplaceString "\"processV000ToV002\": \"true\"" "\"processV000ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
ReplaceString "\"processV001ToV002\": \"false\"" "\"processV001ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
fi

# lambdakzero-builder
if [ "$INPUT_RUN" -eq 2 ]; then
ReplaceString "\"isRun2\": \"0\"" "\"isRun2\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
Expand Down Expand Up @@ -543,8 +552,10 @@ function MakeScriptO2 {
[ $DOO2_CONV_MCCOLL -eq 1 ] && WORKFLOWS+=" o2-analysis-mccollision-converter"
[ $DOO2_CONV_ZDC -eq 1 ] && WORKFLOWS+=" o2-analysis-zdc-converter"
[ $DOO2_CONV_BC -eq 1 ] && WORKFLOWS+=" o2-analysis-bc-converter"
[ $DOO2_CONV_TRKEX -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
[ $DOO2_CONV_TRKEX_0_1 -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
[[ $DOO2_CONV_TRKEX_0_2 -eq 1 || $DOO2_CONV_TRKEX_1_2 -eq 1 ]] && WORKFLOWS+=" o2-analysis-tracks-extra-v002-converter"
[ $DOO2_CONV_V0 -eq 1 ] && WORKFLOWS+=" o2-analysis-v0converter"
[ $DOO2_CONV_MFT -eq 1 ] && WORKFLOWS+=" o2-analysis-mft-tracks-converter"

# Translate options into arguments of the generating script.
OPT_MAKECMD=""
Expand All @@ -563,6 +574,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"
Expand Down
Loading
Loading