Skip to content

Commit 053163a

Browse files
committed
Update configuration
1 parent ce381cf commit 053163a

File tree

5 files changed

+1260
-156
lines changed

5 files changed

+1260
-156
lines changed

codeHF/config_input.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,16 @@ case $INPUT_CASE in
4040
1)
4141
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, real"
4242
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/real/LHC17p_pass1_CENT_woSDD"
43-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
4443
;;
4544
2) # reference
4645
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
4746
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282099"
4847
INPUT_IS_MC=1
49-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
5048
;;
5149
3)
5250
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
5351
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282341"
5452
INPUT_IS_MC=1
55-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
5653
;;
5754
4)
5855
INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, real"
@@ -71,10 +68,9 @@ case $INPUT_CASE in
7168
INPUT_LABEL="Run 2, p-p 13 TeV LHC16p, MC LHC19g6f3, dedicated Ξc"
7269
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC19g6f3"
7370
INPUT_IS_MC=1
74-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
7571
;;
7672
7)
77-
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o, real"
73+
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o_pass4, real"
7874
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22o_pass4_minBias_small"
7975
INPUT_FILES="AO2D.root"
8076
INPUT_RUN=3
@@ -102,22 +98,21 @@ case $INPUT_CASE in
10298
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (ESD)"
10399
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC20f4a"
104100
INPUT_IS_MC=1
105-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
106101
;;
107102
11)
108103
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (AO2D)"
109104
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim_converted/LHC20f4a"
110105
INPUT_FILES="AO2D.root"
111106
INPUT_IS_O2=1
112107
INPUT_IS_MC=1
113-
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"
108+
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_BCINFO=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
114109
;;
115110
12)
116111
INPUT_LABEL="Run 2, p-p 13 TeV, LHC17j (AO2D)"
117112
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/real_converted/LHC17j_20220601" # converted good AO2Ds
118113
INPUT_FILES="AO2D.root"
119114
INPUT_IS_O2=1
120-
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"
115+
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_BCINFO=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_COLL=1 DOO2_CONV_V0=1"
121116
;;
122117
13)
123118
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC22b1b, D2H enriched"
@@ -144,6 +139,7 @@ case $INPUT_CASE in
144139
INPUT_SYS="PbPb"
145140
INPUT_RUN=3
146141
INPUT_IS_O2=1
142+
INPUT_TASK_CONFIG="DOO2_CONV_TRKEX_1_2=1"
147143
;;
148144
16)
149145
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC24d3, anchored"
@@ -154,4 +150,13 @@ case $INPUT_CASE in
154150
INPUT_IS_MC=1
155151
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_1_2=1"
156152
;;
153+
17)
154+
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o_pass7"
155+
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22o_pass7"
156+
INPUT_FILES="AO2D.root"
157+
INPUT_RUN=3
158+
INPUT_IS_O2=1
159+
INPUT_IS_MC=0
160+
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_1_2=1"
161+
;;
157162
esac

codeHF/config_tasks.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ DOO2_SEL_XIC_XIPIPI=0 # hf-candidate-selector-xic-to-xi-pi-pi
7171
DOO2_TASK_D0=1 # hf-task-d0
7272
DOO2_TASK_DS=0 # hf-task-ds
7373
DOO2_TASK_DPLUS=0 # hf-task-dplus
74-
DOO2_TASK_LC=1 # hf-task-lc
74+
DOO2_TASK_LC=0 # hf-task-lc
7575
DOO2_TASK_LB=0 # hf-task-lb
7676
DOO2_TASK_XIC=0 # hf-task-xic
7777
DOO2_TASK_JPSI=0 # hf-task-jpsi
@@ -98,6 +98,7 @@ DOO2_TREE_XIC_XIPIPI=0 # hf-tree-creator-xic-to-xi-pi-pi
9898
DOO2_DATA_D0=0 # hf-derived-data-creator-d0-to-k-pi
9999
DOO2_DATA_LC=0 # hf-derived-data-creator-lc-to-p-k-pi
100100
DOO2_DATA_BPLUS=0 # hf-derived-data-creator-bplus-to-d0-pi
101+
DOO2_DATA_B0=0 # hf-derived-data-creator-b0-to-d-pi
101102
DOO2_DATA_DPLUS=0 # hf-derived-data-creator-dplus-to-pi-k-pi
102103
# Correlations
103104
DOO2_CORR_D0D0BAR_DATA=0 # hf-correlator-d0-d0bar
@@ -134,6 +135,7 @@ DOO2_CONV_COLL=0 # collision-converter
134135
DOO2_CONV_MCCOLL=0 # mccollision-converter
135136
DOO2_CONV_ZDC=0 # zdc-converter
136137
DOO2_CONV_BC=0 # bc-converter
138+
DOO2_CONV_BCINFO=0 # run2bcinfos-converter
137139
DOO2_CONV_TRKEX_0_1=0 # tracks-extra-converter (0→1)
138140
DOO2_CONV_TRKEX_0_2=0 # tracks-extra-v002-converter (0→2)
139141
DOO2_CONV_TRKEX_1_2=0 # tracks-extra-v002-converter (1→2)
@@ -509,6 +511,7 @@ function MakeScriptO2 {
509511
[ $DOO2_DATA_D0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-d0-to-k-pi"
510512
[ $DOO2_DATA_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-lc-to-p-k-pi"
511513
[ $DOO2_DATA_BPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-bplus-to-d0-pi"
514+
[ $DOO2_DATA_B0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-b0-to-d-pi"
512515
[ $DOO2_DATA_DPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-derived-data-creator-dplus-to-pi-k-pi"
513516
# Correlations
514517
WF_CORR=""
@@ -554,6 +557,7 @@ function MakeScriptO2 {
554557
[ $DOO2_CONV_MCCOLL -eq 1 ] && WORKFLOWS+=" o2-analysis-mccollision-converter"
555558
[ $DOO2_CONV_ZDC -eq 1 ] && WORKFLOWS+=" o2-analysis-zdc-converter"
556559
[ $DOO2_CONV_BC -eq 1 ] && WORKFLOWS+=" o2-analysis-bc-converter"
560+
[ $DOO2_CONV_BCINFO -eq 1 ] && WORKFLOWS+=" o2-analysis-run2bcinfos-converter"
557561
[ $DOO2_CONV_TRKEX_0_1 -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
558562
[[ $DOO2_CONV_TRKEX_0_2 -eq 1 || $DOO2_CONV_TRKEX_1_2 -eq 1 ]] && WORKFLOWS+=" o2-analysis-tracks-extra-v002-converter"
559563
[ $DOO2_CONV_V0 -eq 1 ] && WORKFLOWS+=" o2-analysis-v0converter"

0 commit comments

Comments
 (0)