Skip to content

Commit b4cdc53

Browse files
ariedel-cernariedel-cern
committed
Fix: fix typos and other small issues
1 parent f8ecc77 commit b4cdc53

6 files changed

Lines changed: 83 additions & 88 deletions

File tree

‎PWGCF/Femto/Core/closeTripletRejection.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,6 @@ class CloseTripletRejectionTrackTrackCascade
224224
closepairrejection::ClosePairRejectionTrackCascade<prefixTrack2Bachelor, prefixTrack2V0Daughter> mCtrTrack2Cascade;
225225
};
226226

227-
}; // namespace closetripletrejection
228-
}; // namespace o2::analysis::femto
227+
} // namespace closetripletrejection
228+
} // namespace o2::analysis::femto
229229
#endif // PWGCF_FEMTO_CORE_CLOSETRIPLETREJECTION_H_

‎PWGCF/Femto/Core/pairHistManager.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,8 @@ enum PairHist {
103103
kTrueCentVsCent,
104104

105105
// mixing qa
106-
kSeNpart1VsNpart2, // number of unique particles 1 vs unique number of particles 2 in each same event
107-
kMeMixingWindowRaw,
108-
// mixing window size
106+
kSeNpart1VsNpart2, // number of unique particles 1 vs unique number of particles 2 in each same event
107+
kMeMixingWindowRaw, // mixing window size
109108
kMeMixingWindowEffective, // mixing window size, counting event pairs with particle pairs
110109
kMeNpart1VsNpart2, // number of unique particles 1 vs number of unique particles 2 in each mixed event
111110
kMeVtz1VsMult1VsCent1VsVtz2VsMult2VsCent2, // correlation of event properties in each mixing bin

‎PWGCF/Femto/Core/tripletBuilder.h‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class TripletTrackTrackTrackBuilder
124124
} else if (mTrack1Track2AreSameSpecies) {
125125
// Track1 & Track2 & are the same particle species and track 3 is something else
126126
mTrackHistManager1.template init<mode>(registry, trackHistSpec1, confTrackSelection1);
127-
mTrackHistManager3.template init<mode>(registry, trackHistSpec3, confTrackSelection2);
127+
mTrackHistManager3.template init<mode>(registry, trackHistSpec3, confTrackSelection3);
128128

129129
mTripletHistManagerSe.setMass(confTrackSelection1.pdgCodeAbs.value, confTrackSelection1.pdgCodeAbs.value, confTrackSelection3.pdgCodeAbs.value);
130130
mTripletHistManagerSe.setCharge(confTrackSelection1.chargeAbs.value, confTrackSelection1.chargeAbs.value, confTrackSelection3.chargeAbs.value);
@@ -268,7 +268,7 @@ class TripletTrackTrackTrackBuilder
268268
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition1, partition1, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
269269
break;
270270
default:
271-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
271+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
272272
}
273273
} else if (mTrack1Track2AreSameSpecies) {
274274
switch (mMixingPolicy) {
@@ -282,7 +282,7 @@ class TripletTrackTrackTrackBuilder
282282
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition1, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
283283
break;
284284
default:
285-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
285+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
286286
}
287287
} else {
288288
switch (mMixingPolicy) {
@@ -296,7 +296,7 @@ class TripletTrackTrackTrackBuilder
296296
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition2, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
297297
break;
298298
default:
299-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
299+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
300300
}
301301
}
302302
}
@@ -316,7 +316,7 @@ class TripletTrackTrackTrackBuilder
316316
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition1, partition1, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
317317
break;
318318
default:
319-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
319+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
320320
}
321321
} else if (mTrack1Track2AreSameSpecies) {
322322
switch (mMixingPolicy) {
@@ -330,7 +330,7 @@ class TripletTrackTrackTrackBuilder
330330
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition1, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
331331
break;
332332
default:
333-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
333+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
334334
}
335335
} else {
336336
switch (mMixingPolicy) {
@@ -344,7 +344,7 @@ class TripletTrackTrackTrackBuilder
344344
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition2, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
345345
break;
346346
default:
347-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
347+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
348348
}
349349
}
350350
}
@@ -553,7 +553,7 @@ class TripletTrackTrackV0Builder
553553
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition1, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
554554
break;
555555
default:
556-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
556+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
557557
}
558558
} else {
559559
switch (mMixingPolicy) {
@@ -567,7 +567,7 @@ class TripletTrackTrackV0Builder
567567
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition2, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
568568
break;
569569
default:
570-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
570+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
571571
}
572572
}
573573
}
@@ -587,7 +587,7 @@ class TripletTrackTrackV0Builder
587587
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition1, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
588588
break;
589589
default:
590-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
590+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
591591
}
592592
} else {
593593
switch (mMixingPolicy) {
@@ -601,7 +601,7 @@ class TripletTrackTrackV0Builder
601601
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition2, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
602602
break;
603603
default:
604-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
604+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
605605
}
606606
}
607607
}
@@ -688,17 +688,17 @@ class TripletTrackTrackCascadeBuilder
688688
T10 const& confMixing,
689689
T11 const& confTripletBinning,
690690
T12 const& confTripletCuts,
691-
std::map<T13, std::vector<o2::framework::AxisSpec>>& colHistSpec,
692-
std::map<T14, std::vector<o2::framework::AxisSpec>>& trackHistSpec1,
693-
std::map<T15, std::vector<o2::framework::AxisSpec>>& trackHistSpec2,
694-
std::map<T16, std::vector<o2::framework::AxisSpec>>& cascadeHistSpec,
695-
std::map<T17, std::vector<o2::framework::AxisSpec>>& bachelorHistSpec,
696-
std::map<T18, std::vector<o2::framework::AxisSpec>>& posDauHistSpec,
697-
std::map<T19, std::vector<o2::framework::AxisSpec>>& negDauHistSpec,
698-
std::map<T20, std::vector<o2::framework::AxisSpec>>& tripletHistSpec,
699-
std::map<T21, std::vector<o2::framework::AxisSpec>>& cprHistSpecBachelor,
700-
std::map<T22, std::vector<o2::framework::AxisSpec>>& cprHistSpecV0Daughter,
701-
std::map<T23, std::vector<o2::framework::AxisSpec>>& ctrHistSpec)
691+
std::map<T13, std::vector<o2::framework::AxisSpec>> const& colHistSpec,
692+
std::map<T14, std::vector<o2::framework::AxisSpec>> const& trackHistSpec1,
693+
std::map<T15, std::vector<o2::framework::AxisSpec>> const& trackHistSpec2,
694+
std::map<T16, std::vector<o2::framework::AxisSpec>> const& cascadeHistSpec,
695+
std::map<T17, std::vector<o2::framework::AxisSpec>> const& bachelorHistSpec,
696+
std::map<T18, std::vector<o2::framework::AxisSpec>> const& posDauHistSpec,
697+
std::map<T19, std::vector<o2::framework::AxisSpec>> const& negDauHistSpec,
698+
std::map<T20, std::vector<o2::framework::AxisSpec>> const& tripletHistSpec,
699+
std::map<T21, std::vector<o2::framework::AxisSpec>> const& cprHistSpecBachelor,
700+
std::map<T22, std::vector<o2::framework::AxisSpec>> const& cprHistSpecV0Daughter,
701+
std::map<T23, std::vector<o2::framework::AxisSpec>> const& ctrHistSpec)
702702
{
703703
// check if correlate the same tracks or not
704704
mTrack1Track2AreSameSpecies = confMixing.particle12AreSameSpecies.value;
@@ -827,7 +827,7 @@ class TripletTrackTrackCascadeBuilder
827827
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition1, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
828828
break;
829829
default:
830-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
830+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
831831
}
832832
} else {
833833
switch (mMixingPolicy) {
@@ -841,7 +841,7 @@ class TripletTrackTrackCascadeBuilder
841841
tripletprocesshelpers::processMixedEvent<mode>(cols, partition1, partition2, partition3, trackTable, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
842842
break;
843843
default:
844-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
844+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
845845
}
846846
}
847847
}
@@ -861,7 +861,7 @@ class TripletTrackTrackCascadeBuilder
861861
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition1, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
862862
break;
863863
default:
864-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
864+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
865865
}
866866
} else {
867867
switch (mMixingPolicy) {
@@ -875,7 +875,7 @@ class TripletTrackTrackCascadeBuilder
875875
tripletprocesshelpers::processMixedEvent<mode>(cols, mcCols, partition1, partition2, partition3, trackTable, mcParticles, cache, binsVtxMultCent, mMixingDepth, mTripletHistManagerMe, mCtrMe, mTc);
876876
break;
877877
default:
878-
LOG(fatal) << "Invalid binning policiy specifed. Breaking...";
878+
LOG(fatal) << "Invalid binning policy specifed. Breaking...";
879879
}
880880
}
881881
}

‎PWGCF/Femto/Core/tripletHistManager.h‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct ConfTripletBinning : o2::framework::ConfigurableGroup {
101101
o2::framework::Configurable<bool> plotQ3VsMtVsMult{"plotQ3VsMtVsMult", false, "Enable 3D histogram (Q3 vs Mt vs Mult)"};
102102
o2::framework::Configurable<bool> plotQ3VsMtVsMultVsCent{"plotQ3VsMtVsMultVsCent", false, "Enable 4D histogram (Q3 vs Mt vs Mult Vs Cent)"};
103103
o2::framework::Configurable<bool> plotQ3VsMtVsPt1VsPt2VsPt3VsMult{"plotQ3VsMtVsPt1VsPt2VsPt3VsMult", false, "Enable 6D histogram (Q3 vs Mt Vs Pt1 vs Pt2 vs Pt3 vs Mult)"};
104-
o2::framework::Configurable<bool> plotQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent{"plotQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent", false, "Enable 3D histogram (Q3 vs Mt Vs Pt1 vs Pt2 vs Pt3 vs Mult vs Cent)"};
104+
o2::framework::Configurable<bool> plotQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent{"plotQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent", false, "Enable 7D histogram (Q3 vs Mt Vs Pt1 vs Pt2 vs Pt3 vs Mult vs Cent)"};
105105
o2::framework::ConfigurableAxis q3{"q3", {{600, 0, 6}}, "q3"};
106106
o2::framework::ConfigurableAxis mt{"mt", {{500, 0.8, 5.8}}, "mt"};
107107
o2::framework::ConfigurableAxis multiplicity{"multiplicity", {{50, 0, 200}}, "multiplicity"};
@@ -133,20 +133,20 @@ constexpr std::array<histmanager::HistInfo<TripletHist>, kTripletHistogramLast>
133133
{kQ3, o2::framework::HistType::kTH1F, "hQ3", "Q_{3}; Q_{3} (GeV/#it{c}); Entries"},
134134
{kMt, o2::framework::HistType::kTH1F, "hMt", "transverse mass; m_{T} (GeV/#it{c}^{2}); Entries"},
135135
// 2D
136-
{kPt1VsQ3, o2::framework::HistType::kTH2F, "hPt1VsQ3", " p_{T,1} vs Q_{3}; p_{T,1} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
136+
{kPt1VsQ3, o2::framework::HistType::kTH2F, "hPt1VsQ3", "p_{T,1} vs Q_{3}; p_{T,1} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
137137
{kPt2VsQ3, o2::framework::HistType::kTH2F, "hPt2VsQ3", "p_{T,2} vs Q_{3}; p_{T,2} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
138-
{kPt3VsQ3, o2::framework::HistType::kTH2F, "hPt3VsQ3", "p_{T,3} vs Q_{3}; p_{T,2} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
138+
{kPt3VsQ3, o2::framework::HistType::kTH2F, "hPt3VsQ3", "p_{T,3} vs Q_{3}; p_{T,3} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
139139
{kQ3VsMt, o2::framework::HistType::kTH2F, "hQ3VsMt", "Q_{3} vs m_{T}; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2})"},
140140
{kQ3VsMult, o2::framework::HistType::kTH2F, "hQ3VsMult", "Q_{3} vs Multiplicity; Q_{3} (GeV/#it{c}); Multiplicity"},
141141
{kQ3VsCent, o2::framework::HistType::kTH2F, "hQ3VsCent", "Q_{3} vs Centrality; Q_{3} (GeV/#it{c}); Centrality"},
142142
// n-D
143-
{kPt1VsPt2VsPt3, o2::framework::HistType::kTHnSparseF, "hPt1VsPt2VsPt3", "k* vs m_{T} vs multiplicity; k* (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); Multiplicity"},
144-
{kQ3VsPt1VsPt2VsPt3, o2::framework::HistType::kTHnSparseF, "hQ3VsPt1VsPt2VsPt3", "Q_{3} vs p_{T,1} vs p_{T,2} vs p_{T,3}; Q_{3} (GeV/#it{c}); p_{T,1} (GeV/#it{c}) ; p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c})"},
143+
{kPt1VsPt2VsPt3, o2::framework::HistType::kTHnSparseF, "hPt1VsPt2VsPt3", "p_{T,1} vs p_{T,2} vs p_{T,3}; p_{T,1} (GeV/#it{c});p_{T,2} (GeV/#it{c});p_{T,3} (GeV/#it{c});"},
144+
{kQ3VsPt1VsPt2VsPt3, o2::framework::HistType::kTHnSparseF, "hQ3VsPt1VsPt2VsPt3", "Q_{3} vs p_{T,1} vs p_{T,2} vs p_{T,3}; Q_{3} (GeV/#it{c}); p_{T,1} (GeV/#it{c}); p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c});"},
145145
{kQ3VsMtVsMult, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsMult", "Q_{3} vs m_{T} vs multiplicity; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); Multiplicity"},
146-
{kQ3VsMtVsMultVsCent, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsMultVsCent", "Q_{3} vs m_{T} vs multiplicity vs centrality; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); Multiplicity; Centrality"},
146+
{kQ3VsMtVsMultVsCent, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsMultVsCent", "Q_{3} vs m_{T} vs multiplicity vs centrality; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); Multiplicity; Centrality (%);"},
147147
// n-D with mass
148-
{kQ3VsMtVsPt1VsPt2VsPt3VsMult, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsPt1VsPt2VsPt3VsMult", "Q_{3} vs m_{T} vs p_{T,1} vs p_{T,2} vs p_{T,3} vs multiplicity; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); p_{T,1} (GeV/#it{c}) ; p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c}) ; Multiplicity"},
149-
{kQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent", "Q_{3} vs m_{T} vs p_{T,1} vs p_{T,2} vs p_{T,3} vs multiplicity vs centrality; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); p_{T,1} (GeV/#it{c}) ; p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c}) vs multiplicity vs centrality"},
148+
{kQ3VsMtVsPt1VsPt2VsPt3VsMult, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsPt1VsPt2VsPt3VsMult", "Q_{3} vs m_{T} vs p_{T,1} vs p_{T,2} vs p_{T,3} vs multiplicity; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); p_{T,1} (GeV/#it{c}) ; p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c}); Multiplicity;"},
149+
{kQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent, o2::framework::HistType::kTHnSparseF, "hQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent", "Q_{3} vs m_{T} vs p_{T,1} vs p_{T,2} vs p_{T,3} vs multiplicity vs centrality; Q_{3} (GeV/#it{c}); m_{T} (GeV/#it{c}^{2}); p_{T,1} (GeV/#it{c}) ; p_{T,2} (GeV/#it{c}); p_{T,3} (GeV/#it{c}); Multiplicity; Centrality (%);"},
150150
{kTrueQ3VsQ3, o2::framework::HistType::kTH2F, "hTrueQ3VsQ3", "Q_{3,True} vs Q_{3}; Q_{3,true} (GeV/#it{c}); Q_{3} (GeV/#it{c})"},
151151
{kTrueMtVsMt, o2::framework::HistType::kTH2F, "hTrueMtVsMt", "m_{T,True} vs m_{T}; m_{T,True} (GeV/#it{c}^{2}); m_{T} (GeV/#it{c}^{2})"},
152152
{kTrueMultVsMult, o2::framework::HistType::kTH2F, "hTrueMultVsMult", "Multiplicity_{True} vs Multiplicity; Multiplicity_{True} ; Multiplicity"},
@@ -359,7 +359,7 @@ class TripletHistManager
359359
mHasMcCol = true;
360360
auto mcCol1 = col1.template fMcCol_as<T6>();
361361
auto mcCol2 = col2.template fMcCol_as<T6>();
362-
auto mcCol3 = col2.template fMcCol_as<T6>();
362+
auto mcCol3 = col3.template fMcCol_as<T6>();
363363
mTrueMult = (mcCol1.mult() + mcCol2.mult() + mcCol3.mult()) / 3.f;
364364
mTrueCent = (mcCol1.cent() + mcCol2.cent() + mcCol3.cent()) / 3.f;
365365
}
@@ -565,8 +565,6 @@ class TripletHistManager
565565
bool mHasMcCol = false;
566566
float mQ3Min = -1.f;
567567
float mQ3Max = -1.f;
568-
float mKtMin = -1.f;
569-
float mKtMax = -1.f;
570568
float mMtMin = -1.f;
571569
float mMtMax = -1.f;
572570

@@ -582,6 +580,6 @@ class TripletHistManager
582580
bool mPlotQ3VsMtVsPt1VsPt2VsPt3VsMultVsCent = false;
583581
};
584582

585-
}; // namespace triplethistmanager
586-
}; // namespace o2::analysis::femto
583+
} // namespace triplethistmanager
584+
} // namespace o2::analysis::femto
587585
#endif // PWGCF_FEMTO_CORE_TRIPLETHISTMANAGER_H_

0 commit comments

Comments
 (0)