Skip to content

Commit 2343113

Browse files
vkuceravkucera
committed
Fixes
1 parent 194e9c2 commit 2343113

File tree

5 files changed

+54
-47
lines changed

5 files changed

+54
-47
lines changed

‎Tutorials/PWGHF/DataModelMini.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, Tracks, "_1"); //! prong 1
4545

4646
// Track index skim table
4747
DECLARE_SOA_TABLE(HfT2Prongs, "AOD", "HFT2PRONG", //! table with prong indices
48+
o2::soa::Index<>,
4849
hf_track_index::Prong0Id,
4950
hf_track_index::Prong1Id);
5051

@@ -90,6 +91,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(Cpa, cpa, //! cosine of pointing angle of candidate
9091

9192
// Candidate table
9293
DECLARE_SOA_TABLE(HfTCand2ProngBase, "AOD", "HFTCAND2PBASE", //! 2-prong candidate table
94+
o2::soa::Index<>,
9395
hf_cand_prong2::CollisionId,
9496
collision::PosX, collision::PosY, collision::PosZ,
9597
hf_cand_prong2::XSecondaryVertex, hf_cand_prong2::YSecondaryVertex, hf_cand_prong2::ZSecondaryVertex,

‎Tutorials/PWGHF/dpl-config_task.json‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"ccdbPath": "Analysis/PID/TPC/Response",
7878
"recoPass": "",
7979
"ccdb-timestamp": "0",
80-
"useNetworkCorrection": "true",
80+
"useNetworkCorrection": "false",
8181
"autofetchNetworks": "true",
8282
"skipTPCOnly": "-1",
8383
"devicesRequiringTPCOnlyPID": {
@@ -122,9 +122,9 @@
122122
"networkBetaGammaCutoff": "0.45",
123123
"ccdb-path-grplhcif": "GLO/Config/GRPLHCIF"
124124
},
125-
"processTracksIU": "false",
125+
"processTracksIU": "true",
126126
"processTracksIUWithTracksQA": "false",
127-
"processTracksMCIU": "true"
127+
"processTracksMCIU": "false"
128128
},
129129
"ft0-corrected-table": {
130130
"resoFT0A": "20",
@@ -541,13 +541,22 @@
541541
"processMonteCarloWithPID": "false"
542542
},
543543
"tof-signal": {
544+
"enableQaHistograms": "false",
544545
"ccdb-url": "http://alice-ccdb.cern.ch",
546+
"ccdb-path-grplhcif": "GLO/Config/GRPLHCIF",
545547
"ccdb-timestamp": "-1",
546-
"timeShiftCCDBPath": "",
547-
"distanceForGoodMatch": "999",
548-
"distanceForGoodMatchLowMult": "999",
549-
"multThreshold": "0",
550-
"enableQaHistograms": "false",
548+
"timeShiftCCDBPathPos": "Analysis/PID/TOFOffsetPos",
549+
"timeShiftCCDBPathNeg": "Analysis/PID/TOFOffsetPos",
550+
"timeShiftCCDBPathPosMC": "",
551+
"timeShiftCCDBPathNegMC": "",
552+
"paramFileName": "",
553+
"parametrizationPath": "TOF/Calib/Params",
554+
"reconstructionPass": "metadata",
555+
"reconstructionPassDefault": "unanchored",
556+
"fatalOnPassNotAvailable": "false",
557+
"enableTimeDependentResponse": "true",
558+
"collisionSystem": "-1",
559+
"autoSetProcessFunctions": "true",
551560
"processRun3": "true",
552561
"processRun2": "false"
553562
},
@@ -561,37 +570,20 @@
561570
"minRelChi2Change": "0.9"
562571
},
563572
"tof-event-time": {
564-
"inheritFromBaseTask": "true",
565-
"ccdb-url": "",
566-
"ccdb-timestamp": "-1",
567573
"minMomentum": "0.5",
568574
"maxMomentum": "2",
569575
"maxEvTimeTOF": "100000",
570576
"sel8TOFEvTime": "false",
577+
"computeEvTimeWithTOF": "1",
578+
"computeEvTimeWithFT0": "1",
571579
"maxNtracksInSet": "10",
572-
"paramFileName": "",
573-
"parametrizationPath": "TOF/Calib/Params",
574-
"passName": "",
575-
"loadResponseFromCCDB": "false",
576-
"enableTimeDependentResponse": "false",
577-
"fatalOnPassNotAvailable": "true",
578580
"processRun2": "false",
579-
"processNoFT0": "true",
580-
"processFT0": "false",
581-
"processOnlyFT0": "false"
581+
"processRun3": "true"
582582
},
583583
"hf-task-mini-candidate-creator-2prong-expressions": "",
584-
"tof-pid-full": {
585-
"inheritFromBaseTask": "true",
586-
"ccdb-url": "",
587-
"ccdb-timestamp": "-1",
588-
"paramFileName": "",
589-
"parametrizationPath": "",
590-
"passName": "",
591-
"timeShiftCCDBPath": "",
592-
"loadResponseFromCCDB": "false",
593-
"enableTimeDependentResponse": "false",
594-
"fatalOnPassNotAvailable": "true",
584+
"tof-pid-merge": {
585+
"enableQaHistograms": "false",
586+
"enableTOFParamsForBetaMass": "false",
595587
"enableParticle": {
596588
"labels_rows": [
597589
"El",
@@ -605,40 +597,52 @@
605597
"Al"
606598
],
607599
"labels_cols": [
608-
"Enable"
600+
"Enable",
601+
"EnableFull"
609602
],
610603
"values": [
611604
[
605+
"-1",
612606
"-1"
613607
],
614608
[
609+
"-1",
615610
"-1"
616611
],
617612
[
613+
"-1",
618614
"-1"
619615
],
620616
[
617+
"-1",
621618
"-1"
622619
],
623620
[
621+
"-1",
624622
"-1"
625623
],
626624
[
625+
"-1",
627626
"-1"
628627
],
629628
[
629+
"-1",
630630
"-1"
631631
],
632632
[
633+
"-1",
633634
"-1"
634635
],
635636
[
637+
"-1",
636638
"-1"
637639
]
638640
]
639641
},
640-
"processWSlice": "true",
641-
"processWoSlice": "false"
642+
"processRun3": "true",
643+
"processRun2": "false",
644+
"processRun2BetaM": "false",
645+
"processRun3BetaM": "true"
642646
},
643647
"hf-task-mini-candidate-selector-d0": {
644648
"ptCandMin": "0",

‎Tutorials/PWGHF/run_skim.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
2727
# O2 configuration file (in the same directory)
2828
JSON="$DIR_THIS/dpl-config_skim.json"
2929

30-
# command line options of O2 workflows (required per workflow)
30+
# local command line options of O2 workflows (required per workflow)
3131
OPTIONS_LOCAL=(
3232
-b
3333
--configuration json://"$JSON"
3434
--aod-writer-keep "AOD/HFT2PRONG/0"
3535
)
3636

37-
# command line options of O2 workflows (required only once)
37+
# global command line options of O2 workflows (required only once)
3838
OPTIONS_GLOBAL=(
3939
--aod-memory-rate-limit 2000000000
4040
--shm-segment-size 16000000000
4141
--resources-monitoring 2
42+
--aod-file "@input_skim.txt"
4243
)
4344

4445
# execute the mini skim creator workflow and its dependencies

‎Tutorials/PWGHF/run_task.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
2727
# O2 configuration file (in the same directory)
2828
JSON="$DIR_THIS/dpl-config_task.json"
2929

30-
# command line options of O2 workflows (required per workflow)
30+
# local command line options of O2 workflows (required per workflow)
3131
OPTIONS_LOCAL=(
3232
-b
3333
--configuration json://"$JSON"
3434
)
3535

36-
# command line options of O2 workflows (required only once)
36+
# global command line options of O2 workflows (required only once)
3737
OPTIONS_GLOBAL=(
3838
--aod-memory-rate-limit 2000000000
3939
--shm-segment-size 16000000000
4040
--resources-monitoring 2
4141
--aod-parent-base-path-replacement "old-path-to-parent;new-path-to-parent"
4242
--aod-parent-access-level 1
43+
--aod-file "@input_task.txt"
4344
)
4445

4546
# execute the mini task workflow and its dependencies
46-
o2-analysis-pid-tof-base "${OPTIONS_LOCAL[@]}" | \
47-
o2-analysis-pid-tof-full "${OPTIONS_LOCAL[@]}" | \
4847
o2-analysis-pid-tpc-service "${OPTIONS_LOCAL[@]}" | \
48+
o2-analysis-pid-tof-merge "${OPTIONS_LOCAL[@]}" | \
4949
o2-analysis-ft0-corrected-table "${OPTIONS_LOCAL[@]}" | \
5050
o2-analysis-mccollision-converter "${OPTIONS_LOCAL[@]}" | \
5151
o2-analysis-event-selection-service "${OPTIONS_LOCAL[@]}" | \

‎Tutorials/PWGHF/skimCreatorMini.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ struct HfSkimCreatorMini {
136136
void init(InitContext&)
137137
{
138138
// 2-prong histograms
139-
registry.add("hVtx2ProngX", "2-prong candidates;#it{x}_{sec. vtx.} (cm);entries", {HistType::kTH1D, {{1000, -2., 2.}}});
140-
registry.add("hVtx2ProngY", "2-prong candidates;#it{y}_{sec. vtx.} (cm);entries", {HistType::kTH1D, {{1000, -2., 2.}}});
141-
registry.add("hVtx2ProngZ", "2-prong candidates;#it{z}_{sec. vtx.} (cm);entries", {HistType::kTH1D, {{1000, -20., 20.}}});
142-
registry.add("hMassD0", "D^{0} candidates;inv. mass (#pi K) (GeV/#it{c}^{2});entries", {HistType::kTH1D, {{500, 0., 5.}}});
139+
registry.add("hVtx2ProngX", "2-prong candidates;#it{x}_{sec. vtx.} (cm);entries", {HistType::kTH1F, {{1000, -2., 2.}}});
140+
registry.add("hVtx2ProngY", "2-prong candidates;#it{y}_{sec. vtx.} (cm);entries", {HistType::kTH1F, {{1000, -2., 2.}}});
141+
registry.add("hVtx2ProngZ", "2-prong candidates;#it{z}_{sec. vtx.} (cm);entries", {HistType::kTH1F, {{1000, -20., 20.}}});
142+
registry.add("hMassD0ToPiK", "D^{0} candidates;inv. mass (#pi K) (GeV/#it{c}^{2});entries", {HistType::kTH1F, {{500, 0., 5.}}});
143143

144144
// Configure the vertexer
145145
fitter.setBz(magneticField);
@@ -195,9 +195,9 @@ struct HfSkimCreatorMini {
195195
registry.fill(HIST("hVtx2ProngZ"), secondaryVertex[2]);
196196
const std::array arrayMomenta{pVec0, pVec1};
197197
const auto massPiK{RecoDecay::m(arrayMomenta, std::array{MassPiPlus, MassKPlus})};
198-
const auto massKPi{RecoDecay::m(arrayMomenta, std::array{MassKPlus, MassPiPlus})};
199-
registry.fill(HIST("hMassD0"), massPiK);
200-
registry.fill(HIST("hMassD0"), massKPi);
198+
// const auto massKPi{RecoDecay::m(arrayMomenta, std::array{MassKPlus, MassPiPlus})};
199+
registry.fill(HIST("hMassD0ToPiK"), massPiK);
200+
// registry.fill(HIST("hMassD0ToPiK"), massKPi);
201201
}
202202
}
203203
}

0 commit comments

Comments
 (0)