diff --git a/PWGDQ/Core/AnalysisCompositeCut.cxx b/PWGDQ/Core/AnalysisCompositeCut.cxx index cbf0f328283..cc0068d8e58 100644 --- a/PWGDQ/Core/AnalysisCompositeCut.cxx +++ b/PWGDQ/Core/AnalysisCompositeCut.cxx @@ -17,13 +17,11 @@ #include -ClassImp(AnalysisCompositeCut) - - //____________________________________________________________________________ - AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(), - fOptionUseAND(useAND), - fCutList(), - fCompositeCutList() +//____________________________________________________________________________ +AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(), + fOptionUseAND(useAND), + fCutList(), + fCompositeCutList() { // // default constructor diff --git a/PWGDQ/Core/AnalysisCompositeCut.h b/PWGDQ/Core/AnalysisCompositeCut.h index a6b3f6afda4..6418b3a5512 100644 --- a/PWGDQ/Core/AnalysisCompositeCut.h +++ b/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(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 fCutList; // list of cuts std::vector fCompositeCutList; // list of composite cuts - - ClassDef(AnalysisCompositeCut, 2); }; #endif // PWGDQ_CORE_ANALYSISCOMPOSITECUT_H_ diff --git a/PWGDQ/Core/AnalysisCut.cxx b/PWGDQ/Core/AnalysisCut.cxx index a1dae4ce6b0..63c67d1a94f 100644 --- a/PWGDQ/Core/AnalysisCut.cxx +++ b/PWGDQ/Core/AnalysisCut.cxx @@ -21,8 +21,6 @@ using std::cout; using std::endl; -ClassImp(AnalysisCut); - std::vector AnalysisCut::fgUsedVars = {}; //____________________________________________________________________________ diff --git a/PWGDQ/Core/AnalysisCut.h b/PWGDQ/Core/AnalysisCut.h index 990de29abb4..bb06c423182 100644 --- a/PWGDQ/Core/AnalysisCut.h +++ b/PWGDQ/Core/AnalysisCut.h @@ -72,8 +72,6 @@ class AnalysisCut : public TNamed protected: std::vector fCuts; - - ClassDef(AnalysisCut, 2); }; //____________________________________________________________________________ diff --git a/PWGDQ/Core/CMakeLists.txt b/PWGDQ/Core/CMakeLists.txt index 41ceb661bf9..835c14c17ae 100644 --- a/PWGDQ/Core/CMakeLists.txt +++ b/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) diff --git a/PWGDQ/Core/HistogramManager.cxx b/PWGDQ/Core/HistogramManager.cxx index ae1c4be3022..ae062e371e3 100644 --- a/PWGDQ/Core/HistogramManager.cxx +++ b/PWGDQ/Core/HistogramManager.cxx @@ -43,8 +43,6 @@ using namespace std; #include #include -ClassImp(HistogramManager); - //_______________________________________________________________________________ HistogramManager::HistogramManager() : TNamed("", ""), fMainList(nullptr), diff --git a/PWGDQ/Core/HistogramManager.h b/PWGDQ/Core/HistogramManager.h index 94aa3ecec00..ec8781ea66a 100644 --- a/PWGDQ/Core/HistogramManager.h +++ b/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_ diff --git a/PWGDQ/Core/MCProng.cxx b/PWGDQ/Core/MCProng.cxx index 1e50a10fce2..ee95463839d 100644 --- a/PWGDQ/Core/MCProng.cxx +++ b/PWGDQ/Core/MCProng.cxx @@ -22,8 +22,6 @@ #include #include -ClassImp(MCProng); - std::map MCProng::fgSourceNames = { {"kNothing", MCProng::kNothing}, {"kPhysicalPrimary", MCProng::kPhysicalPrimary}, diff --git a/PWGDQ/Core/MCProng.h b/PWGDQ/Core/MCProng.h index 4677a995bc7..7d795834855 100644 --- a/PWGDQ/Core/MCProng.h +++ b/PWGDQ/Core/MCProng.h @@ -114,7 +114,5 @@ class MCProng bool fCheckGenerationsInTime; std::vector fPDGInHistory; std::vector fExcludePDGInHistory; - - ClassDef(MCProng, 2); }; #endif // PWGDQ_CORE_MCPRONG_H_ diff --git a/PWGDQ/Core/MCSignal.cxx b/PWGDQ/Core/MCSignal.cxx index cb05a02b02c..20e510b0662 100644 --- a/PWGDQ/Core/MCSignal.cxx +++ b/PWGDQ/Core/MCSignal.cxx @@ -24,8 +24,6 @@ using std::cout; using std::endl; -ClassImp(MCSignal); - //________________________________________________________________________________________________ MCSignal::MCSignal() : TNamed("", ""), fProngs({}), diff --git a/PWGDQ/Core/MixingHandler.cxx b/PWGDQ/Core/MixingHandler.cxx index 5b769fed65d..acdddee4fc1 100644 --- a/PWGDQ/Core/MixingHandler.cxx +++ b/PWGDQ/Core/MixingHandler.cxx @@ -23,8 +23,6 @@ #include using namespace std; -ClassImp(MixingHandler); - //_________________________________________________________________________ MixingHandler::MixingHandler() : TNamed(), fIsInitialized(false), diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h index d7a16ef122d..581ceba7725 100644 --- a/PWGDQ/Core/MixingHandler.h +++ b/PWGDQ/Core/MixingHandler.h @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -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 counters = {0}; + std::array 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(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 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 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> fVariableLimits; std::map 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 fPools; // key: category, value: pool of events corresponding to that category - - ClassDef(MixingHandler, 2); }; #endif // PWGDQ_CORE_MIXINGHANDLER_H_ diff --git a/PWGDQ/Core/PWGDQCoreLinkDef.h b/PWGDQ/Core/PWGDQCoreLinkDef.h deleted file mode 100644 index 1f6a6f33685..00000000000 --- a/PWGDQ/Core/PWGDQCoreLinkDef.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2019-2020 CERN and copyright holders of ALICE O2. -// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. -// All rights not expressly granted are reserved. -// -// This software is distributed under the terms of the GNU General Public -// License v3 (GPL Version 3), copied verbatim in the file "COPYING". -// -// In applying this license CERN does not waive the privileges and immunities -// granted to it by virtue of its status as an Intergovernmental Organization -// or submit itself to any jurisdiction. - -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; - -#pragma link C++ class VarManager + ; -#pragma link C++ class HistogramManager + ; -#pragma link C++ class MixingHandler + ; -#pragma link C++ class AnalysisCut + ; -#pragma link C++ class AnalysisCompositeCut + ; -#pragma link C++ class MCProng + ; -#pragma link C++ class MCSignal + ; diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx index 097fe8296f7..2944b44faaa 100644 --- a/PWGDQ/Core/VarManager.cxx +++ b/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 VarManager::fgVarNamesMap; diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index cc872d95e96..51228a6c357 100644 --- a/PWGDQ/Core/VarManager.h +++ b/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