From 6e12722f05c66903f36ae45f32adc1983b2c408d Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 8 Nov 2022 13:24:32 +0100
Subject: [PATCH] Use Logger instead of FairLogger

---
 MQ/unpacker/CbmTbDaqBuffer.cxx                              | 2 +-
 algo/evbuild/EventBuilder.h                                 | 2 --
 .../nicafemto/format/anatree/CbmAnaTreeSource.cxx           | 2 +-
 .../nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx    | 2 +-
 analysis/common/analysis_tree_converter/CbmConverterTask.h  | 2 --
 .../analysis_tree_converter/CbmSimTracksConverter.cxx       | 2 +-
 core/base/utils/CbmFileUtils.cxx                            | 2 +-
 core/config/CbmConfigBase.h                                 | 6 +++---
 core/detectors/much/CbmMuchTrackingInterface.cxx            | 2 +-
 core/detectors/psd/CbmPsdContFact.cxx                       | 2 +-
 core/detectors/rich/CbmRichContFact.cxx                     | 2 +-
 core/detectors/sts/CbmStsTrackingInterface.cxx              | 2 +-
 core/detectors/tof/CbmTofTrackingInterface.cxx              | 2 +-
 core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx              | 2 +-
 core/detectors/trd/CbmTrdTrackingInterface.cxx              | 2 +-
 core/qa/CbmQaHist.h                                         | 2 +-
 fles/cosy2019/unpacker/CbmStsCoincHodo.cxx                  | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx    | 2 +-
 fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx    | 2 +-
 fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx                | 2 +-
 fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx                | 2 +-
 mvd/CbmMvdTrackingInterface.cxx                             | 2 +-
 reco/KF/CbmTrackingDetectorInterfaceInit.cxx                | 2 --
 reco/KF/Interface/CbmPVFinderKF.cxx                         | 2 --
 reco/L1/CbmCaPerformance.cxx                                | 2 +-
 reco/L1/L1Algo/L1Array.h                                    | 2 +-
 reco/L1/L1Algo/L1Assert.h                                   | 2 +-
 reco/L1/L1Algo/L1BaseStationInfo.cxx                        | 2 +-
 reco/L1/L1Algo/L1CAIteration.h                              | 2 +-
 reco/L1/L1Algo/L1MaterialInfo.cxx                           | 2 +-
 reco/L1/L1Algo/L1ObjectInitController.h                     | 2 +-
 reco/L1/L1Algo/L1Parameters.cxx                             | 2 +-
 reco/L1/L1Algo/L1Station.cxx                                | 2 +-
 reco/L1/L1Algo/L1Utils.h                                    | 2 +-
 reco/L1/L1Algo/L1Vector.h                                   | 2 +-
 reco/L1/L1Algo/utils/L1AlgoDraw.h                           | 2 ++
 reco/L1/qa/CbmTrackingInputQaSts.cxx                        | 2 +-
 reco/base/CbmRecoUnpackConfig.tmpl                          | 1 -
 reco/base/CbmUnpackTask.tmpl                                | 2 +-
 reco/calibration/CbmOffsetDigiTime.tmpl                     | 2 +-
 reco/detectors/much/unpack/CbmMuchUnpackConfig.h            | 3 ---
 reco/detectors/psd/unpack/CbmPsdUnpackConfig.h              | 3 ---
 reco/detectors/rich/unpack/CbmRichUnpackConfig.h            | 3 ---
 reco/detectors/sts/unpack/CbmStsUnpackConfig.h              | 3 ---
 reco/detectors/tof/CbmTofExtendTracks.cxx                   | 2 +-
 reco/detectors/tof/CbmTofHitMaker.cxx                       | 2 +-
 reco/detectors/tof/unpack/CbmBmonUnpackConfig.h             | 3 ---
 reco/detectors/tof/unpack/CbmTofUnpackConfig.h              | 3 ---
 reco/detectors/trd/CbmTrdModuleRec2D.cxx                    | 2 +-
 .../trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx     | 2 +-
 .../trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx         | 2 +-
 reco/detectors/trd/unpack/CbmTrdUnpackConfig.h              | 3 ---
 reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h          | 3 ---
 reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx           | 2 +-
 reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx               | 2 +-
 reco/eventbuilder/digis/CbmEvbuildRawTask.cxx               | 2 +-
 reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx           | 2 +-
 reco/tasks/CbmReco.cxx                                      | 2 +-
 reco/tasks/CbmTaskBuildEvents.cxx                           | 2 +-
 reco/tasks/CbmTaskDigiEventQa.cxx                           | 2 +-
 reco/tasks/CbmTaskMakeRecoEvents.cxx                        | 2 +-
 reco/tasks/CbmTaskTriggerDigi.cxx                           | 2 +-
 reco/tasks/CbmTaskUnpack.cxx                                | 2 +-
 sim/detectors/rich/geo/RichGeoCreator.cxx                   | 2 +-
 sim/detectors/rich/geo/RichGeoMaterials.h                   | 2 +-
 sim/transport/generators/CbmBeamGenerator.cxx               | 2 +-
 66 files changed, 56 insertions(+), 87 deletions(-)

diff --git a/MQ/unpacker/CbmTbDaqBuffer.cxx b/MQ/unpacker/CbmTbDaqBuffer.cxx
index 3342871f94..e87a841f13 100644
--- a/MQ/unpacker/CbmTbDaqBuffer.cxx
+++ b/MQ/unpacker/CbmTbDaqBuffer.cxx
@@ -9,7 +9,7 @@
 
 #include "CbmTbDaqBuffer.h"
 
-#include <FairLogger.h>  // for Logger, LOG
+#include <Logger.h>  // for Logger, LOG
 
 #include <boost/any.hpp>
 
diff --git a/algo/evbuild/EventBuilder.h b/algo/evbuild/EventBuilder.h
index bc34137464..945fb70f1e 100644
--- a/algo/evbuild/EventBuilder.h
+++ b/algo/evbuild/EventBuilder.h
@@ -9,8 +9,6 @@
 #include "CbmDigiEvent.h"
 #include "CbmDigiTimeslice.h"
 
-#include <FairLogger.h>
-
 #include <algorithm>
 #include <map>
 #include <vector>
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
index a4c4e07f0e..f1c029b8f1 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/anatree/CbmAnaTreeSource.cxx
@@ -14,8 +14,8 @@
 
 #include "CbmAnaTreeContainer.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
+#include <Logger.h>
 
 #include <TBranch.h>
 #include <TChain.h>
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
index ab77b91163..b5c78c2edc 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaGeneratorWriteUnigen.cxx
@@ -13,8 +13,8 @@
 
 #include "NicaGeneratorWriteUnigen.h"
 
-#include <FairLogger.h>
 #include <FairTask.h>
+#include <Logger.h>
 
 #include <TTree.h>
 
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h
index f2d4e24847..694d7e3c03 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h
@@ -7,8 +7,6 @@
 
 #include <CbmLink.h>
 
-#include <FairLogger.h>
-
 #include <map>
 #include <string>
 
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 37d8d6dcb9..f3e24e37ce 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -10,9 +10,9 @@
 #include "CbmMCDataManager.h"
 #include "CbmMCTrack.h"
 
-#include "FairLogger.h"
 #include "FairMCEventHeader.h"
 #include "FairRootManager.h"
+#include "Logger.h"
 
 #include <TClonesArray.h>
 #include <TDirectory.h>
diff --git a/core/base/utils/CbmFileUtils.cxx b/core/base/utils/CbmFileUtils.cxx
index 0da0247c41..059fdc5b1c 100644
--- a/core/base/utils/CbmFileUtils.cxx
+++ b/core/base/utils/CbmFileUtils.cxx
@@ -4,7 +4,7 @@
 
 #include "CbmFileUtils.h"
 
-#include "FairLogger.h"  // for LOG, info and error
+#include "Logger.h"  // for LOG, info and error
 
 #include "TArchiveFile.h"  // for TArchiveFile
 #include "TFile.h"         // for TFile
diff --git a/core/config/CbmConfigBase.h b/core/config/CbmConfigBase.h
index b35f0f26e5..8fb0706b55 100644
--- a/core/config/CbmConfigBase.h
+++ b/core/config/CbmConfigBase.h
@@ -6,7 +6,7 @@
 
 #include "CbmDefs.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TSystem.h>
 
@@ -159,8 +159,8 @@ public:
   static void SetLogLevel(const pt::ptree& moduleTree)
   {
     auto logScreenLevel = moduleTree.get_optional<std::string>("logScreenLevel");
-    if (logScreenLevel) FairLogger::GetLogger()->SetLogScreenLevel(logScreenLevel.get().c_str());
+    if (logScreenLevel) fair::Logger::SetConsoleSeverity(logScreenLevel.get().c_str());
     auto logVerbosityLevel = moduleTree.get_optional<std::string>("logVerbosityLevel");
-    if (logVerbosityLevel) FairLogger::GetLogger()->SetLogVerbosityLevel(logVerbosityLevel.get().c_str());
+    if (logVerbosityLevel) fair::Logger::SetVerbosity(logVerbosityLevel.get().c_str());
   }
 };
diff --git a/core/detectors/much/CbmMuchTrackingInterface.cxx b/core/detectors/much/CbmMuchTrackingInterface.cxx
index 6aa020b4a9..0e43542eb5 100644
--- a/core/detectors/much/CbmMuchTrackingInterface.cxx
+++ b/core/detectors/much/CbmMuchTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmMuchTrackingInterface)
 
diff --git a/core/detectors/psd/CbmPsdContFact.cxx b/core/detectors/psd/CbmPsdContFact.cxx
index b2b51eaf92..6383e4d984 100644
--- a/core/detectors/psd/CbmPsdContFact.cxx
+++ b/core/detectors/psd/CbmPsdContFact.cxx
@@ -16,8 +16,8 @@
 #include "CbmMcbm2018PsdPar.h"  // for CbmMcbm2018PsdPar
 
 #include <FairContFact.h>   // for FairContainer
-#include <FairLogger.h>     // for LOG
 #include <FairRuntimeDb.h>  // for FairRuntimeDb
+#include <Logger.h>         // for LOG
 
 #include <TList.h>    // for TList
 #include <TString.h>  // for TString
diff --git a/core/detectors/rich/CbmRichContFact.cxx b/core/detectors/rich/CbmRichContFact.cxx
index b21142b4d8..73db64eae2 100644
--- a/core/detectors/rich/CbmRichContFact.cxx
+++ b/core/detectors/rich/CbmRichContFact.cxx
@@ -16,8 +16,8 @@
 #include "CbmMcbm2018RichPar.h"  // for CbmMcbm2018RichPar
 
 #include <FairContFact.h>   // for FairContainer
-#include <FairLogger.h>     // for LOG
 #include <FairRuntimeDb.h>  // for FairRuntimeDb
+#include <Logger.h>         // for LOG
 
 #include <TList.h>    // for TList
 #include <TString.h>  // for TString
diff --git a/core/detectors/sts/CbmStsTrackingInterface.cxx b/core/detectors/sts/CbmStsTrackingInterface.cxx
index e7605fac0d..f57a2b520c 100644
--- a/core/detectors/sts/CbmStsTrackingInterface.cxx
+++ b/core/detectors/sts/CbmStsTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmStsTrackingInterface)
 
diff --git a/core/detectors/tof/CbmTofTrackingInterface.cxx b/core/detectors/tof/CbmTofTrackingInterface.cxx
index de024d1750..61d5f2e744 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.cxx
+++ b/core/detectors/tof/CbmTofTrackingInterface.cxx
@@ -17,7 +17,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmTofTrackingInterface)
 
diff --git a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
index c234270691..0c00d4103b 100644
--- a/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
+++ b/core/detectors/trd/CbmMcbm2020TrdTshiftPar.cxx
@@ -5,8 +5,8 @@
 #include "CbmMcbm2020TrdTshiftPar.h"
 
 // FairRoot
-#include "FairLogger.h"
 #include "FairParamList.h"
+#include "Logger.h"
 
 // ROOT
 #include "THnSparse.h"
diff --git a/core/detectors/trd/CbmTrdTrackingInterface.cxx b/core/detectors/trd/CbmTrdTrackingInterface.cxx
index 1a17227120..00e6a8c0c9 100644
--- a/core/detectors/trd/CbmTrdTrackingInterface.cxx
+++ b/core/detectors/trd/CbmTrdTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include "TGeoManager.h"
 #include "TString.h"
diff --git a/core/qa/CbmQaHist.h b/core/qa/CbmQaHist.h
index 5f838c0a55..546e573b25 100644
--- a/core/qa/CbmQaHist.h
+++ b/core/qa/CbmQaHist.h
@@ -12,7 +12,7 @@
 
 #include "CbmQaCanvas.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TFitResultPtr.h>
 #include <TPaveStats.h>
diff --git a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
index 0fa600f9d0..1716143ea1 100644
--- a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
@@ -8,9 +8,9 @@
 #include "CbmStsDigi.h"
 #include "CbmStsHit.h"
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRunOnline.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TFile.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
index 9740525551..1abaf45326 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoMuchLite.cxx
@@ -12,11 +12,11 @@
 #include "CbmMcbm2018MuchPar.h"
 
 // // FairRoot
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 //
 // // Root
 #include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
index b14d25d7d0..0c3d30b662 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskMuchLite.cxx
@@ -7,12 +7,12 @@
 #include "CbmMcbm2018MonitorAlgoMuchLite.h"
 #include "CbmMcbm2018MuchPar.h"
 
-#include "FairLogger.h"
 #include "FairParGenericSet.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "THttpServer.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index dcf90bc736..aa40909ea9 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -17,11 +17,11 @@
 #include "CbmTofAddress.h"
 #include "CbmTofDetectorId_v14a.h"  // in cbmdata/tof
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
index 882c01784c..ff9f624413 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindTask.cxx
@@ -14,12 +14,12 @@
 #include "CbmMcbm2018TofPar.h"
 #include "CbmMcbmSpillFindAlgo.h"
 
-#include "FairLogger.h"
 #include "FairParGenericSet.h"
 #include "FairRootManager.h"
 #include "FairRun.h"
 #include "FairRunOnline.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TCanvas.h"
 #include "THttpServer.h"
diff --git a/mvd/CbmMvdTrackingInterface.cxx b/mvd/CbmMvdTrackingInterface.cxx
index 7714dc6143..dbc09eb392 100644
--- a/mvd/CbmMvdTrackingInterface.cxx
+++ b/mvd/CbmMvdTrackingInterface.cxx
@@ -13,7 +13,7 @@
 
 #include "FairDetector.h"
 #include "FairRunAna.h"
-#include <FairLogger.h>
+#include <Logger.h>
 
 ClassImp(CbmMvdTrackingInterface)
 
diff --git a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
index 25fdaceb7c..ad27b0b668 100644
--- a/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
+++ b/reco/KF/CbmTrackingDetectorInterfaceInit.cxx
@@ -18,8 +18,6 @@
 #include "CbmTofTrackingInterface.h"
 #include "CbmTrdTrackingInterface.h"
 
-#include <FairLogger.h>
-
 ClassImp(CbmTrackingDetectorInterfaceInit)
 
   CbmTrackingDetectorInterfaceInit* CbmTrackingDetectorInterfaceInit::fpInstance = nullptr;
diff --git a/reco/KF/Interface/CbmPVFinderKF.cxx b/reco/KF/Interface/CbmPVFinderKF.cxx
index 0adca96f47..f98d4ecdac 100644
--- a/reco/KF/Interface/CbmPVFinderKF.cxx
+++ b/reco/KF/Interface/CbmPVFinderKF.cxx
@@ -10,8 +10,6 @@
 #include "CbmKFVertex.h"
 #include "CbmStsTrack.h"
 
-#include <FairLogger.h>
-
 #include "TClonesArray.h"
 
 #include "math.h"
diff --git a/reco/L1/CbmCaPerformance.cxx b/reco/L1/CbmCaPerformance.cxx
index 989c6a1e09..f9e4110cc5 100644
--- a/reco/L1/CbmCaPerformance.cxx
+++ b/reco/L1/CbmCaPerformance.cxx
@@ -13,8 +13,8 @@
 #include "CbmL1.h"  // for L1DetectorID
 #include "CbmMCDataManager.h"
 
-#include "FairLogger.h"
 #include "FairRootManager.h"
+#include "Logger.h"
 
 #include <cassert>
 #include <stdexcept>  // for std::logic_error
diff --git a/reco/L1/L1Algo/L1Array.h b/reco/L1/L1Algo/L1Array.h
index d2754a9773..ed8fd640d3 100644
--- a/reco/L1/L1Algo/L1Array.h
+++ b/reco/L1/L1Algo/L1Array.h
@@ -5,7 +5,7 @@
 #ifndef L1Array_h
 #define L1Array_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <array>
 #include <string>
diff --git a/reco/L1/L1Algo/L1Assert.h b/reco/L1/L1Algo/L1Assert.h
index a5e03567c5..97f4fc8b39 100644
--- a/reco/L1/L1Algo/L1Assert.h
+++ b/reco/L1/L1Algo/L1Assert.h
@@ -20,7 +20,7 @@
 #ifndef L1Assert_h
 #define L1Assert_h 1
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #if defined(NDEBUG) || defined(L1_NO_ASSERT)  // TODO: Do we need to add FAST_CODE here? (S.Zharko)
 #define L1ASSERT(LEVEL, COND)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.cxx b/reco/L1/L1Algo/L1BaseStationInfo.cxx
index 0592d84b0d..6165bc7817 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.cxx
+++ b/reco/L1/L1Algo/L1BaseStationInfo.cxx
@@ -14,7 +14,7 @@
  ***********************************************************************************************************/
 
 // FairRoot
-#include <FairLogger.h>
+#include <Logger.h>
 
 // L1Algo core
 #include "L1Assert.h"
diff --git a/reco/L1/L1Algo/L1CAIteration.h b/reco/L1/L1Algo/L1CAIteration.h
index a6e3d59f03..199d93a408 100644
--- a/reco/L1/L1Algo/L1CAIteration.h
+++ b/reco/L1/L1Algo/L1CAIteration.h
@@ -12,7 +12,7 @@
 #ifndef L1CAIteration_h
 #define L1CAIteration_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/string.hpp>
diff --git a/reco/L1/L1Algo/L1MaterialInfo.cxx b/reco/L1/L1Algo/L1MaterialInfo.cxx
index c02b993a70..442ba6a87d 100644
--- a/reco/L1/L1Algo/L1MaterialInfo.cxx
+++ b/reco/L1/L1Algo/L1MaterialInfo.cxx
@@ -4,7 +4,7 @@
 
 #include "L1MaterialInfo.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/reco/L1/L1Algo/L1ObjectInitController.h b/reco/L1/L1Algo/L1ObjectInitController.h
index 353ca0a2f2..ac9a141849 100644
--- a/reco/L1/L1Algo/L1ObjectInitController.h
+++ b/reco/L1/L1Algo/L1ObjectInitController.h
@@ -9,7 +9,7 @@
 /// @author Sergei Zharko
 /// @date   22.02.2022
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include <bitset>
 #include <cassert>
diff --git a/reco/L1/L1Algo/L1Parameters.cxx b/reco/L1/L1Algo/L1Parameters.cxx
index 78b3aebc77..3bd33def76 100644
--- a/reco/L1/L1Algo/L1Parameters.cxx
+++ b/reco/L1/L1Algo/L1Parameters.cxx
@@ -9,7 +9,7 @@
 
 #include "L1Parameters.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 
diff --git a/reco/L1/L1Algo/L1Station.cxx b/reco/L1/L1Algo/L1Station.cxx
index 17fa68f124..8c3bf9905b 100644
--- a/reco/L1/L1Algo/L1Station.cxx
+++ b/reco/L1/L1Algo/L1Station.cxx
@@ -4,7 +4,7 @@
 
 #include "L1Station.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <iomanip>
 #include <sstream>
diff --git a/reco/L1/L1Algo/L1Utils.h b/reco/L1/L1Algo/L1Utils.h
index 1fb299955b..bd1b798ab9 100644
--- a/reco/L1/L1Algo/L1Utils.h
+++ b/reco/L1/L1Algo/L1Utils.h
@@ -10,7 +10,7 @@
 #ifndef L1Utils_h
 #define L1Utils_h 1
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <chrono>
 #include <iomanip>
diff --git a/reco/L1/L1Algo/L1Vector.h b/reco/L1/L1Algo/L1Vector.h
index 5e5654afb8..5c77cd0b1d 100644
--- a/reco/L1/L1Algo/L1Vector.h
+++ b/reco/L1/L1Algo/L1Vector.h
@@ -12,7 +12,7 @@
 
 #include "L1Def.h"
 #ifndef FAST_CODE
-#include <FairLogger.h>
+#include <Logger.h>
 #endif
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/base_object.hpp>
diff --git a/reco/L1/L1Algo/utils/L1AlgoDraw.h b/reco/L1/L1Algo/utils/L1AlgoDraw.h
index 2bcdf5d419..be548cad4d 100644
--- a/reco/L1/L1Algo/utils/L1AlgoDraw.h
+++ b/reco/L1/L1Algo/utils/L1AlgoDraw.h
@@ -5,6 +5,8 @@
 #ifndef L1AlgoDraw_h
 #define L1AlgoDraw_h 1
 
+#include <TString.h>
+
 #include <map>
 #include <vector>
 
diff --git a/reco/L1/qa/CbmTrackingInputQaSts.cxx b/reco/L1/qa/CbmTrackingInputQaSts.cxx
index 1728c0cd49..9070e14be5 100644
--- a/reco/L1/qa/CbmTrackingInputQaSts.cxx
+++ b/reco/L1/qa/CbmTrackingInputQaSts.cxx
@@ -23,7 +23,7 @@
 #include "CbmStsTrackingInterface.h"  // Communicate via tracking detector interface
 #include "CbmTimeSlice.h"
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TDatabasePDG.h"
diff --git a/reco/base/CbmRecoUnpackConfig.tmpl b/reco/base/CbmRecoUnpackConfig.tmpl
index 7072c5fc68..54b9935aac 100644
--- a/reco/base/CbmRecoUnpackConfig.tmpl
+++ b/reco/base/CbmRecoUnpackConfig.tmpl
@@ -21,7 +21,6 @@
 
 #include "CbmRecoUnpackAlgo.tmpl"
 
-#include <FairLogger.h>
 //#include <FairParAsciiFileIo.h>
 #include <FairRootManager.h>
 #include <Logger.h>
diff --git a/reco/base/CbmUnpackTask.tmpl b/reco/base/CbmUnpackTask.tmpl
index 2c22de882e..f7e47f8ded 100644
--- a/reco/base/CbmUnpackTask.tmpl
+++ b/reco/base/CbmUnpackTask.tmpl
@@ -8,12 +8,12 @@
 /// CbmRoot (+externals) headers
 
 /// FairRoot headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRun.h>
 #include <FairRuntimeDb.h>
 #include <FairRunOnline.h>
 #include <FairParGenericSet.h>
+#include <Logger.h>
 
 /// Fairsoft (Root, Boost, ...) headers
 #include <THttpServer.h>
diff --git a/reco/calibration/CbmOffsetDigiTime.tmpl b/reco/calibration/CbmOffsetDigiTime.tmpl
index 3724843ca4..1fa3830615 100644
--- a/reco/calibration/CbmOffsetDigiTime.tmpl
+++ b/reco/calibration/CbmOffsetDigiTime.tmpl
@@ -8,9 +8,9 @@
 /// CbmRoot (+externals) headers
 
 /// FairRoot headers
-#include "FairLogger.h"
 #include "FairRootManager.h"
 #include "FairRunOnline.h"
+#include "Logger.h"
 
 /// Fairsoft (Root, Boost, ...) headers
 
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
index 810b137774..cc6454696f 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
+++ b/reco/detectors/much/unpack/CbmMuchUnpackConfig.h
@@ -21,9 +21,6 @@
 #include "CbmMuchUnpackMonitor.h"
 #include "CbmRecoUnpackConfig.tmpl"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
index 19fcf86072..907f2bd11f 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackConfig.h
@@ -22,9 +22,6 @@
 #include "CbmPsdUnpackAlgo.h"
 #include "CbmRecoUnpackConfig.tmpl"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
index 9ddff96f43..28b2b8d09f 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackConfig.h
@@ -23,9 +23,6 @@
 #include "CbmRichUnpackAlgoBase.h"
 #include "CbmRichUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
index 7a66125201..9a96221525 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackConfig.h
@@ -25,9 +25,6 @@
 #include "CbmStsUnpackAlgo.h"
 #include "CbmStsUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/tof/CbmTofExtendTracks.cxx b/reco/detectors/tof/CbmTofExtendTracks.cxx
index ea1b341b43..794ac2eb95 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.cxx
+++ b/reco/detectors/tof/CbmTofExtendTracks.cxx
@@ -31,11 +31,11 @@
 #include "CbmTofTrackletTools.h"
 #include "CbmVertex.h"
 
-#include "FairLogger.h"
 #include "FairRootFileSink.h"
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 #include "TClonesArray.h"
 #include "TDirectory.h"
diff --git a/reco/detectors/tof/CbmTofHitMaker.cxx b/reco/detectors/tof/CbmTofHitMaker.cxx
index cf8beb1b24..d371377482 100644
--- a/reco/detectors/tof/CbmTofHitMaker.cxx
+++ b/reco/detectors/tof/CbmTofHitMaker.cxx
@@ -40,11 +40,11 @@
 
 // FAIR classes and includes
 #include "FairEventHeader.h"
-#include "FairLogger.h"
 #include "FairRootFileSink.h"
 #include "FairRootManager.h"
 #include "FairRunAna.h"
 #include "FairRuntimeDb.h"
+#include "Logger.h"
 
 // ROOT Classes and includes
 #include "TClonesArray.h"
diff --git a/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h b/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
index 5d1f2ff028..4b779d122a 100644
--- a/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
+++ b/reco/detectors/tof/unpack/CbmBmonUnpackConfig.h
@@ -23,9 +23,6 @@
 #include "CbmTofUnpackAlgo.h"
 #include "CbmTofUnpackConfig.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
index 0d5aecbaa2..baa76c4d20 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackConfig.h
@@ -24,9 +24,6 @@
 #include "CbmTofUnpackAlgo.h"
 #include "CbmTofUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.cxx b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
index 5c4bf685f5..837d67caf5 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
@@ -12,7 +12,7 @@
 #include "CbmTrdHit.h"
 #include "CbmTrdParModDigi.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TF1.h>
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
index 73a5277f8d..353b087984 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiLookUpCorrR.cxx
@@ -6,7 +6,7 @@
 
 #include "CbmTrdSpadic.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <RtypesCore.h>
 #include <TFile.h>
diff --git a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
index c267400bc1..bff1dea27e 100644
--- a/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
+++ b/reco/detectors/trd/rawToDigiMethods/CbmTrdRawToDigiMaxAdcR.cxx
@@ -4,7 +4,7 @@
 
 #include "CbmTrdRawToDigiMaxAdcR.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <algorithm>
 #include <iostream>
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
index 0a8e96d553..0d81b49c3f 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackConfig.h
@@ -25,9 +25,6 @@
 #include "CbmTrdUnpackAlgoBaseR.h"
 #include "CbmTrdUnpackMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
index 25540834f5..bd3888642a 100644
--- a/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
+++ b/reco/detectors/trd/unpack/CbmTrdUnpackFaspConfig.h
@@ -25,9 +25,6 @@
 #include "CbmTrdUnpackFaspAlgo.h"
 #include "CbmTrdUnpackFaspMonitor.h"
 
-#include <FairLogger.h>
-#include <Logger.h>
-
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index fbee4665ee..b4753a8742 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -17,9 +17,9 @@
 #include "TimesliceMetaData.h"
 
 /// FAIRROOT headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 /// FAIRSOFT headers (geant, boost, ...)
 #include <TCanvas.h>
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
index 2b848786e7..b54e0f7f84 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
+++ b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.cxx
@@ -17,9 +17,9 @@
 #include "TimesliceMetaData.h"
 
 /// FAIRROOT headers
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 /// FAIRSOFT headers (geant, boost, ...)
 #include <TCanvas.h>
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
index db6fbc07c3..81485a8cf0 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
+++ b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
@@ -7,9 +7,9 @@
 #include "CbmDigiManager.h"
 #include "CbmRawEvent.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TFile.h>
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
index 35a7e39ad4..788478c65a 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
@@ -10,9 +10,9 @@
 #include "CbmModuleList.h"
 #include "CbmSeedFinderSlidingWindow.h"
 
-#include <FairLogger.h>
 #include <FairRootManager.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TFile.h>
diff --git a/reco/tasks/CbmReco.cxx b/reco/tasks/CbmReco.cxx
index e9b7065bb7..0c19981f42 100644
--- a/reco/tasks/CbmReco.cxx
+++ b/reco/tasks/CbmReco.cxx
@@ -12,10 +12,10 @@
 #include "CbmTsEventHeader.h"
 
 #include <FairFileSource.h>
-#include <FairLogger.h>
 #include <FairRootFileSink.h>
 #include <FairRunAna.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <THttpServer.h>
 #include <TRootSniffer.h>
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index d5fb029fb6..7ade618907 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -9,7 +9,7 @@
 #include "CbmDigiTimeslice.h"
 #include "CbmModuleList.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TStopwatch.h>
 
diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index 5574c4aaac..e7218cd3c0 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -10,8 +10,8 @@
 #include "CbmModuleList.h"
 #include "CbmReco.h"  // for CbmRecoConfig
 
-#include <FairLogger.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TH1F.h>
 #include <THttpServer.h>
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index e2876f4954..a07b32d9d5 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -8,7 +8,7 @@
 #include "CbmDefs.h"
 #include "CbmEvent.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include <TClonesArray.h>
 #include <TStopwatch.h>
diff --git a/reco/tasks/CbmTaskTriggerDigi.cxx b/reco/tasks/CbmTaskTriggerDigi.cxx
index 9e339010c1..6b6303244a 100644
--- a/reco/tasks/CbmTaskTriggerDigi.cxx
+++ b/reco/tasks/CbmTaskTriggerDigi.cxx
@@ -15,7 +15,7 @@
 #include "CbmTofDigi.h"
 #include "CbmTrdDigi.h"
 
-#include <FairLogger.h>
+#include <Logger.h>
 
 #include "TimeClusterTrigger.h"
 
diff --git a/reco/tasks/CbmTaskUnpack.cxx b/reco/tasks/CbmTaskUnpack.cxx
index ef821c48de..034167b09f 100644
--- a/reco/tasks/CbmTaskUnpack.cxx
+++ b/reco/tasks/CbmTaskUnpack.cxx
@@ -14,8 +14,8 @@
 
 #include "MicrosliceDescriptor.hpp"
 
-#include <FairLogger.h>
 #include <FairRunOnline.h>
+#include <Logger.h>
 
 #include <TStopwatch.h>
 
diff --git a/sim/detectors/rich/geo/RichGeoCreator.cxx b/sim/detectors/rich/geo/RichGeoCreator.cxx
index d283a67526..43b64db753 100644
--- a/sim/detectors/rich/geo/RichGeoCreator.cxx
+++ b/sim/detectors/rich/geo/RichGeoCreator.cxx
@@ -4,7 +4,7 @@
 
 #include "RichGeoCreator.h"
 
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TGeoArb8.h"
 #include "TGeoBBox.h"
diff --git a/sim/detectors/rich/geo/RichGeoMaterials.h b/sim/detectors/rich/geo/RichGeoMaterials.h
index 25f91a32bf..fb6845c253 100644
--- a/sim/detectors/rich/geo/RichGeoMaterials.h
+++ b/sim/detectors/rich/geo/RichGeoMaterials.h
@@ -10,7 +10,7 @@
 #include "FairGeoLoader.h"
 #include "FairGeoMedia.h"
 #include "FairGeoMedium.h"
-#include "FairLogger.h"
+#include "Logger.h"
 
 #include "TGeoManager.h"
 #include "TGeoMedium.h"
diff --git a/sim/transport/generators/CbmBeamGenerator.cxx b/sim/transport/generators/CbmBeamGenerator.cxx
index f39dbba2ad..f01f014c27 100644
--- a/sim/transport/generators/CbmBeamGenerator.cxx
+++ b/sim/transport/generators/CbmBeamGenerator.cxx
@@ -12,10 +12,10 @@
 
 #include "CbmEventGenerator.h"
 
-#include "FairLogger.h"
 #include "FairMCEventHeader.h"
 #include "FairPrimaryGenerator.h"
 #include "FairRunSim.h"
+#include "Logger.h"
 
 #include "TFile.h"
 #include "TRandom.h"
-- 
GitLab