Skip to content

Commit bf75c17

Browse files
gmantzarChristopher Klumm
authored andcommitted
Run clang-fromat on the modified/ new files
1 parent c83a34f commit bf75c17

8 files changed

Lines changed: 908 additions & 935 deletions

PWGCF/FemtoDream/Core/femtoDreamObjectSelection.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,14 @@ class FemtoDreamObjectSelection
6060
}
6161
}
6262

63-
///assigns value from configurbale to protected class member
64-
/// \param selVals o2 configurable containing the values employed for the selection
65-
template<typename V>
63+
/// assigns value from configurbale to protected class member
64+
/// \param selVals o2 configurable containing the values employed for the selection
65+
template <typename V>
6666
void assign(V& selVals)
6767
{
68-
assignedValue = static_cast<selValDataType>(selVals);
68+
assignedValue = static_cast<selValDataType>(selVals);
6969
}
7070

71-
7271
/// Pass the Configurable of selection values in the analysis task to the selection class
7372
/// \tparam T Type of the configurable passed to the function
7473
/// \param selVals o2 configurable containing the values employed for the selection
@@ -202,7 +201,7 @@ class FemtoDreamObjectSelection
202201
HistogramRegistry* mHistogramRegistry; ///< For Analysis QA output
203202
HistogramRegistry* mQAHistogramRegistry; ///< For QA output
204203
std::vector<FemtoDreamSelection<selValDataType, selVariable>> mSelections; ///< Vector containing all selections
205-
selValDataType assignedValue;
204+
selValDataType assignedValue;
206205
};
207206

208207
} // namespace femtoDream

PWGCF/FemtoDream/Core/femtoDreamParticleHisto.h

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,15 @@ class FemtoDreamParticleHisto
7272
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassCascade").c_str(), "; M_{Cascade}; Entries", kTH1F, {InvMassAxis});
7373
mHistogramRegistry->add((folderName + folderSuffix + "/hpTInvMassCascade").c_str(), "; p_{T} (GeV/#it{c{}); M_{Cascade}", kTH2F, {pTAxis, InvMassAxis});
7474
}
75-
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso){
76-
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassPhi").c_str(), "; M_{#Phi}; Entries",kTH1F, {InvMassAxis}); //added for Phi !!
75+
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso) {
76+
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassPhi").c_str(), "; M_{#Phi}; Entries", kTH1F, {InvMassAxis}); // added for Phi !!
7777
mHistogramRegistry->add((folderName + folderSuffix + "/hpTInvMassPhi").c_str(), "; p_{T} (GeV/#it{c{}); M_{#Phi}", kTH2F, {pTAxis, InvMassAxis});
7878
}
79-
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild){
79+
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
8080

81-
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassPhi").c_str(), "; M_{#Phi}; Entries",kTH1F, {InvMassAxis}); //added for Phi !!
81+
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassPhi").c_str(), "; M_{#Phi}; Entries", kTH1F, {InvMassAxis}); // added for Phi !!
8282
mHistogramRegistry->add((folderName + folderSuffix + "/hpTInvMassPhi").c_str(), "; p_{T} (GeV/#it{c{}); M_{#Phi}", kTH2F, {pTAxis, InvMassAxis});
83-
8483
}
85-
8684
}
8785

8886
// comment
@@ -160,7 +158,7 @@ class FemtoDreamParticleHisto
160158
mHistogramRegistry->add((folderName + folderSuffix + "/hCascDecayVtxZ").c_str(), "; #it{Vtx}_{z} (cm); Entries", kTH1F, {{2000, 0, 200}});
161159
mHistogramRegistry->add((folderName + folderSuffix + "/hInvMassCompetingCascade").c_str(), "; M_{Competing Cascade}; Entries", kTH1F, {InvMassCompetingAxis});
162160
mHistogramRegistry->add((folderName + folderSuffix + "/hpTInvMassCompetingCascade").c_str(), "; p_{T} (GeV/#it{c{}); M_{Competing Cascade}", kTH2F, {pTAxis, InvMassCompetingAxis});
163-
} else if constexpr ( mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
161+
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
164162
mHistogramRegistry->add((folderName + folderSuffix + "/hCharge").c_str(), "; Charge; Entries", kTH1F, {{5, -2.5, 2.5}});
165163
mHistogramRegistry->add((folderName + folderSuffix + "/hTPCfindable").c_str(), "; TPC findable clusters; Entries", kTH1F, {{163, -0.5, 162.5}});
166164
mHistogramRegistry->add((folderName + folderSuffix + "/hTPCfound").c_str(), "; TPC found clusters; Entries", kTH1F, {{163, -0.5, 162.5}});
@@ -185,8 +183,6 @@ class FemtoDreamParticleHisto
185183
mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_pi").c_str(), "n#sigma_{ITS}^{#pi}", kTH2F, {pTAxis, NsigmaITSAxis});
186184
mHistogramRegistry->add((folderName + folderSuffix + "/nSigmaITS_K").c_str(), "n#sigma_{ITS}^{K}", kTH2F, {pTAxis, NsigmaITSAxis});
187185
}
188-
189-
190186
}
191187

192188
/// Initializes specialized Monte Carlo particle histograms
@@ -293,7 +289,7 @@ class FemtoDreamParticleHisto
293289
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kTrack || mParticleType == o2::aod::femtodreamparticle::ParticleType::kV0Child || mParticleType == o2::aod::femtodreamparticle::ParticleType::kCascadeV0Child || mParticleType == o2::aod::femtodreamparticle::ParticleType::kCascadeBachelor) {
294290
/// Track histograms
295291
tempFitVarAxisTitle = "DCA_{xy} (cm)";
296-
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild || mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso){ //mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso || Phi has no TempFitVar!!
292+
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild || mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso) { // mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso || Phi has no TempFitVar!!
297293
/// Reso histograms added!!
298294
tempFitVarAxisTitle = "DCA_{xy} (cm)";
299295
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kV0 || mParticleType == o2::aod::femtodreamparticle::ParticleType::kCascadeV0) {
@@ -302,7 +298,7 @@ class FemtoDreamParticleHisto
302298
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kCascade) {
303299
/// Cascade histograms
304300
tempFitVarAxisTitle = "cos#alpha";
305-
}else {
301+
} else {
306302
LOG(fatal) << "FemtoDreamParticleHisto: Histogramming for requested object not defined - quitting!";
307303
}
308304

@@ -364,15 +360,13 @@ class FemtoDreamParticleHisto
364360
// mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hpTInvMassCascade"), part.pt(), part.mLambda());
365361
}
366362
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kReso) {
367-
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hInvMassPhi"), part.mLambda()); // currently no MC for Phi!!
363+
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hInvMassPhi"), part.mLambda()); // currently no MC for Phi!!
368364
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hpTInvMassPhi"), part.pt(), part.mLambda()); // getter from FDPArticles now!!
369365
}
370-
if constexpr(mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild){
371-
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hInvMassPhi"), part.mLambda()); // currently no MC for Phi!!
366+
if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
367+
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hInvMassPhi"), part.mLambda()); // currently no MC for Phi!!
372368
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hpTInvMassPhi"), part.pt(), part.mLambda()); // getter from FDPArticles now!!
373369
}
374-
375-
376370
}
377371

378372
template <o2::aod::femtodreamMCparticle::MCType mc, typename Tpart>
@@ -510,7 +504,7 @@ class FemtoDreamParticleHisto
510504
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hCascDecayVtxZ"), part.cascDecayVtxZ());
511505
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hInvMassCompetingCascade"), part.mOmega());
512506
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hpTInvMassCompetingCascade"), part.pt(), part.mOmega());
513-
} else if constexpr ( mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
507+
} else if constexpr (mParticleType == o2::aod::femtodreamparticle::ParticleType::kResoChild) {
514508
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hCharge"), part.sign());
515509
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hTPCfindable"), part.tpcNClsFindable());
516510
mHistogramRegistry->fill(HIST(o2::aod::femtodreamparticle::ParticleTypeName[mParticleType]) + HIST(mFolderSuffix[mFolderSuffixType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/hTPCfound"), part.tpcNClsFound());

0 commit comments

Comments
 (0)