@@ -57,9 +57,9 @@ enum ColHist {
5757 kColHistLast
5858};
5959
60- constexpr std::string_view ColAnalysisDir = " Collisions/Analysis/" ;
61- constexpr std::string_view ColQaDir = " Collisions/QA/" ;
62- constexpr std::string_view ColMcDir = " Collisions/MC/" ;
60+ constexpr std::string_view AnalysisDir = " Collisions/Analysis/" ;
61+ constexpr std::string_view QaDir = " Collisions/QA/" ;
62+ constexpr std::string_view McDir = " Collisions/MC/" ;
6363
6464constexpr std::array<histmanager::HistInfo<ColHist>, kColHistLast > HistTable = {
6565 {
@@ -221,7 +221,7 @@ class CollisionHistManager
221221 private:
222222 void initAnalysis (std::map<ColHist, std::vector<o2::framework::AxisSpec>> const & Specs)
223223 {
224- std::string analysisDir = std::string (ColAnalysisDir );
224+ std::string analysisDir = std::string (AnalysisDir );
225225 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kPosZ , HistTable), getHistDesc (kPosZ , HistTable), getHistType (kPosZ , HistTable), {Specs.at (kPosZ )});
226226 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kMult , HistTable), getHistDesc (kMult , HistTable), getHistType (kMult , HistTable), {Specs.at (kMult )});
227227 mHistogramRegistry ->add (analysisDir + getHistNameV2 (kCent , HistTable), getHistDesc (kCent , HistTable), getHistType (kCent , HistTable), {Specs.at (kCent )});
@@ -230,7 +230,7 @@ class CollisionHistManager
230230
231231 void initQa (std::map<ColHist, std::vector<o2::framework::AxisSpec>> const & Specs)
232232 {
233- std::string qaDir = std::string (ColQaDir );
233+ std::string qaDir = std::string (QaDir );
234234 mHistogramRegistry ->add (qaDir + getHistNameV2 (kPosX , HistTable), getHistDesc (kPosX , HistTable), getHistType (kPosX , HistTable), {Specs.at (kPosX )});
235235 mHistogramRegistry ->add (qaDir + getHistNameV2 (kPosY , HistTable), getHistDesc (kPosY , HistTable), getHistType (kPosY , HistTable), {Specs.at (kPosY )});
236236 mHistogramRegistry ->add (qaDir + getHistNameV2 (kPos , HistTable), getHistDesc (kPos , HistTable), getHistType (kPos , HistTable), {Specs.at (kPos )});
@@ -247,34 +247,34 @@ class CollisionHistManager
247247
248248 void initMc (std::map<ColHist, std::vector<o2::framework::AxisSpec>> const & Specs)
249249 {
250- std::string mcDir = std::string (ColMcDir );
250+ std::string mcDir = std::string (McDir );
251251 mHistogramRegistry ->add (mcDir + getHistNameV2 (kTrueMultVsMult , HistTable), getHistDesc (kTrueMultVsMult , HistTable), getHistType (kTrueMultVsMult , HistTable), {Specs.at (kTrueMultVsMult )});
252252 mHistogramRegistry ->add (mcDir + getHistNameV2 (kTrueCentVsCent , HistTable), getHistDesc (kTrueCentVsCent , HistTable), getHistType (kTrueCentVsCent , HistTable), {Specs.at (kTrueCentVsCent )});
253253 }
254254
255255 template <typename T>
256256 void fillAnalysis (T const & col)
257257 {
258- mHistogramRegistry ->fill (HIST (ColAnalysisDir ) + HIST (getHistName (kPosZ , HistTable)), col.posZ ());
259- mHistogramRegistry ->fill (HIST (ColAnalysisDir ) + HIST (getHistName (kMult , HistTable)), col.mult ());
260- mHistogramRegistry ->fill (HIST (ColAnalysisDir ) + HIST (getHistName (kCent , HistTable)), col.cent ());
261- mHistogramRegistry ->fill (HIST (ColAnalysisDir ) + HIST (getHistName (kMagField , HistTable)), col.magField ());
258+ mHistogramRegistry ->fill (HIST (AnalysisDir ) + HIST (getHistName (kPosZ , HistTable)), col.posZ ());
259+ mHistogramRegistry ->fill (HIST (AnalysisDir ) + HIST (getHistName (kMult , HistTable)), col.mult ());
260+ mHistogramRegistry ->fill (HIST (AnalysisDir ) + HIST (getHistName (kCent , HistTable)), col.cent ());
261+ mHistogramRegistry ->fill (HIST (AnalysisDir ) + HIST (getHistName (kMagField , HistTable)), col.magField ());
262262 }
263263
264264 template <typename T>
265265 void fillQa (T const & col)
266266 {
267- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kPosX , HistTable)), col.posX ());
268- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kPosY , HistTable)), col.posY ());
269- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kPos , HistTable)), std::hypot (col.posX (), col.posY (), col.posZ ()));
270- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kSphericity , HistTable)), col.sphericity ());
271- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kOccupancy , HistTable)), col.trackOccupancyInTimeRange ());
267+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kPosX , HistTable)), col.posX ());
268+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kPosY , HistTable)), col.posY ());
269+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kPos , HistTable)), std::hypot (col.posX (), col.posY (), col.posZ ()));
270+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kSphericity , HistTable)), col.sphericity ());
271+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kOccupancy , HistTable)), col.trackOccupancyInTimeRange ());
272272 if (mPlot2d ) {
273- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kPoszVsMult , HistTable)), col.posZ (), col.mult ());
274- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kPoszVsCent , HistTable)), col.posZ (), col.cent ());
275- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kCentVsMult , HistTable)), col.cent (), col.mult ());
276- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kMultVsSphericity , HistTable)), col.mult (), col.sphericity ());
277- mHistogramRegistry ->fill (HIST (ColQaDir ) + HIST (getHistName (kCentVsSphericity , HistTable)), col.cent (), col.sphericity ());
273+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kPoszVsMult , HistTable)), col.posZ (), col.mult ());
274+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kPoszVsCent , HistTable)), col.posZ (), col.cent ());
275+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kCentVsMult , HistTable)), col.cent (), col.mult ());
276+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kMultVsSphericity , HistTable)), col.mult (), col.sphericity ());
277+ mHistogramRegistry ->fill (HIST (QaDir ) + HIST (getHistName (kCentVsSphericity , HistTable)), col.cent (), col.sphericity ());
278278 }
279279 }
280280
@@ -285,8 +285,8 @@ class CollisionHistManager
285285 return ;
286286 }
287287 auto mcCol = col.template fMcCol_as <T2>();
288- mHistogramRegistry ->fill (HIST (ColMcDir ) + HIST (getHistName (kTrueMultVsMult , HistTable)), mcCol.mult (), col.mult ());
289- mHistogramRegistry ->fill (HIST (ColMcDir ) + HIST (getHistName (kTrueCentVsCent , HistTable)), mcCol.cent (), col.cent ());
288+ mHistogramRegistry ->fill (HIST (McDir ) + HIST (getHistName (kTrueMultVsMult , HistTable)), mcCol.mult (), col.mult ());
289+ mHistogramRegistry ->fill (HIST (McDir ) + HIST (getHistName (kTrueCentVsCent , HistTable)), mcCol.cent (), col.cent ());
290290 }
291291
292292 o2::framework::HistogramRegistry* mHistogramRegistry = nullptr ;
0 commit comments