Skip to content

Commit 9d5d15a

Browse files
sigurdnesesigurdnese
authored
[PWGDQ] Require exact match for group string in HistogramsLibrary (#6254)
* Require exact match for group string in HistogramsLibrary * Adjust comment block to reflect changes
1 parent 641bda5 commit 9d5d15a

1 file changed

Lines changed: 14 additions & 15 deletions

File tree

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
1818
{
1919
//
2020
// Add a predefined group of histograms to the HistogramManager hm and histogram class histClass
21-
// NOTE: The groupName and subGroupName arguments may contain several keywords, but the user should take care of
22-
// ambiguities. TODO: fix it!
21+
// NOTE: The subGroupName argument may contain several keywords, but the user should take care of ambiguities. TODO: fix it!
2322
// NOTE: All of the histograms which match any of the group or subgroup names will be added to the same histogram class !!
2423
// So one has to make sure not to mix e.g. event-wise with track-wise histograms
2524
// NOTE: The subgroup name can be empty. In this case just a minimal set of histograms corresponding to the group name will be defined
@@ -28,7 +27,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
2827
groupStr.ToLower();
2928
TString subGroupStr = subGroupName;
3029
subGroupStr.ToLower();
31-
if (groupStr.Contains("event")) {
30+
if (!groupStr.CompareTo("event")) {
3231
hm->AddHistogram(histClass, "VtxZ", "Vtx Z", false, 60, -15.0, 15.0, VarManager::kVtxZ);
3332
hm->AddHistogram(histClass, "VtxZ_Run", "Vtx Z", true, VarManager::GetDummyNRuns(), -0.5 + VarManager::GetDummyFirst(), 0.5 + VarManager::GetDummyLast(), VarManager::kRunNo, 60, -15.0, 15.0, VarManager::kVtxZ, 1, 0, 1, VarManager::kNothing, VarManager::GetRunStr().Data());
3433
hm->AddHistogram(histClass, "BC", "Event per BC", false, 3564, 0.0, 3564.0, VarManager::kBCOrbit);
@@ -234,7 +233,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
234233
}
235234
} // end "event"
236235

237-
if (groupStr.CompareTo("two-collisions") == 0) {
236+
if (!groupStr.CompareTo("two-collisions")) {
238237
hm->AddHistogram(histClass, "DeltaZ", "z_{1} - z_{2}", false, 400, -20., 20., VarManager::kTwoEvDeltaZ);
239238
hm->AddHistogram(histClass, "DeltaZ_Z1", "z_{1} - z_{2} vs z_{1}", false, 24, -12., 12., VarManager::kTwoEvPosZ1, 300, -15., 15., VarManager::kTwoEvDeltaZ);
240239
hm->AddHistogram(histClass, "DeltaR", "r_{1} - r_{2}", false, 200, -0.1, 0.1, VarManager::kTwoEvDeltaR);
@@ -245,7 +244,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
245244
hm->AddHistogram(histClass, "NContrib1vs2", "n.contrib 1 vs 2", false, 100, 0.0, 100.0, VarManager::kTwoEvPVcontrib1, 100, 0.0, 100.0, VarManager::kTwoEvPVcontrib2);
246245
}
247246

248-
if (groupStr.Contains("track")) {
247+
if (!groupStr.CompareTo("track")) {
249248
hm->AddHistogram(histClass, "Pt", "p_{T} distribution", false, 2000, 0.0, 20.0, VarManager::kPt);
250249
hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta);
251250
hm->AddHistogram(histClass, "Phi", "#varphi distribution", false, 500, -2. * TMath::Pi(), 2. * TMath::Pi(), VarManager::kPhi);
@@ -667,7 +666,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
667666
}
668667
}
669668

670-
if (groupStr.Contains("mctruth_triple")) {
669+
if (!groupStr.CompareTo("mctruth_triple")) {
671670
hm->AddHistogram(histClass, "Eta_Pt", "", false, 100, -2.0, 2.0, VarManager::kPairEta, 200, 0.0, 20.0, VarManager::kPairPt);
672671
hm->AddHistogram(histClass, "Eta_Pt_lepton1", "", false, 100, -2.0, 2.0, VarManager::kEta1, 200, 0.0, 20.0, VarManager::kPt1);
673672
hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 20.0, VarManager::kPt2);
@@ -686,7 +685,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
686685
hm->AddHistogram(histClass, "DeltaMass_Jpsi", "", false, 1500, 3, 4.5, (VarManager::kDeltaMass_jpsi));
687686
hm->AddHistogram(histClass, "Rapidity", "", false, 400, -4.0, 4.0, VarManager::kRap);
688687
}
689-
if (groupStr.Contains("mctruth_pair")) {
688+
if (!groupStr.CompareTo("mctruth_pair")) {
690689
hm->AddHistogram(histClass, "Mass_Pt", "", false, 500, 0.0, 5.0, VarManager::kMass, 200, 0.0, 20.0, VarManager::kPt);
691690
hm->AddHistogram(histClass, "Pt", "", false, 2000, 0.0, 20.0, VarManager::kPt);
692691
hm->AddHistogram(histClass, "Pt_Dilepton", "", false, 2000, 0.0, 20.0, VarManager::kPairPtDau);
@@ -696,7 +695,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
696695
hm->AddHistogram(histClass, "Eta_Pt", "", false, 40, -2.0, 2.0, VarManager::kEta, 200, 0.0, 20.0, VarManager::kPt);
697696
hm->AddHistogram(histClass, "Phi_Eta", "#phi vs #eta distribution", false, 200, -5.0, 5.0, VarManager::kEta, 200, -2. * TMath::Pi(), 2. * TMath::Pi(), VarManager::kPhi);
698697
}
699-
if (groupStr.Contains("mctruth_track")) {
698+
if (!groupStr.CompareTo("mctruth_track")) {
700699
hm->AddHistogram(histClass, "PtMC", "MC pT", false, 2000, 0.0, 20.0, VarManager::kMCPt);
701700
hm->AddHistogram(histClass, "EtaMC", "MC #eta", false, 50, -5.0, 5.0, VarManager::kMCEta);
702701
hm->AddHistogram(histClass, "PhiMC", "MC #phi", false, 50, -6.3, 6.3, VarManager::kMCPhi);
@@ -709,7 +708,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
709708
hm->AddHistogram(histClass, "RapidityMC", "", false, 400, -4.0, 4.0, VarManager::kMCY);
710709
}
711710

712-
if (groupStr.Contains("pair")) {
711+
if (!groupStr.CompareTo("pair")) {
713712
if (subGroupStr.Contains("barrel")) {
714713
hm->AddHistogram(histClass, "Mass", "", false, 500, 0.0, 5.0, VarManager::kMass);
715714
hm->AddHistogram(histClass, "Mass_HighRange", "", false, 375, 0.0, 15.0, VarManager::kMass);
@@ -1102,7 +1101,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
11021101
}
11031102
}
11041103

1105-
if (groupStr.Contains("dilepton-track")) {
1104+
if (!groupStr.CompareTo("dilepton-track")) {
11061105
if (subGroupStr.Contains("mixedevent")) { // for mixed event
11071106
hm->AddHistogram(histClass, "Mass_Pt", "", false, 40, 0.0, 20.0, VarManager::kPairMass, 40, 0.0, 20.0, VarManager::kPairPt);
11081107
hm->AddHistogram(histClass, "Mass", "", false, 750, 0.0, 30.0, VarManager::kPairMass);
@@ -1150,7 +1149,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
11501149
}
11511150
}
11521151

1153-
if (groupStr.Contains("dilepton-hadron-array-correlation")) {
1152+
if (!groupStr.CompareTo("dilepton-hadron-array-correlation")) {
11541153
const int kInvMassBins = 500;
11551154
double InvMassBinLims[kInvMassBins + 1];
11561155
for (int i = 0; i <= kInvMassBins; i++)
@@ -1180,7 +1179,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
11801179
int varsJPsiHadCorr[4] = {VarManager::kPairMassDau, VarManager::kDeltaEta, VarManager::kDeltaPhi, VarManager::kPairPtDau};
11811180
hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr, nJPsiHadCorr);
11821181
}
1183-
if (groupStr.Contains("dilepton-charmhadron")) {
1182+
if (!groupStr.CompareTo("dilepton-charmhadron")) {
11841183
if (subGroupStr.EqualTo("jpsitomumu")) {
11851184
hm->AddHistogram(histClass, "hMassVsPtJPsi", "", false, 100, 0.f, 50.f, VarManager::kPt, 300, 2.f, 5.f, VarManager::kMass);
11861185
hm->AddHistogram(histClass, "hRapVsPtJPsi", "", false, 100, 0.f, 50.f, VarManager::kPt, 50, -4.5f, -2.0f, VarManager::kRap);
@@ -1209,7 +1208,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
12091208
hm->AddHistogram(histClass, "hPhiVsPtVsBdtDmesonWithJPsi", "", false, 100, 0.f, 1.f, VarManager::kBdtCharmHadron, 100, 0.f, 50.f, VarManager::kPtCharmHadron, 180, 0., 2 * constants::math::PI, VarManager::kPhiCharmHadron);
12101209
}
12111210
}
1212-
if (groupStr.Contains("dilepton-dihadron")) {
1211+
if (!groupStr.CompareTo("dilepton-dihadron")) {
12131212
if (subGroupStr.EqualTo("xtojpsipipi")) {
12141213
hm->AddHistogram(histClass, "hMass_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadMass);
12151214
hm->AddHistogram(histClass, "hPt_X3872", "", false, 200, 0.0, 20.0, VarManager::kQuadPt);
@@ -1219,7 +1218,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
12191218
hm->AddHistogram(histClass, "hPtDilepton_MassDihadron", "", false, 200, 0, 20, VarManager::kPairPt, 100, 3.0, 5.0, VarManager::kDitrackMass);
12201219
}
12211220
}
1222-
if (groupStr.Contains("dilepton-photon-mass")) {
1221+
if (!groupStr.CompareTo("dilepton-photon-mass")) {
12231222
hm->AddHistogram(histClass, "Mass_Dilepton", "", false, 500, 0.0, 5.0, VarManager::kPairMassDau);
12241223
hm->AddHistogram(histClass, "Mass_Photon", "", false, 500, 0.0, 0.1, VarManager::kMassDau);
12251224
hm->AddHistogram(histClass, "Mass_Dilepton_Mass_Photon", "", false, 250, 0.0, 5.0, VarManager::kPairMassDau, 250, 0.0, 5.0, VarManager::kMassDau);
@@ -1239,7 +1238,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
12391238
hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 20.0, VarManager::kPt);
12401239
}
12411240

1242-
if (groupStr.Contains("photon")) {
1241+
if (!groupStr.CompareTo("photon")) {
12431242
hm->AddHistogram(histClass, "Pt_Photon", "p_{T} distribution", false, 4500, 0.0, 4.5, VarManager::kPt);
12441243
hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta);
12451244
hm->AddHistogram(histClass, "Eta_Pt", "", false, 100, -2.0, 2.0, VarManager::kEta, 200, 0.0, 20.0, VarManager::kPt);

0 commit comments

Comments
 (0)