From 3482d8b373c2c427026d3f9387558c65a139da03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Tue, 19 Nov 2024 02:03:42 +0100 Subject: [PATCH 1/8] Fix B+ config --- codeHF/workflows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 3c0b6bdd..cd93a55c 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -391,14 +391,13 @@ workflows: 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] + tables: [HFCOLLBASE, HFCOLLID, HFMCCOLLBASE, HFMCCOLLID, HFMCRCOLLID, HFBPBASE, HFBPPAR, HFBPPARD0, HFBPPARE, HFBPML, HFBPMLD0, HFBPID, HFBPMC, HFBPPBASE, HFBPPID] # D meson correlations From 3b59f634a10a45d89a110ab10d0d4f37639a5e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Wed, 11 Dec 2024 14:31:20 +0100 Subject: [PATCH 2/8] Update O2 workflow configuration --- codeHF/config_tasks.sh | 9 ++++----- codeHF/dpl-config_run3.json | 5 +---- codeHF/workflows.yml | 10 ++++++---- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 70b6f727..9afb60e7 100644 --- a/codeHF/config_tasks.sh +++ b/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" diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index c0554f92..ac3f4a8e 100644 --- a/codeHF/dpl-config_run3.json +++ b/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", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index cd93a55c..7424a7ac 100644 --- a/codeHF/workflows.yml +++ b/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: From a4f3b632aeaf94f724c09bc151900a644d123c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Wed, 11 Dec 2024 18:43:54 +0100 Subject: [PATCH 3/8] Add missing cuts in Lc selector --- codeHF/dpl-config_run3.json | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index ac3f4a8e..ca4b195d 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -3580,6 +3580,9 @@ "Chi2PCA", "decay length", "cos pointing angle", + "decLengthXY", + "normDecLXY", + "impParXY", "mass (Kpi)" ], "values": [ @@ -3591,6 +3594,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3601,6 +3607,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3611,6 +3620,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3621,6 +3633,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3631,6 +3646,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3641,6 +3659,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3651,6 +3672,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3661,6 +3685,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3671,6 +3698,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ], [ @@ -3681,6 +3711,9 @@ "0.5", "0.004", "0", + "0.", + "0.", + "1e+10", "-1" ] ] From e22e668a8f7d4d99ed0eca6138a22e6b5955f34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Thu, 12 Dec 2024 10:56:31 +0100 Subject: [PATCH 4/8] Add lf-mc-centrality --- codeHF/dpl-config_run3.json | 28 ++++++++++++++++++++++++++++ codeHF/workflows.yml | 5 +++++ 2 files changed, 33 insertions(+) diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index ca4b195d..0bdd9c3a 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -8187,5 +8187,33 @@ "applyEvSel": "0", "processMC": "true", "processData": "false" + }, + "mc-centrality": { + "ccdb-url": "http://alice-ccdb.cern.ch", + "ccdb-timestamp": "-1", + "path": "ccdb://Users/n/njacazio/MCCentrality", + "selectPrimaries": "true", + "binsPercentile": { + "values": [ + "0", + "0", + "0.001", + "0.01", + "1", + "5", + "10", + "15", + "20", + "25", + "30", + "40", + "50", + "60", + "70", + "80", + "90", + "100" + ] + } } } diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index 7424a7ac..b84ba535 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -371,6 +371,7 @@ workflows: - o2-analysis-hf-candidate-creator-2prong_derX - o2-analysis-hf-pid-creator - o2-analysis-centrality_runX + - o2-analysis-lf-mc-centrality - o2-analysis-multiplicity-table_runX - o2-analysis-track-dca_runX - o2-analysis-pid-tof-full_runX @@ -383,6 +384,7 @@ workflows: - o2-analysis-hf-candidate-creator-3prong_derX - o2-analysis-hf-pid-creator - o2-analysis-centrality_runX + - o2-analysis-lf-mc-centrality - o2-analysis-multiplicity-table_runX - o2-analysis-track-dca_runX - o2-analysis-pid-tof-full_runX @@ -395,6 +397,7 @@ workflows: - o2-analysis-hf-candidate-creator-bplus - o2-analysis-hf-pid-creator - o2-analysis-centrality_runX + - o2-analysis-lf-mc-centrality - o2-analysis-multiplicity-table_runX - o2-analysis-track-dca_runX - o2-analysis-pid-tof-full_runX @@ -596,6 +599,8 @@ workflows: executable: o2-analysis-alice3-centrality dependencies: o2-analysis-track-dca_run5 + o2-analysis-lf-mc-centrality: {} + o2-analysis-event-selection: dependencies: o2-analysis-timestamp From 0027a1143edadf931e5f40b7d6dcd5a409b892ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 13 Dec 2024 00:37:32 +0100 Subject: [PATCH 5/8] Add converters extra-tracks-v2 and mft-tracks. Update JSON for multiplicity table. --- codeHF/config_input.sh | 30 +++++++------- codeHF/config_tasks.sh | 32 ++++++++++----- codeHF/dpl-config_run3.json | 79 +++++++++++++++++++++++++------------ codeHF/workflows.yml | 4 ++ 4 files changed, 95 insertions(+), 50 deletions(-) diff --git a/codeHF/config_input.sh b/codeHF/config_input.sh index 7943939d..ec74e4a8 100644 --- a/codeHF/config_input.sh +++ b/codeHF/config_input.sh @@ -40,38 +40,38 @@ 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" @@ -79,7 +79,7 @@ case $INPUT_CASE in 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)" @@ -87,7 +87,7 @@ case $INPUT_CASE in 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" @@ -96,13 +96,13 @@ 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)" @@ -110,14 +110,14 @@ case $INPUT_CASE in 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" @@ -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" @@ -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" @@ -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 diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 9afb60e7..4c724a7b 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -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. @@ -265,6 +268,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." @@ -538,8 +550,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="" diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json index 0bdd9c3a..490fbb3c 100644 --- a/codeHF/dpl-config_run3.json +++ b/codeHF/dpl-config_run3.json @@ -7372,6 +7372,10 @@ "processStandard": "false", "processCovariance": "true" }, + "tracks-extra-v002-converter": { + "processV000ToV002": "true", + "processV001ToV002": "false" + }, "track-to-collision-association": { "nSigmaForTimeCompat": "4", "timeMargin": "0", @@ -7394,67 +7398,90 @@ "processRun3FT0": "false" }, "multiplicity-table": { - "processRun3": "0", - "processRun2": "1", + "doVertexZeq": "1", + "fractionOfEvents": "2", "enabledTables": { + "labels_rows": [ + "FV0Mults", + "FT0Mults", + "FDDMults", + "ZDCMults", + "TrackletMults", + "TPCMults", + "PVMults", + "MultsExtra", + "MultSelections", + "FV0MultZeqs", + "FT0MultZeqs", + "FDDMultZeqs", + "PVMultZeqs", + "MultMCExtras", + "MFTMults" + ], + "labels_cols": [ + "Enable" + ], "values": [ [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" ], [ - -1 + "-1" + ], + [ + "-1" ] ] }, - "fractionOfEvents": "2", - "processMC2Mults": "0", + "ccdburl": "http://alice-ccdb.cern.ch", + "ccdbpath": "Centrality/Calibration", + "reconstructionPass": "", + "produceHistograms": "false", "min_pt_globaltrack": "0.15", - "min_ncluster_its_globaltrack": "5", "max_pt_globaltrack": "1e+10", - "processGlobalTrackingCounters": "0", + "min_ncluster_its_globaltrack": "5", "min_ncluster_itsib_globaltrack": "1", - "doVertexZeq": "1", - "produceHistograms": "0", - "reconstructionPass": " ", - "ccdbpath": "Centrality/Calibration", - "ccdburl": "http://alice-ccdb.cern.ch", - "processMC": "1" + "processRun2": "true", + "processRun3": "false", + "processGlobalTrackingCounters": "false", + "processMC": "false", + "processMC2Mults": "false" }, "pid-multiplicity": { "processIU": "false", diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml index b84ba535..e41eace5 100644 --- a/codeHF/workflows.yml +++ b/codeHF/workflows.yml @@ -660,8 +660,12 @@ workflows: o2-analysis-tracks-extra-converter: {} + o2-analysis-tracks-extra-v002-converter: {} + o2-analysis-v0converter: {} + o2-analysis-mft-tracks-converter: {} + # LF o2-analysis-lf-lambdakzerobuilder: From d16eef6977074deae05560bcf250c6c4a5d125ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 13 Dec 2024 00:38:16 +0100 Subject: [PATCH 6/8] Disable skimming and candidate creators by default --- codeHF/config_tasks.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 4c724a7b..727d0eef 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -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 From 42ff01c02e63c2b773b8237d1de73673c7d2e117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 13 Dec 2024 00:35:33 +0100 Subject: [PATCH 7/8] Update Run 2 conversion --- exec/convertAO2D.C | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/exec/convertAO2D.C b/exec/convertAO2D.C index 4a54fd64..44dae0af 100644 --- a/exec/convertAO2D.C +++ b/exec/convertAO2D.C @@ -12,6 +12,8 @@ R__ADD_INCLUDE_PATH($ALICE_ROOT) R__ADD_INCLUDE_PATH($ALICE_PHYSICS) +#include + #include "ANALYSIS/macros/train/AddESDHandler.C" // NOLINT #include "ANALYSIS/macros/train/AddAODHandler.C" // NOLINT #include "ANALYSIS/macros/train/AddMCHandler.C" // NOLINT @@ -19,6 +21,7 @@ R__ADD_INCLUDE_PATH($ALICE_PHYSICS) #include "OADB/macros/AddTaskPhysicsSelection.C" // NOLINT #include "ANALYSIS/macros/AddTaskPIDResponse.C" // NOLINT #include "RUN3/AddTaskAO2Dconverter.C" // NOLINT +#include "PWGGA/GammaConv/macros/AddTask_V0Reader.C" // NOLINT #include "utilitiesAli.h" @@ -40,8 +43,8 @@ Long64_t convertAO2D(TString listoffiles, bool isMC = 1, bool useAliEvCuts = fal ULong64_t nentries = chain->GetEntries(); if (nmaxevents != -1) nentries = nmaxevents; - cout << nentries << " entries in the chain." << endl; - cout << nentries << " converted" << endl; + std::cout << nentries << " entries in the chain." << endl; + std::cout << nentries << " converted" << endl; AliAnalysisManager* mgr = new AliAnalysisManager("AOD converter"); if (isESD) { AddESDHandler(); @@ -52,9 +55,29 @@ Long64_t convertAO2D(TString listoffiles, bool isMC = 1, bool useAliEvCuts = fal AddTaskMultSelection(); AddTaskPhysicsSelection(isMC); AddTaskPIDResponse(); + + // V0Reader related stuff + Int_t isHeavyIon = 0; + TString periodNameV0Reader = "LHC17p"; + TString cutnumberEvent = "00000003"; + if (isHeavyIon == 1) + cutnumberEvent = "10000003"; + else if (isHeavyIon == 2) + cutnumberEvent = "80000003"; + else if (isHeavyIon == 29) // UPC + cutnumberEvent = "100c0003"; + TString conversionPhotonCutnumber = "00000008400000001100000000"; + AddTask_V0Reader(periodNameV0Reader, kFALSE, 0, kTRUE, isHeavyIon, cutnumberEvent + "_" + conversionPhotonCutnumber, conversionPhotonCutnumber); + if (isMC && isESD) AliMCEventHandler* handlerMC = AddMCHandler(); AliAnalysisTaskAO2Dconverter* converter = AddTaskAO2Dconverter(""); + converter->SetTruncation(true); + converter->SetCompression(501); + converter->SetMaxBytes(250000000); + converter->SetEMCALAmplitudeThreshold(0.075); + converter->SetConversionCut(conversionPhotonCutnumber); + converter->SetDeltaAODBranchName(Form("GammaConv_%s_%s_gamma", cutnumberEvent.Data(), conversionPhotonCutnumber.Data())); // converter->SelectCollisionCandidates(AliVEvent::kAny); if (useAliEvCuts) converter->SetUseEventCuts(kTRUE); From 0e44bc18069627bdadedea1c8eec8e26f732a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= Date: Fri, 13 Dec 2024 01:12:36 +0100 Subject: [PATCH 8/8] Add setup of processMcAll --- codeHF/config_tasks.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh index 727d0eef..b172b122 100644 --- a/codeHF/config_tasks.sh +++ b/codeHF/config_tasks.sh @@ -208,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." @@ -220,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."