Please consider the following formatting changes to #15384

PWGDQ/Core/AnalysisCompositeCut.cxx

@@ -11,6 +11,12 @@
 
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
 
+#include "AnalysisCut.h"
+
+#include <Rtypes.h>
+
+#include <vector>
+
 ClassImp(AnalysisCompositeCut)
 
   //____________________________________________________________________________

PWGDQ/Core/AnalysisCompositeCut.h

@@ -14,10 +14,14 @@
 // Cut class manipulating groups of cuts
 //
 
-#ifndef AnalysisCompositeCut_H
-#define AnalysisCompositeCut_H
+#ifndef PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_
+#define PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_
 
 #include "PWGDQ/Core/AnalysisCut.h"
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
 #include <vector>
 
 //_________________________________________________________________________
@@ -52,4 +56,4 @@ class AnalysisCompositeCut : public AnalysisCut
   ClassDef(AnalysisCompositeCut, 2);
 };
 
-#endif
+#endif // PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_

PWGDQ/Core/AnalysisCut.cxx

@@ -11,6 +11,10 @@
 
 #include "PWGDQ/Core/AnalysisCut.h"
 
+#include <TNamed.h>
+
+#include <Rtypes.h>
+
 #include <iostream>
 #include <vector>
 

PWGDQ/Core/AnalysisCut.h

@@ -14,10 +14,14 @@
 // Class for analysis cuts applied on the variables defined in the VarManager
 //
 
-#ifndef AnalysisCut_H
-#define AnalysisCut_H
+#ifndef PWGDQ_CORE_ANALYSISCUT_H_
+#define PWGDQ_CORE_ANALYSISCUT_H_
 
 #include <TF1.h>
+#include <TNamed.h>
+
+#include <Rtypes.h>
+
 #include <vector>
 
 //_________________________________________________________________________
@@ -176,4 +180,4 @@ inline bool AnalysisCut::IsSelected(float* values)
   return true;
 }
 
-#endif
+#endif // PWGDQ_CORE_ANALYSISCUT_H_

PWGDQ/Core/CutsLibrary.cxx

@@ -14,20 +14,27 @@
 #include "PWGDQ/Core/CutsLibrary.h"
 
 #include "AnalysisCompositeCut.h"
+#include "AnalysisCut.h"
 #include "VarManager.h"
 
+#include <Framework/Array2D.h>
+#include <Framework/Logger.h>
+
 #include <TF1.h>
+#include <TString.h>
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/error.h>
 
 #include <RtypesCore.h>
 
+#include <cstddef>
 #include <iostream>
-#include <set>
+#include <numeric>
 #include <string>
+#include <utility>
 #include <vector>
 
-using std::cout;
-using std::endl;
-
 AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
 {
   //

PWGDQ/Core/CutsLibrary.h

@@ -17,9 +17,12 @@
 
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
 #include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/VarManager.h"
+
+#include <Framework/Array2D.h>
 
 #include <string>
+#include <utility>
+#include <variant>
 #include <vector>
 
 // ///////////////////////////////////////////////
@@ -98,8 +101,6 @@
 //           End of Cuts for CEFP               //
 // ///////////////////////////////////////////////
 
-#include "rapidjson/document.h"
-
 namespace o2::aod
 {
 namespace dqcuts

PWGDQ/Core/DQMlResponse.h

@@ -17,11 +17,16 @@
 #ifndef PWGDQ_CORE_DQMLRESPONSE_H_
 #define PWGDQ_CORE_DQMLRESPONSE_H_
 
+#include "PWGDQ/Core/VarManager.h"
+
 #include "Tools/ML/MlResponse.h"
 
+#include <Framework/Logger.h>
+
+#include <cstdint>
 #include <map>
 #include <string>
-#include <unordered_map>
+#include <utility>
 #include <vector>
 
 namespace o2::analysis

PWGDQ/Core/HistogramManager.cxx

@@ -11,28 +11,37 @@
 
 #include "PWGDQ/Core/HistogramManager.h"
 
+#include <Framework/Logger.h>
+
+#include <TArrayD.h>
+#include <TCollection.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TH3.h>
+#include <THnBase.h>
+#include <TNamed.h>
+#include <TString.h>
+
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
+#include <cstdint>
 #include <iostream>
-#include <memory>
-#include <fstream>
 #include <list>
+#include <memory>
 #include <vector>
-#include <algorithm>
-#include "Framework/Logger.h"
 using namespace std;
 
-#include <TObject.h>
-#include <TObjArray.h>
+#include <TClass.h>
 #include <THashList.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include <TH3F.h>
-#include <TProfile.h>
-#include <TProfile2D.h>
-#include <TProfile3D.h>
 #include <THn.h>
 #include <THnSparse.h>
 #include <TIterator.h>
-#include <TClass.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TProfile.h>
+#include <TProfile2D.h>
+#include <TProfile3D.h>
 
 ClassImp(HistogramManager);
 

PWGDQ/Core/HistogramManager.h

@@ -17,17 +17,20 @@
 #ifndef PWGDQ_CORE_HISTOGRAMMANAGER_H_
 #define PWGDQ_CORE_HISTOGRAMMANAGER_H_
 
-#include <TString.h>
-#include <TNamed.h>
-#include <TList.h>
-#include <THashList.h>
-#include <TAxis.h>
 #include <TArrayD.h>
+#include <TAxis.h>
+#include <THashList.h>
+#include <TNamed.h>
+#include <TString.h>
 
-#include <string>
+#include <Rtypes.h>
+#include <RtypesCore.h>
+
+#include <cstdint>
+#include <list>
 #include <map>
+#include <string>
 #include <vector>
-#include <list>
 
 class HistogramManager : public TNamed
 {
@@ -103,10 +106,10 @@ class HistogramManager : public TNamed
   std::map<std::string, std::list<std::vector<int>>> fVariablesMap; //!  map holding identifiers for all variables needed by histograms
 
   // various
-  bool fUseDefaultVariableNames;    //! toggle the usage of default variable names and units
-  uint64_t fBinsAllocated;          //! number of allocated bins
-  TString* fVariableNames;          //! variable names
-  TString* fVariableUnits;          //! variable units
+  bool fUseDefaultVariableNames; //! toggle the usage of default variable names and units
+  uint64_t fBinsAllocated;       //! number of allocated bins
+  TString* fVariableNames;       //! variable names
+  TString* fVariableUnits;       //! variable units
 
   void MakeAxisLabels(TAxis* ax, const char* labels);
 

PWGDQ/Core/HistogramsLibrary.cxx

@@ -13,11 +13,25 @@
 //
 #include "PWGDQ/Core/HistogramsLibrary.h"
 
+#include "HistogramManager.h"
 #include "VarManager.h"
 
-#include "CommonConstants/MathConstants.h"
+#include <CommonConstants/MathConstants.h>
+#include <Framework/Logger.h>
+
+#include <TArrayD.h>
+#include <TMath.h>
+#include <TString.h>
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/error.h>
+
+#include <RtypesCore.h>
 
 #include <algorithm>
+#include <array>
+#include <cstring>
+#include <ostream>
 #include <vector>
 
 void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* histClass, const char* groupName, const char* subGroupName)
@@ -2529,7 +2543,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch
         str += json[i];
       }
     }
-    LOG(fatal) << "**** Parsing error is somewhere here: " << str.Data() << endl;
+    LOG(fatal) << "**** Parsing error is somewhere here: " << str.Data() << std::endl;
     return;
   }
 

PWGDQ/Core/HistogramsLibrary.h

@@ -15,11 +15,7 @@
 #ifndef PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 #define PWGDQ_CORE_HISTOGRAMSLIBRARY_H_
 
-#include <TString.h>
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
-#include "CommonConstants/MathConstants.h"
-#include "rapidjson/document.h"
 
 namespace o2::aod
 {
@@ -29,7 +25,7 @@ void DefineHistograms(HistogramManager* hm, const char* histClass, const char* g
 template <typename T>
 bool ValidateJSONHistogram(T hist);
 void AddHistogramsFromJSON(HistogramManager* hm, const char* json);
-}
+} // namespace dqhistograms
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_HISTOGRAMSLIBRARY_H_

PWGDQ/Core/MCProng.cxx

@@ -11,10 +11,16 @@
 
 #include "PWGDQ/Core/MCProng.h"
 
-#include <map>
-#include <vector>
+#include <TString.h>
+
+#include <Rtypes.h>
+
 #include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <iostream>
+#include <map>
+#include <vector>
 
 ClassImp(MCProng);
 

PWGDQ/Core/MCProng.h

@@ -57,12 +57,13 @@ A few non-existent PYTHIA codes are used to select more than one PYTHIA code.
 #ifndef PWGDQ_CORE_MCPRONG_H_
 #define PWGDQ_CORE_MCPRONG_H_
 
-#include "TNamed.h"
-#include "TString.h"
+#include <TString.h>
 
-#include <vector>
-#include <iostream>
+#include <Rtypes.h>
+
+#include <cstdint>
 #include <map>
+#include <vector>
 
 class MCProng
 {

PWGDQ/Core/MCSignal.cxx

@@ -9,11 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <vector>
-#include <iostream>
-
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "MCProng.h"
+
+#include <TNamed.h>
+
+#include <Rtypes.h>
+
+#include <cstdint>
+#include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 

PWGDQ/Core/MCSignal.h

@@ -57,10 +57,11 @@ process(aod::McParticles const& mcTracks) {
 #define PWGDQ_CORE_MCSIGNAL_H_
 
 #include "MCProng.h"
-#include "TNamed.h"
 
+#include <TNamed.h>
+
+#include <cstdint>
 #include <vector>
-#include <iostream>
 
 class MCSignal : public TNamed
 {

PWGDQ/Core/MCSignalLibrary.cxx

@@ -11,16 +11,24 @@
 //
 // Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
 //
-#include <string>
-#include <vector>
-// #include <iostream>
-
 #include "PWGDQ/Core/MCSignalLibrary.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/Logger.h"
+#include "MCProng.h"
+#include "MCSignal.h"
+
+#include <CommonConstants/PhysicsConstants.h>
+#include <Framework/Logger.h>
 
 #include <TPDGCode.h>
+#include <TString.h>
+
+#include <rapidjson/document.h>
+#include <rapidjson/error/error.h>
+
+#include <cstdint>
+#include <cstring>
+#include <string>
+#include <vector>
 
 using namespace o2::constants::physics;
 // using std::cout;