Move Zorro into Common/Core

Author: mpuccio

Common/Core/AnalysisCoreLinkDef.h

@@ -28,4 +28,8 @@
 
 #pragma link C++ class FFitWeights + ;
 
+#pragma link C++ class ZorroHelper + ;
+#pragma link C++ class ZorroSummary + ;
+#pragma link C++ class std::vector < ZorroHelper> + ;
+
 #endif // COMMON_CORE_ANALYSISCORELINKDEF_H_

Common/Core/CMakeLists.txt

@@ -22,6 +22,8 @@ o2physics_add_library(AnalysisCore
         MetadataHelper.cxx
         CollisionTypeHelper.cxx
         FFitWeights.cxx
+        Zorro.cxx
+        ZorroSummary.cxx
         PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsParameters ROOT::EG O2::CCDB ROOT::Physics O2::FT0Base O2::FV0Base O2::DataFormatsParamTOF)
 
 o2physics_target_root_dictionary(AnalysisCore
@@ -38,6 +40,9 @@ o2physics_target_root_dictionary(AnalysisCore
         PID/PIDTOFParamService.h
         CollisionTypeHelper.h
         FFitWeights.h
+        Zorro.h
+        ZorroHelper.h
+        ZorroSummary.h
         LINKDEF AnalysisCoreLinkDef.h)
 
 o2physics_add_header_only_library(TPCDriftManager

EventFiltering/Zorro.cxx Common/Core/Zorro.cxxEventFiltering/Zorro.cxx renamed to Common/Core/Zorro.cxx

@@ -12,7 +12,7 @@
 
 #include "Zorro.h"
 
-#include "EventFiltering/ZorroHelper.h"
+#include "Common/Core/ZorroHelper.h"
 
 #include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/LHCConstants.h>

EventFiltering/Zorro.h Common/Core/Zorro.hEventFiltering/Zorro.h renamed to Common/Core/Zorro.h

@@ -75,7 +75,7 @@ class Zorro
 
   ZorroSummary mZorroSummary{"ZorroSummary", "ZorroSummary"};
 
-  std::string mBaseCCDBPath = "EventFiltering/Zorro/";
+  std::string mBaseCCDBPath = "Common/Core/Zorro/";
   int mRunNumber = 0;
   std::pair<int64_t, int64_t> mRunDuration;
   int64_t mOrbitResetTimestamp = 0;

EventFiltering/ZorroHelper.h Common/Core/ZorroHelper.hEventFiltering/ZorroHelper.h renamed to Common/Core/ZorroHelper.h

@@ -106,12 +106,3 @@ o2physics_add_dpl_workflow(lf-f1proton-filter
     SOURCES PWGLF/filterdoublephi.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase
     COMPONENT_NAME Analysis)
-
-o2physics_add_library(EventFilteringUtils
-    SOURCES Zorro.cxx ZorroSummary.cxx
-    INSTALL_HEADERS ZorroHelper.h ZorroSummary.h
-    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore Arrow::arrow_shared)
-
-o2physics_target_root_dictionary(EventFilteringUtils
-   HEADERS ZorroHelper.h ZorroSummary.h
-   LINKDEF EventFilteringUtilsLinkDef.h)

EventFiltering/ZorroSummary.cxx Common/Core/ZorroSummary.cxxEventFiltering/ZorroSummary.cxx renamed to Common/Core/ZorroSummary.cxx

@@ -26,14 +26,14 @@
 #include "TTree.h"
 
 #include "CCDB/BasicCCDBManager.h"
-#include "EventFiltering/ZorroHelper.h"
+#include "Common/Core/ZorroHelper.h"
 #include "CommonConstants/LHCConstants.h"
 
 constexpr uint32_t chunkSize = 1000000;
 
 void uploadOTSobjects(std::string inputList, std::string passName, bool useAlien, bool chunkedProcessing = true)
 {
-  const std::string kBaseCCDBPath = "EventFiltering/Zorro/";
+  const std::string kBaseCCDBPath = "Common/Core/Zorro/";
   std::string baseCCDBpath = passName.empty() ? kBaseCCDBPath : kBaseCCDBPath + passName + "/";
   if (useAlien) {
     TGrid::Connect("alien://");