Remove dependency on FairRoot::Base from Common/MathUtils (#9964)

ktf · web-flow · commit da7e87a27e73 · 2022-09-30T23:47:09.000+02:00
Avoid loading Proof as a core dependency, plus other related dependencies cleanups.
diff --git a/CCDB/src/BasicCCDBManager.cxx b/CCDB/src/BasicCCDBManager.cxx
@@ -14,7 +14,7 @@
 //
 #include "CCDB/BasicCCDBManager.h"
 #include <boost/lexical_cast.hpp>
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 #include <string>
 
 namespace o2
diff --git a/CCDB/src/CcdbApi.cxx b/CCDB/src/CcdbApi.cxx
@@ -30,7 +30,7 @@
 #include <TMemFile.h>
 #include <TH1F.h>
 #include <TTree.h>
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 #include <TError.h>
 #include <TClass.h>
 #include <CCDB/CCDBTimeStampUtils.h>
diff --git a/Common/Field/CMakeLists.txt b/Common/Field/CMakeLists.txt
@@ -16,7 +16,7 @@ o2_add_library(Field
                        src/MagFieldParam.cxx
                        src/MagneticField.cxx
                        src/MagneticWrapperChebyshev.cxx
-               PUBLIC_LINK_LIBRARIES O2::MathUtils)
+                       PUBLIC_LINK_LIBRARIES O2::MathUtils FairRoot::Base)
 
 o2_target_root_dictionary(Field
                           HEADERS include/Field/MagneticWrapperChebyshev.h
diff --git a/Common/MathUtils/CMakeLists.txt b/Common/MathUtils/CMakeLists.txt
@@ -17,7 +17,7 @@ o2_add_library(
           src/Chebyshev3DCalc.cxx
   PUBLIC_LINK_LIBRARIES
     ROOT::Hist
-    FairRoot::Base
+    FairLogger::FairLogger
     O2::CommonConstants
     O2::GPUCommon
     ROOT::GenVector
diff --git a/Common/MathUtils/src/Chebyshev3D.cxx b/Common/MathUtils/src/Chebyshev3D.cxx
@@ -23,10 +23,10 @@
 #include <TSystem.h>                   // for TSystem, gSystem
 #include <cstdio>                      // for printf, fprintf, FILE, fclose, fflush, etc
 #include "MathUtils/Chebyshev3DCalc.h" // for Chebyshev3DCalc, etc
-#include "FairLogger.h"                // for FairLogger
 #include "TMathBase.h"                 // for Max, Abs
 #include "TNamed.h"                    // for TNamed
 #include "TObjArray.h"                 // for TObjArray
+#include <fairlogger/Logger.h>         // for FairLogger
 
 using namespace o2::math_utils;
 
diff --git a/Common/Utils/include/CommonUtils/ConfigurationMacroHelper.h b/Common/Utils/include/CommonUtils/ConfigurationMacroHelper.h
@@ -14,11 +14,11 @@
 #ifndef ALICEO2_CONF_CONFIGURATIONMACRO_H_
 #define ALICEO2_CONF_CONFIGURATIONMACRO_H_
 
-#include "FairLogger.h"
 #include "TROOT.h"
 #include "TSystem.h"
 #include "TGlobal.h"
 #include "TFunction.h"
+#include <fairlogger/Logger.h>
 #include <string>
 
 namespace o2
diff --git a/Common/Utils/src/ConfigurableParam.cxx b/Common/Utils/src/ConfigurableParam.cxx
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <iostream>
 #include <string>
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 #include <typeinfo>
 #include "TDataMember.h"
 #include "TDataType.h"
diff --git a/Common/Utils/src/ConfigurableParamHelper.cxx b/Common/Utils/src/ConfigurableParamHelper.cxx
@@ -22,7 +22,7 @@
 #include <TList.h>
 #include <iostream>
 #include <sstream>
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 #include <boost/property_tree/ptree.hpp>
 #include <functional>
 #ifdef NDEBUG
diff --git a/Common/Utils/test/testTreeStream.cxx b/Common/Utils/test/testTreeStream.cxx
@@ -22,7 +22,6 @@
 #include "CommonUtils/TreeStreamRedirector.h"
 #include "CommonUtils/RootChain.h"
 #include "ReconstructionDataFormats/Track.h"
-#include <FairLogger.h>
 #include <string>
 
 using namespace o2::utils;
@@ -34,7 +33,6 @@ BOOST_AUTO_TEST_CASE(TreeStream_test)
   // Example test function to show functionality of TreeStreamRedirector
 
   // create the  redirector associated with file (testredirector.root)
-  FairLogger* logger = FairLogger::GetLogger();
 
   LOG(info) << "Testing  TreeStream creation";
   std::string outFName("testTreeStream.root");
diff --git a/DataFormats/Detectors/Common/src/AlignParam.cxx b/DataFormats/Detectors/Common/src/AlignParam.cxx
@@ -12,7 +12,7 @@
 /// \file AlignParam.cxx
 /// \brief Implementation of the base alignment parameters class
 
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 #include <TGeoManager.h>
 #include <TGeoMatrix.h>
 #include <TGeoOverlap.h>
diff --git a/DataFormats/Detectors/Common/src/DetID.cxx b/DataFormats/Detectors/Common/src/DetID.cxx
@@ -17,7 +17,7 @@
 #include "CommonUtils/StringUtils.h"
 #include <cassert>
 #include <string>
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2::detectors;
 
diff --git a/DataFormats/Detectors/TOF/src/Cluster.cxx b/DataFormats/Detectors/TOF/src/Cluster.cxx
@@ -13,7 +13,7 @@
 /// \brief Implementation of the TOF cluster
 
 #include "DataFormatsTOF/Cluster.h"
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 
 #include <TString.h>
 
diff --git a/DataFormats/Reconstruction/src/PID.cxx b/DataFormats/Reconstruction/src/PID.cxx
@@ -15,7 +15,7 @@
 
 #include "ReconstructionDataFormats/PID.h"
 #include <cassert>
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 
 using namespace o2::track;
 
diff --git a/DataFormats/common/CMakeLists.txt b/DataFormats/common/CMakeLists.txt
@@ -17,7 +17,7 @@ o2_add_library(CommonDataFormat
                        src/AbstractRefAccessor.cxx
                        src/TFIDInfo.cxx
                PUBLIC_LINK_LIBRARIES O2::CommonConstants O2::GPUCommon
-                                     ROOT::Core FairRoot::Base O2::MathUtils Microsoft.GSL::GSL)
+                                     ROOT::Core O2::MathUtils Microsoft.GSL::GSL)
 
 o2_target_root_dictionary(CommonDataFormat
                           HEADERS include/CommonDataFormat/TimeStamp.h
diff --git a/DataFormats/common/test/testRangeRef.cxx b/DataFormats/common/test/testRangeRef.cxx
@@ -14,7 +14,7 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include "CommonDataFormat/RangeReference.h"
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 
 namespace o2
 {
diff --git a/DataFormats/simulation/CMakeLists.txt b/DataFormats/simulation/CMakeLists.txt
@@ -23,7 +23,7 @@ o2_add_library(SimulationDataFormat
                PUBLIC_LINK_LIBRARIES Microsoft.GSL::GSL
                                      O2::DetectorsCommonDataFormats
                                      O2::GPUCommon O2::DetectorsBase
-                                     O2::SimConfig)
+                                     O2::SimConfig ROOT::TreePlayer)
 
 o2_target_root_dictionary(
   SimulationDataFormat
diff --git a/Detectors/MUON/MCH/Clustering/src/ClusterFinderGEM.cxx b/Detectors/MUON/MCH/Clustering/src/ClusterFinderGEM.cxx
@@ -33,8 +33,6 @@
 #include <TMath.h>
 #include <TRandom.h>
 
-#include <FairLogger.h>
-
 // GG
 #include "PadOriginal.h"
 #include "ClusterOriginal.h"
diff --git a/Detectors/MUON/MCH/Clustering/src/ClusterFinderOriginal.cxx b/Detectors/MUON/MCH/Clustering/src/ClusterFinderOriginal.cxx
@@ -33,17 +33,15 @@
 #include <TMath.h>
 #include <TRandom.h>
 
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 
 #include "MCHBase/MathiesonOriginal.h"
 #include "MCHBase/ResponseParam.h"
 #include "MCHClustering/ClusterizerParam.h"
 #include "PadOriginal.h"
 #include "ClusterOriginal.h"
 
-namespace o2
-{
-namespace mch
+namespace o2::mch
 {
 
 //_________________________________________________________________________________________________
@@ -2093,5 +2091,4 @@ void ClusterFinderOriginal::setClusterResolution(Cluster& cluster) const
   }
 }
 
-} // namespace mch
 } // namespace o2
diff --git a/Detectors/MUON/MCH/PreClustering/src/PreClusterFinder.cxx b/Detectors/MUON/MCH/PreClustering/src/PreClusterFinder.cxx
@@ -17,13 +17,11 @@
 #include <vector>
 
 #include <fairmq/Tools.h>
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 
 #include "PreClusterFinderMapping.h"
 
-namespace o2
-{
-namespace mch
+namespace o2::mch
 {
 
 struct PreClusterFinder::DetectionElement {
@@ -543,5 +541,4 @@ void PreClusterFinder::createMapping()
   LOG(info) << "create mapping in: " << std::chrono::duration<double, std::milli>(tEnd - tStart).count() << " ms";
 }
 
-} // namespace mch
 } // namespace o2
diff --git a/Detectors/MUON/MCH/PreClustering/src/PreClusterFinderMapping.cxx b/Detectors/MUON/MCH/PreClustering/src/PreClusterFinderMapping.cxx
@@ -18,15 +18,13 @@
 
 #include <TMath.h>
 
-#include <FairLogger.h>
+#include <fairlogger/Logger.h>
 
 #include "MCHMappingInterface/Segmentation.h"
 
 #include "MCHPreClustering/PreClusterFinderParam.h"
 
-namespace o2
-{
-namespace mch
+namespace o2::mch
 {
 
 using namespace std;
@@ -157,5 +155,4 @@ bool Mapping::areOverlappingExcludeCorners(float area1[2][2], float area2[2][2])
   return false;
 }
 
-} // namespace mch
 } // namespace o2
diff --git a/EventVisualisation/DataConverter/src/VisualisationCalo.cxx b/EventVisualisation/DataConverter/src/VisualisationCalo.cxx
@@ -15,12 +15,9 @@
 ///
 
 #include "EventVisualisationDataConverter/VisualisationCalo.h"
-#include "FairLogger.h"
 
 using namespace std;
-namespace o2
-{
-namespace event_visualisation
+namespace o2::event_visualisation
 {
 
 VisualisationCalo::VisualisationCalo() = default;
@@ -47,5 +44,4 @@ VisualisationCalo::VisualisationCalo(const VisualisationCalo& src)
   this->mPID = src.mPID;
 }
 
-} // namespace event_visualisation
 } // namespace o2
diff --git a/EventVisualisation/DataConverter/src/VisualisationEvent.cxx b/EventVisualisation/DataConverter/src/VisualisationEvent.cxx
@@ -21,14 +21,11 @@
 #include <string>
 #include <limits>
 #include <algorithm>
-#include "FairLogger.h"
 
 using namespace std;
 using namespace rapidjson;
 
-namespace o2
-{
-namespace event_visualisation
+namespace o2::event_visualisation
 {
 
 VisualisationEvent::GIDVisualisation VisualisationEvent::mVis = [] {
@@ -153,5 +150,4 @@ void VisualisationEvent::afterLoading()
   }
 }
 
-} // namespace event_visualisation
 } // namespace o2
diff --git a/EventVisualisation/DataConverter/src/VisualisationEventJSONSerializer.cxx b/EventVisualisation/DataConverter/src/VisualisationEventJSONSerializer.cxx
@@ -15,7 +15,7 @@
 /// \author julian.myrcha@cern.ch
 
 #include "EventVisualisationDataConverter/VisualisationEventJSONSerializer.h"
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 #include <iostream>
 #include <iomanip>
 #include <limits>
@@ -27,11 +27,8 @@
 
 using namespace rapidjson;
 
-namespace o2
+namespace o2::event_visualisation
 {
-namespace event_visualisation
-{
-constexpr int JSON_FILE_VERSION = 1;
 
 void VisualisationEventJSONSerializer::toFile(const VisualisationEvent& event, std::string fileName)
 {
@@ -333,5 +330,4 @@ rapidjson::Value VisualisationEventJSONSerializer::jsonTree(const VisualisationT
   return tree;
 }
 
-} // namespace event_visualisation
-} // namespace o2
+} // namespace o2::event_visualisation
diff --git a/EventVisualisation/DataConverter/src/VisualisationEventROOTSerializer.cxx b/EventVisualisation/DataConverter/src/VisualisationEventROOTSerializer.cxx
@@ -15,7 +15,7 @@
 /// \author julian.myrcha@cern.ch
 
 #include "EventVisualisationDataConverter/VisualisationEventROOTSerializer.h"
-#include "FairLogger.h"
+#include <fairlogger/Logger.h>
 #include <iostream>
 
 #include <TFile.h>
diff --git a/EventVisualisation/DataConverter/src/VisualisationEventSerializer.cxx b/EventVisualisation/DataConverter/src/VisualisationEventSerializer.cxx
@@ -17,13 +17,11 @@
 #include "EventVisualisationDataConverter/VisualisationEventSerializer.h"
 #include "EventVisualisationDataConverter/VisualisationEventJSONSerializer.h"
 #include "EventVisualisationDataConverter/VisualisationEventROOTSerializer.h"
-#include "FairLogger.h"
 #include <iostream>
 #include <iomanip>
+#include <sstream>
 
-namespace o2
-{
-namespace event_visualisation
+namespace o2::event_visualisation
 {
 std::map<std::string, VisualisationEventSerializer*> VisualisationEventSerializer::instances = {
   {".json", new o2::event_visualisation::VisualisationEventJSONSerializer()},
@@ -36,5 +34,4 @@ std::string VisualisationEventSerializer::fileNameIndexed(const std::string file
   return buffer.str();
 }
 
-} // namespace event_visualisation
-} // namespace o2
+} // namespace o2::event_visualisation
diff --git a/EventVisualisation/DataConverter/src/VisualisationTrack.cxx b/EventVisualisation/DataConverter/src/VisualisationTrack.cxx
@@ -17,13 +17,10 @@
 ///
 
 #include "EventVisualisationDataConverter/VisualisationTrack.h"
-#include "FairLogger.h"
 
 using namespace std;
 
-namespace o2
-{
-namespace event_visualisation
+namespace o2::event_visualisation
 {
 
 VisualisationTrack::VisualisationTrack() = default;
@@ -86,5 +83,4 @@ VisualisationCluster& VisualisationTrack::addCluster(float pos[])
   return mClusters.back();
 }
 
-} // namespace event_visualisation
 } // namespace o2
diff --git a/Framework/AnalysisSupport/CMakeLists.txt b/Framework/AnalysisSupport/CMakeLists.txt
@@ -21,7 +21,7 @@ o2_add_library(FrameworkAnalysisSupport
                        src/DataInputDirector.cxx
                        src/AODJAlienReaderHelpers.cxx
                PRIVATE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/src
-               PUBLIC_LINK_LIBRARIES O2::Framework ${EXTRA_TARGETS})
+               PUBLIC_LINK_LIBRARIES O2::Framework ${EXTRA_TARGETS} ROOT::TreePlayer)
 
 o2_add_test(DataInputDirector NAME test_Framework_test_DataInputDirector
                SOURCES test/test_DataInputDirector.cxx
diff --git a/Framework/Core/CMakeLists.txt b/Framework/Core/CMakeLists.txt
diff --git a/Framework/RootAnalysisHelpers/CMakeLists.txt b/Framework/RootAnalysisHelpers/CMakeLists.txt
diff --git a/Framework/RootAnalysisHelpers/test/test_SimpleRDataFrameProcessing.cxx b/Framework/RootAnalysisHelpers/test/test_SimpleRDataFrameProcessing.cxx
diff --git a/Framework/Utils/CMakeLists.txt b/Framework/Utils/CMakeLists.txt
