Merge pull request #10 from alibuild/alibot-cleanup-12946

[PWGCF] Please consider the following formatting changes to #12946

Author: wenyaCern

PWGCF/DataModel/FemtoDerived.h

@@ -35,7 +35,7 @@ enum CollisionBinning {
   kMult,               //! Bin collision in number of charged tracks for mixing
   kMultPercentile,     //! Bin collision in multiplicity percentile for mixing
   kMultMultPercentile, //! Bin collision in number of charged tracks and multiplicity percentile for mixing
-  kMultPercentileQn, //! Bin collision in multiplicity percentile an qn value for mixing  
+  kMultPercentileQn,   //! Bin collision in multiplicity percentile an qn value for mixing
   kNCollisionBinning
 };
 
@@ -52,7 +52,7 @@ DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit f
 
 DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
 
-DECLARE_SOA_COLUMN(QnVal, qnVal, int); //! qn values for dividing events
+DECLARE_SOA_COLUMN(QnVal, qnVal, int);         //! qn values for dividing events
 DECLARE_SOA_COLUMN(Occupancy, occupancy, int); //! Occupancy of the event
 } // namespace femtodreamcollision
 

PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h

@@ -181,8 +181,8 @@ class FemtoDreamCollisionSelection
   /// \param col Collision
   /// \return whether or not the collisions fulfills the specified selections
   template <typename C>
-  bool occupancySelection(C const& col, 
-                              int tpcOccupancyMin, int tpcOccupancyMax)
+  bool occupancySelection(C const& col,
+                          int tpcOccupancyMin, int tpcOccupancyMax)
   {
     const auto occupancy = col.trackOccupancyInTimeRange();
     if ((occupancy < tpcOccupancyMin || occupancy > tpcOccupancyMax)) {
@@ -245,7 +245,7 @@ class FemtoDreamCollisionSelection
     mHistogramQn->add<TProfile>("Event/profileC22", "; cent; c22", kTProfile, {{10, 0, 100}});
     mHistogramQn->add<TProfile>("Event/profileC24", "; cent; c24", kTProfile, {{10, 0, 100}});
 
-    if (doQnSeparation){      
+    if (doQnSeparation) {
       for (int iqn(0); iqn < mumQnBins; ++iqn) {
         profilesC22.push_back(mHistogramQn->add<TProfile>(("Qn/profileC22_" + std::to_string(iqn)).c_str(), "; cent; c22", kTProfile, {{10, 0, 100}}));
       }
@@ -400,7 +400,7 @@ class FemtoDreamCollisionSelection
       mHistogramQn->fill(HIST("Event/qnBin"), qnBin);
       if (qnBin >= 0 && qnBin < numQnBins) {
         std::get<std::shared_ptr<TH1>>(qnMults[qnBin])->Fill(mult);
-      }      
+      }
     }
 
     return qnBin;
@@ -482,8 +482,8 @@ class FemtoDreamCollisionSelection
     TComplex negEtaQStar = TComplex::Conjugate(negEtaQ);
 
     mHistogramQn->get<TProfile>(HIST("Event/profileC22"))->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
-    if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins){
-      std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ*posEtaQStar).Re()/(negEtaMQ*posEtaMQ), (negEtaMQ*posEtaMQ));
+    if (doQnSeparation && mQnBin >= 0 && mQnBin < numQnBins) {
+      std::get<std::shared_ptr<TProfile>>(profilesC22[mQnBin])->Fill(centrality, (negEtaQ * posEtaQStar).Re() / (negEtaMQ * posEtaMQ), (negEtaMQ * posEtaMQ));
     }
     return;
   }
@@ -501,8 +501,8 @@ class FemtoDreamCollisionSelection
   float mSphericityPtmin = 0.f;
   int mQnBin = -999;
   HistogramRegistry* mHistogramQn = nullptr; ///< For flow cumulant output
-  std::vector<HistPtr> qnMults;  /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
-  std::vector<HistPtr> profilesC22; /// Pofile Histograms of c22 per Qn bin
+  std::vector<HistPtr> qnMults;              /// Histograms of multiplicity (TH1F) per Qn bin. Stored as HistPtr (variant of shared_ptr) from HistogramManager.
+  std::vector<HistPtr> profilesC22;          /// Pofile Histograms of c22 per Qn bin
   TH2D* mReQthisEvt = nullptr;               ///< For flow cumulant in an event
   TH2D* mImQthisEvt = nullptr;               ///< For flow cumulant in an event
   TH2D* mReQ2thisEvt = nullptr;              ///< For flow cumulant in an event

PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx

@@ -771,8 +771,8 @@ struct femtoDreamProducerTask {
           !colCuts.isPileUpCollisionPbPb(col, OptionEvtSpecialSelections.ConfEvNoSameBunchPileup, OptionEvtSpecialSelections.ConfEvIsGoodITSLayersAll)) {
         return;
       }
-      if (OptionEvtSpecialSelections.ConfIsUseOccupancy && 
-            !colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
+      if (OptionEvtSpecialSelections.ConfIsUseOccupancy &&
+          !colCuts.occupancySelection(col, OptionEvtSpecialSelections.ConfTPCOccupancyMin, OptionEvtSpecialSelections.ConfTPCOccupancyMax)) {
         return;
       }
     }
@@ -1209,7 +1209,7 @@ struct femtoDreamProducerTask {
     if (ConfUseItsPid.value) {
       fillCollisionsAndTracksAndV0AndCascade<false, true, true, true, false>(col, tracks, tracksWithItsPid, fullV0s, fullCascades);
     } else {
-      fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);  
+      fillCollisionsAndTracksAndV0AndCascade<false, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
     }
   }
   PROCESS_SWITCH(femtoDreamProducerTask, processData_CentPbPb,
@@ -1276,7 +1276,7 @@ struct femtoDreamProducerTask {
     // get magnetic field for run
     initCCDB_Mag_Trig(col.bc_as<aod::BCsWithTimestamps>());
     // fill the tables
-    fillCollisionsAndTracksAndV0AndCascade<true, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);    
+    fillCollisionsAndTracksAndV0AndCascade<true, false, true, true, false>(col, tracks, tracks, fullV0s, fullCascades);
   }
   PROCESS_SWITCH(femtoDreamProducerTask, processMC_CentPbPb, "Provide MC data with centrality information for PbPb collisions", false);
 };

PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx

@@ -752,7 +752,7 @@ struct femtoDreamPairTaskTrackTrack {
       case femtodreamcollision::kMultMultPercentile:
         doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultMultPercentile);
         break;
-     case femtodreamcollision::kMultPercentileQn:
+      case femtodreamcollision::kMultPercentileQn:
         doMixedEvent_NotMasked<false>(cols, parts, PartitionTrk1, PartitionTrk2, colBinningMultPercentileqn);
         break;
       default: