Please consider the following formatting changes to #15383

PWGCF/Core/AnalysisConfigurableCuts.cxx

@@ -11,6 +11,10 @@
 
 #include "PWGCF/Core/AnalysisConfigurableCuts.h"
 
+#include <TNamed.h>
+
+#include <Rtypes.h>
+
 using namespace o2::analysis;
 
 ClassImp(SimpleInclusiveCut);

PWGCF/Core/AnalysisConfigurableCuts.h

@@ -16,9 +16,7 @@
 #ifndef PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 #define PWGCF_CORE_ANALYSISCONFIGURABLECUTS_H_
 
-#include <TMath.h>
 #include <TNamed.h>
-#include <TObject.h>
 
 #include <Rtypes.h>
 

PWGCF/Core/CorrelationContainer.cxx

@@ -15,20 +15,29 @@
 // Author: Jan Fiete Grosse-Oetringhaus
 
 #include "PWGCF/Core/CorrelationContainer.h"
-#include "Framework/StepTHn.h"
-#include "Framework/Logger.h"
-#include "THnSparse.h"
-#include "TMath.h"
-#include "TList.h"
-#include "TCollection.h"
-#include "TH1D.h"
-#include "TH2D.h"
-#include "TH3D.h"
-#include "TCanvas.h"
-#include "TF1.h"
-#include "THn.h"
-#include "Framework/HistogramSpec.h"
-#include "CommonConstants/MathConstants.h"
+
+#include <CommonConstants/MathConstants.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/Logger.h>
+#include <Framework/StepTHn.h>
+
+#include <TCanvas.h>
+#include <TCollection.h>
+#include <TF1.h>
+#include <THn.h>
+#include <TIterator.h>
+#include <TList.h>
+#include <TMath.h>
+#include <TMathBase.h>
+#include <TNamed.h>
+#include <TObject.h>
+#include <TString.h>
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
+#include <cstring>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;

PWGCF/Core/CorrelationContainer.h

@@ -9,14 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef CorrelationContainer_H
-#define CorrelationContainer_H
+#ifndef PWGCF_CORE_CORRELATIONCONTAINER_H_
+#define PWGCF_CORE_CORRELATIONCONTAINER_H_
 
 // encapsulate histogram and corrections for correlation analysis
 
-#include "TNamed.h"
-#include "TString.h"
-#include "Framework/HistogramSpec.h"
+#include <Framework/HistogramSpec.h>
+
+#include <TNamed.h>
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
+#include <vector>
 
 class TH1;
 class TH1F;
@@ -181,4 +186,4 @@ class CorrelationContainer : public TNamed
   ClassDef(CorrelationContainer, 2) // underlying event histogram container
 };
 
-#endif
+#endif // PWGCF_CORE_CORRELATIONCONTAINER_H_

PWGCF/Core/PairCuts.h

@@ -9,23 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef O2_ANALYSIS_PAIRCUTS_H
-#define O2_ANALYSIS_PAIRCUTS_H
+#ifndef PWGCF_CORE_PAIRCUTS_H_
+#define PWGCF_CORE_PAIRCUTS_H_
 
-#include <cmath>
+#include <CommonConstants/MathConstants.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/Logger.h>
+
+#include <RtypesCore.h>
 
-#include "Framework/Logger.h"
-#include "Framework/HistogramRegistry.h"
-#include "CommonConstants/MathConstants.h"
+#include <cmath>
 
 // Functions which cut on particle pairs (decays, conversions, two-track cuts)
 //
 // Author: Jan Fiete Grosse-Oetringhaus
 
-using namespace o2;
-using namespace o2::framework;
-using namespace constants::math;
-
 class PairCuts
 {
  public:
@@ -36,14 +35,14 @@ class PairCuts
                   Rho,
                   ParticlesLastEntry };
 
-  void SetHistogramRegistry(HistogramRegistry* registry) { histogramRegistry = registry; }
+  void SetHistogramRegistry(o2::framework::HistogramRegistry* registry) { histogramRegistry = registry; }
 
   void SetPairCut(Particle particle, float cut)
   {
     LOGF(info, "Enabled pair cut for %d with value %f", static_cast<int>(particle), cut);
     mCuts[particle] = cut;
     if (histogramRegistry != nullptr && histogramRegistry->contains(HIST("ControlConvResonances")) == false) {
-      histogramRegistry->add("ControlConvResonances", "", {HistType::kTH2F, {{6, -0.5, 5.5, "id"}, {500, -0.5, 0.5, "delta mass"}}});
+      histogramRegistry->add("ControlConvResonances", "", {o2::framework::kTH2F, {{6, -0.5, 5.5, "id"}, {500, -0.5, 0.5, "delta mass"}}});
     }
   }
 
@@ -54,7 +53,7 @@ class PairCuts
     mTwoTrackRadius = radius;
 
     if (histogramRegistry != nullptr && histogramRegistry->contains(HIST("TwoTrackDistancePt_0")) == false) {
-      histogramRegistry->add("TwoTrackDistancePt_0", "", {HistType::kTH3F, {{100, -0.15, 0.15, "#Delta#eta"}, {100, -0.05, 0.05, "#Delta#varphi^{*}_{min}"}, {20, 0, 10, "#Delta p_{T}"}}});
+      histogramRegistry->add("TwoTrackDistancePt_0", "", {o2::framework::HistType::kTH3F, {{100, -0.15, 0.15, "#Delta#eta"}, {100, -0.05, 0.05, "#Delta#varphi^{*}_{min}"}, {20, 0, 10, "#Delta p_{T}"}}});
       histogramRegistry->addClone("TwoTrackDistancePt_0", "TwoTrackDistancePt_1");
     }
   }
@@ -70,7 +69,7 @@ class PairCuts
   float mTwoTrackDistance = -1; // distance below which the pair is flagged as to be removed
   float mTwoTrackRadius = 0.8f; // radius at which the two track cuts are applied
 
-  HistogramRegistry* histogramRegistry = nullptr; // if set, control histograms are stored here
+  o2::framework::HistogramRegistry* histogramRegistry = nullptr; // if set, control histograms are stored here
 
   template <typename T>
   bool conversionCut(T const& track1, T const& track2, Particle conv, double cut);
@@ -147,7 +146,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
       }
 
       if (dphistarminabs < mTwoTrackDistance && std::fabs(deta) < mTwoTrackDistance) {
-        //LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
+        // LOGF(debug, "Removed track pair %ld %ld with %f %f %f %f %d %f %f %d %d", track1.index(), track2.index(), deta, dphistarminabs, track1.phi2(), track1.pt(), track1.sign(), track2.phi2(), track2.pt(), track2.sign(), magField);
         return true;
       }
 
@@ -163,7 +162,7 @@ bool PairCuts::twoTrackCut(T const& track1, T const& track2, int magField)
 template <typename T>
 bool PairCuts::conversionCut(T const& track1, T const& track2, Particle conv, double cut)
 {
-  //LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
+  // LOGF(info, "pt is %f %f", track1.pt(), track2.pt());
 
   if (cut < 0) {
     return false;
@@ -286,25 +285,25 @@ double PairCuts::getInvMassSquaredFast(T const& track1, double m0_1, T const& tr
 
   // fold onto 0...pi
   float deltaPhi = std::fabs(phi1 - phi2);
-  while (deltaPhi > TwoPI) {
-    deltaPhi -= TwoPI;
+  while (deltaPhi > o2::constants::math::TwoPI) {
+    deltaPhi -= o2::constants::math::TwoPI;
   }
-  if (deltaPhi > PI) {
-    deltaPhi = TwoPI - deltaPhi;
+  if (deltaPhi > o2::constants::math::PI) {
+    deltaPhi = o2::constants::math::TwoPI - deltaPhi;
   }
 
   float cosDeltaPhi = 0;
-  if (deltaPhi < PI / 3.0f) {
+  if (deltaPhi < o2::constants::math::PI / 3.0f) {
     cosDeltaPhi = 1.0 - deltaPhi * deltaPhi / 2 + deltaPhi * deltaPhi * deltaPhi * deltaPhi / 24;
-  } else if (deltaPhi < 2.0f * PI / 3.0f) {
-    cosDeltaPhi = -(deltaPhi - PI / 2) + 1.0 / 6 * std::pow((deltaPhi - PI / 2), 3);
+  } else if (deltaPhi < 2.0f * o2::constants::math::PI / 3.0f) {
+    cosDeltaPhi = -(deltaPhi - o2::constants::math::PI / 2) + 1.0 / 6 * std::pow((deltaPhi - o2::constants::math::PI / 2), 3);
   } else {
-    cosDeltaPhi = -1.0f + 1.0f / 2.0f * (deltaPhi - PI) * (deltaPhi - PI) - 1.0f / 24.0f * std::pow(deltaPhi - PI, 4.0f);
+    cosDeltaPhi = -1.0f + 1.0f / 2.0f * (deltaPhi - o2::constants::math::PI) * (deltaPhi - o2::constants::math::PI) - 1.0f / 24.0f * std::pow(deltaPhi - o2::constants::math::PI, 4.0f);
   }
 
   double mass2 = m0_1 * m0_1 + m0_2 * m0_2 + 2.0f * (std::sqrt(e1squ * e2squ) - (pt1 * pt2 * (cosDeltaPhi + 1.0f / tantheta1 / tantheta2)));
 
-  //LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
+  // LOGF(debug, "%f %f %f %f %f %f %f %f %f", pt1, eta1, phi1, pt2, eta2, phi2, m0_1, m0_2, mass2);
 
   return mass2;
 }
@@ -326,17 +325,17 @@ float PairCuts::getDPhiStar(T const& track1, T const& track2, float radius, int
 
   float dphistar = phi1 - phi2 - charge1 * std::asin(0.015 * magField * radius / pt1) + charge2 * std::asin(0.015 * magField * radius / pt2);
 
-  if (dphistar > PI) {
-    dphistar = TwoPI - dphistar;
+  if (dphistar > o2::constants::math::PI) {
+    dphistar = o2::constants::math::TwoPI - dphistar;
   }
-  if (dphistar < -PI) {
-    dphistar = -TwoPI - dphistar;
+  if (dphistar < -o2::constants::math::PI) {
+    dphistar = -o2::constants::math::TwoPI - dphistar;
   }
-  if (dphistar > PI) { // might look funny but is needed
-    dphistar = TwoPI - dphistar;
+  if (dphistar > o2::constants::math::PI) { // might look funny but is needed
+    dphistar = o2::constants::math::TwoPI - dphistar;
   }
 
   return dphistar;
 }
 
-#endif
+#endif // PWGCF_CORE_PAIRCUTS_H_

PWGCF/DataModel/CorrelationsDerived.h

@@ -11,11 +11,10 @@
 #ifndef PWGCF_DATAMODEL_CORRELATIONSDERIVED_H_
 #define PWGCF_DATAMODEL_CORRELATIONSDERIVED_H_
 
-#include "Common/DataModel/Centrality.h"
-
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
 
+#include <cstdint>
 #include <vector>
 
 namespace o2::aod

PWGCF/DataModel/DptDptFiltered.h

@@ -11,8 +11,10 @@
 #ifndef PWGCF_DATAMODEL_DPTDPTFILTERED_H_
 #define PWGCF_DATAMODEL_DPTDPTFILTERED_H_
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+
+#include <cstdint>
 
 namespace o2
 {

PWGCF/DataModel/FemtoDerived.h

@@ -11,22 +11,17 @@
 #ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
 #define PWGCF_DATAMODEL_FEMTODERIVED_H_
 
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/PIDResponseTOF.h"
-#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/DataTypes.h"
-#include "Framework/Expressions.h"
-#include "MathUtils/Utils.h"
+#include <CommonConstants/PhysicsConstants.h>
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/Expressions.h>
 
 #include <cmath>
+#include <cstdint>
+#include <string_view>
 
 namespace o2::aod
 {

PWGCF/DataModel/SPTableZDC.h

@@ -17,12 +17,10 @@
 #ifndef PWGCF_DATAMODEL_SPTABLEZDC_H_
 #define PWGCF_DATAMODEL_SPTABLEZDC_H_
 
-#include "Common/Core/RecoDecay.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "Framework/AnalysisDataModel.h"
+#include <Framework/AnalysisDataModel.h>
 
 #include <cmath>
+#include <cstdint>
 #include <vector>
 
 namespace o2::aod

PWGCF/EbyEFluctuations/Tasks/FactorialMomentsTask.cxx

@@ -13,26 +13,40 @@
 /// \author Salman Malik
 /// \author Balwan Singh
 
-#include "TRandom.h"
-#include <TH1F.h>
-
-// O2 includes
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/O2DatabasePDGPlugin.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/GlobalTrackID.h"
-#include "ReconstructionDataFormats/Track.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/Configurable.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/HistogramSpec.h>
+#include <Framework/InitContext.h>
+#include <Framework/O2DatabasePDGPlugin.h>
+#include <Framework/OutputObjHeader.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TH1.h>
+#include <TH2.h>
+#include <TMath.h>
+#include <TRandom.h>
+#include <TString.h>
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
 
-#include <unordered_set>
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <string_view>
 #include <vector>
 
 using namespace o2;