@@ -285,23 +285,23 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
285285
286286 struct ParticleHistograms {
287287 TList* fParticleHistogramsList = nullptr ;
288- std::array<std::array<std::array<TH1F *, 2 >, 2 >, eParticleHistograms_N> fParticleHistograms = {{{{ nullptr }}} };
288+ std::array<std::array<std::array<TH1F *, 2 >, 2 >, eParticleHistograms_N> fParticleHistograms { };
289289 } pc;
290290
291291 struct EventHistograms {
292292 TList* fEventHistogramsList = nullptr ;
293- std::array<std::array<std::array<TH1F *, 2 >, 2 >, eEventHistograms_N> fEventHistograms = {{{{ nullptr }}} };
293+ std::array<std::array<std::array<TH1F *, 2 >, 2 >, eEventHistograms_N> fEventHistograms { };
294294 } ev;
295295
296296 struct QAHistograms {
297297 bool fQASwitch = kTRUE ;
298298 TList* fQAHistogramsList = nullptr ;
299- std::array<std::array<TH2F *, 2 >, eQAHistograms_N> fQAHistograms = {{{ nullptr }} }; // [type][before/after cut]
299+ std::array<std::array<TH2F *, 2 >, eQAHistograms_N> fQAHistograms { }; // [type][before/after cut]
300300 } qa;
301301
302302 struct CorrHistograms {
303303 TList* fCorrHistogramsList = nullptr ;
304- std::array<std::array<std::array<std::array<TH2F *, eCutBeforeAfter_N>, eMultEstm_N>, eMultEstm_N>, eCorrHistograms_N> fCorrHistograms = {{{{ nullptr }}} };
304+ std::array<std::array<std::array<std::array<TH2F *, eCutBeforeAfter_N>, eMultEstm_N>, eMultEstm_N>, eCorrHistograms_N> fCorrHistograms { };
305305 } cr;
306306
307307 struct WeightHistograms {
@@ -509,12 +509,11 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
509509 return mcc.fQvectorBefore [n][p];
510510 }
511511 return TComplex::Conjugate (mcc.fQvectorBefore [-n][p]);
512- } else {
513- if (n >= 0 ) {
514- return mcc.fQvectorAfter [n][p];
515- }
516- return TComplex::Conjugate (mcc.fQvectorAfter [-n][p]);
517512 }
513+ if (n >= 0 ) {
514+ return mcc.fQvectorAfter [n][p];
515+ }
516+ return TComplex::Conjugate (mcc.fQvectorAfter [-n][p]);
518517 }
519518
520519 template <std::size_t N>
@@ -728,7 +727,7 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
728727 continue ;
729728 }
730729
731- hist->SetDirectory (0 );
730+ hist->SetDirectory (nullptr );
732731 auto * histClone = dynamic_cast <TH1F *>(hist->Clone ());
733732 if (!histClone) {
734733 LOGF (warning, " Failed to clone histogram %s" , hist->GetName ());
@@ -1438,7 +1437,7 @@ struct MultiparticleCumulants { // this name is used in lower-case format to nam
14381437 wt.fWeightSwitch = cfWeightSwitch;
14391438
14401439 // *) Book base list:
1441- TList * temp = new TList ();
1440+ auto * temp = new TList ();
14421441 temp->SetOwner (kTRUE );
14431442 fBaseList .setObject (temp);
14441443
0 commit comments