Move FastMultEstimation to ITS tracking library

Author: mpuccio

Detectors/ITSMFT/ITS/reconstruction/CMakeLists.txt

@@ -11,15 +11,11 @@
 
 o2_add_library(ITSReconstruction
         SOURCES src/RecoGeomHelper.cxx
-                src/FastMultEstConfig.cxx
-                src/FastMultEst.cxx
         PUBLIC_LINK_LIBRARIES O2::ITSBase
                               O2::ITSMFTReconstruction
                               O2::DataFormatsITS
                               O2::CommonUtils)
 
 o2_target_root_dictionary(
   ITSReconstruction
-  HEADERS include/ITSReconstruction/RecoGeomHelper.h
-          include/ITSReconstruction/FastMultEst.h
-          include/ITSReconstruction/FastMultEstConfig.h)
+        HEADERS include/ITSReconstruction/RecoGeomHelper.h)

Detectors/ITSMFT/ITS/reconstruction/src/ITSReconstructionLinkDef.h

@@ -16,8 +16,5 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::its::RecoGeomHelper + ;
-#pragma link C++ class o2::its::FastMultEst + ;
-#pragma link C++ class o2::its::FastMultEstConfig + ;
-#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::FastMultEstConfig> + ;
 
 #endif

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

@@ -14,6 +14,8 @@ o2_add_library(ITStracking
                SOURCES src/ClusterLines.cxx
                        src/Cluster.cxx
                        src/Configuration.cxx
+                       src/FastMultEstConfig.cxx
+                       src/FastMultEst.cxx
                        src/TimeFrame.cxx
                        src/IOUtils.cxx
                        src/Tracker.cxx
@@ -28,6 +30,7 @@ o2_add_library(ITStracking
                        O2::DataFormatsITSMFT
                        O2::SimulationDataFormat
                        O2::ITSBase
+                       O2::CommonUtils
                        O2::ITSReconstruction
                        O2::ITSMFTReconstruction
                        O2::DataFormatsITS
@@ -49,6 +52,8 @@ o2_target_root_dictionary(ITStracking
                                   include/ITStracking/Tracklet.h
                                   include/ITStracking/Cluster.h
                                   include/ITStracking/Definitions.h
+                                  include/ITStracking/FastMultEst.h
+                                  include/ITStracking/FastMultEstConfig.h
                                   include/ITStracking/TrackingConfigParam.h
                           LINKDEF src/TrackingLinkDef.h)
 

…/include/ITSReconstruction/FastMultEst.h …acking/include/ITStracking/FastMultEst.hDetectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/FastMultEst.h renamed to Detectors/ITSMFT/ITS/tracking/include/ITStracking/FastMultEst.h Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/FastMultEst.h renamed to Detectors/ITSMFT/ITS/tracking/include/ITStracking/FastMultEst.h

@@ -20,7 +20,7 @@
 #include "DataFormatsITSMFT/ROFRecord.h"
 #include "DataFormatsITSMFT/CompCluster.h"
 #include <DataFormatsITSMFT/PhysTrigger.h>
-#include "ITSReconstruction/FastMultEstConfig.h"
+#include "ITStracking/FastMultEstConfig.h"
 #include <gsl/span>
 #include <array>
 

…de/ITSReconstruction/FastMultEstConfig.h …/include/ITStracking/FastMultEstConfig.hDetectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/FastMultEstConfig.h renamed to Detectors/ITSMFT/ITS/tracking/include/ITStracking/FastMultEstConfig.h Detectors/ITSMFT/ITS/reconstruction/include/ITSReconstruction/FastMultEstConfig.h renamed to Detectors/ITSMFT/ITS/tracking/include/ITStracking/FastMultEstConfig.h

@@ -13,7 +13,7 @@
 /// \brief Fast multiplicity estimator for ITS
 /// \author ruben.shahoyan@cern.ch
 
-#include "ITSReconstruction/FastMultEst.h"
+#include "ITStracking/FastMultEst.h"
 #include "DataFormatsITSMFT/DPLAlpideParam.h"
 #include "Framework/Logger.h"
 #include <ctime>

…T/ITS/reconstruction/src/FastMultEst.cxx …/ITSMFT/ITS/tracking/src/FastMultEst.cxxDetectors/ITSMFT/ITS/reconstruction/src/FastMultEst.cxx renamed to Detectors/ITSMFT/ITS/tracking/src/FastMultEst.cxx Detectors/ITSMFT/ITS/reconstruction/src/FastMultEst.cxx renamed to Detectors/ITSMFT/ITS/tracking/src/FastMultEst.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "ITSReconstruction/FastMultEstConfig.h"
+#include "ITStracking/FastMultEstConfig.h"
 #include "TRandom.h"
 
 O2ParamImpl(o2::its::FastMultEstConfig);

…reconstruction/src/FastMultEstConfig.cxx …T/ITS/tracking/src/FastMultEstConfig.cxxDetectors/ITSMFT/ITS/reconstruction/src/FastMultEstConfig.cxx renamed to Detectors/ITSMFT/ITS/tracking/src/FastMultEstConfig.cxx Detectors/ITSMFT/ITS/reconstruction/src/FastMultEstConfig.cxx renamed to Detectors/ITSMFT/ITS/tracking/src/FastMultEstConfig.cxx

@@ -17,8 +17,8 @@
 #include "DataFormatsITSMFT/DPLAlpideParam.h"
 #include "ITSBase/GeometryTGeo.h"
 
-#include "ITSReconstruction/FastMultEstConfig.h"
-#include "ITSReconstruction/FastMultEst.h"
+#include "ITStracking/FastMultEstConfig.h"
+#include "ITStracking/FastMultEst.h"
 
 #include "ITStracking/TrackingConfigParam.h"
 #include "ITStracking/TrackingInterface.h"

Detectors/ITSMFT/ITS/tracking/src/TrackingInterface.cxx

@@ -42,4 +42,8 @@
 #pragma link C++ class o2::its::ITSGpuTrackingParamConfig + ;
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::ITSGpuTrackingParamConfig> + ;
 
+#pragma link C++ class o2::its::FastMultEst + ;
+#pragma link C++ class o2::its::FastMultEstConfig + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::its::FastMultEstConfig> + ;
+
 #endif