Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
a07b940
create dev branch
Jul 7, 2021
e111131
update settings for Lc test
Jul 7, 2021
b7fdfb8
update config to new input folder
Jul 7, 2021
5492cb1
update settings
Jul 7, 2021
7786730
update config
Jul 7, 2021
cfd21a8
update config for test
Jul 8, 2021
4cdbaff
update config
Jul 8, 2021
4248c22
update config
Jul 8, 2021
f2ea676
update config
Jul 8, 2021
b8023af
update
Jul 8, 2021
d665ccb
update config
Jul 9, 2021
b3672fc
update config
Jul 9, 2021
6d44db5
update
Jul 9, 2021
9ec67a1
update config
Jul 9, 2021
f8b63ff
update config
Jul 9, 2021
ecc5bb9
update config
Jul 9, 2021
d4b3c1a
update config
Jul 9, 2021
cbdb932
update config
Jul 12, 2021
9f88c55
undo
Jul 12, 2021
4ef3352
update
Jul 15, 2021
4477ff2
update
Jul 16, 2021
9ce92b3
update
Jul 16, 2021
d94dca7
u
Jul 19, 2021
27dbc80
u
Jul 19, 2021
144d288
u
Jul 20, 2021
68a7d59
u
Jul 20, 2021
a7782ef
u
Aug 11, 2021
3c82ad0
u
Aug 11, 2021
28f7dc5
u
Aug 11, 2021
f5a1ae1
u
Aug 12, 2021
54a2a15
u
Aug 23, 2021
79c1bb9
u
Aug 25, 2021
bcd7298
u
Aug 25, 2021
2d2da9a
Merge branch 'DevMaurice' into master
mjongerh Aug 26, 2021
9b1fced
update
mjongerh Sep 22, 2021
bb93cc6
Update branch
mjongerh Oct 11, 2021
2bcbcb6
local gitignore
mjongerh Oct 11, 2021
ab95963
Merge branch 'AliceO2Group:master' into master
mjongerh Oct 14, 2021
9a5b54a
Merge branch 'AliceO2Group:master' into master
mjongerh Oct 29, 2021
c9b5638
Set local gitignore
mjongerh Oct 31, 2021
bd837d1
Initial Lb Tree creator
mjongerh Oct 31, 2021
110501b
s
mjongerh Nov 1, 2021
b39ceb4
update config json
mjongerh Nov 4, 2021
62d91e2
s
mjongerh Nov 9, 2021
e1916af
s
mjongerh Nov 10, 2021
8c7bc90
s
mjongerh Nov 10, 2021
6d798d0
s
mjongerh Nov 10, 2021
d432214
s
mjongerh Nov 10, 2021
6c7d0a7
s
mjongerh Nov 10, 2021
69bdbf4
s
mjongerh Nov 10, 2021
a22cc36
s
mjongerh Nov 10, 2021
a82bedd
Merge branch 'master' of https://github.com/AliceO2Group/Run3Analysis…
mjongerh Nov 16, 2021
9c72784
Merge branch 'master' into LbTreeCreator
mjongerh Nov 16, 2021
4d9e88b
s
mjongerh Nov 16, 2021
ea5230b
s
mjongerh Nov 16, 2021
03d1f51
Update .gitignore
mjongerh Nov 17, 2021
5276fd0
Update config_tasks.sh
mjongerh Nov 17, 2021
438f659
Update dpl-config_run5_hf.json
mjongerh Nov 17, 2021
810d5ac
Update dpl-config_run5_hf.json
mjongerh Nov 17, 2021
b5ade1b
Update dpl-config_run5_hf.json
mjongerh Nov 17, 2021
4f9cb98
Update config_tasks.sh
mjongerh Nov 17, 2021
b6c9eb9
Update config_input.sh
mjongerh Nov 17, 2021
a4f0d1f
Update config_tasks.sh
mjongerh Nov 17, 2021
3a8c600
Update .gitignore
mjongerh Nov 17, 2021
6cc9005
Update .gitignore
mjongerh Nov 17, 2021
5791774
Update workflows.yml
mjongerh Nov 17, 2021
f955f64
Update .gitignore
mjongerh Nov 17, 2021
69a4409
Merge branch 'LbTreeCreator' of https://github.com/mjongerh/Run3Analy…
mjongerh Nov 17, 2021
5522316
Merge branch 'master' into LbTreeCreator
mjongerh Nov 19, 2021
e74c4cd
Merge branch 'master' of https://github.com/AliceO2Group/Run3Analysis…
mjongerh Nov 26, 2021
f9e97ec
Fix labels
mjongerh Dec 2, 2021
abee0bf
Merge branch 'master' of https://github.com/AliceO2Group/Run3Analysis…
mjongerh Jan 11, 2022
5151c5f
Merge branch 'AliceO2Group:master' into master
mjongerh Jan 21, 2022
575ae70
local gitignore
mjongerh Feb 2, 2022
3195bae
Merge branch 'master' of https://github.com/AliceO2Group/Run3Analysis…
mjongerh Mar 2, 2022
26ea625
Update branch
Apr 6, 2022
86f25d7
Update workflows
Apr 6, 2022
241dccf
Update configtasks to include cuts and mc conversion
Apr 6, 2022
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
21 changes: 21 additions & 0 deletions codeHF/config_tasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ DATABASE_O2="workflows.yml"
MAKE_GRAPH=0 # Make topology graph.

# Activation of O2 workflows
# MC conversion
DOO2_MCCONV=1 # mc-converter
# Trigger selection
DOO2_TRIGSEL=0 # event-selection
# QA
Expand All @@ -45,13 +47,15 @@ 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_X=0 # hf-candidate-creator-x
DOO2_CAND_LB=0 # hf-candidate-creator-lb
DOO2_CAND_CHIC=0 # hf-candidate-creator-chic
DOO2_CAND_XICC=0 # hf-candidate-creator-xicc
DOO2_CAND_BPLUS=0 # hf-candidate-creator-bplus
# Selectors
DOO2_SEL_D0=0 # hf-d0-candidate-selector
DOO2_SEL_DPLUS=0 # hf-dplus-topikpi-candidate-selector
DOO2_SEL_LC=0 # hf-lc-candidate-selector
DOO2_SEL_LB=0 # hf-lb-tolcpi-candidate-selector
DOO2_SEL_XIC=0 # hf-xic-topkpi-candidate-selector
DOO2_SEL_JPSI=0 # hf-jpsi-candidate-selector
DOO2_SEL_X=0 # hf-x-tojpsipipi-candidate-selector
Expand All @@ -63,6 +67,7 @@ DOO2_SEL_BPLUS=0 # hf-bplus-tod0pi-candidate-selector
DOO2_TASK_D0=1 # hf-task-d0
DOO2_TASK_DPLUS=0 # hf-task-dplus
DOO2_TASK_LC=0 # hf-task-lc
DOO2_TASK_LB=0 # hf-task-lb
DOO2_TASK_XIC=0 # hf-task-xic
DOO2_TASK_JPSI=0 # hf-task-jpsi
DOO2_TASK_X=0 # hf-task-x
Expand All @@ -73,6 +78,7 @@ DOO2_TASK_BPLUS=0 # hf-task-bplus
# Tree creators
DOO2_TREE_D0=0 # hf-tree-creator-d0-tokpi
DOO2_TREE_LC=0 # hf-tree-creator-lc-topkpi
DOO2_TREE_LB=0 # hf-tree-creator-lb-tolcpi
DOO2_TREE_X=0 # hf-tree-creator-x-tojpsipipi
DOO2_TREE_XICC=0 # hf-tree-creator-xicc-topkpipi
DOO2_TREE_CHIC=0 # hf-tree-creator-chic-tojpsigamma
Expand All @@ -88,6 +94,7 @@ DOO2_DPLUSDMINUS_MCGEN=0 # hf-correlator-dplusdminus-mc-gen
APPLYCUTS_D0=0 # Apply D0 selection cuts.
APPLYCUTS_DPLUS=0 # Apply D+ selection cuts.
APPLYCUTS_LC=0 # Apply Λc selection cuts.
APPLYCUTS_LB=0 # Apply Λb selection cuts.
APPLYCUTS_XIC=0 # Apply Ξc selection cuts.
APPLYCUTS_JPSI=0 # Apply J/ψ selection cuts.
APPLYCUTS_X=0 # Apply X selection cuts.
Expand Down Expand Up @@ -182,6 +189,12 @@ function AdjustJson {
ReplaceString "\"d_selectionFlagDPlus\": \"0\"" "\"d_selectionFlagDPlus\": \"7\"" "$JSON" || ErrExit "Failed to edit $JSON."
fi

# Enable Λb selection.
if [ $APPLYCUTS_LB -eq 1 ]; then
MsgWarn "\nUsing Λb selection cuts"
ReplaceString "\"d_selectionFlagLb\": \"0\"" "\"d_selectionFlagLb\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
fi

# Enable Λc selection.
if [ $APPLYCUTS_LC -eq 1 ]; then
MsgWarn "\nUsing Λc selection cuts"
Expand Down Expand Up @@ -235,6 +248,8 @@ function MakeScriptO2 {
[ "$ISALICE3" -eq 1 ] && SUFFIX_ALICE3="-alice3" || SUFFIX_ALICE3=""

WORKFLOWS=""
# MC converter to version 001 of mcparticles
[ $DOO2_MCCONV -eq 1 ] && WORKFLOWS+=" o2-analysis-mc-converter"
# Trigger selection
[ $DOO2_TRIGSEL -eq 1 ] && WORKFLOWS+=" o2-analysis-event-selection"
# QA
Expand All @@ -253,6 +268,7 @@ function MakeScriptO2 {
[ $DOO2_CAND_2PRONG -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-2prong"
[ $DOO2_CAND_3PRONG -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-3prong"
[ $DOO2_CAND_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-x"
[ $DOO2_CAND_LB -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-lb"
[ $DOO2_CAND_CHIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-chic"
[ $DOO2_CAND_CASC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-cascade"
[ $DOO2_CAND_XICC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-xicc"
Expand All @@ -263,6 +279,7 @@ function MakeScriptO2 {
[ $DOO2_SEL_JPSI -eq 1 ] && WORKFLOWS+=" ${WF_SEL_JPSI}${SUFFIX_ALICE3}"
[ $DOO2_SEL_DPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-dplus-topikpi-candidate-selector"
[ $DOO2_SEL_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-lc-candidate-selector"
[ $DOO2_SEL_LB -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-lb-tolcpi-candidate-selector"
[ $DOO2_SEL_XIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-xic-topkpi-candidate-selector"
[ $DOO2_SEL_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-x-tojpsipipi-candidate-selector"
[ $DOO2_SEL_CHIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-chic-tojpsigamma-candidate-selector"
Expand All @@ -274,6 +291,7 @@ function MakeScriptO2 {
[ $DOO2_TASK_JPSI -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-jpsi"
[ $DOO2_TASK_DPLUS -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-dplus"
[ $DOO2_TASK_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-lc"
[ $DOO2_TASK_LB -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-lb"
[ $DOO2_TASK_XIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-xic"
[ $DOO2_TASK_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-x"
[ $DOO2_TASK_CHIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-chic"
Expand All @@ -291,6 +309,7 @@ function MakeScriptO2 {
# Tree creators
[ $DOO2_TREE_D0 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-d0-tokpi"
[ $DOO2_TREE_LC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-lc-topkpi"
[ $DOO2_TREE_LB -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-lb-tolcpi"
[ $DOO2_TREE_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-x-tojpsipipi"
[ $DOO2_TREE_XICC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-xicc-topkpipi"
[ $DOO2_TREE_CHIC -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-tree-creator-chic-tojpsigamma"
Expand Down Expand Up @@ -363,6 +382,7 @@ function MakeScriptPostprocess {
[ $DOO2_TASK_D0 -eq 1 ] && { OPT_COMPARE+=" d0 "; [ "$ISMC" -eq 1 ] && OPT_COMPARE+=" d0-mc "; }
[ $DOO2_TASK_DPLUS -eq 1 ] && OPT_COMPARE+=" dplus "
[ $DOO2_TASK_LC -eq 1 ] && { OPT_COMPARE+=" lc "; [ "$ISMC" -eq 1 ] && OPT_COMPARE+=" lc-mc "; }
[ $DOO2_TASK_LB -eq 1 ] && { OPT_COMPARE+=" lb "; [ "$ISMC" -eq 1 ] && OPT_COMPARE+=" lb-mc "; }
[ $DOO2_TASK_XIC -eq 1 ] && OPT_COMPARE+=" xic "
[ $DOO2_TASK_JPSI -eq 1 ] && OPT_COMPARE+=" jpsi "
[ "$OPT_COMPARE" ] && POSTEXEC+=" && root -b -q -l \"$DIR_TASKS/Compare.C(\\\"\$FileO2\\\", \\\"\$FileAli\\\", \\\"$OPT_COMPARE\\\", $DORATIO)\""
Expand All @@ -373,6 +393,7 @@ function MakeScriptPostprocess {
[ $DOO2_TASK_D0 -eq 1 ] && PARTICLES+=" d0 "
[ $DOO2_TASK_DPLUS -eq 1 ] && PARTICLES+=" dplus "
[ $DOO2_TASK_LC -eq 1 ] && PARTICLES+=" lc "
[ $DOO2_TASK_LB -eq 1 ] && PARTICLES+=" lb "
[ $DOO2_TASK_XIC -eq 1 ] && PARTICLES+=" xic "
[ $DOO2_TASK_JPSI -eq 1 ] && PARTICLES+=" jpsi "
[ $DOO2_TASK_LCK0SP -eq 1 ] && PARTICLES+=" lc-tok0sP "
Expand Down
44 changes: 44 additions & 0 deletions codeHF/dpl-config_run5_hf.json
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,50 @@
]
}
},
"hf-lb-tolcpi-candidate-selector": {
"d_pTCandMin": "3.",
"d_pTCandMax": "50.",
"d_pidTPCMinpT": "1000.",
"d_pidTPCMaxpT": "2000.",
"d_pidTOFMinpT": "0.",
"d_pidTOFMaxpT": "10.",
"d_TPCNClsFindablePIDCut": "-9999",
"d_nSigmaTPC": "1000.",
"d_nSigmaTOF": "3.",
"pTBins": {
"values": [
"0",
"0.5",
"1",
"2",
"3",
"4",
"5",
"7",
"10",
"13",
"16",
"20",
"24"
]
},
"Lb_to_lcpi_cuts": {
"values": [
[ "1.", "0.98", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.98", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.98", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.98", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.99", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.003", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.002", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.002", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.002", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ],
[ "1.", "0.994", "0.0001", "0.002", "0.0015", "1.0", "0.5", "0.05", "0.05", "0.02", "0.5", "0.8" ]
]
}
},
"hf-task-d0": {
"cutYCandMax": "0.8",
"d_selectionFlagD0": "0",
Expand Down
24 changes: 24 additions & 0 deletions codeHF/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ workflows:
default: [HFCANDBPLUSBASE, HFCANDBPLUSEXT]
mc: [HFCANDBPMCREC, HFCANDBPMCGEN]

o2-analysis-hf-candidate-creator-lb:
<<: *cand_creator
dependencies:
- o2-analysis-hf-lc-candidate-selector
tables:
default: [HFCANDLBBASE, HFCANLBXEXT]
mc: [HFCANDLBMCREC, HFCANDLBMCGEN]

# Selectors

o2-analysis-hf-d0-candidate-selector: &selector_2prong
Expand Down Expand Up @@ -110,6 +118,11 @@ workflows:
<<: *selector_3prong
tables: HFSELLCCAND

o2-analysis-hf-lb-tolcpi-candidate-selector:
<<: *selector_3prong
dependencies: o2-analysis-hf-candidate-creator-lb
tables: HFSELLBCAND

o2-analysis-hf-xic-topkpi-candidate-selector:
<<: *selector_3prong
tables: HFSELXICCAND
Expand Down Expand Up @@ -174,6 +187,12 @@ workflows:
mc: "--doMC"
dependencies: o2-analysis-hf-lc-tok0sp-candidate-selector

o2-analysis-hf-task-lb:
options:
mc: "--doMC"
dependencies: [o2-analysis-hf-lb-tolcpi-candidate-selector, o2-analysis-trackextension-alice3, o2-analysis-alice3-centrality]


o2-analysis-hf-task-xicc:
options:
mc: "--doMC"
Expand Down Expand Up @@ -209,6 +228,11 @@ workflows:
dependencies: o2-analysis-hf-lc-candidate-selector
tables: [HFCANDP3Full, HFCANDP3FullE, HFCANDP3FullP]

o2-analysis-hf-tree-creator-lb-tolcpi:
requires_mc: yes
dependencies: [o2-analysis-hf-lb-tolcpi-candidate-selector, o2-analysis-trackextension-alice3, o2-analysis-trackselection]
tables: HFCANDLbFull

o2-analysis-hf-tree-creator-x-tojpsipipi:
requires_mc: yes
dependencies: o2-analysis-hf-x-tojpsipipi-candidate-selector
Expand Down