Skip to content

Commit f3dba44

Browse files
vkuceravkucera
committed
Update configuration of HFJ workflows
1 parent f12feea commit f3dba44

File tree

4 files changed

+116
-66
lines changed

4 files changed

+116
-66
lines changed

‎codeHF/Compare.C‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ Int_t Compare(TString pathFileO2 = "AnalysisResults_O2.root", TString pathFileAl
205205
AddHistogram(vecHisJets, "#it{p}_{T}^{cand} (GeV/#it{c})", "fHistJetCandPt", "jet-finder-hf-data/h_D0_pt", 1, 1, 0);
206206

207207
VecSpecHis vecHisJetSubstructure;
208-
AddHistogram(vecHisJetSubstructure, "#it{z}_{g}", "fHistJetZg", "jet-substructure-hf-data/h_jet_zg", 1, 0, 0);
209-
AddHistogram(vecHisJetSubstructure, "#it{R}_{g}", "fHistJetRg", "jet-substructure-hf-data/h_jet_rg", 1, 0, 0);
210-
AddHistogram(vecHisJetSubstructure, "#it{n}_{SD}", "fHistJetNsd", "jet-substructure-hf-data/h_jet_nsd", 1, 0, 0);
208+
AddHistogram(vecHisJetSubstructure, "#it{z}_{g}", "fHistJetZg", "jet-substructure-d0-data/h_jet_zg", 1, 0, 0);
209+
AddHistogram(vecHisJetSubstructure, "#it{R}_{g}", "fHistJetRg", "jet-substructure-d0-data/h_jet_rg", 1, 0, 0);
210+
AddHistogram(vecHisJetSubstructure, "#it{n}_{SD}", "fHistJetNsd", "jet-substructure-d0-data/h_jet_nsd", 1, 0, 0);
211211

212212
VecSpecHis vecHisJetsMC;
213213
AddHistogram(vecHisJetsMC, "#it{p}_{T,det}^{jet} (GeV/#it{c})", "fHistJetPt", "jet-finder-hf-mcd/h_jet_pt", 1, 1, 0);
@@ -222,12 +222,12 @@ Int_t Compare(TString pathFileO2 = "AnalysisResults_O2.root", TString pathFileAl
222222
AddHistogram(vecHisJetsMC, "#it{p}_{T,gen}^{cand} (GeV/#it{c})", "fHistJetCandPt_Part", "jet-finder-hf-mcp/h_D0_pt", 1, 1, 0);
223223

224224
VecSpecHis vecHisJetSubstructureMC;
225-
AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,det}", "fHistJetZg", "jet-substructure-hf-mcd/h_jet_zg", 1, 0, 0);
226-
AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,gen}", "fHistJetZg_Part", "jet-substructure-hf-mcp/h_jet_zg", 1, 0, 0);
227-
AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,det}", "fHistJetRg", "jet-substructure-hf-mcd/h_jet_rg", 1, 0, 0);
228-
AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,gen}", "fHistJetRg_Part", "jet-substructure-hf-mcp/h_jet_rg", 1, 0, 0);
229-
AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,det}", "fHistJetNsd", "jet-substructure-hf-mcd/h_jet_nsd", 1, 0, 0);
230-
AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,gen}", "fHistJetNsd_Part", "jet-substructure-hf-mcp/h_jet_nsd", 1, 0, 0);
225+
AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,det}", "fHistJetZg", "jet-substructure-d0-mcd/h_jet_zg", 1, 0, 0);
226+
AddHistogram(vecHisJetSubstructureMC, "#it{z}_{g,gen}", "fHistJetZg_Part", "jet-substructure-d0-mcp/h_jet_zg", 1, 0, 0);
227+
AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,det}", "fHistJetRg", "jet-substructure-d0-mcd/h_jet_rg", 1, 0, 0);
228+
AddHistogram(vecHisJetSubstructureMC, "#it{R}_{g,gen}", "fHistJetRg_Part", "jet-substructure-d0-mcp/h_jet_rg", 1, 0, 0);
229+
AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,det}", "fHistJetNsd", "jet-substructure-d0-mcd/h_jet_nsd", 1, 0, 0);
230+
AddHistogram(vecHisJetSubstructureMC, "#it{n}_{SD,gen}", "fHistJetNsd_Part", "jet-substructure-d0-mcp/h_jet_nsd", 1, 0, 0);
231231

232232
// vector of specifications of vectors: name, VecSpecHis, pads X, pads Y
233233
VecSpecVecSpec vecSpecVecSpec;

‎codeHF/config_tasks.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ DOO2_TASK_D0HADRON=0 # hf-task-correlation-d0-hadrons
112112
DOO2_TASK_FLOW=0 # hf-task-flow
113113
# Jets
114114
DOO2_JET_FIND=0 # je-jet-finder-d0
115-
DOO2_JET_FIND_QA=0 # je-jet-finder-hf-qa
116-
DOO2_JET_MATCH=0 # je-jet-matching
117-
DOO2_JET_SUB=0 # je-jet-substructure-hf
118-
DOO2_JET_SUB_OUT=0 # je-jet-substructure-hf-output
115+
DOO2_JET_FIND_QA=0 # je-jet-finder-d0-qa
116+
DOO2_JET_MATCH=0 # je-jet-matching-mc-d0-ch
117+
DOO2_JET_SUB=0 # je-jet-substructure-d0
118+
DOO2_JET_SUB_OUT=0 # je-jet-substructure-d0-output
119119
# QA
120120
DOO2_REJ_ALICE3=0 # hf-task-qa-pid-rejection
121121
DOO2_QA_EFF=0 # qa-efficiency
@@ -525,16 +525,16 @@ function MakeScriptO2 {
525525
# Jets
526526
if [ "$INPUT_IS_MC" -eq 1 ]; then
527527
[ $DOO2_JET_FIND -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-mcd-charged o2-analysis-je-jet-finder-d0-mcp-charged"
528-
[ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-hf-qa_mc"
529-
[ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf_mcd o2-analysis-je-jet-substructure-hf_mcp"
530-
[ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf-output_mcd o2-analysis-je-jet-substructure-hf-output_mcp"
528+
[ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-qa_mc"
529+
[ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0_mc"
530+
[ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0-output_mc"
531531
else
532532
[ $DOO2_JET_FIND -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-data-charged"
533-
[ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-hf-qa_data"
534-
[ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf_data"
535-
[ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-hf-output_data"
533+
[ $DOO2_JET_FIND_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-d0-qa_data"
534+
[ $DOO2_JET_SUB -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0_data"
535+
[ $DOO2_JET_SUB_OUT -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-substructure-d0-output_data"
536536
fi
537-
[ $DOO2_JET_MATCH -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-matching"
537+
[ $DOO2_JET_MATCH -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-matching-mc-d0-ch"
538538
# QA
539539
[ $DOO2_REJ_ALICE3 -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-task-qa-pid-rejection"
540540
[ $DOO2_QA_EFF -eq 1 ] && WORKFLOWS+=" o2-analysis-qa-efficiency"

‎codeHF/dpl-config_run3.json‎

Lines changed: 78 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7043,35 +7043,63 @@
70437043
"processMcGenMixedEvent": "false"
70447044
},
70457045
"jet-deriveddata-producer": {
7046+
"ccdbUrl": "http://alice-ccdb.cern.ch",
7047+
"ccdbPathLut": "GLO/Param/MatLUT",
7048+
"ccdbPathGrp": "GLO/GRP/GRP",
7049+
"ccdbPathGrpMag": "GLO/Config/GRPMagField",
7050+
"dcaZMax": "0.2",
7051+
"ccdb-url": "http://alice-ccdb.cern.ch",
7052+
"includeTriggers": "false",
7053+
"processClearMaps": "false",
70467054
"processBunchCrossings": "false",
70477055
"processCollisions": "true",
70487056
"processCollisionsWithoutCentralityAndMultiplicity": "false",
70497057
"processCollisionsRun2": "false",
7058+
"processCollisionsALICE3": "false",
7059+
"processWithoutEMCalCollisionLabels": "false",
7060+
"processEMCalCollisionLabels": "false",
70507061
"processMcCollisionLabels": "false",
70517062
"processMcCollisions": "false",
70527063
"processTracks": "true",
7064+
"processTracksWithCollisionAssociator": "false",
70537065
"processMcTrackLabels": "false",
7066+
"processMcTrackLabelsWithCollisionAssociator": "false",
70547067
"processParticles": "false",
70557068
"processClusters": "false",
7069+
"processMcClusterLabels": "false",
7070+
"processD0Collisions": "false",
7071+
"processD0McCollisions": "false",
70567072
"processD0": "true",
7057-
"processD0MC": "true",
7073+
"processD0MC": "false",
7074+
"processLcCollisions": "false",
7075+
"processLcMcCollisions": "false",
70587076
"processLc": "false",
70597077
"processLcMC": "false",
7078+
"processBplusCollisions": "false",
7079+
"processBplusMcCollisions": "false",
7080+
"processBplus": "false",
7081+
"processBplusMC": "false",
70607082
"processV0": "false",
7061-
"processV0MC": "false"
7083+
"processV0MC": "false",
7084+
"processDielectronCollisions": "false",
7085+
"processDielectron": "false",
7086+
"processDielectronMc": "false"
70627087
},
70637088
"jet-finder-d0-data-charged": {
70647089
"vertexZCut": "10",
70657090
"centralityMin": "-999",
70667091
"centralityMax": "999",
7092+
"trackOccupancyInTimeRangeMax": "999999",
7093+
"eventSelections": "sel8",
7094+
"triggerMasks": "",
70677095
"trackPtMin": "0.15",
70687096
"trackPtMax": "1000",
70697097
"trackEtaMin": "-0.9",
70707098
"trackEtaMax": "0.9",
70717099
"trackPhiMin": "-999",
70727100
"trackPhiMax": "999",
7101+
"trackingEfficiency": "1",
70737102
"trackSelections": "globalTracks",
7074-
"eventSelections": "sel8",
70757103
"particleSelections": "PhysicalPrimary",
70767104
"clusterDefinition": "kV3Default",
70777105
"clusterEtaMin": "-0.7",
@@ -7104,28 +7132,34 @@
71047132
"jetRecombScheme": "0",
71057133
"jetGhostArea": "0.005",
71067134
"ghostRepeat": "1",
7135+
"DoTriggering": "false",
71077136
"jetAreaFractionMin": "-99",
71087137
"jetPtBinWidth": "5",
71097138
"fillTHnSparse": "false",
7139+
"jetExtraParam": "-99",
71107140
"processDummy": "false",
71117141
"processChargedJetsData": "true",
71127142
"processChargedEvtWiseSubJetsData": "false",
71137143
"processChargedJetsMCD": "false",
71147144
"processChargedEvtWiseSubJetsMCD": "false",
7115-
"processChargedJetsMCP": "false"
7145+
"processChargedJetsMCP": "false",
7146+
"processChargedEvtWiseSubJetsMCP": "false"
71167147
},
71177148
"jet-finder-d0-mcd-charged": {
71187149
"vertexZCut": "10",
71197150
"centralityMin": "-999",
71207151
"centralityMax": "999",
7152+
"trackOccupancyInTimeRangeMax": "999999",
7153+
"eventSelections": "sel8",
7154+
"triggerMasks": "",
71217155
"trackPtMin": "0.15",
71227156
"trackPtMax": "1000",
71237157
"trackEtaMin": "-0.9",
71247158
"trackEtaMax": "0.9",
71257159
"trackPhiMin": "-999",
71267160
"trackPhiMax": "999",
7161+
"trackingEfficiency": "1",
71277162
"trackSelections": "globalTracks",
7128-
"eventSelections": "sel8",
71297163
"particleSelections": "PhysicalPrimary",
71307164
"clusterDefinition": "kV3Default",
71317165
"clusterEtaMin": "-0.7",
@@ -7158,28 +7192,34 @@
71587192
"jetRecombScheme": "0",
71597193
"jetGhostArea": "0.005",
71607194
"ghostRepeat": "1",
7195+
"DoTriggering": "false",
71617196
"jetAreaFractionMin": "-99",
71627197
"jetPtBinWidth": "5",
71637198
"fillTHnSparse": "false",
7199+
"jetExtraParam": "-99",
71647200
"processDummy": "false",
71657201
"processChargedJetsData": "false",
71667202
"processChargedEvtWiseSubJetsData": "false",
71677203
"processChargedJetsMCD": "true",
71687204
"processChargedEvtWiseSubJetsMCD": "false",
7169-
"processChargedJetsMCP": "false"
7205+
"processChargedJetsMCP": "false",
7206+
"processChargedEvtWiseSubJetsMCP": "false"
71707207
},
71717208
"jet-finder-d0-mcp-charged": {
71727209
"vertexZCut": "10",
71737210
"centralityMin": "-999",
71747211
"centralityMax": "999",
7212+
"trackOccupancyInTimeRangeMax": "999999",
7213+
"eventSelections": "sel8",
7214+
"triggerMasks": "",
71757215
"trackPtMin": "0.15",
71767216
"trackPtMax": "1000",
71777217
"trackEtaMin": "-0.9",
71787218
"trackEtaMax": "0.9",
71797219
"trackPhiMin": "-999",
71807220
"trackPhiMax": "999",
7221+
"trackingEfficiency": "1",
71817222
"trackSelections": "globalTracks",
7182-
"eventSelections": "sel8",
71837223
"particleSelections": "PhysicalPrimary",
71847224
"clusterDefinition": "kV3Default",
71857225
"clusterEtaMin": "-0.7",
@@ -7212,19 +7252,25 @@
72127252
"jetRecombScheme": "0",
72137253
"jetGhostArea": "0.005",
72147254
"ghostRepeat": "1",
7255+
"DoTriggering": "false",
72157256
"jetAreaFractionMin": "-99",
72167257
"jetPtBinWidth": "5",
72177258
"fillTHnSparse": "false",
7259+
"jetExtraParam": "-99",
72187260
"processDummy": "false",
72197261
"processChargedJetsData": "false",
72207262
"processChargedEvtWiseSubJetsData": "false",
72217263
"processChargedJetsMCD": "false",
72227264
"processChargedEvtWiseSubJetsMCD": "false",
7223-
"processChargedJetsMCP": "true"
7265+
"processChargedJetsMCP": "true",
7266+
"processChargedEvtWiseSubJetsMCP": "false"
72247267
},
72257268
"jet-finder-charged-d0-qa": {
72267269
"selectedJetsRadius": "0.4",
7270+
"eventSelections": "sel8",
72277271
"vertexZCut": "10",
7272+
"centralityMin": "-999",
7273+
"centralityMax": "999",
72287274
"jetRadii": {
72297275
"values": [
72307276
"0.4"
@@ -7235,23 +7281,39 @@
72357281
"trackPtMin": "0.15",
72367282
"trackPtMax": "100",
72377283
"trackSelections": "globalTracks",
7238-
"selectionFlagD0": "0",
7239-
"selectionFlagD0bar": "0",
7240-
"selectionFlagLcToPKPi": "0",
7241-
"selectionFlagLcToPiPK": "0",
7242-
"selectionFlagBplus": "0",
7284+
"jetPtMax": "200",
7285+
"jetEtaMin": "-99",
7286+
"jetEtaMax": "99",
7287+
"jetAreaFractionMin": "-99",
7288+
"leadingConstituentPtMin": "-99",
7289+
"pTHatMaxMCD": "999",
7290+
"pTHatMaxMCP": "999",
7291+
"pTHatExponent": "6",
7292+
"randomConeR": "0.4",
72437293
"processDummy": "false",
7244-
"processJetsData": "true",
7294+
"processJetsData": "false",
7295+
"processJetsRhoAreaSubData": "false",
7296+
"processJetsRhoAreaSubMCD": "false",
7297+
"processEvtWiseConstSubJetsData": "false",
7298+
"processJetsSubMatched": "false",
72457299
"processJetsMCD": "true",
72467300
"processJetsMCDWeighted": "false",
72477301
"processJetsMCP": "true",
72487302
"processJetsMCPWeighted": "false",
72497303
"processJetsMCPMCDMatched": "false",
72507304
"processJetsMCPMCDMatchedWeighted": "false",
72517305
"processMCCollisionsWeighted": "false",
7252-
"processTriggeredData": "false"
7306+
"processTriggeredData": "false",
7307+
"processHFTriggeredData": "false",
7308+
"processTracks": "false",
7309+
"processTracksWeighted": "false",
7310+
"processTracksSub": "false",
7311+
"processRho": "false",
7312+
"processRandomConeData": "false",
7313+
"processRandomConeMCD": "false",
7314+
"processCandidates": "false"
72537315
},
7254-
"jet-matching-d0-ch": {
7316+
"jet-matching-mc-d0-ch": {
72557317
"doMatchingGeo": "true",
72567318
"doMatchingPt": "true",
72577319
"doMatchingHf": "true",

‎codeHF/workflows.yml‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -488,53 +488,41 @@ workflows:
488488
requires_mc: yes
489489
tables: [D0PJET, D0PJETCONSTS, D0PJETCONSTSUB]
490490

491-
o2-analysis-je-jet-finder-hf-qa_data:
492-
executable: o2-analysis-je-jet-finder-hf-qa
491+
o2-analysis-je-jet-finder-d0-qa_data:
492+
executable: o2-analysis-je-jet-finder-d0-qa
493493
dependencies: o2-analysis-je-jet-finder-d0-data-charged
494494

495-
o2-analysis-je-jet-finder-hf-qa_mc:
496-
executable: o2-analysis-je-jet-finder-hf-qa
495+
o2-analysis-je-jet-finder-d0-qa_mc:
496+
executable: o2-analysis-je-jet-finder-d0-qa
497497
dependencies: [o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged]
498498
requires_mc: yes
499499

500-
o2-analysis-je-jet-matching:
500+
o2-analysis-je-jet-matching-mc-d0-ch:
501501
dependencies: [o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged]
502502
requires_mc: yes
503503
tables: [D0JETMP2D, D0JETMD2P]
504504

505-
o2-analysis-je-jet-substructure-hf_data:
506-
executable: o2-analysis-je-jet-substructure-hf
505+
o2-analysis-je-jet-substructure-d0_data:
506+
executable: o2-analysis-je-jet-substructure-d0
507507
dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-data-charged]
508508
tables: D0SS
509509

510-
o2-analysis-je-jet-substructure-hf_mcd:
511-
executable: o2-analysis-je-jet-substructure-hf
512-
dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcd-charged]
510+
o2-analysis-je-jet-substructure-d0_mc:
511+
executable: o2-analysis-je-jet-substructure-d0
512+
dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcd-charged, o2-analysis-je-jet-finder-d0-mcp-charged]
513513
requires_mc: yes
514-
tables: D0MCDSS
514+
tables: [D0MCDSS, D0MCPSS]
515515

516-
o2-analysis-je-jet-substructure-hf_mcp:
517-
executable: o2-analysis-je-jet-substructure-hf
518-
dependencies: [o2-analysis-hf-candidate-selector-d0, o2-analysis-je-jet-finder-d0-mcp-charged]
519-
requires_mc: yes
520-
tables: D0MCPSS
521-
522-
o2-analysis-je-jet-substructure-hf-output_data:
523-
executable: o2-analysis-je-jet-substructure-hf-output
524-
dependencies: o2-analysis-je-jet-substructure-hf_data
516+
o2-analysis-je-jet-substructure-d0-output_data:
517+
executable: o2-analysis-je-jet-substructure-d0-output
518+
dependencies: o2-analysis-je-jet-substructure-d0_data
525519
tables: [D0O, D0SSO]
526520

527-
o2-analysis-je-jet-substructure-hf-output_mcd:
528-
executable: o2-analysis-je-jet-substructure-hf-output
529-
dependencies: o2-analysis-je-jet-substructure-hf_mcd
530-
requires_mc: yes
531-
tables: [D0MCDO, D0MCDSSO]
532-
533-
o2-analysis-je-jet-substructure-hf-output_mcp:
534-
executable: o2-analysis-je-jet-substructure-hf-output
535-
dependencies: o2-analysis-je-jet-substructure-hf_mcp
521+
o2-analysis-je-jet-substructure-d0-output_mc:
522+
executable: o2-analysis-je-jet-substructure-d0-output
523+
dependencies: o2-analysis-je-jet-substructure-d0_mc
536524
requires_mc: yes
537-
tables: [D0MCPO, D0MCPSSO]
525+
tables: [D0MCDO, D0MCDSSO, D0MCPO, D0MCPSSO]
538526

539527
# QA
540528

0 commit comments

Comments
 (0)