[PWGDQ] Removing ROOT dictionaries

PWGDQ/Core/AnalysisCompositeCut.cxx

@@ -17,13 +17,11 @@
 
 #include <vector>
 
-ClassImp(AnalysisCompositeCut)
-
-  //____________________________________________________________________________
-  AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
-                                                            fOptionUseAND(useAND),
-                                                            fCutList(),
-                                                            fCompositeCutList()
+//____________________________________________________________________________
+AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
+                                                          fOptionUseAND(useAND),
+                                                          fCutList(),
+                                                          fCompositeCutList()
 {
   //
   // default constructor

PWGDQ/Core/AnalysisCompositeCut.h

@@ -36,8 +36,8 @@ class AnalysisCompositeCut : public AnalysisCut
 
   void AddCut(AnalysisCut* cut)
   {
-    if (cut->IsA() == AnalysisCompositeCut::Class()) {
-      fCompositeCutList.push_back(*(AnalysisCompositeCut*)cut);
+    if (auto* composite = dynamic_cast<AnalysisCompositeCut*>(cut)) {
+      fCompositeCutList.push_back(*composite);
     } else {
       fCutList.push_back(*cut);
     }
@@ -52,8 +52,6 @@ class AnalysisCompositeCut : public AnalysisCut
   bool fOptionUseAND;                                  // true (default): apply AND on all cuts; false: use OR
   std::vector<AnalysisCut> fCutList;                   // list of cuts
   std::vector<AnalysisCompositeCut> fCompositeCutList; // list of composite cuts
-
-  ClassDef(AnalysisCompositeCut, 2);
 };
 
 #endif // PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_

PWGDQ/Core/AnalysisCut.cxx

@@ -15,14 +15,12 @@
 
 #include <Rtypes.h>
 
 #include <iostream>
 #include <vector>
 
 using std::cout;
 using std::endl;
 
-ClassImp(AnalysisCut);
-
 std::vector<int> AnalysisCut::fgUsedVars = {};
 
 //____________________________________________________________________________
@@ -64,5 +62,5 @@
 //____________________________________________________________________________
 void AnalysisCut::PrintCuts()
 {
   cout << "**************** AnalysisCut::PrintCuts" << endl;
 }

PWGDQ/Core/AnalysisCut.h

@@ -72,8 +72,6 @@ class AnalysisCut : public TNamed
 
  protected:
   std::vector<CutContainer> fCuts;
-
-  ClassDef(AnalysisCut, 2);
 };
 
 //____________________________________________________________________________

PWGDQ/Core/CMakeLists.txt

@@ -22,17 +22,3 @@ o2physics_add_library(PWGDQCore
                         MCProng.cxx
                         MCSignal.cxx
                PUBLIC_LINK_LIBRARIES O2::Framework O2::DCAFitter O2::GlobalTracking O2Physics::AnalysisCore KFParticle::KFParticle O2Physics::MLCore)
-
-o2physics_target_root_dictionary(PWGDQCore
-                          HEADERS   AnalysisCut.h
-                                    AnalysisCompositeCut.h
-                                    VarManager.h
-                                    HistogramManager.h
-                                    CutsLibrary.h
-                                    MixingHandler.h
-                                    MixingLibrary.h
-                                    HistogramsLibrary.h
-                                    MCProng.h
-                                    MCSignal.h
-                                    MCSignalLibrary.h
-                          LINKDEF PWGDQCoreLinkDef.h)

PWGDQ/Core/HistogramManager.cxx

@@ -26,7 +26,7 @@
 #include <RtypesCore.h>
 
 #include <cstdint>
 #include <iostream>
 #include <list>
 #include <memory>
 #include <vector>
@@ -43,8 +43,6 @@
 #include <TProfile2D.h>
 #include <TProfile3D.h>
 
-ClassImp(HistogramManager);
-
 //_______________________________________________________________________________
 HistogramManager::HistogramManager() : TNamed("", ""),
                                        fMainList(nullptr),
@@ -924,14 +922,14 @@
   //
   // Print the defined histograms
   //
   cout << "###################################################################" << endl;
   cout << "HistogramManager:: " << fMainList->GetName() << endl;
   for (int i = 0; i < fMainList->GetEntries(); ++i) {
     auto* list = reinterpret_cast<TList*>(fMainList->At(i));
     cout << "************** List " << list->GetName() << endl;
     for (int j = 0; j < list->GetEntries(); ++j) {
       TObject* obj = list->At(j);
       cout << obj->GetName() << ": " << obj->IsA()->GetName() << endl;
     }
   }
 }

PWGDQ/Core/HistogramManager.h

@@ -115,8 +115,6 @@ class HistogramManager : public TNamed
 
   HistogramManager& operator=(const HistogramManager& c);
   HistogramManager(const HistogramManager& c);
-
-  ClassDef(HistogramManager, 2)
 };
 
 #endif // PWGDQ_CORE_HISTOGRAMMANAGER_H_

PWGDQ/Core/MCProng.cxx

@@ -18,12 +18,10 @@
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
 #include <map>
 #include <vector>
 
-ClassImp(MCProng);
-
 std::map<TString, int> MCProng::fgSourceNames = {
   {"kNothing", MCProng::kNothing},
   {"kPhysicalPrimary", MCProng::kPhysicalPrimary},
@@ -422,8 +420,8 @@
       }
       break;
     case 900:                     // electron from LF mesons + Quarkonias for LMEE
       decision = absPDG == 111 || // pion
                  absPDG == 221 || // eta
                  absPDG == 331 || // eta'
                  absPDG == 113 || // rho
                  absPDG == 223 || // omega

PWGDQ/Core/MCProng.h

@@ -114,7 +114,5 @@ class MCProng
   bool fCheckGenerationsInTime;
   std::vector<int> fPDGInHistory;
   std::vector<bool> fExcludePDGInHistory;
-
-  ClassDef(MCProng, 2);
 };
 #endif // PWGDQ_CORE_MCPRONG_H_

PWGDQ/Core/MCSignal.cxx

@@ -24,8 +24,6 @@
 using std::cout;
 using std::endl;
 
-ClassImp(MCSignal);
-
 //________________________________________________________________________________________________
 MCSignal::MCSignal() : TNamed("", ""),
                        fProngs({}),

PWGDQ/Core/MixingHandler.cxx

@@ -23,8 +23,6 @@
 #include <vector>
 using namespace std;
 
-ClassImp(MixingHandler);
-
 //_________________________________________________________________________
 MixingHandler::MixingHandler() : TNamed(),
                                  fIsInitialized(false),

PWGDQ/Core/MixingHandler.h

@@ -26,6 +26,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <iostream>
 #include <map>
 #include <vector>
@@ -57,7 +58,7 @@ class MixingHandler : public TNamed
     // bit map for active filtering bits of all the tracks
     uint32_t filteringMask = 0;
     // counters to keep track of how many times the event was used for mixing (for each track cut separately)
-    std::array<short, 64> counters = {0};
+    std::array<int16_t, 64> counters = {0};
     // add a track to the event and update the filtering mask accordingly
     void AddTrack1(const MixingTrack& track)
     {
@@ -74,7 +75,7 @@ class MixingHandler : public TNamed
     // 1) increment the counters for a given track cut bit mask and if the counters reached the pool depth,
     // 2) clear the corresponding bit in the tracks filtering flags to exclude them from further mixing
     // 3) for each track, if there are no more active bits in the filtering mask, then remove the track from the event
-    void IncrementCounters(uint32_t mask, short poolDepth)
+    void IncrementCounters(uint32_t mask, int16_t poolDepth)
     {
       for (int i = 0; i < 32; i++) {
         uint32_t bitMask = (static_cast<uint32_t>(1) << i);
@@ -150,7 +151,7 @@ class MixingHandler : public TNamed
     }
     // The function that performs the mixing is called outside this class, but the pool provides the events and tracks to be mixed and takes care of updating the events after mixing
     // (e.g. incrementing the counters and removing the tracks that reached the pool depth for a given cut)
-    void UpdatePool(const MixingEvent& event, short poolDepth)
+    void UpdatePool(const MixingEvent& event, int16_t poolDepth)
     {
       for (auto& event : events) {
         event.IncrementCounters(event.filteringMask, poolDepth);
@@ -176,14 +177,14 @@ class MixingHandler : public TNamed
 
   // setters
   void AddMixingVariable(int var, std::vector<float> binLims);
-  void SetPoolDepth(short depth) { fPoolDepth = depth; }
+  void SetPoolDepth(int16_t depth) { fPoolDepth = depth; }
 
   // getters
   // int GetNMixingVariables() const { return fVariables.size(); }
   // int GetMixingVariable(VarManager::Variables var); // returns the position in the internal varible list of the handler. Useful for checks, mostly
   // std::vector<float> GetMixingVariableLimits(VarManager::Variables var);
   MixingPool& GetPool(int category) { return fPools[category]; }
-  short GetPoolDepth() const { return fPoolDepth; }
+  int16_t GetPoolDepth() const { return fPoolDepth; }
 
   void Init();
   int FindEventCategory(float* values);
@@ -200,10 +201,8 @@ class MixingHandler : public TNamed
   std::vector<std::vector<float>> fVariableLimits;
   std::map<int, int> fVariables; // key: variable, value: position in the internal variable list of the handler (used to map the variables to the values passed to FindEventCategory)
 
-  short fPoolDepth;                 // number of events to be kept in each pool
+  int16_t fPoolDepth;               // number of events to be kept in each pool
   std::map<int, MixingPool> fPools; // key: category, value: pool of events corresponding to that category
-
-  ClassDef(MixingHandler, 2);
 };
 
 #endif // PWGDQ_CORE_MIXINGHANDLER_H_

PWGDQ/Core/VarManager.cxx

@@ -43,8 +43,6 @@
 
 using namespace o2::constants::physics;
 
-ClassImp(VarManager);
-
 TString VarManager::fgVariableNames[VarManager::kNVars] = {""};
 TString VarManager::fgVariableUnits[VarManager::kNVars] = {""};
 std::map<TString, int> VarManager::fgVarNamesMap;

PWGDQ/Core/VarManager.h

@@ -1585,8 +1585,6 @@ class VarManager : public TObject
 
   VarManager& operator=(const VarManager& c);
   VarManager(const VarManager& c);
-
-  ClassDef(VarManager, 6);
 };
 
 template <typename T, typename C>