Skip to content

Commit 0e78939

Browse files
vkuceravkucera
committed
Add converters extra-tracks-v2 and mft-tracks. Update JSON for multiplicity table.
1 parent bd47334 commit 0e78939

File tree

4 files changed

+95
-50
lines changed

4 files changed

+95
-50
lines changed

‎codeHF/config_input.sh‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,54 +40,54 @@ 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_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
43+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
4444
;;
4545
2) # reference
4646
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
4747
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282099"
4848
INPUT_IS_MC=1
49-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
49+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
5050
;;
5151
3)
5252
INPUT_LABEL="Run 2, p-p 5.02 TeV LHC17p, MC LHC18a4a2_cent"
5353
INPUT_DIR="$INPUT_BASE/Run2/pp_5.02TeV/sim/LHC18a4a2_cent/282341"
5454
INPUT_IS_MC=1
55-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
55+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
5656
;;
5757
4)
5858
INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, real"
5959
INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/real/LHC15o"
6060
INPUT_SYS="PbPb"
61-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
61+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
6262
;;
6363
5)
6464
INPUT_LABEL="Run 2, Pb-Pb 5.02 TeV LHC15o, MC LHC15k1a3"
6565
INPUT_DIR="$INPUT_BASE/Run2/PbPb_5.02TeV/sim/LHC15k1a3"
6666
INPUT_SYS="PbPb"
6767
INPUT_IS_MC=1
68-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
68+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
6969
;;
7070
6)
7171
INPUT_LABEL="Run 2, p-p 13 TeV LHC16p, MC LHC19g6f3, dedicated Ξc"
7272
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC19g6f3"
7373
INPUT_IS_MC=1
74-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
74+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
7575
;;
7676
7)
7777
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22o, real"
7878
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22o_pass4_minBias_small"
7979
INPUT_FILES="AO2D.root"
8080
INPUT_RUN=3
8181
INPUT_IS_O2=1
82-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
82+
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"
8383
;;
8484
8)
8585
INPUT_LABEL="Run 3, p-p 13.6 TeV, LHC22r, real, low interaction rate (100 kHz)"
8686
INPUT_DIR="$INPUT_BASE/Run3/pp_13.6TeV/real/LHC22r"
8787
INPUT_FILES="AO2D.root"
8888
INPUT_RUN=3
8989
INPUT_IS_O2=1
90-
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"
90+
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"
9191
;;
9292
9)
9393
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC21k6, general purpose"
@@ -96,28 +96,28 @@ case $INPUT_CASE in
9696
INPUT_RUN=3
9797
INPUT_IS_O2=1
9898
INPUT_IS_MC=1
99-
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"
99+
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"
100100
;;
101101
10)
102102
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (ESD)"
103103
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim/LHC20f4a"
104104
INPUT_IS_MC=1
105-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
105+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1"
106106
;;
107107
11)
108108
INPUT_LABEL="Run 2, p-p 13 TeV LHC18f, MC LHC20f4a (AO2D)"
109109
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/sim_converted/LHC20f4a"
110110
INPUT_FILES="AO2D.root"
111111
INPUT_IS_O2=1
112112
INPUT_IS_MC=1
113-
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"
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"
114114
;;
115115
12)
116116
INPUT_LABEL="Run 2, p-p 13 TeV, LHC17j (AO2D)"
117117
INPUT_DIR="$INPUT_BASE/Run2/pp_13TeV/real_converted/LHC17j_20220601" # converted good AO2Ds
118118
INPUT_FILES="AO2D.root"
119119
INPUT_IS_O2=1
120-
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"
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"
121121
;;
122122
13)
123123
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC22b1b, D2H enriched"
@@ -126,7 +126,7 @@ case $INPUT_CASE in
126126
INPUT_RUN=3
127127
INPUT_IS_O2=1
128128
INPUT_IS_MC=1
129-
INPUT_TASK_CONFIG="DOO2_CONV_ZDC=1 DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
129+
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"
130130
;;
131131
14)
132132
INPUT_LABEL="Run 3, p-p 13.6 TeV, MC LHC23f4b2, general purpose"
@@ -135,7 +135,7 @@ case $INPUT_CASE in
135135
INPUT_RUN=3
136136
INPUT_IS_O2=1
137137
INPUT_IS_MC=1
138-
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX=1 DOO2_CONV_V0=1"
138+
INPUT_TASK_CONFIG="DOO2_CONV_BC=1 DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_0_2=1 DOO2_CONV_V0=1"
139139
;;
140140
15)
141141
INPUT_LABEL="Run 3, Pb-Pb 5.36 TeV LHC23zzi_pass2"
@@ -152,6 +152,6 @@ case $INPUT_CASE in
152152
INPUT_RUN=3
153153
INPUT_IS_O2=1
154154
INPUT_IS_MC=1
155-
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1"
155+
INPUT_TASK_CONFIG="DOO2_CONV_MCCOLL=1 DOO2_CONV_TRKEX_1_2=1"
156156
;;
157157
esac

‎codeHF/config_tasks.sh‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,17 @@ DOO2_PID_TOF=0 # pid-tof-full/alice3-pid-tof
127127
DOO2_PID_TOF_QA=0 # pid-tof-qa-mc
128128
DOO2_PID_BAYES=0 # pid-bayes
129129
# Converters (Consider setting these per input case via INPUT_TASK_CONFIG.)
130-
DOO2_CONV_MC=0 # mc-converter
131-
DOO2_CONV_FDD=0 # fdd-converter
132-
DOO2_CONV_COLL=0 # collision-converter
133-
DOO2_CONV_MCCOLL=0 # mccollision-converter
134-
DOO2_CONV_ZDC=0 # zdc-converter
135-
DOO2_CONV_BC=0 # bc-converter
136-
DOO2_CONV_TRKEX=0 # tracks-extra-converter
137-
DOO2_CONV_V0=0 # v0converter
130+
DOO2_CONV_MC=0 # mc-converter
131+
DOO2_CONV_FDD=0 # fdd-converter
132+
DOO2_CONV_COLL=0 # collision-converter
133+
DOO2_CONV_MCCOLL=0 # mccollision-converter
134+
DOO2_CONV_ZDC=0 # zdc-converter
135+
DOO2_CONV_BC=0 # bc-converter
136+
DOO2_CONV_TRKEX_0_1=0 # tracks-extra-converter (0→1)
137+
DOO2_CONV_TRKEX_0_2=0 # tracks-extra-v002-converter (0→2)
138+
DOO2_CONV_TRKEX_1_2=0 # tracks-extra-v002-converter (1→2)
139+
DOO2_CONV_V0=0 # v0converter
140+
DOO2_CONV_MFT=0 # mft-tracks-converter
138141

139142
# Selection cuts
140143
APPLYCUTS_D0=1 # Apply D0 selection cuts.
@@ -265,6 +268,15 @@ function AdjustJson {
265268
ReplaceString "\"isRun3\": \"true\"" "\"isRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
266269
fi
267270

271+
# tracks-extra-v002-converter
272+
if [ $DOO2_CONV_TRKEX_0_2 -eq 1 ]; then
273+
ReplaceString "\"processV000ToV002\": \"false\"" "\"processV000ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
274+
ReplaceString "\"processV001ToV002\": \"true\"" "\"processV001ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
275+
elif [ $DOO2_CONV_TRKEX_1_2 -eq 1 ]; then
276+
ReplaceString "\"processV000ToV002\": \"true\"" "\"processV000ToV002\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
277+
ReplaceString "\"processV001ToV002\": \"false\"" "\"processV001ToV002\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
278+
fi
279+
268280
# lambdakzero-builder
269281
if [ "$INPUT_RUN" -eq 2 ]; then
270282
ReplaceString "\"isRun2\": \"0\"" "\"isRun2\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
@@ -538,8 +550,10 @@ function MakeScriptO2 {
538550
[ $DOO2_CONV_MCCOLL -eq 1 ] && WORKFLOWS+=" o2-analysis-mccollision-converter"
539551
[ $DOO2_CONV_ZDC -eq 1 ] && WORKFLOWS+=" o2-analysis-zdc-converter"
540552
[ $DOO2_CONV_BC -eq 1 ] && WORKFLOWS+=" o2-analysis-bc-converter"
541-
[ $DOO2_CONV_TRKEX -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
553+
[ $DOO2_CONV_TRKEX_0_1 -eq 1 ] && WORKFLOWS+=" o2-analysis-tracks-extra-converter"
554+
[[ $DOO2_CONV_TRKEX_0_2 -eq 1 || $DOO2_CONV_TRKEX_1_2 -eq 1 ]] && WORKFLOWS+=" o2-analysis-tracks-extra-v002-converter"
542555
[ $DOO2_CONV_V0 -eq 1 ] && WORKFLOWS+=" o2-analysis-v0converter"
556+
[ $DOO2_CONV_MFT -eq 1 ] && WORKFLOWS+=" o2-analysis-mft-tracks-converter"
543557

544558
# Translate options into arguments of the generating script.
545559
OPT_MAKECMD=""

‎codeHF/dpl-config_run3.json‎

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7372,6 +7372,10 @@
73727372
"processStandard": "false",
73737373
"processCovariance": "true"
73747374
},
7375+
"tracks-extra-v002-converter": {
7376+
"processV000ToV002": "true",
7377+
"processV001ToV002": "false"
7378+
},
73757379
"track-to-collision-association": {
73767380
"nSigmaForTimeCompat": "4",
73777381
"timeMargin": "0",
@@ -7394,67 +7398,90 @@
73947398
"processRun3FT0": "false"
73957399
},
73967400
"multiplicity-table": {
7397-
"processRun3": "0",
7398-
"processRun2": "1",
7401+
"doVertexZeq": "1",
7402+
"fractionOfEvents": "2",
73997403
"enabledTables": {
7404+
"labels_rows": [
7405+
"FV0Mults",
7406+
"FT0Mults",
7407+
"FDDMults",
7408+
"ZDCMults",
7409+
"TrackletMults",
7410+
"TPCMults",
7411+
"PVMults",
7412+
"MultsExtra",
7413+
"MultSelections",
7414+
"FV0MultZeqs",
7415+
"FT0MultZeqs",
7416+
"FDDMultZeqs",
7417+
"PVMultZeqs",
7418+
"MultMCExtras",
7419+
"MFTMults"
7420+
],
7421+
"labels_cols": [
7422+
"Enable"
7423+
],
74007424
"values": [
74017425
[
7402-
-1
7426+
"-1"
74037427
],
74047428
[
7405-
-1
7429+
"-1"
74067430
],
74077431
[
7408-
-1
7432+
"-1"
74097433
],
74107434
[
7411-
-1
7435+
"-1"
74127436
],
74137437
[
7414-
-1
7438+
"-1"
74157439
],
74167440
[
7417-
-1
7441+
"-1"
74187442
],
74197443
[
7420-
-1
7444+
"-1"
74217445
],
74227446
[
7423-
-1
7447+
"-1"
74247448
],
74257449
[
7426-
-1
7450+
"-1"
74277451
],
74287452
[
7429-
-1
7453+
"-1"
74307454
],
74317455
[
7432-
-1
7456+
"-1"
74337457
],
74347458
[
7435-
-1
7459+
"-1"
74367460
],
74377461
[
7438-
-1
7462+
"-1"
74397463
],
74407464
[
7441-
-1
7465+
"-1"
7466+
],
7467+
[
7468+
"-1"
74427469
]
74437470
]
74447471
},
7445-
"fractionOfEvents": "2",
7446-
"processMC2Mults": "0",
7472+
"ccdburl": "http://alice-ccdb.cern.ch",
7473+
"ccdbpath": "Centrality/Calibration",
7474+
"reconstructionPass": "",
7475+
"produceHistograms": "false",
74477476
"min_pt_globaltrack": "0.15",
7448-
"min_ncluster_its_globaltrack": "5",
74497477
"max_pt_globaltrack": "1e+10",
7450-
"processGlobalTrackingCounters": "0",
7478+
"min_ncluster_its_globaltrack": "5",
74517479
"min_ncluster_itsib_globaltrack": "1",
7452-
"doVertexZeq": "1",
7453-
"produceHistograms": "0",
7454-
"reconstructionPass": " ",
7455-
"ccdbpath": "Centrality/Calibration",
7456-
"ccdburl": "http://alice-ccdb.cern.ch",
7457-
"processMC": "1"
7480+
"processRun2": "true",
7481+
"processRun3": "false",
7482+
"processGlobalTrackingCounters": "false",
7483+
"processMC": "false",
7484+
"processMC2Mults": "false"
74587485
},
74597486
"pid-multiplicity": {
74607487
"processIU": "false",

‎codeHF/workflows.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,12 @@ workflows:
658658

659659
o2-analysis-tracks-extra-converter: {}
660660

661+
o2-analysis-tracks-extra-v002-converter: {}
662+
661663
o2-analysis-v0converter: {}
662664

665+
o2-analysis-mft-tracks-converter: {}
666+
663667
# LF
664668

665669
o2-analysis-lf-lambdakzerobuilder:

0 commit comments

Comments
 (0)