PWGDQ utility classes moved from AnalysisCore to Analysis/Tasks/PWGDQ

Analysis/CMakeLists.txt

@@ -12,3 +12,4 @@ add_subdirectory(Core)
 add_subdirectory(DataModel)
 add_subdirectory(Tasks)
 add_subdirectory(Tutorials)
+add_subdirectory(PWGDQ)

Analysis/Core/CMakeLists.txt

@@ -11,10 +11,6 @@
 o2_add_library(AnalysisCore
                SOURCES  src/CorrelationContainer.cxx
                         src/TrackSelection.cxx
-                        src/VarManager.cxx
-                        src/HistogramManager.cxx
-                        src/AnalysisCut.cxx
-                        src/AnalysisCompositeCut.cxx
                         src/TriggerAliases.cxx
 			src/HFConfigurables.cxx
                PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel)
@@ -23,10 +19,6 @@ o2_target_root_dictionary(AnalysisCore
               HEADERS include/AnalysisCore/CorrelationContainer.h
                       include/AnalysisCore/TrackSelection.h
                       include/AnalysisCore/TrackSelectionDefaults.h
-                      include/AnalysisCore/VarManager.h
-                      include/AnalysisCore/HistogramManager.h
-                      include/AnalysisCore/AnalysisCut.h
-                      include/AnalysisCore/AnalysisCompositeCut.h
                       include/AnalysisCore/TriggerAliases.h
                       include/AnalysisCore/MC.h
 		      include/AnalysisCore/HFConfigurables.h

Analysis/Core/src/AnalysisCoreLinkDef.h

@@ -16,8 +16,4 @@
 #pragma link C++ class TrackSelection + ;
 #pragma link C++ class TriggerAliases + ;
 
-#pragma link C++ class VarManager + ;
-#pragma link C++ class HistogramManager + ;
-#pragma link C++ class AnalysisCut + ;
-#pragma link C++ class AnalysisCompositeCut + ;
 #pragma link C++ class HFTrackIndexSkimsCreatorConfigs + ;

Analysis/PWGDQ/CMakeLists.txt

@@ -0,0 +1,25 @@
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# 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.
+
+o2_add_library(PWGDQCore
+               SOURCES  src/VarManager.cxx
+                        src/HistogramManager.cxx
+                        src/AnalysisCut.cxx
+                        src/AnalysisCompositeCut.cxx
+               PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore)
+
+o2_target_root_dictionary(PWGDQCore
+                          HEADERS  include/PWGDQCore/AnalysisCut.h 
+                          include/PWGDQCore/AnalysisCompositeCut.h 
+                          include/PWGDQCore/VarManager.h 
+                          include/PWGDQCore/HistogramManager.h
+                          include/PWGDQCore/CutsLibrary.h 
+                          include/PWGDQCore/HistogramsLibrary.h
+                          LINKDEF src/PWGDQCoreLinkDef.h)

Analysis/Core/include/AnalysisCore/AnalysisCompositeCut.h → Analysis/PWGDQ/include/PWGDQCore/AnalysisCompositeCut.h

@@ -16,7 +16,7 @@
 #ifndef AnalysisCompositeCut_H
 #define AnalysisCompositeCut_H
 
-#include "AnalysisCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCut.h"
 #include <vector>
 
 //_________________________________________________________________________
@@ -44,8 +44,8 @@ class AnalysisCompositeCut : public AnalysisCut
   bool IsSelected(float* values) override;
 
  protected:
-  bool fOptionUseAND;                // true (default): apply AND on all cuts; false: use OR
-  std::vector<AnalysisCut> fCutList; // list of cuts
+  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);

Analysis/Tasks/PWGDQ/CutsLibrary.h → Analysis/PWGDQ/include/PWGDQCore/CutsLibrary.h

@@ -10,9 +10,9 @@
 //
 // Contact: [email protected], [email protected]
 //
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
-#include "AnalysisCore/VarManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
 
 namespace o2::aod
 {

Analysis/Tasks/PWGDQ/HistogramsLibrary.h → Analysis/PWGDQ/include/PWGDQCore/HistogramsLibrary.h

@@ -10,8 +10,8 @@
 //
 // Contact: [email protected], [email protected]
 //
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/VarManager.h"
 
 namespace o2::aod
 {

Analysis/Core/src/AnalysisCompositeCut.cxx → Analysis/PWGDQ/src/AnalysisCompositeCut.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 
 ClassImp(AnalysisCompositeCut)
 

Analysis/Core/src/AnalysisCut.cxx → Analysis/PWGDQ/src/AnalysisCut.cxx

@@ -8,11 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "AnalysisCore/AnalysisCut.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
+#include "PWGDQCore/AnalysisCut.h"
 
 ClassImp(AnalysisCut);
 

Analysis/Core/src/HistogramManager.cxx → Analysis/PWGDQ/src/HistogramManager.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "AnalysisCore/HistogramManager.h"
+#include "PWGDQCore/HistogramManager.h"
 
 #include <iostream>
 #include <fstream>

Analysis/Tasks/PWGDQ/PWGDQCoreLinkDef.h → Analysis/PWGDQ/src/PWGDQCoreLinkDef.h

@@ -11,3 +11,8 @@
 #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 AnalysisCut + ;
+#pragma link C++ class AnalysisCompositeCut + ;

Analysis/Core/src/VarManager.cxx → Analysis/PWGDQ/src/VarManager.cxx

@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "AnalysisCore/VarManager.h"
+#include "PWGDQCore/VarManager.h"
 
 #include <TMath.h>
 

Analysis/Tasks/PWGDQ/CMakeLists.txt

@@ -1,42 +1,44 @@
-o2_add_library(PWGDQCore
-               SOURCES
-               PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore)
-
-o2_target_root_dictionary(PWGDQCore
-              HEADERS CutsLibrary.h HistogramsLibrary.h
-              LINKDEF PWGDQCoreLinkDef.h)
+# Copyright CERN and copyright holders of ALICE O2. This software is distributed
+# under the terms of the GNU General Public License v3 (GPL Version 3), copied
+# verbatim in the file "COPYING".
+#
+# See http://alice-o2.web.cern.ch/license for full licensing information.
+#
+# 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.
 
 o2_add_dpl_workflow(table-maker
                     SOURCES tableMaker.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)
 
 o2_add_dpl_workflow(table-reader
                     SOURCES tableReader.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)
 
 o2_add_dpl_workflow(dilepton-ee
                     SOURCES dileptonEE.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)
 
 o2_add_dpl_workflow(dilepton-mumu
                     SOURCES dileptonMuMu.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)
 
 o2_add_dpl_workflow(table-maker-pp
                     SOURCES tableMaker_pp.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)
 
 o2_add_dpl_workflow(dq-filter-pp
                     SOURCES filterPP.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)                    
 
 o2_add_dpl_workflow(table-maker-muon-pp
                     SOURCES tableMakerMuon_pp.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::DetectorsBase O2::AnalysisCore O2::PWGDQCore
                     COMPONENT_NAME Analysis)

Analysis/Tasks/PWGDQ/dileptonEE.cxx

@@ -15,10 +15,10 @@
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include <TH1F.h>
 #include <TMath.h>
 #include <THashList.h>

Analysis/Tasks/PWGDQ/dileptonMuMu.cxx

@@ -15,10 +15,10 @@
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include <TH1F.h>
 #include <TMath.h>
 #include <THashList.h>

Analysis/Tasks/PWGDQ/filterPP.cxx

@@ -19,12 +19,12 @@
 #include "AnalysisDataModel/Centrality.h"
 #include "AnalysisCore/TriggerAliases.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
-#include "CutsLibrary.h"
-#include "HistogramsLibrary.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/CutsLibrary.h"
+#include "PWGDQCore/HistogramsLibrary.h"
 #include "AnalysisDataModel/PID/PIDResponse.h"
 #include "AnalysisDataModel/TrackSelectionTables.h"
 #include <TH1F.h>

Analysis/Tasks/PWGDQ/tableMaker.cxx

@@ -19,10 +19,10 @@
 #include "AnalysisDataModel/Centrality.h"
 #include "AnalysisCore/TriggerAliases.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include "AnalysisDataModel/PID/PIDResponse.h"
 #include "AnalysisDataModel/TrackSelectionTables.h"
 #include <iostream>

Analysis/Tasks/PWGDQ/tableMakerMuon_pp.cxx

@@ -19,10 +19,10 @@
 #include "AnalysisDataModel/Centrality.h"
 #include "AnalysisCore/TriggerAliases.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include "AnalysisDataModel/PID/PIDResponse.h"
 #include "AnalysisDataModel/TrackSelectionTables.h"
 #include <iostream>

Analysis/Tasks/PWGDQ/tableMaker_pp.cxx

@@ -19,10 +19,10 @@
 #include "AnalysisDataModel/Centrality.h"
 #include "AnalysisCore/TriggerAliases.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include "AnalysisDataModel/PID/PIDResponse.h"
 #include "AnalysisDataModel/TrackSelectionTables.h"
 #include <iostream>

Analysis/Tasks/PWGDQ/tableReader.cxx

@@ -15,10 +15,10 @@
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/ASoAHelpers.h"
 #include "AnalysisDataModel/ReducedInfoTables.h"
-#include "AnalysisCore/VarManager.h"
-#include "AnalysisCore/HistogramManager.h"
-#include "AnalysisCore/AnalysisCut.h"
-#include "AnalysisCore/AnalysisCompositeCut.h"
+#include "PWGDQCore/VarManager.h"
+#include "PWGDQCore/HistogramManager.h"
+#include "PWGDQCore/AnalysisCut.h"
+#include "PWGDQCore/AnalysisCompositeCut.h"
 #include <TH1F.h>
 #include <TMath.h>
 #include <THashList.h>