diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index 189fbff313b5fdbcd8a32f5a0e8ef7a5e69acd99..a338e1bdabd9921475edb9b479c5c85e6c4e6c46 100644
--- a/MQ/histoServer/CMakeLists.txt
+++ b/MQ/histoServer/CMakeLists.txt
@@ -17,6 +17,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRROOT_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
+ ${FAIRLOGGER_INCLUDE_DIR}
)
Include_Directories(${INCLUDE_DIRECTORIES})
diff --git a/MQ/histoServer/CbmHistoServer.cxx b/MQ/histoServer/CbmHistoServer.cxx
index cefb6a5e224e598db9fc7a09e8833554a178bfea..22d0b0f84ddc3e73aa22b706f935473110dfd4cb 100644
--- a/MQ/histoServer/CbmHistoServer.cxx
+++ b/MQ/histoServer/CbmHistoServer.cxx
@@ -9,7 +9,7 @@
#include "CbmHistoServer.h"
//#include "CbmHistoCanvasDrawer.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "RootSerializer.h"
#include "TH1.h"
diff --git a/MQ/histoServer/CbmMqHistoServer.cxx b/MQ/histoServer/CbmMqHistoServer.cxx
index 0ec75bbed1d16e5297c715c9dd9fe4cbd6f866ec..7604d68d62715005074492c2cca6f62828be59d0 100644
--- a/MQ/histoServer/CbmMqHistoServer.cxx
+++ b/MQ/histoServer/CbmMqHistoServer.cxx
@@ -9,7 +9,8 @@
#include "CbmFlesCanvasTools.h"
-#include "FairLogger.h"
+#include "BoostSerializer.h"
+#include <Logger.h>
#include "FairMQProgOptions.h" // device->fConfig
#include "TCanvas.h"
diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index a70169740c26d326f420ba23c74664fc94cf4ab8..142c43860863ebf2f12cf7f5622c1acd53cf3997 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -36,6 +36,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
${VMC_INCLUDE_DIRS}
+ ${FAIRLOGGER_INCLUDE_DIR}
${IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
diff --git a/MQ/source/CMakeLists.txt b/MQ/source/CMakeLists.txt
index c8d90b5fd5ea3d4b15de52c277fd30b22f60ff6a..383431039eb48f1dea1ab12489034ef53b6a463b 100644
--- a/MQ/source/CMakeLists.txt
+++ b/MQ/source/CMakeLists.txt
@@ -25,6 +25,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
${FAIRMQ_INCLUDE_DIR}
${FAIRMQ_INCLUDE_DIR}/options
${VMC_INCLUDE_DIRS}
+ ${FAIRLOGGER_INCLUDE_DIR}
${IPC_INCLUDE_DIRECTORY}
${CBMROOT_SOURCE_DIR}/external/cppzmq
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/mc/NicaCbmMCTrack.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/mc/NicaCbmMCTrack.cxx
index 4a28206293eefa88579814a368cf29ad46732d78..c9643df51d31dc0d024abe22c96c031a1157c6c0 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/mc/NicaCbmMCTrack.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/mc/NicaCbmMCTrack.cxx
@@ -8,6 +8,8 @@
*/
#include "NicaCbmMCTrack.h"
+#include <Logger.h>
+
NicaCbmMCTrack::NicaCbmMCTrack() : fNPoints(0) {}
void NicaCbmMCTrack::Update(CbmMCTrack* mc, Double_t charge) {
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
index d6b9e5bf1bad9be77dc6b2ad57800f9ff17e711f..8fce67550321f1bf2ebd769a10e9f3359e518233 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
@@ -7,7 +7,7 @@
* Warsaw University of Technology, Faculty of Physics
*/
#include "NicaUnigenSource.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "UEvent.h"
#include "UParticle.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
index 4e4f791fdc8d8ebe5c109885ecc19eb9fa759172..1943a528e6a5c1c40800d0b383a61a7a7c81ac57 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
@@ -18,7 +18,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCPoint.h"
#include "FairTrackParam.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
index d9c1fb2e7d7e762f6b7822a52843140188a2f694..03a8cc5fd76044d2f53fcf15c45b8584237291b3 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
@@ -15,7 +15,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "L1Field.h"
//#include "CbmStsKFTrackFitter.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
index 61f29cf5944f1d0678bd3ae41f64e361b9eb72f1..f2bb2bf603e8e60a509e206999c925fbe1a21897 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
@@ -18,7 +18,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "L1Field.h"
//#include "CbmStsKFTrackFitter.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
index 8495c80be57d61b0d91f4302c8e330850ee03bb1..40e315d762976f762dfbf4a6f330bc19f1a09f22 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
@@ -29,7 +29,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "L1Field.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
index 5b17e12b489e650d34a1d27b068fb4c05e4d3ae4..0a4476c206dcc84329d476d15d1d94781593c499 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
@@ -18,7 +18,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "L1Field.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
index c05c5f569b5c95e49fad07c1bd07fe438883b3ac..7bbf7aee7e13783e71ebc29032c7d317757ea95d 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
@@ -17,7 +17,7 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "L1Field.h"
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
index 86ddcca6c00bc3aa3cd5790d0af1c63c29ba0032..359abde845d5dd55c9d0b0b382fdc9db37392524 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
@@ -10,7 +10,7 @@
#include <string>
//Fair class headers
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
//#include "FairRunAna.h"
#include "FairRun.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
index ec4aacf0ad59442f219e965d9a20d8a36f1c79bb..213b025086902cbb13b6075ba1bf24cd10f38ff5 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
@@ -15,7 +15,7 @@
#include "CbmMCTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunSim.h"
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index 8ef5b6558a6164567a173661769666880b8c7b4a..ba9bef25cfe9c4b58a610a9c0c43b16dea764109 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -42,7 +42,7 @@ using namespace std;
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmVertex.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRootManager.h"
@@ -3240,7 +3240,7 @@ void CbmHadronAnalysis::ExecEvent(Option_t*) {
LOG(debug) << "-D- b = " << fMCEventHeader->GetB()
<< ", phi = " << fMCEventHeader->GetRotZ();
}
- if (FairLogger::GetLogger()->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
for (Int_t j = 0; j < nTofHits; j++) {
TofHit = (CbmTofHit*) fTofHits->At(j);
if (NULL == TofHit) continue;
@@ -3270,7 +3270,7 @@ void CbmHadronAnalysis::ExecEvent(Option_t*) {
}
}
- if (FairLogger::GetLogger()->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
for (Int_t j = 0; j < nTofHits; j++) {
TofHit = (CbmTofHit*) fTofHits->At(j);
if (NULL == TofHit) continue;
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
index 97ead1b203654ba7bce00dcf1aa1af9709e3701a..31841fc646503097e7bbf71434ad04841ee1c995 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
@@ -39,7 +39,7 @@
// CBMroot classes and includes
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
@@ -5249,7 +5249,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
LOG(debug) << Form("no valid match in %d hits for Addr 0x%08x found ",
iNbMatchedHits,
pHitRef->GetAddress());
- if (gLogger->IsLogNeeded(fair::Severity::debug1))
+ if (fair::Logger::Logging(fair::Severity::debug1))
LOG(fatal) << "Check for consistency!";
return 0;
}
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
index 1096b7a44418b9d4c5e47038566611d1692aad5f..250d33f643adef9813360d26f990a6042fb4e1aa 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
@@ -22,7 +22,7 @@
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/analysis/detectors/tof/CbmTofGeometryQa.cxx b/analysis/detectors/tof/CbmTofGeometryQa.cxx
index 80591216cca9bfd3fff08225af489dec1c2e8f6b..4c50b9bb7fc9ab938e5b52b95012ecdc2425d9bf 100644
--- a/analysis/detectors/tof/CbmTofGeometryQa.cxx
+++ b/analysis/detectors/tof/CbmTofGeometryQa.cxx
@@ -18,7 +18,7 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
diff --git a/analysis/detectors/tof/CbmTofHitFinderQa.cxx b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
index 89358379ef04e50039b338143778bcbbe317027a..35458c9c93b07a13752902e4523f3f335bf79714 100644
--- a/analysis/detectors/tof/CbmTofHitFinderQa.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
@@ -22,7 +22,7 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
index 37d8657551bdddd906240bfba61aedfeaaf55579..04928e529af79b8d625c1dd31779f96aad2828cc 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
@@ -10,7 +10,7 @@
#include "CbmTofAddress.h"
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TH1.h"
#include <TFile.h>
diff --git a/analysis/detectors/tof/CbmTofTests.cxx b/analysis/detectors/tof/CbmTofTests.cxx
index c225ffa61d6285404c12e18a9c95c870394c825c..d26edb02a1064aad661f4f8fb44683cdec29245a 100644
--- a/analysis/detectors/tof/CbmTofTests.cxx
+++ b/analysis/detectors/tof/CbmTofTests.cxx
@@ -30,7 +30,7 @@
*/
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/core/base/CbmDaq.cxx b/core/base/CbmDaq.cxx
index 9f07f7262446992d3d4075a058165043d2475688..c1d9ade4608ef9378a18682a1e5535b553ba74f4 100644
--- a/core/base/CbmDaq.cxx
+++ b/core/base/CbmDaq.cxx
@@ -11,8 +11,7 @@
#include "CbmTimeSlice.h" // for CbmTimeSlice, CbmTimeSlice::kEvent
#include <FairEventHeader.h> // for FairEventHeader
-#include <FairLogger.h> // for Logger, LOG, Severity, Severity::debug
-#include <FairLogger.h> // for FairLogger, gLogger
+#include <Logger.h> // for Logger, LOG, Severity, Severity::debug
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
@@ -142,7 +141,7 @@ void CbmDaq::CloseTimeSlice() {
fTimeDigiFirst = fTimeSlice->GetTimeDataFirst();
if (fNofTimeSlices == 1 || fTimeSlice->GetTimeDataLast() > fTimeDigiLast)
fTimeDigiLast = fTimeSlice->GetTimeDataLast();
- if (gLogger->IsLogNeeded(fair::Severity::debug)) PrintCurrentEventRange();
+ if (fair::Logger::Logging(fair::Severity::debug)) PrintCurrentEventRange();
LOG(info) << GetName() << " " << GetBufferStatus();
}
// ===========================================================================
diff --git a/core/base/CbmDigiManager.h b/core/base/CbmDigiManager.h
index c503ce5da3bde09c04a8f84fd5b5353923d01706..6ac21ae6324e3545325dacd07bd6d8fb3eb2091e 100644
--- a/core/base/CbmDigiManager.h
+++ b/core/base/CbmDigiManager.h
@@ -10,7 +10,7 @@
#include <Rtypes.h> // for THashConsistencyHolder, Cla...
#include <RtypesCore.h> // for UInt_t, Bool_t, Int_t, kTRUE
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <FairTask.h> // for InitStatus
#include <boost/any.hpp> // for any_cast, bad_any_cast (ptr...
diff --git a/core/base/CbmDigitize.h b/core/base/CbmDigitize.h
index bd9ad69bb4f00b62e266562138329f9436c9709e..20d0bafd99264c3019febcd2f4f46fd83999c6d0 100644
--- a/core/base/CbmDigitize.h
+++ b/core/base/CbmDigitize.h
@@ -10,7 +10,7 @@
#include <RtypesCore.h> // for Double_t, Bool_t, ULong64_t, kFALSE, kTRUE
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <FairTask.h>
#include <map>
diff --git a/core/base/CbmHistManager.h b/core/base/CbmHistManager.h
index 82799a606da91498566081a8743b3cf07674e186..fc95ae5564906e7d5a4e99a9172aef076406071f 100644
--- a/core/base/CbmHistManager.h
+++ b/core/base/CbmHistManager.h
@@ -21,7 +21,7 @@
#include <TProfile.h> // for TProfile
#include <TProfile2D.h> // for TProfile2D
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <cassert> // for assert
#include <map> // for map, __map_const_iterator, operator!=
diff --git a/core/base/CbmMCDataArray.cxx b/core/base/CbmMCDataArray.cxx
index 2cfdff7d746cab8cb0eb63304f0711eb88e3592d..c0e1eefae29c7d5a6e0d3246894ee4fa7473aeb9 100644
--- a/core/base/CbmMCDataArray.cxx
+++ b/core/base/CbmMCDataArray.cxx
@@ -3,7 +3,7 @@
**/
#include "CbmMCDataArray.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
#include <TChain.h> // for TChain
diff --git a/core/base/CbmMCDataManager.cxx b/core/base/CbmMCDataManager.cxx
index 96b5a159ebff50095904911d888f1a2125d9d89e..7bcddacf1aa791b2affba12504ffeb16af50cce1 100644
--- a/core/base/CbmMCDataManager.cxx
+++ b/core/base/CbmMCDataManager.cxx
@@ -3,7 +3,7 @@
#include "CbmMCDataArray.h" // for CbmMCDataArray
#include "CbmMCDataObject.h" // for CbmMCDataObject
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kFATAL, kSUCCESS
diff --git a/core/base/CbmMCDataObject.cxx b/core/base/CbmMCDataObject.cxx
index ce1409d6aefdb3193ede8d29155094a3c02b302f..c60fa16fadd00d3fe1faec1fadaa713c3188ab5f 100644
--- a/core/base/CbmMCDataObject.cxx
+++ b/core/base/CbmMCDataObject.cxx
@@ -3,7 +3,7 @@
**/
#include "CbmMCDataObject.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
#include <TChain.h> // for TChain
#include <TObject.h> // for TObject
diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index c3dc5e4a2439cf0c8021e583d614a61948017d4e..7f1894c22de3e9f9c0a517517e57200dd49d1e19 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -27,7 +27,7 @@
#include "CbmTrack.h" // for CbmTrack
#include "CbmTrackMatchNew.h" // for CbmTrackMatchNew
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairMCPoint.h> // for FairMCPoint
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus
diff --git a/core/base/CbmRadDamage.cxx b/core/base/CbmRadDamage.cxx
index d22dcd890af1b427cd075c6f94e0fc0ced22899f..8a8553d9a6526af23296af8846bd1d1afb6c4f34 100644
--- a/core/base/CbmRadDamage.cxx
+++ b/core/base/CbmRadDamage.cxx
@@ -4,7 +4,7 @@
**/
#include "CbmRadDamage.h"
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <TMath.h> // for Exp, Qe, K
#include <TMathBase.h> // for Abs
#include <TString.h> // for TString, operator+, operator<<
diff --git a/core/base/CbmReadoutBuffer.h b/core/base/CbmReadoutBuffer.h
index e4a2c4e340d8b15ba183c5d5894d06d3e5596445..9c3da669f8cdd7437f5a32e3622055685bab88b8 100644
--- a/core/base/CbmReadoutBuffer.h
+++ b/core/base/CbmReadoutBuffer.h
@@ -8,7 +8,7 @@
#ifndef CBMREADOUTBUFFER_H
#define CBMREADOUTBUFFER_H 1
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h>
#include <FairWriteoutBuffer.h>
#include <TClonesArray.h>
diff --git a/core/base/utils/CbmGeometryUtils.cxx b/core/base/utils/CbmGeometryUtils.cxx
index 1334ab85a7c5034db7cbac0dd9589f262a4da76e..08586b0aab00677769c43cf0ee21a42cb0977402 100644
--- a/core/base/utils/CbmGeometryUtils.cxx
+++ b/core/base/utils/CbmGeometryUtils.cxx
@@ -4,8 +4,7 @@
#include <FairGeoInterface.h> // for FairGeoInterface
#include <FairGeoLoader.h> // for FairGeoLoader
#include <FairGeoMedia.h> // for FairGeoMedia
-#include <FairLogger.h> // for LOG, Logger, Severity, Severity::debug
-#include <FairLogger.h> // for FairLogger, gLogger
+#include <Logger.h> // for LOG, Logger, Severity, Severity::debug
#include <FairModule.h> // for FairModule
#include <TFile.h> // for TFile, gFile
diff --git a/core/data/CbmEventStore.h b/core/data/CbmEventStore.h
index a70f6f5ef15de0f2934dd1fc4befcfbc93d731cb..b20806a7c81e90b714e53c2499d677170e98cb67 100644
--- a/core/data/CbmEventStore.h
+++ b/core/data/CbmEventStore.h
@@ -12,7 +12,7 @@
#include <TObjArray.h> // for TObjArray
#include <TObject.h> // for TObject
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <boost/any.hpp> // for any_cast
diff --git a/core/data/CbmMCEventList.cxx b/core/data/CbmMCEventList.cxx
index 79e287020f0a0e596860872dd1a0dabb018617e9..52eb8c81b6dd3fdf73bc0090382bbac1fe743c2a 100644
--- a/core/data/CbmMCEventList.cxx
+++ b/core/data/CbmMCEventList.cxx
@@ -4,7 +4,7 @@
**/
#include "CbmMCEventList.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TNamed.h> // for TNamed
#include <TString.h> // for operator<<, TString
diff --git a/core/data/CbmMCTrack.cxx b/core/data/CbmMCTrack.cxx
index 7b78439a88e25d2a09f95067aa1ae000a571c057..b86c26fb36e9018e9e7020fbc41bd76441b11797 100644
--- a/core/data/CbmMCTrack.cxx
+++ b/core/data/CbmMCTrack.cxx
@@ -4,7 +4,7 @@
// -------------------------------------------------------------------------
#include "CbmMCTrack.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TDatabasePDG.h> // for TDatabasePDG
#include <TMCProcess.h> // for kPNoProcess, TMCProcessName
diff --git a/core/data/CbmModuleList.cxx b/core/data/CbmModuleList.cxx
index e81849aa4dcf4991a1e334254d4a651590b3bce8..51247cf7c74e9c9b79d2484646db3777cb13a657 100644
--- a/core/data/CbmModuleList.cxx
+++ b/core/data/CbmModuleList.cxx
@@ -6,7 +6,7 @@
#include "CbmDefs.h" // for ECbmModuleId enumerator
-#include <FairLogger.h> // for LOG macro
+#include <Logger.h> // for LOG macro
#include <utility> // for pair
diff --git a/core/data/CbmTimeSlice.cxx b/core/data/CbmTimeSlice.cxx
index c879b5771a7f610dbf1480e92d694e9e87db83f1..3a9949ac20d91eb5632a9f4bd540e9371c592a5e 100644
--- a/core/data/CbmTimeSlice.cxx
+++ b/core/data/CbmTimeSlice.cxx
@@ -9,7 +9,7 @@
#include "CbmLink.h" // for CbmLink
#include "CbmModuleList.h" // for CbmModuleList
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TNamed.h> // for TNamed
#include <TString.h> // for operator<<
diff --git a/core/data/base/CbmDigiBranch.h b/core/data/base/CbmDigiBranch.h
index 18a5ab491ad40779ab1ff741d6301f64a427b3bd..248dd9efd9911fdfea8e56794f5abe8367ef251d 100644
--- a/core/data/base/CbmDigiBranch.h
+++ b/core/data/base/CbmDigiBranch.h
@@ -5,7 +5,7 @@
#include <vector>
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h>
#include <TClonesArray.h>
diff --git a/core/data/base/CbmDigiVector.h b/core/data/base/CbmDigiVector.h
index b26ae81ad8447282ba83588ded5f02d77749a9c6..927ba7017cd1b5012436827fef3df2a73665e6ce 100644
--- a/core/data/base/CbmDigiVector.h
+++ b/core/data/base/CbmDigiVector.h
@@ -8,7 +8,7 @@
#define CBMDIGIVECTOR_H 1
-#include <FairLogger.h>
+#include <Logger.h>
#include <vector>
#include "CbmDigiContainer.h"
diff --git a/core/data/global/CbmGlobalTrack.cxx b/core/data/global/CbmGlobalTrack.cxx
index fec70609999233bec0674ce46b4070464bd4a0ff..bf039f0b909ec6680c36f9f063ca03c62443ab39 100644
--- a/core/data/global/CbmGlobalTrack.cxx
+++ b/core/data/global/CbmGlobalTrack.cxx
@@ -5,7 +5,7 @@
// -------------------------------------------------------------------------
#include "CbmGlobalTrack.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TObject.h> // for TObject
diff --git a/core/data/global/CbmVertex.cxx b/core/data/global/CbmVertex.cxx
index 733a404ce6e130ee51614e391cef0e6f0122050e..5d26f3853859be9bc5db94b46425ed533fba4f60 100644
--- a/core/data/global/CbmVertex.cxx
+++ b/core/data/global/CbmVertex.cxx
@@ -4,7 +4,7 @@
// -------------------------------------------------------------------------
#include "CbmVertex.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TMatrixTSym.h> // for TMatrixTSym
#include <TMatrixTUtils.h> // for TMatrixTRow, TMatrixTRow_const
diff --git a/core/data/much/CbmMuchAddress.h b/core/data/much/CbmMuchAddress.h
index dd015dea5e44ecea4ed38728ec41ff9012799aad..a9e392822a94c26ff4324a71ecb36989983a409e 100644
--- a/core/data/much/CbmMuchAddress.h
+++ b/core/data/much/CbmMuchAddress.h
@@ -4,7 +4,7 @@
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, UInt_t
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include "CbmAddress.h" // for CbmAddress
diff --git a/core/data/much/CbmMuchPoint.cxx b/core/data/much/CbmMuchPoint.cxx
index 1a502727716d83758726dc11bab26d9a69f99461..f8e2d02290c6254d78bb4348439617f6a463ff6c 100644
--- a/core/data/much/CbmMuchPoint.cxx
+++ b/core/data/much/CbmMuchPoint.cxx
@@ -10,7 +10,7 @@
#include "CbmMuchPoint.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
#include <TMathBase.h> // for Abs
diff --git a/core/data/mvd/CbmMvdDetectorId.h b/core/data/mvd/CbmMvdDetectorId.h
index 19e803afaeb4d7473289de24e8447f44aa9de03d..734e1c6084742ab043317fad341f5273c9d72150 100644
--- a/core/data/mvd/CbmMvdDetectorId.h
+++ b/core/data/mvd/CbmMvdDetectorId.h
@@ -24,7 +24,7 @@
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include "CbmDefs.h" // for ECbmModuleId::kMvd
diff --git a/core/data/mvd/CbmMvdDigi.cxx b/core/data/mvd/CbmMvdDigi.cxx
index 67a915adc23dd1af59c227a9370cc98513c6c025..223a0598a5d42dada390b30b365574c64e73c140 100644
--- a/core/data/mvd/CbmMvdDigi.cxx
+++ b/core/data/mvd/CbmMvdDigi.cxx
@@ -5,7 +5,7 @@
#include "CbmMvdDigi.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TMath.h> // for Power
#include <TObject.h> // for TObject
diff --git a/core/data/mvd/CbmMvdHit.cxx b/core/data/mvd/CbmMvdHit.cxx
index d08e0b1b9a34d081bf1b71ef5a6aabd5e498aa1a..07677aa05dfef57c02b758c613daa33b2971d3e6 100644
--- a/core/data/mvd/CbmMvdHit.cxx
+++ b/core/data/mvd/CbmMvdHit.cxx
@@ -6,7 +6,7 @@
#include "CbmMvdHit.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
// ----- Default constructor -------------------------------------------
CbmMvdHit::CbmMvdHit()
diff --git a/core/data/mvd/CbmMvdPoint.cxx b/core/data/mvd/CbmMvdPoint.cxx
index 2b1b184035d542c9530ebdcc9f9fccdbe568f49b..e9f4fcd11c4b7b40b89afacf1b2f578b27ded76f 100644
--- a/core/data/mvd/CbmMvdPoint.cxx
+++ b/core/data/mvd/CbmMvdPoint.cxx
@@ -4,7 +4,7 @@
// -------------------------------------------------------------------------
#include "CbmMvdPoint.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairMCEventHeader.h> // for FairMCEventHeader
#include <FairMCPoint.h> // for FairMCPoint
#include <FairPrimaryGenerator.h> // for FairPrimaryGenerator
diff --git a/core/data/psd/CbmPsdHit.cxx b/core/data/psd/CbmPsdHit.cxx
index f7fcb659fb72309d34b6ae194191df53022d4305..5e102b188b3f8ce31fef5129a5651c1ecdc02fb5 100644
--- a/core/data/psd/CbmPsdHit.cxx
+++ b/core/data/psd/CbmPsdHit.cxx
@@ -7,7 +7,7 @@
**/
#include "CbmPsdHit.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TObject.h> // for TObject
diff --git a/core/data/psd/CbmPsdPoint.cxx b/core/data/psd/CbmPsdPoint.cxx
index dad02604570a9cc344a2ee1786daac96284d0dc6..5b5416a6e1c6aa04490182641a2b3421411a9d57 100644
--- a/core/data/psd/CbmPsdPoint.cxx
+++ b/core/data/psd/CbmPsdPoint.cxx
@@ -5,7 +5,7 @@
#include "CbmPsdPoint.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
#include <sstream> // for stringstream
diff --git a/core/data/rich/CbmRichPoint.cxx b/core/data/rich/CbmRichPoint.cxx
index 2f5860a9b2284c7bf932dbb4294a6f9cb06488b4..3b33e6570944f75ecb105315ce43566e6fd49fba 100644
--- a/core/data/rich/CbmRichPoint.cxx
+++ b/core/data/rich/CbmRichPoint.cxx
@@ -5,7 +5,7 @@
#include "CbmRichPoint.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
#include <TVector3.h> // for TVector3
diff --git a/core/data/rich/CbmRichRing.cxx b/core/data/rich/CbmRichRing.cxx
index 05c1fbe1b917950a94452b00d9cb5e28d9077722..649f80e159ed7e4382e2222395cde53034deb748 100644
--- a/core/data/rich/CbmRichRing.cxx
+++ b/core/data/rich/CbmRichRing.cxx
@@ -36,7 +36,7 @@
#include "CbmRichRing.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TMath.h> // for Pi
#include <TObject.h> // for TObject
diff --git a/core/data/sts/CbmStsAddress.cxx b/core/data/sts/CbmStsAddress.cxx
index 2682685a058b75c7f09d249c99c13bfbfe170a38..31b5d4f1808c05e13433010206f5962c21fc1129 100644
--- a/core/data/sts/CbmStsAddress.cxx
+++ b/core/data/sts/CbmStsAddress.cxx
@@ -7,7 +7,7 @@
#include "CbmDefs.h" // for kSts
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <cassert> // for assert
#include <sstream> // for operator<<, basic_ostream, stringstream
diff --git a/core/data/test/global/_GTestCbmVertex.cxx b/core/data/test/global/_GTestCbmVertex.cxx
index 2d64bee367790b261c88b95e87fa429003249303..0c6fee18f91c6dd996b4429a6e0e2f3020037074 100644
--- a/core/data/test/global/_GTestCbmVertex.cxx
+++ b/core/data/test/global/_GTestCbmVertex.cxx
@@ -1,6 +1,6 @@
#include "CbmVertex.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <TMatrixTSym.h>
#include <TVector3.h>
diff --git a/core/data/tof/CbmTofDetectorId_v07a.cxx b/core/data/tof/CbmTofDetectorId_v07a.cxx
index 09c2d0a90fdb23dcaa5c8ce7bb4271929bbb68c4..12a9b0f605ad1b90d4968c45956e59ebfffc4a7b 100644
--- a/core/data/tof/CbmTofDetectorId_v07a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v07a.cxx
@@ -6,7 +6,7 @@
#include "CbmTofDetectorId_v07a.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
const Int_t CbmTofDetectorId_v07a::shiftarray[] = {0, 5, 9, 19, 23};
const Int_t CbmTofDetectorId_v07a::bitarray[] = {5, 4, 10, 4, 9};
diff --git a/core/data/tof/CbmTofTracklet.cxx b/core/data/tof/CbmTofTracklet.cxx
index 22ac0e4ec096fd199a9f98eeb06dd4e8c5d66c23..d7e61eeae90a48ef8d0c6801d99567a7e6aed555 100644
--- a/core/data/tof/CbmTofTracklet.cxx
+++ b/core/data/tof/CbmTofTracklet.cxx
@@ -7,7 +7,7 @@
#include "CbmTofHit.h" // for CbmTofHit
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairTrackParam.h> // for FairTrackParam
#include <TMath.h> // for Power, Sqrt
diff --git a/core/data/tof/CbmTofTrackletParam.cxx b/core/data/tof/CbmTofTrackletParam.cxx
index 0c0d4c78c9b352dab44827c9cdb3d8f4ca26d562..ba9446e84a96f942f2447c8229596d06baa16eea 100644
--- a/core/data/tof/CbmTofTrackletParam.cxx
+++ b/core/data/tof/CbmTofTrackletParam.cxx
@@ -5,7 +5,7 @@
#include "CbmTofTrackletParam.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
Double_t CbmTofTrackletParam::GetZr(Double_t R) const {
Double_t P = (fTx + fTy);
diff --git a/core/data/trd/CbmTrdCluster.cxx b/core/data/trd/CbmTrdCluster.cxx
index 504de9f87880a2d37606eae978478ab76af26158..fbc976de94efb58ea94512b650f8add9f105f685 100644
--- a/core/data/trd/CbmTrdCluster.cxx
+++ b/core/data/trd/CbmTrdCluster.cxx
@@ -5,7 +5,7 @@
*/
#include "CbmTrdCluster.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TMathBase.h> // for Min, Abs
#
diff --git a/core/data/trd/CbmTrdDigi.cxx b/core/data/trd/CbmTrdDigi.cxx
index 3063a5bbd7abcee421fda67b9d46a4126fec604c..5a215d42b3da85dd1e2d27f3f5b4db9081b8e283 100644
--- a/core/data/trd/CbmTrdDigi.cxx
+++ b/core/data/trd/CbmTrdDigi.cxx
@@ -2,7 +2,7 @@
#include "CbmTrdAddress.h" // for CbmTrdAddress
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <TMath.h> // for Ceil
diff --git a/core/data/trd/CbmTrdPoint.cxx b/core/data/trd/CbmTrdPoint.cxx
index 954879c432b922fd3c25517480eeed57efb67adb..81de745f4310e13385bfafb9810e1f48a33da6f1 100644
--- a/core/data/trd/CbmTrdPoint.cxx
+++ b/core/data/trd/CbmTrdPoint.cxx
@@ -5,7 +5,7 @@
#include "CbmTrdPoint.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
#include <TVector3.h> // for TVector3
diff --git a/core/data/trd/CbmTrdRawMessageSpadic.cxx b/core/data/trd/CbmTrdRawMessageSpadic.cxx
index 29a18389c13af0630a0e8d88bb306ccf8b7618bc..ece0cb42e1139ae07af8ee960c140d6acdcef3b5 100644
--- a/core/data/trd/CbmTrdRawMessageSpadic.cxx
+++ b/core/data/trd/CbmTrdRawMessageSpadic.cxx
@@ -1,6 +1,6 @@
#include "CbmTrdRawMessageSpadic.h"
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <algorithm> // for max_element
#include <stdexcept> // for range_error
diff --git a/core/detectors/much/CbmMcbm2018MuchPar.cxx b/core/detectors/much/CbmMcbm2018MuchPar.cxx
index ffbab96cca0c8b515ce5371c98fc199a5a235809..86611a3a046ad22cfe1b6b597010edbf53515505 100644
--- a/core/detectors/much/CbmMcbm2018MuchPar.cxx
+++ b/core/detectors/much/CbmMcbm2018MuchPar.cxx
@@ -7,7 +7,7 @@
#include "CbmMcbm2018MuchPar.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/core/detectors/much/CbmMuchContFact.cxx b/core/detectors/much/CbmMuchContFact.cxx
index 9b5283cd45a249b2440d29beeadb869871e98dc2..febf765bfefcb3245b2b469e4b34f358932bfb0d 100644
--- a/core/detectors/much/CbmMuchContFact.cxx
+++ b/core/detectors/much/CbmMuchContFact.cxx
@@ -13,7 +13,7 @@
#include "CbmMcbm2018MuchPar.h" // for CbmMcbm2018MuchPar
#include <FairContFact.h> // for FairContainer
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <TList.h> // for TList
diff --git a/core/detectors/much/CbmMuchGeoScheme.cxx b/core/detectors/much/CbmMuchGeoScheme.cxx
index 84e8628bb94a7b3e89996043b76a3c258a670b1b..67a1a29aafda5b0defb7cd36ee57a01e56334cfa 100644
--- a/core/detectors/much/CbmMuchGeoScheme.cxx
+++ b/core/detectors/much/CbmMuchGeoScheme.cxx
@@ -14,7 +14,7 @@
#include "CbmMuchModuleGemRadial.h" // for CbmMuchModuleGemRadial
#include "CbmMuchStation.h" // for CbmMuchStation
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <TArrayD.h> // for TArrayD
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/much/CbmMuchModuleGemRadial.cxx b/core/detectors/much/CbmMuchModuleGemRadial.cxx
index 70f9892d73621f638e03278db5b114e5bc5e6b86..dc83892c444c46eaef82e830f411e9339aa6978d 100644
--- a/core/detectors/much/CbmMuchModuleGemRadial.cxx
+++ b/core/detectors/much/CbmMuchModuleGemRadial.cxx
@@ -11,7 +11,7 @@
#include "CbmMuchPadRadial.h" // for CbmMuchPadRadial
#include "CbmMuchSectorRadial.h" // for CbmMuchSectorRadial
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <TVector3.h> // for TVector3
diff --git a/core/detectors/much/CbmMuchSector.cxx b/core/detectors/much/CbmMuchSector.cxx
index d66490c8587e6314c567894d30d5973fdb62b5f2..1eeaf16a458ede16efbee9a26bd732ea7a43a215 100644
--- a/core/detectors/much/CbmMuchSector.cxx
+++ b/core/detectors/much/CbmMuchSector.cxx
@@ -1,6 +1,6 @@
#include "CbmMuchSector.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <vector> // for vector
diff --git a/core/detectors/much/CbmMuchSectorRadial.cxx b/core/detectors/much/CbmMuchSectorRadial.cxx
index 4f9ebccd3c50f0f7d79bc46b21bd75081b91b04a..5bc81cfad47cf3af3f558b67e972f731ca1a3ae4 100644
--- a/core/detectors/much/CbmMuchSectorRadial.cxx
+++ b/core/detectors/much/CbmMuchSectorRadial.cxx
@@ -13,7 +13,7 @@
#include <TMath.h> // for Ceil, Floor, Pi, TwoPi
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <vector> // for vector
diff --git a/core/detectors/much/CbmMuchSegmentSector.cxx b/core/detectors/much/CbmMuchSegmentSector.cxx
index 466535a0f7417296caeab8580869184892493b04..9f6538520636745c1d80ff1202ed7dd181c2bfae 100644
--- a/core/detectors/much/CbmMuchSegmentSector.cxx
+++ b/core/detectors/much/CbmMuchSegmentSector.cxx
@@ -17,7 +17,7 @@
#include "CbmMuchSectorRadial.h" // for CbmMuchSectorRadial
#include "CbmMuchStation.h" // for CbmMuchStation
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
diff --git a/core/detectors/psd/CbmMcbm2018PsdPar.cxx b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
index a80d869f153fd4d6fa4da8c0cf5c53ea054378cc..fc4a5cc07c069a1ad11e9e3fdd42cbbdd0251784 100644
--- a/core/detectors/psd/CbmMcbm2018PsdPar.cxx
+++ b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
@@ -7,7 +7,7 @@
#include "CbmMcbm2018PsdPar.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.cxx b/core/detectors/rich/CbmMcbm2018RichPar.cxx
index 420ce2a8ac3aebab0f0817437df8bb6577bb96ad..c8ec993c1b66d26488a55bf6a5b548c372d2f50c 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.cxx
+++ b/core/detectors/rich/CbmMcbm2018RichPar.cxx
@@ -8,13 +8,13 @@
#include "CbmMcbm2018RichPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParamList.h"
// C/C++
#include <iomanip>
-//#include "FairLogger.h" //TODO delete
+//#include <Logger.h> //TODO delete
CbmMcbm2018RichPar::CbmMcbm2018RichPar(const char* name, const char* title, const char* context)
: FairParGenericSet(name, title, context)
diff --git a/core/detectors/rich/CbmRichDigiMapManager.cxx b/core/detectors/rich/CbmRichDigiMapManager.cxx
index 6e0e85a771e8ba88d9686bcfce742a6546c25e2e..1fa3cf9cd3bd49ada8283e156f9da9be35a6d711 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichDigiMapManager.cxx
@@ -8,7 +8,7 @@
#include "CbmRichDetectorData.h" // for CbmRichPmtData, CbmRichPixelData
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for TGeoManager, gGeoManager
diff --git a/core/detectors/rich/CbmRichGeoManager.cxx b/core/detectors/rich/CbmRichGeoManager.cxx
index 14b408a03bdeb5212c4a726a1097cd475e19db27..931416f3f1ea9a8a67258490913f185f17165733 100644
--- a/core/detectors/rich/CbmRichGeoManager.cxx
+++ b/core/detectors/rich/CbmRichGeoManager.cxx
@@ -8,7 +8,7 @@
#include "CbmRichRecGeoPar.h" // for CbmRichRecGeoParPmt, CbmRichRecGeoPar
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for TGeoManager, gGeoManager
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
index 024c3b66b44190344ae0807967a624b38b6382b1..5a9b105f70b58d715180bfa5de3095f29dd0a754 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
@@ -8,7 +8,7 @@
#include "CbmRichDetectorData.h" // for CbmRichPmtData, CbmRichPixelData
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for TGeoManager, gGeoManager
diff --git a/core/detectors/rich/CbmRichPmt.cxx b/core/detectors/rich/CbmRichPmt.cxx
index d4343b060cd97a727b6bebe3026f8da45972d6ba..92a063ffed3c7573b7cb133dbc5192c4046198f8 100644
--- a/core/detectors/rich/CbmRichPmt.cxx
+++ b/core/detectors/rich/CbmRichPmt.cxx
@@ -11,7 +11,7 @@
#include "CbmRichPmtType.h" // for CbmRichPmtTypeEnum, CbmRichPmtTypeCer...
#include "CbmRichRecGeoPar.h" // for CbmRichRecGeoPar
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TAxis.h> // for TAxis
#include <TRandom.h> // for TRandom, gRandom
diff --git a/core/detectors/rich/CbmRichRecGeoPar.h b/core/detectors/rich/CbmRichRecGeoPar.h
index e1410f16da14b8f39b02d6cb6b578eb3de2cb60f..a6cec4c2a6a0f8262b5ee3911cb260ae2bfa1209 100644
--- a/core/detectors/rich/CbmRichRecGeoPar.h
+++ b/core/detectors/rich/CbmRichRecGeoPar.h
@@ -15,7 +15,7 @@
#include <TMath.h> // for Pi, Abs, IsNaN, Min, Max
#include <TVector3.h> // for TVector3
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <map> // for map
#include <string> // for string
diff --git a/core/detectors/sts/CbmMcbm2018StsPar.cxx b/core/detectors/sts/CbmMcbm2018StsPar.cxx
index adaf6e44996f2cf2c4cad7fee1133ca4f006e650..1773ab6f59a229c9c28ebd9f0d9f0d57141c05e1 100644
--- a/core/detectors/sts/CbmMcbm2018StsPar.cxx
+++ b/core/detectors/sts/CbmMcbm2018StsPar.cxx
@@ -6,7 +6,7 @@
#include "CbmMcbm2018StsPar.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/core/detectors/sts/CbmStsContFact.cxx b/core/detectors/sts/CbmStsContFact.cxx
index 5d8256ff43f35ea9ce45dbae3175008120459ba4..0955d280efc60dc6c8103afdf28ba7e916314d07 100644
--- a/core/detectors/sts/CbmStsContFact.cxx
+++ b/core/detectors/sts/CbmStsContFact.cxx
@@ -10,7 +10,7 @@
#include "CbmStsParSetSensorCond.h" // for CbmStsParSetSensorCond
#include "CbmStsParSim.h" // for CbmStsParSim
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairParSet.h> // for FairParSet
#include <FairRuntimeDb.h> // for FairRuntimeDb
diff --git a/core/detectors/sts/CbmStsElement.cxx b/core/detectors/sts/CbmStsElement.cxx
index 7955a18e540d0dd9ba8b6d4e69e5aee6bf1e4357..6c8789ff98e73300c4ed0f417608ed01cb3aa651 100644
--- a/core/detectors/sts/CbmStsElement.cxx
+++ b/core/detectors/sts/CbmStsElement.cxx
@@ -4,7 +4,7 @@
**/
#include "CbmStsElement.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include "CbmStsModule.h" // for CbmStsModule
#include "CbmStsSetup.h" // for CbmStsSetup
diff --git a/core/detectors/sts/CbmStsModule.cxx b/core/detectors/sts/CbmStsModule.cxx
index 41fa57c4d69c124cf30946b101ed3d6931825c60..35dad23576d4a428e4bc5ef24d9fefdd23e186bd 100644
--- a/core/detectors/sts/CbmStsModule.cxx
+++ b/core/detectors/sts/CbmStsModule.cxx
@@ -9,7 +9,7 @@
#include "CbmStsParModule.h" // for CbmStsParModule
#include "CbmStsSensor.h" // for CbmStsSensor
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGeoManager.h> // for gGeoManager
#include <TGeoNode.h> // for TGeoNode
diff --git a/core/detectors/sts/CbmStsParSetModule.cxx b/core/detectors/sts/CbmStsParSetModule.cxx
index df72b0c9363135f411ce00999ab912c02d0c9bb6..e5bf10a7eb8b0fc5bd485e98fbbe45318b3c0a0f 100644
--- a/core/detectors/sts/CbmStsParSetModule.cxx
+++ b/core/detectors/sts/CbmStsParSetModule.cxx
@@ -6,7 +6,7 @@
#include "CbmStsParModule.h" // for CbmStsParModule
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <cassert> // for assert
#include <sstream> // for operator<<, basic_ostream, stringstream
diff --git a/core/detectors/sts/CbmStsParSetSensor.cxx b/core/detectors/sts/CbmStsParSetSensor.cxx
index 2c22ffb52f7fbc4598243e859ccaf5a7dfd5b3ed..86716abb2cbeaf306a8af8dc72ec85007b66d64c 100644
--- a/core/detectors/sts/CbmStsParSetSensor.cxx
+++ b/core/detectors/sts/CbmStsParSetSensor.cxx
@@ -4,7 +4,7 @@
**/
#include "CbmStsParSetSensor.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <cassert> // for assert
#include <sstream> // for operator<<, basic_ostream, stringstream
diff --git a/core/detectors/sts/CbmStsParSetSensorCond.cxx b/core/detectors/sts/CbmStsParSetSensorCond.cxx
index bc5f0a9c2404daeb4877a045ccefec2511c59b2b..13c03b9559420e211dc0ad53bda33c39322fb7ff 100644
--- a/core/detectors/sts/CbmStsParSetSensorCond.cxx
+++ b/core/detectors/sts/CbmStsParSetSensorCond.cxx
@@ -6,7 +6,7 @@
#include "CbmStsParSensorCond.h" // for CbmStsParSensorCond
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TString.h> // for TString, operator<<, operator+, ope...
#include <TSystem.h> // for TSystem, gSystem
diff --git a/core/detectors/sts/CbmStsParSim.cxx b/core/detectors/sts/CbmStsParSim.cxx
index 36b79ee64162a70d30a67510d92fe47944485085..bac486c9d951357c48f4833ba74e80df6b48e3c7 100644
--- a/core/detectors/sts/CbmStsParSim.cxx
+++ b/core/detectors/sts/CbmStsParSim.cxx
@@ -5,7 +5,7 @@
#include "CbmStsParSim.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <sstream> // for operator<<, basic_ostream, stringstream
#include <string> // for char_traits
diff --git a/core/detectors/sts/CbmStsPhysics.cxx b/core/detectors/sts/CbmStsPhysics.cxx
index 3a6ba9b3c9dc6269a11380056847cc5a1a10a62c..b360d4e98f27e0794e92e673f02afa305386dd5a 100644
--- a/core/detectors/sts/CbmStsPhysics.cxx
+++ b/core/detectors/sts/CbmStsPhysics.cxx
@@ -7,7 +7,7 @@
#include "CbmStsDefs.h" // for CbmSts, kProtonMass, kSiCharge, kSiDe...
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TDatabasePDG.h> // for TDatabasePDG
#include <TMath.h> // for Log, Power
diff --git a/core/detectors/sts/CbmStsSetup.cxx b/core/detectors/sts/CbmStsSetup.cxx
index b7a59d51ebe8ac52c07ef5d0cc06fbee550ad921..c4759b0102d8a6bc3c350c4b009679fc3b28b79f 100644
--- a/core/detectors/sts/CbmStsSetup.cxx
+++ b/core/detectors/sts/CbmStsSetup.cxx
@@ -15,7 +15,7 @@
#include "CbmStsStation.h" // for CbmStsStation
#include <FairField.h> // for FairField
-#include <FairLogger.h> // for FairLogger
+#include <Logger.h> // for FairLogger
#include <FairRun.h> // for FairRun
#include <TCollection.h> // for TIter
diff --git a/core/detectors/sts/CbmStsSetup.h b/core/detectors/sts/CbmStsSetup.h
index 332ab444d20c0e1b3edb9de09ae3373a88a367a8..370557e6d4b97ca7effdb2261cf7832ebfb44cca 100644
--- a/core/detectors/sts/CbmStsSetup.h
+++ b/core/detectors/sts/CbmStsSetup.h
@@ -10,7 +10,7 @@
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Int_t, Double_t, Bool_t, UInt_t, UChar_t
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <map> // for map, __map_const_iterator, operator!=
#include <set> // for set
diff --git a/core/detectors/sts/CbmStsStation.cxx b/core/detectors/sts/CbmStsStation.cxx
index e96ca00adee58b7b1cd33e11b1e6eb5ffabf1616..d44f88576addde842b6856b99da11ae84d6a26a3 100644
--- a/core/detectors/sts/CbmStsStation.cxx
+++ b/core/detectors/sts/CbmStsStation.cxx
@@ -10,7 +10,7 @@
#include "CbmStsParSensor.h" // for CbmStsParSensor
#include "CbmStsSensor.h" // for CbmStsSensor
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoMatrix.h> // for TGeoHMatrix
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index c3c98d6877b91e792388fd459f11eaf94b6f38a8..a5ebd0ad3a1372a83c9c513ab75fb2e7a4384c63 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -6,7 +6,7 @@
#include "CbmMcbm2018TofPar.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/core/detectors/tof/CbmTofCell.cxx b/core/detectors/tof/CbmTofCell.cxx
index 526371f371872dbb516c5096f9bd30b1d64bed02..806c9d1d6b22173a76c68166b6e4610280bd65fe 100644
--- a/core/detectors/tof/CbmTofCell.cxx
+++ b/core/detectors/tof/CbmTofCell.cxx
@@ -1,6 +1,6 @@
#include "CbmTofCell.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TGeoManager.h> // for gGeoManager
#include <TNamed.h> // for TNamed
diff --git a/core/detectors/tof/CbmTofContFact.cxx b/core/detectors/tof/CbmTofContFact.cxx
index 8f7c20063aac055c48cdf76b7ddfa1ef9f4a0964..c740bb2ab4bc00ad4770a07b6dc8f1598cfaaea0 100644
--- a/core/detectors/tof/CbmTofContFact.cxx
+++ b/core/detectors/tof/CbmTofContFact.cxx
@@ -15,7 +15,7 @@
#include "CbmTofDigiPar.h" // for CbmTofDigiPar
#include <FairContFact.h> // for FairContainer
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <TList.h> // for TList
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.cxx b/core/detectors/tof/CbmTofCreateDigiPar.cxx
index 2891b4d9ef37d3e4d45fe79867be0d4d7b599a01..00bc5509d01eaf7da449f284cd66251d60180af1 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.cxx
+++ b/core/detectors/tof/CbmTofCreateDigiPar.cxx
@@ -4,7 +4,7 @@
#include "CbmTofDigiPar.h" // for CbmTofDigiPar
#include "CbmTofGeoHandler.h" // for CbmTofGeoHandler, k07a, k12b, k14a
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.cxx b/core/detectors/tof/CbmTofDigiBdfPar.cxx
index 80521e043bbb18656ffa4a364fa5b8bf903033c8..acb2b1c7ea9ffd42180688d173bcf10ab7365c71 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.cxx
+++ b/core/detectors/tof/CbmTofDigiBdfPar.cxx
@@ -6,7 +6,7 @@
#include "CbmTofAddress.h" // for CbmTofAddress
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairParGenericSet.h> // for FairParGenericSet
#include <FairParamList.h> // for FairParamList
diff --git a/core/detectors/tof/CbmTofDigiPar.cxx b/core/detectors/tof/CbmTofDigiPar.cxx
index 20012d86dcf13ea11b73b8651016ff89fd42d831..c78f127de2f2c7c1f89ccff1c87a7492d16c1d86 100644
--- a/core/detectors/tof/CbmTofDigiPar.cxx
+++ b/core/detectors/tof/CbmTofDigiPar.cxx
@@ -2,7 +2,7 @@
#include "CbmTofCell.h" // for CbmTofCell
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairParGenericSet.h> // for FairParGenericSet
#include <FairParamList.h> // for FairParamList
diff --git a/core/detectors/tof/CbmTofGeoHandler.cxx b/core/detectors/tof/CbmTofGeoHandler.cxx
index bdfdfac2904a6729e5ad6578ff82ef791925358f..37ae3fff727283a38291374769ff136e88084c88 100644
--- a/core/detectors/tof/CbmTofGeoHandler.cxx
+++ b/core/detectors/tof/CbmTofGeoHandler.cxx
@@ -10,7 +10,7 @@
#include "CbmTofDetectorId_v14a.h" // for CbmTofDetectorId_v14a
#include "CbmTofDetectorId_v21a.h" // for CbmTofDetectorId_v21a
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TGeoBBox.h> // for TGeoBBox
#include <TGeoManager.h> // for gGeoManager, TGeoManager
diff --git a/core/detectors/trd/CbmTrdContFact.cxx b/core/detectors/trd/CbmTrdContFact.cxx
index 56a4f34c5c98c52a9e5a05f9af4b6d7ac0048287..2a982c495a8f79fc9e1c670c8d6d21dda21a9b80 100644
--- a/core/detectors/trd/CbmTrdContFact.cxx
+++ b/core/detectors/trd/CbmTrdContFact.cxx
@@ -18,7 +18,7 @@
#include "CbmTrdParSetGeo.h" // for CbmTrdParSetGeo
#include <FairContFact.h> // for FairContainer
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <TList.h> // for TList
diff --git a/core/detectors/trd/CbmTrdFASP.cxx b/core/detectors/trd/CbmTrdFASP.cxx
index d9fff1e555caea4d17a43e1e576f2de4c3a5677c..a988f194f66b9209027bc5f3bbe0a7194e35eedf 100644
--- a/core/detectors/trd/CbmTrdFASP.cxx
+++ b/core/detectors/trd/CbmTrdFASP.cxx
@@ -3,7 +3,7 @@
#include "CbmMatch.h" // for CbmMatch
#include "CbmTrdDigi.h" // for CbmTrdDigi, CbmTrdDigi::kFASP
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TAxis.h> // for TAxis
#include <TCanvas.h> // for TCanvas
diff --git a/core/detectors/trd/CbmTrdGas.cxx b/core/detectors/trd/CbmTrdGas.cxx
index 45d8dc22fbd9ac875d070e4145d2aa29244f91cd..339552d4dfeb840dfa26274988f51855e8b34f72 100644
--- a/core/detectors/trd/CbmTrdGas.cxx
+++ b/core/detectors/trd/CbmTrdGas.cxx
@@ -4,7 +4,7 @@
*/
#include "CbmTrdGas.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TGeoBBox.h> // for TGeoBBox
diff --git a/core/detectors/trd/CbmTrdGeoHandler.cxx b/core/detectors/trd/CbmTrdGeoHandler.cxx
index 98f3d2bb26530b8cf20d9f13907fd5f9b15a4246..660f5f86dec1c116c68cfb1ca47ceb7c3ebc8a3c 100644
--- a/core/detectors/trd/CbmTrdGeoHandler.cxx
+++ b/core/detectors/trd/CbmTrdGeoHandler.cxx
@@ -6,7 +6,7 @@
#include "CbmTrdAddress.h" // for CbmTrdAddress
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TGeoBBox.h> // for TGeoBBox
diff --git a/core/detectors/trd/CbmTrdHardwareSetupR.cxx b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
index b4e026794761c20633a313d555e7cceb72e9846e..cd43a1ba078b003b0fbe450a6831451e870de0af 100644
--- a/core/detectors/trd/CbmTrdHardwareSetupR.cxx
+++ b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
@@ -15,7 +15,7 @@
#include "CbmTrdParSetAsic.h" // for CbmTrdParSetAsic
#include "CbmTrdParSpadic.h" // for CbmTrdParSpadic
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairParAsciiFileIo.h> // for FairParAsciiFileIo
#include <FairParamList.h> // for FairParamList
#include <FairRuntimeDb.h> // for FairRuntimeDb
diff --git a/core/detectors/trd/CbmTrdParAsic.cxx b/core/detectors/trd/CbmTrdParAsic.cxx
index b35f6053342cdd797bb5c2de7740e3986df5e157..a575adc4bcd18f438f19baebbf117945c3120006 100644
--- a/core/detectors/trd/CbmTrdParAsic.cxx
+++ b/core/detectors/trd/CbmTrdParAsic.cxx
@@ -1,6 +1,6 @@
#include "CbmTrdParAsic.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <stdio.h> // for printf
diff --git a/core/detectors/trd/CbmTrdParMod.cxx b/core/detectors/trd/CbmTrdParMod.cxx
index 0d5fbd41ac8ae3b03444d4f06259c1f79844af03..eb09757d63c04aafa260ba9cadc05d41d27d32bd 100644
--- a/core/detectors/trd/CbmTrdParMod.cxx
+++ b/core/detectors/trd/CbmTrdParMod.cxx
@@ -1,6 +1,6 @@
#include "CbmTrdParMod.h"
-#include <FairLogger.h> // for LOG
+#include <Logger.h> // for LOG
//___________________________________________________________________
CbmTrdParMod::CbmTrdParMod(const char* name, const char* title)
diff --git a/core/detectors/trd/CbmTrdParModDigi.cxx b/core/detectors/trd/CbmTrdParModDigi.cxx
index cbd9df7fad03144d4167fd7b2eb1a58c39eccc5d..efb3b94db6e08d9bc93d0b3d326e0b868a7fd4a5 100644
--- a/core/detectors/trd/CbmTrdParModDigi.cxx
+++ b/core/detectors/trd/CbmTrdParModDigi.cxx
@@ -3,7 +3,7 @@
#include "CbmTrdAddress.h" // for CbmTrdAddress
#include "CbmTrdPoint.h" // for CbmTrdPoint
-#include <FairLogger.h> // for FairLogger, gLogger, Logger, LOG, Severity, Severity::debug2
+#include <Logger.h> // for LOG, Severity, Severity::debug2
#include <TGeoManager.h> // for TGeoManager, gGeoManager
#include <TString.h> // for TString
@@ -507,7 +507,7 @@ void CbmTrdParModDigi::GetPadInfo(const CbmTrdPoint* trdPoint,
gGeoManager->MasterToLocal(global_point, local_point);
// 20131009 - DE - debuging output to check module orientation 0,1,2,3 with box generator
- if (gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ if (fair::Logger::Logging(fair::Severity::debug2)) {
// print module orientation
LOG(debug2) << "module orientation: " << std::setprecision(5)
<< fOrientation;
diff --git a/core/detectors/trd/CbmTrdParModGas.cxx b/core/detectors/trd/CbmTrdParModGas.cxx
index dd24bc8135475d3db314a6680755b9c6fdcff314..a4bcaf74c1fceae449d31144e9597f02f2b942ff 100644
--- a/core/detectors/trd/CbmTrdParModGas.cxx
+++ b/core/detectors/trd/CbmTrdParModGas.cxx
@@ -1,6 +1,6 @@
#include "CbmTrdParModGas.h"
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TAxis.h> // for TAxis
#include <TGenericClassInfo.h> // for TGenericClassInfo
diff --git a/core/detectors/trd/CbmTrdParSetAsic.cxx b/core/detectors/trd/CbmTrdParSetAsic.cxx
index e172131270826ef91f961f16a24e0d8b77be4e84..a2ff1e9df5f7abcf3cfc70f3330708e94366908a 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.cxx
+++ b/core/detectors/trd/CbmTrdParSetAsic.cxx
@@ -5,7 +5,7 @@
#include "CbmTrdParMod.h" // for CbmTrdParMod
#include "CbmTrdParSpadic.h" // for CbmTrdParSpadic, NSPADICCH
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdParSetDigi.cxx b/core/detectors/trd/CbmTrdParSetDigi.cxx
index b54eb40eba91214a37a506eddbc9bf296e808ed7..db68496aaec2a6ca187a52a18ddb45ae3ea31a8e 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.cxx
+++ b/core/detectors/trd/CbmTrdParSetDigi.cxx
@@ -3,7 +3,7 @@
#include "CbmTrdParMod.h" // for CbmTrdParMod
#include "CbmTrdParModDigi.h" // for CbmTrdParModDigi
-#include <FairLogger.h> // for FairLogger, Logger, LOG, Severity, Severity::debug
+#include <Logger.h> // for LOG, Severity, Severity::debug
#include <FairParamList.h> // for FairParamList
#include <TArrayD.h> // for TArrayD
@@ -102,7 +102,7 @@ Bool_t CbmTrdParSetDigi::getParams(FairParamList* l) {
->SetAnodeWireOffset(awOff); //>0?awOff:0.375);
((CbmTrdParModDigi*) fModuleMap[moduleId[i]])
->SetAnodeWireSpacing(awPitch); //>0?awPitch:0.25);
- if (FairLogger::GetLogger()->IsLogNeeded(fair::Severity::debug))
+ if (fair::Logger::Logging(fair::Severity::debug))
fModuleMap[moduleId[i]]->Print();
}
return kTRUE;
diff --git a/core/detectors/trd/CbmTrdParSetGain.cxx b/core/detectors/trd/CbmTrdParSetGain.cxx
index abf36c3a407848822c895e59e65104fa7669535a..10e075639e7123119410c83bc781ec3632a9172b 100644
--- a/core/detectors/trd/CbmTrdParSetGain.cxx
+++ b/core/detectors/trd/CbmTrdParSetGain.cxx
@@ -1,6 +1,6 @@
#include "CbmTrdParSetGain.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairParamList.h> // for FairParamList
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdParSetGas.cxx b/core/detectors/trd/CbmTrdParSetGas.cxx
index bd58b60e5a421baada34822a4c616605abff7671..3716fa66c37cd10e77ad3759bb77a0d6cc6ace99 100644
--- a/core/detectors/trd/CbmTrdParSetGas.cxx
+++ b/core/detectors/trd/CbmTrdParSetGas.cxx
@@ -2,7 +2,7 @@
#include "CbmTrdParModGas.h" // for CbmTrdParModGas
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdParSetGeo.cxx b/core/detectors/trd/CbmTrdParSetGeo.cxx
index 801100ad4e579e01c57fdb365b973754ef1bf101..bc00e57baa5835e96d3ab3316fcda20dce6868a3 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.cxx
+++ b/core/detectors/trd/CbmTrdParSetGeo.cxx
@@ -3,7 +3,7 @@
#include "CbmTrdGeoHandler.h" // for CbmTrdGeoHandler
#include "CbmTrdParModGeo.h" // for CbmTrdParModGeo
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TGeoManager.h> // for TGeoManager, gGeoManager
diff --git a/core/detectors/trd/CbmTrdParSpadic.cxx b/core/detectors/trd/CbmTrdParSpadic.cxx
index b05f20606d1c5956fc633c650efe1a38ef7f6d78..9e50123981c545a9c7b41cc50b49d14b7a32869d 100644
--- a/core/detectors/trd/CbmTrdParSpadic.cxx
+++ b/core/detectors/trd/CbmTrdParSpadic.cxx
@@ -2,7 +2,7 @@
#include "CbmTrdDefs.h" // for eCbmTrdModuleTypes, eCbmTrdModuleType...
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdRadiator.cxx b/core/detectors/trd/CbmTrdRadiator.cxx
index 12df2100269f8a24afb5de56bb09d56dfe4348da..6dbce89622374860dd77cfa4177b8d2f83c6ec82 100644
--- a/core/detectors/trd/CbmTrdRadiator.cxx
+++ b/core/detectors/trd/CbmTrdRadiator.cxx
@@ -7,7 +7,7 @@
#include "CbmTrdGas.h" // for CbmTrdGas
#include "CbmTrdPoint.h" // for CbmTrdPoint
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TDirectory.h> // for TDirectory
#include <TFile.h> // for TFile, gFile
diff --git a/core/detectors/trd/CbmTrdSPADIC.cxx b/core/detectors/trd/CbmTrdSPADIC.cxx
index 1ca6c15e79fd6a246d6d291c944083485d00878a..66aa45e087248bc51dfb9b95a0bfa75854ffb578 100644
--- a/core/detectors/trd/CbmTrdSPADIC.cxx
+++ b/core/detectors/trd/CbmTrdSPADIC.cxx
@@ -6,7 +6,7 @@
#include "CbmTrdParModDigi.h" // for CbmTrdParModDigi
#include "CbmTrdParSetDigi.h" // for CbmTrdParSetDigi
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
diff --git a/core/detectors/trd/CbmTrdUtils.cxx b/core/detectors/trd/CbmTrdUtils.cxx
index 6accef4b9be7fb6e1955aaef7039ea412a9484ea..ebe2dbbcd1d92d69bf70976774fcada991616e73 100644
--- a/core/detectors/trd/CbmTrdUtils.cxx
+++ b/core/detectors/trd/CbmTrdUtils.cxx
@@ -9,7 +9,7 @@
#include "CbmTrdParModDigi.h" // for CbmTrdParModDigi
#include "CbmTrdParSetDigi.h" // for CbmTrdParSetDigi
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for kWhite
#include <TAxis.h> // for TAxis
diff --git a/core/eventdisplay/CbmEvDisTracks.cxx b/core/eventdisplay/CbmEvDisTracks.cxx
index ba9b0712a7939165f05221c45b81b63a9fb9ad6f..8b72c22c143090ba37cbc4cf077d156331508b9f 100644
--- a/core/eventdisplay/CbmEvDisTracks.cxx
+++ b/core/eventdisplay/CbmEvDisTracks.cxx
@@ -13,7 +13,7 @@
#include "CbmTofTracklet.h" // for CbmTofTracklet
#include <FairEventManager.h> // for FairEventManager
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kERROR, kSUCCESS
diff --git a/core/eventdisplay/CbmPixelHitSetDraw.cxx b/core/eventdisplay/CbmPixelHitSetDraw.cxx
index c5940e970ab420cf7c70b33728e0d19a8382a16f..a86f0e55c1cf906fb76d43b3aabb0e392d18e13f 100644
--- a/core/eventdisplay/CbmPixelHitSetDraw.cxx
+++ b/core/eventdisplay/CbmPixelHitSetDraw.cxx
@@ -2,7 +2,7 @@
#include "CbmPixelHit.h" // for CbmPixelHit
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for ClassImp
#include <TVector3.h> // for TVector3
diff --git a/core/eventdisplay/CbmPointSetArray.cxx b/core/eventdisplay/CbmPointSetArray.cxx
index fe83926c4bb67ee9613b3bce31969baa18c442de..74673c3909d5f4310729f3ffe483e0f5e7e57657 100644
--- a/core/eventdisplay/CbmPointSetArray.cxx
+++ b/core/eventdisplay/CbmPointSetArray.cxx
@@ -5,7 +5,7 @@
// -------------------------------------------------------------------------
#include "CbmPointSetArray.h"
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for ClassImp
#include <TColor.h> // for TColor
diff --git a/core/eventdisplay/CbmPointSetArrayDraw.cxx b/core/eventdisplay/CbmPointSetArrayDraw.cxx
index 3a052971977b0565d76348b3228c01fe1eff7a75..6b98c8b61ce85f23012c87ee2015cd51dac9e0c0 100644
--- a/core/eventdisplay/CbmPointSetArrayDraw.cxx
+++ b/core/eventdisplay/CbmPointSetArrayDraw.cxx
@@ -10,7 +10,7 @@
#include "CbmTofHit.h" // for CbmTofHit
#include <FairEventManager.h> // for FairEventManager
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
diff --git a/core/eventdisplay/CbmRecoTracks.cxx b/core/eventdisplay/CbmRecoTracks.cxx
index a687aef2e36bc61fcc7f33ece15f00992cd4a962..7341442ae7c37d5bca94a17d2b1d6b9f390d8ad5 100644
--- a/core/eventdisplay/CbmRecoTracks.cxx
+++ b/core/eventdisplay/CbmRecoTracks.cxx
@@ -19,7 +19,7 @@
#include "CbmTrack.h" // for CbmTrack
#include <FairEventManager.h> // for FairEventManager
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kERROR, kSUCCESS
#include <FairTrackParam.h> // for FairTrackParam
diff --git a/core/eventdisplay/CbmTrdDigiDraw.cxx b/core/eventdisplay/CbmTrdDigiDraw.cxx
index 971b7798412176125cdca1e4d00bd436c32baf8b..d96e4bab430712b0115f1a6fccf3a21c59071d89 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.cxx
+++ b/core/eventdisplay/CbmTrdDigiDraw.cxx
@@ -10,7 +10,7 @@
#include "CbmTrdParSetDigi.h" // for CbmTrdParSetDigi
#include <FairEventManager.h> // for FairEventManager
-#include <FairLogger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
diff --git a/core/field/CbmFieldContFact.cxx b/core/field/CbmFieldContFact.cxx
index 64fc4211f04bd659566c0ad0449b471abbd0f217..72b968a3ef7242d789dcc7e6e3b6bd96ed9ffd1c 100644
--- a/core/field/CbmFieldContFact.cxx
+++ b/core/field/CbmFieldContFact.cxx
@@ -7,7 +7,7 @@
#include "CbmFieldPar.h" // for CbmFieldPar
#include <FairContFact.h> // for FairContainer
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <TList.h> // for TList
diff --git a/core/field/CbmFieldMap.cxx b/core/field/CbmFieldMap.cxx
index c3a7f90cf6df05e04d7aab913849790d8b377c30..f138b4224e3a283c5626b040b527c0614a214e07 100644
--- a/core/field/CbmFieldMap.cxx
+++ b/core/field/CbmFieldMap.cxx
@@ -10,7 +10,7 @@
#include "CbmFieldPar.h" // for CbmFieldPar
#include <FairField.h> // for FairField
-#include <FairLogger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
#include <TArrayF.h> // for TArrayF
#include <TFile.h> // for TFile, gFile
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
index c67eae149f5025167105773bc1af58d78b1a6bd9..a03af02d772fcb58e80bb75c6adcdf320ff5ed5f 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
@@ -11,7 +11,7 @@
//#include "CbmCosy2019HodoPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
index d2cb0f0c2d65ecedfebcec5fa49ef0bfb11b777b..1eddbcf980385bac6f5941936bd6cb728d44057b 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
@@ -11,7 +11,7 @@
//#include "CbmCosy2019HodoPar.h"
//#include "CbmHodoDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
index 542455249d480cf8addaf8f867bd8d19483fb7cc..d8333f025bd747bed8eb491db5c14d6521584b66 100644
--- a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
@@ -6,7 +6,7 @@
#include "CbmCosy2019HodoPar.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
index 8d5059694c81ea2ec4ad16c01b7d2cc205aa5e4b..1eb6dbc27dfce5e3c594779623cc312b065ae7ca 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
@@ -13,7 +13,7 @@
//#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
index 6d054a5eb8fbd096dc7344378f3dc22043b667e1..6377a1bd49e3b36034a50536809c7f5645f172dd 100644
--- a/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
+++ b/fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx
@@ -14,7 +14,7 @@
#include "TimesliceInputArchive.hpp"
#include "TimesliceSubscriber.hpp"
-#include "FairLogger.h"
+#include <Logger.h>
#include <fstream>
#include <iomanip>
diff --git a/fles/mcbm2018/CbmMcbm2018Source.cxx b/fles/mcbm2018/CbmMcbm2018Source.cxx
index 3e42ec0d9cae42ec51812f1eb158e3869e012b4f..e8817f42212ba24f8799cba44211f5bd16487e95 100644
--- a/fles/mcbm2018/CbmMcbm2018Source.cxx
+++ b/fles/mcbm2018/CbmMcbm2018Source.cxx
@@ -17,7 +17,7 @@
#include "TimesliceMultiSubscriber.hpp"
#include "TimesliceSubscriber.hpp"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunOnline.h"
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
index ab09f0795b6478dda3f500de43644892d8882c2c..c85d3b18d4e038f5476a2bd1516988cbf4e13b67 100644
--- a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
+++ b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
@@ -12,7 +12,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index cdcc1f1cfd86abed19b553b5c7da91749ef676e4..eb996e7274427027ac8917a5a200ea41f9c79f00 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -12,7 +12,7 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmMcbm2018PsdPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -348,7 +348,7 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts,
// Prepare variables for the loop on contents
const uint64_t* pInBuff = reinterpret_cast<const uint64_t*>(msContent);
- if (gLogger->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
if (uNbMessages != 0) printf("\n\n");
for (uint32_t uIdx = 0; uIdx < uNbMessages; uIdx++) {
// Fill message
@@ -358,7 +358,7 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts,
}
PsdData::PsdGbtReader PsdReader(pInBuff);
- if (gLogger->IsLogNeeded(fair::Severity::debug))
+ if (fair::Logger::Logging(fair::Severity::debug))
PsdReader.SetPrintOutMode(true);
if (uSize > 0) {
while (PsdReader.GetTotalGbtWordsRead() < uNbMessages) {
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
index fb766fb55ac685fbce48a8edba739ad0fdfe4748..0dd89f4255f9ff95ca0abdecf62ec25601d98a71 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
@@ -13,7 +13,7 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
index f412d0367f740fb397e07e714dc1ac5bad270cba..eacdb5bec56df0ce2c8690b2bd996a9543ee36d2 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
@@ -13,7 +13,7 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
index 742261b6744814d6334242811641b57e22508060..ffbb82a23bd9e508550ac40a352988aa6a6b5873 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
@@ -10,7 +10,7 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmMcbm2018TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
index af06f1eefd3be764df14e5ebcf13c37f02198a78..7107d6f751198b3a0afd3bf992d46ad0b3d47ed8 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
@@ -10,7 +10,7 @@
#include "CbmFlesHistosTools.h"
#include "CbmFormatMsHeaderPrintout.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
index 1e1e229b0a6238b3b985341fead998fa6fd17551..db02b2457e8d4e2b5a0729a15a6d1f18e4c3a678 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
@@ -14,7 +14,7 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -1262,9 +1262,9 @@ Bool_t CbmMcbm2018MonitorMcbmPulser::ProcessTofMs(const fles::Timeslice& ts,
continue;
} // if( 0 == uIdx )
- if (gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ if (fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
- } // if (gLogger->IsLogNeeded( fair::Severity::debug2 ))
+ } // if (fair::Logger::Logging( fair::Severity::debug2 ))
// Increment counter for different message types
// and fill the corresponding histogram
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
index 3f35bd67de16dbe18f5e2b18d80e72f8e8277698..db8c74b0f470b5d19c04ff102aa6c748177a3fd4 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
@@ -16,7 +16,7 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -1149,9 +1149,9 @@ Bool_t CbmMcbm2018MonitorMcbmRate::ProcessTofMs(const fles::Timeslice& ts,
continue;
} // if( 0 == uIdx )
- if (gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ if (fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
- } // if (gLogger->IsLogNeeded( fair::Severity::debug2 ))
+ } // if (fair::Logger::Logging( fair::Severity::debug2 ))
// Increment counter for different message types
// and fill the corresponding histogram
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
index 5132d801d045ce3bb3d4d05c88676c395cb24173..9e9a19926aeb6a5c2be2b13a62a2fec4da0f7c4d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
@@ -14,7 +14,7 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -1400,9 +1400,9 @@ Bool_t CbmMcbm2018MonitorMcbmSync::ProcessTofMs(const fles::Timeslice& ts,
continue;
} // if( 0 == uIdx )
- if (gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ if (fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
- } // if (gLogger->IsLogNeeded( fair::Severity::debug2 ))
+ } // if (fair::Logger::Logging( fair::Severity::debug2 ))
// Increment counter for different message types
// and fill the corresponding histogram
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
index a788a645bcd7221033c0d93611bb060629c91c58..1b16a776065655b61d058e58802dde07a24e5f2e 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
@@ -15,7 +15,7 @@
#include "CbmMcbm2018MuchPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
index d37d5f5fa6700cc2d112ab144b6d3dcabf6492a8..3004da6a12f6c25173a214a527e02c69925d8d73 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
@@ -17,7 +17,7 @@
#include "CbmMcbm2018MuchPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
index 8416ea06d6fd1d88c982fcf3d1b3cdf5146e34a0..8fd22d28f055c092a99362f7dd1b03d30a1d9038 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
@@ -16,7 +16,7 @@
#include "CbmMcbm2018StsPar.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
index 70b9a39368751258697932f0df228092337a8ee4..7ef4465d8cc9e06b177038f1f5b6896bb85d6324 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
@@ -14,7 +14,7 @@
#include "CbmHistManager.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
index 9114f57e5b0750530e954552e9bab1e673c11cb4..b5717c705264edece788de83d1765cb43e438311 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
@@ -14,7 +14,7 @@
#include "CbmHistManager.h"
// FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
index 861b4c477ba27309183ce13ea5723c98d4e039e6..e09b2352f5ad6a47220e7f0144d1e74db2403618 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
@@ -11,7 +11,7 @@
#include "CbmMcbm2018MonitorAlgoPsd.h"
#include "CbmMcbm2018PsdPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
index 6afc8f5beb28708942cabface7a6e2e0fab6b2f2..a6eaf8afeee70aa92027fe4bf1a1136d80892734 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018MonitorAlgoT0.h"
#include "CbmMcbm2018TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
index 3574413d5aae8722f6fa470faac9a6ae4458e764..c4e060ae0c3c912e8cf41a2b82c0de46afb9360b 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018MonitorAlgoTof.h"
#include "CbmMcbm2018TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
index 23353307dab9e26497c7001259cac508b62338ce..827dc1cbef902b7586d03e1db7deebd728b578a2 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018MonitorAlgoTofPulser.h"
#include "CbmMcbm2018TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
index 1de7fb838033fada37be652e7908b772953fa096..68a8c4cf9c20549c921af9c53263e1dae729f826 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
@@ -13,7 +13,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -2207,10 +2207,10 @@ Bool_t CbmMcbm2018MonitorTof::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
// Increment counter for different message types
// and fill the corresponding histogram
@@ -2650,7 +2650,7 @@ void CbmMcbm2018MonitorTof::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018MonitorTof::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
@@ -2660,7 +2660,7 @@ void CbmMcbm2018MonitorTof::ProcessEpochCycle(uint64_t ulCycleData) {
<< FormatHexPrintout(ulCycleData, 16, '0', true) << " Cycle 0x"
<< FormatHexPrintout(ulEpochCycleVal, 16, '0', true);
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
for (uint32_t uGet4Index = 0; uGet4Index < fuNrOfGet4PerGdpb; uGet4Index++) {
fuGet4Id = uGet4Index;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
index 8bba5ddaa9145c4d49212d773aa763ac6688fadd..bd1cf46f4a998e909bfad53c10a1b8b138700515 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
@@ -13,7 +13,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -885,10 +885,10 @@ Bool_t CbmMcbm2018MonitorTofPulser::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
// Increment counter for different message types
// and fill the corresponding histogram
@@ -1117,7 +1117,7 @@ void CbmMcbm2018MonitorTofPulser::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018MonitorTofPulser::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
@@ -1127,7 +1127,7 @@ void CbmMcbm2018MonitorTofPulser::ProcessEpochCycle(uint64_t ulCycleData) {
<< FormatHexPrintout(ulCycleData, 16, '0', true) << " Cycle 0x"
<< FormatHexPrintout(ulEpochCycleVal, 16, '0', true);
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
for (uint32_t uGet4Index = 0; uGet4Index < fuNrOfGet4PerGdpb; uGet4Index++) {
fuGet4Id = uGet4Index;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
index 36fc7876a21ad8f21f0d4c99314b9d66b973bc05..499a3b21316b693bbcfaa2472f272c2e7924cb4d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
@@ -12,7 +12,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
index 87cbd73cfe8cc07121f7921bd91bbd736f77a8ff..d55d1730e7ebb7bd07d6de0299bb27c70d688176 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
@@ -14,7 +14,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
@@ -1113,10 +1113,10 @@ Bool_t CbmMcbm2018TofTestFee::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
// Increment counter for different message types
// and fill the corresponding histogram
@@ -1326,7 +1326,7 @@ void CbmMcbm2018TofTestFee::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || gLogger->IsLogNeeded(fair::Severity::debug2)) {
+ || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018TofTestFee::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
@@ -1336,7 +1336,7 @@ void CbmMcbm2018TofTestFee::ProcessEpochCycle(uint64_t ulCycleData) {
<< FormatHexPrintout(ulCycleData, 16, '0', true) << " Cycle 0x"
<< FormatHexPrintout(ulEpochCycleVal, 16, '0', true);
fuRawDataPrintMsgIdx++;
- } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || gLogger->IsLogNeeded( fair::Severity::debug2 ) )
+ } // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
for (uint32_t uGet4Index = 0; uGet4Index < fuNrOfGet4PerGdpb; uGet4Index++) {
fuGet4Id = uGet4Index;
diff --git a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
index 62613aa6950b2b8bb7c18510f9f8bc037447768b..72e764ffd204dbb5a4d20f5127540740fac87be1 100644
--- a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
@@ -11,7 +11,7 @@
#include "CbmMuchBeamTimeDigi.h"
#include "TimesliceMetaData.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmCheckEvents.cxx b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
index 35e2dc0ad34d6299df2d5d5da7b146f443b7ee0b..b5c9bc2398ab25e470d13e7ca5b3dde171d92662 100644
--- a/fles/mcbm2018/tasks/CbmCheckEvents.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
@@ -15,7 +15,7 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmCheckTiming.cxx b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
index ddb16f0f4e999e6b0b74996ff1ec25f02cb06eea..23050d42e79c05de40055d7faa9ba9785799b157 100644
--- a/fles/mcbm2018/tasks/CbmCheckTiming.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
@@ -16,7 +16,7 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
index 28ae219ea4997d13de7eecb2e78b54b31e6f9893..e1f7e8dcf7e2d6088dcba2ad8647ac4f01dc5662 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
@@ -7,7 +7,7 @@
********************************************************************************/
#include "CbmMcbm2018EventBuilder.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
index 63f3bffae864ce9dccde49fd80ee9507cc1cfa0b..4de774c246cf9155ba78dc28741fa05cae9df7b5 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
@@ -10,7 +10,7 @@
#include "CbmDigiManager.h"
#include "CbmMuchBeamTimeDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
index 110db892f9d6003b14b5eb7402463f0992a9f318..6a339c9604c966351ea2cd1005a919ffceab2c02 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
@@ -10,7 +10,7 @@
#include "CbmDigiManager.h"
#include "CbmStsDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
index 88c58aad453210c90e3acfa9cd492a1caaf836b3..8e9ad5596d7209a2146f1930a155d71e008b8121 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
@@ -16,7 +16,7 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
index 40fb17690dc67402401a4512b152fa044fa9087c..8ce2887d84f0ba8fe6aab54278cfd2a39db7603c 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
@@ -16,7 +16,7 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
index c4da8780fc71c134f61e90df8efe4e5d0a558e67..584fd9d0dbf620488defd4a401f84c8ca8a7381e 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
@@ -10,7 +10,7 @@
#include "CbmDigiManager.h"
#include "CbmFlesHistosTools.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index ba02951e84d508f2fa0a079eaf1487e2356dca06..b307c81195f6711c334785b536cf933375aa6635 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -21,7 +21,7 @@
#include "CbmDigiManager.h"
/// FAIRROOT headers
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index 683a1f8e67b468ffeced53df13383b30fa062757..e542852aa4b056361557e6b3580c1fc7bbd0118e 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -9,7 +9,7 @@
#include "CbmEvent.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
index af8c47e6579d6d34e166070b8334a819e141287f..743097af7d4a4b60c6f1944decc1518eb348adf4 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
@@ -16,7 +16,7 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
index 5fd266077b9faa3283a20366f8027adc2377fce4..d5dc6b2eec2938ff8976e0f16f91ad0707fbcbad 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
@@ -10,7 +10,7 @@
/// CBM headers
/// FAIRROOT headers
-#include "FairLogger.h"
+#include <Logger.h>
/// FAIRSOFT headers (geant, boost, ...)
#include "TH1.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
index e92f2a7da9ce0b63645e8507c71d43d437d7d262..696c3c7746e76f46ecc977e932687678383f63f2 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
@@ -11,7 +11,7 @@
#include "CbmMcbm2018TofPar.h"
#include "CbmStsDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
index 58eb897e99fe923c2647eaab1f0367c86eaa7b51..98fc7b8b2be02d946ad1b6019404737ef5ef0b53 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
@@ -11,7 +11,7 @@
#include "CbmMcbm2018StsPar.h"
#include "CbmStsDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index f01bdc155e083c4fb7296c787dd07ab918d88e61..ecdfb8d6d6f25dc55217e3e2ca9edd708bbed08b 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -62,7 +62,7 @@ fullTimeCorr = (T - AZ0R) - (AC2R-AC0R) + MSidx
// ROOT
#include <TCanvas.h>
#include <TList.h>
-// FairLogger
+
#include <Logger.h>
// CbmRoot
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
index 42bcf9fb8fbb982160120013479ab3f4f25e23da..18d707f03743f8a5fb11d273012efbec8f3fdd9b 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018MuchPar.h"
#include "CbmMcbm2018UnpackerAlgoMuch.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index c6a5e5c4f871ce71307d551e69f7a0e7ac923fd5..639998d4e07b743b1bb47e9fcffd11a04d39cb55 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -11,7 +11,7 @@
#include "CbmMcbm2018PsdPar.h"
#include "CbmMcbm2018UnpackerAlgoPsd.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
index 13c85b393b74c5204e7b2e27fc49854c6af56054..240bced642163e7db6e0da2ee2a1ef414dc1d8c7 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
@@ -16,7 +16,7 @@
#include <TROOT.h>
// FairRoot
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairParGenericSet.h>
#include <FairRootManager.h>
#include <FairRun.h>
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
index b29bb7e501e8a9372ef3b358b16986637f50e160..647a2445a9a965cfc660678a5be3508506339dff 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
index 8046bcb2d9741202e4d0a1bba5f4e092696a917a..f7ad02b437eb6d6365196f098a2c0b6d0d1197b9 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
@@ -10,7 +10,7 @@
#include "CbmMcbm2018TofPar.h"
#include "CbmMcbm2018UnpackerAlgoTof.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
index 70638ccdf89f6acbba958b948d7e12f3a6fcd307..926104ee1d4b99151a23abf4be94c57565380366 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
@@ -1,7 +1,7 @@
#include "CbmMcbm2018UnpackerTaskTrdR.h"
#include "CbmMcbm2018UnpackerAlgoTrdR.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
index 17b7dc6e28c8d5df620867dd55309b123bf4d893..1e781e3c667ca266f25a07f6b268e7a97288dd70 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
@@ -10,7 +10,7 @@
#include "CbmStar2019EventBuilderEtofAlgo.h"
#include "CbmStar2019TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
index 0c04ab7a734f09dc28ac9dda41f760cb275a37d2..112a624e09584eec6d67d9587e87e7ffd04fa97a 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
@@ -10,7 +10,7 @@
#include "CbmHistManager.h"
#include "CbmStar2019TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
index 9999cab24c9f908f08cd9787b9ffa3bfb6ec2877..aa07eea7fcdb7f0de870710d37f6aa5a162153cd 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
@@ -12,7 +12,7 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
index ca683c0e3e82829b2806fd8255d4481e4e209bb6..91e748cd38c482393bf22376e1c04d1facd634d9 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
@@ -10,7 +10,7 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmStar2019TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
index 1070b1573690c799be46d064d72e49f25d4eae9e..fc7707210f80c6d8ec3f76fbaf5a3b7bfe295003 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
@@ -10,7 +10,7 @@
#include "CbmStar2019MonitorPulserAlgo.h"
#include "CbmStar2019TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
index 3040170b0bedcd2f93b2a1670783fcbf5d4cefac..97d0720d73543eadb2b218a256481eb4085147d1 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
@@ -10,7 +10,7 @@
#include "CbmStar2019MonitorAlgo.h"
#include "CbmStar2019TofPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
index d1224c9269d76c101de839499a942be90ac0fbf0..eef1cd41c360680698ee150265a506974ea9987b 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
@@ -10,7 +10,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
index f45f57aa36fa1c18cf1d86b1535977a34c2a45d8..ce5dd63ab3b8b9b60c0b48f83e40490cf5dbad09 100644
--- a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
+++ b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
@@ -10,7 +10,7 @@
#include "CbmHistManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
diff --git a/fles/star2019/parameter/CbmStar2019TofPar.cxx b/fles/star2019/parameter/CbmStar2019TofPar.cxx
index 286986d68a31157ce124972efce1f452747f8b7a..c20ec348ccf89fb0de304b3ff1b72a8694d6b900 100644
--- a/fles/star2019/parameter/CbmStar2019TofPar.cxx
+++ b/fles/star2019/parameter/CbmStar2019TofPar.cxx
@@ -8,7 +8,7 @@
#include "gDpbMessv100.h"
#include "FairDetParIo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
diff --git a/mvd/CbmMvdDetector.cxx b/mvd/CbmMvdDetector.cxx
index 9c6bbb1bcdf0ee7d4a2e2ad5820ebdf05f702717..a7f3936ba3d0c7c805a3237628594263710794de 100644
--- a/mvd/CbmMvdDetector.cxx
+++ b/mvd/CbmMvdDetector.cxx
@@ -24,7 +24,7 @@
#include "CbmDigiManager.h"
/// includes from FairRoot
-#include "FairLogger.h"
+#include <Logger.h>
/// includes from Root
#include "TGeoBBox.h"
diff --git a/mvd/CbmMvdDigitizer.cxx b/mvd/CbmMvdDigitizer.cxx
index 54d11c68be6ac0c74014e868aca8e2f4fd3b86d0..6e636f10d87f0fd5830343cc60bb14ba850aa0b0 100644
--- a/mvd/CbmMvdDigitizer.cxx
+++ b/mvd/CbmMvdDigitizer.cxx
@@ -15,7 +15,7 @@
#include "CbmMvdPoint.h"
// Includes from FAIR
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairModule.h"
#include "FairRootManager.h"
diff --git a/mvd/CbmMvdDigitizerTB.cxx b/mvd/CbmMvdDigitizerTB.cxx
index 3a0e361ea20798739b6117b454162066f918c1ca..19c78dc44e8aea2ce43667e118eb90e9c8442f46 100644
--- a/mvd/CbmMvdDigitizerTB.cxx
+++ b/mvd/CbmMvdDigitizerTB.cxx
@@ -6,7 +6,7 @@
#include "CbmMvdDigitizerTB.h"
#include "CbmMvdDetector.h"
#include "CbmMvdPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairModule.h"
#include "FairRootManager.h"
#include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index 532fa49572f42c98f51184c489344096155d940f..c4f60139e3bbda981608ac737c4db5cdf654eba7 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -23,7 +23,7 @@
/// includes from FairRoot
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairPrimaryGenerator.h"
#include "FairRunAna.h"
diff --git a/mvd/CbmMvdStationPar.cxx b/mvd/CbmMvdStationPar.cxx
index 0402444ea6823812683492ac165c0c9b1f26b1c0..1e245c266022ca71e43ea8d824b0e7d1b9839eb5 100644
--- a/mvd/CbmMvdStationPar.cxx
+++ b/mvd/CbmMvdStationPar.cxx
@@ -5,7 +5,7 @@
#include "CbmMvdStationPar.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <iostream>
#include <math.h>
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index e4c649869037ba3cf615f97f71af6d0bd7d9816d..91330933b45e4e756cd483b6b3e232313c154cbe 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -4,7 +4,7 @@
// -------------------------------------------------------------------------
#include "CbmMvdSensorClusterfinderTask.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TObjArray.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
index 8f2448a75e0c73a545d84647e4b0c662c6247f04..55e8d6ef3c11b8659c72f51ca6f0a12c156a50f3 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -7,7 +7,7 @@
#include "CbmMvdSensorDigiToHitTask.h"
#include "TClonesArray.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TObjArray.h"
#include <cstring>
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
index 791927b5ca947e3a8f67d4507a28958867106c4d..8479a47088b776b1f0b8e696aa3b878491ab9050 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
@@ -28,7 +28,7 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
index 874f344ef72505089cf5acd49d01f65d76ce631d..82003aafe02b611922f8501127abcb44a965007c 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
@@ -28,7 +28,7 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
index 70d4b8fa93e877633d7f2671efcff1edef06d427..9f77789ad8be2b96f2fe9bd56f240ccf6e5cc25f 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
@@ -14,7 +14,7 @@
// Includes from base
#include "CbmMCTrack.h"
#include "FairGeoNode.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index 266b30eb71b67f69d18872c0428c1fef825a61ca..3e0458a327ff7b86d7d7ccf47be63a76226c96ae 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -14,7 +14,7 @@
// Includes from base
#include "CbmMCTrack.h"
#include "FairGeoNode.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/mvd/qa/CbmMvdClusterAna.cxx b/mvd/qa/CbmMvdClusterAna.cxx
index 7bed7142047a994032c428a29217805308e1363d..0a6ee6529ebab85b8dc3c85162bdae22c01e76c6 100644
--- a/mvd/qa/CbmMvdClusterAna.cxx
+++ b/mvd/qa/CbmMvdClusterAna.cxx
@@ -25,7 +25,7 @@
//-- Include from Fair --//
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairTrackParam.h"
diff --git a/mvd/qa/CbmMvdQa.cxx b/mvd/qa/CbmMvdQa.cxx
index d5e490f78e478a1faa18c298189d9a8940958fac..c900aac48fd2adb352730e0cf9a0a289b6f4c3f6 100644
--- a/mvd/qa/CbmMvdQa.cxx
+++ b/mvd/qa/CbmMvdQa.cxx
@@ -26,7 +26,7 @@
//-- Include from Fair --//
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairTrackParam.h"
diff --git a/mvd/tools/CbmMvdGeoHandler.cxx b/mvd/tools/CbmMvdGeoHandler.cxx
index bc4892f8884c0813fe2779d68d57b0670276339d..b013bdcbb929422b40310582d4c6ffb20969b322 100644
--- a/mvd/tools/CbmMvdGeoHandler.cxx
+++ b/mvd/tools/CbmMvdGeoHandler.cxx
@@ -7,7 +7,7 @@
#include "CbmMvdGeoHandler.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TGeoBBox.h"
#include "TGeoManager.h"
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.cxx b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
index 19625d6dc9cc02d3ab4f837051a8e8f02ba71c86..f2772e631777caed5691ec6650075a1a5a624eda 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
@@ -8,7 +8,7 @@
#include "CbmMvdCluster.h"
//-- Include from Fair --//
-#include "FairLogger.h"
+#include <Logger.h>
//-- Include from Root --//
#include "TCanvas.h"
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
index cda2ca1cbd84ebb7195a5e5fafb10659ff98fd53..f7e9fc844b936b8c5084490e5529c5beaed549f0 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
@@ -15,7 +15,7 @@
//-- Include from Fair --//
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairTrackParam.h"
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 3d8b2f0c1c97d5f9d5136a7245a63214ce767909..025192b07f00e5bb03e62d86fe0271df358c8ef2 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -18,7 +18,7 @@
#include "KFPTrackVector.h"
#include "KFParticleTopoReconstructor.h"
-#include "FairLogger.h"
+#include <Logger.h>
//ROOT headers
#include "TClonesArray.h" //to get arrays from the FairRootManager
diff --git a/reco/KF/Interface/CbmTofTrackFitterKF.cxx b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
index 1272fdae49967346c4ba32df427a28f452e73ee3..bf4c00d8fe27170b37da68c3cc9e7548ad8b9df6 100644
--- a/reco/KF/Interface/CbmTofTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
@@ -9,7 +9,7 @@
#include "CbmTofHit.h"
#include "CbmTofTracklet.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
index c3bc60e1fa25e46c89b23d168d2e60c944e9cf9c..89225d91e18bf7e793fa163a52992ec9c6e05f3b 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
@@ -8,7 +8,7 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/psd/CbmPsdHitProducer.cxx b/reco/detectors/psd/CbmPsdHitProducer.cxx
index 00e10162044b630f0217ba0118e94fc9a42dfbb5..abd873b1bfeb8b28db7f2e16c72aafc0532778e6 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdHitProducer.cxx
@@ -17,7 +17,7 @@
#include "CbmPsdHit.h"
#include "CbmPsdHitProducer.h"
-#include "FairLogger.h"
+#include <Logger.h>
using std::cout;
using std::endl;
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index 4624ecaae4810c3bf6a15ad10b3890850c330299..55e3d1eabc5eaf24a8efbe8891721dbc7c075ff9 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -4,7 +4,7 @@
#include "CbmEvent.h"
#include "CbmPsdDigi.h"
#include "CbmPsdMCbmHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.cxx b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
index 4c69891845694b74fde5453d41742ea083bae640..2eb7a15cc87cdf90a724159eb1102e97c5188b85 100644
--- a/reco/detectors/rich/CbmRichElectronIdAnn.cxx
+++ b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
@@ -10,7 +10,7 @@
#include "CbmRichGeoManager.h"
#include "CbmRichRing.h"
#include "CbmRichUtil.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
#include "TMath.h"
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index f2d1a9b614c48156062849be9f34e5d950e4c9a9..b40c4a7a55c7c0301b678257d5096d928426acf1 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -15,7 +15,7 @@
#include "CbmRichGeoManager.h"
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/CbmRichReconstruction.cxx b/reco/detectors/rich/CbmRichReconstruction.cxx
index 0d936795995fb887c06246ac2c601c692db71119..ea54887ec36ce4f15f0e0b61903ac7758606983a 100644
--- a/reco/detectors/rich/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/CbmRichReconstruction.cxx
@@ -36,7 +36,7 @@
#include "CbmGlobalTrack.h"
#include "CbmRichConverter.h"
#include "FairHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmHistManager.cxx b/reco/detectors/rich/alignment/CbmHistManager.cxx
index 8bbf29dcdedc0ede133eccfa5c1e0e5bd87c30a6..26068d2448ea88fc6959ebb407dfb7e8a8dea70f 100644
--- a/reco/detectors/rich/alignment/CbmHistManager.cxx
+++ b/reco/detectors/rich/alignment/CbmHistManager.cxx
@@ -8,7 +8,7 @@
#include "CbmHistManager.h"
#include "utils/CbmUtils.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClass.h"
#include "TDirectory.h"
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.cxx b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
index 399db902498da232115b84ba403f4e2da5c2e246..215ffa926b0a0a86fa68e539d97bdff655866237 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichAlignment.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
index b31a6e4d9ad647f6a113f5f9fefaea433112ed1e..05b758840e2f2ff81a552f019358d266acaf7019 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichCorrection.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
index 3dd0d65da9743b3599761c49f8c341d3d0c274ba..b3d29e581a7eb1422024cca4d2fef75ada79224a 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichCorrectionVector.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.cxx b/reco/detectors/rich/alignment/CbmRichMirror.cxx
index e1d9fb511bc17387c23269820cfb82b75c585353..8d926405a07535bc954c3fb2b46277c963ea003e 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirror.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichMirror.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
index 57740ad0e159dbd0770c6376d69287a002f025fd..f03fa9765a7d80d7971c29c974259d0728df6cf2 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
@@ -3,7 +3,7 @@
using namespace std;
using std::string;
-#include "FairLogger.h"
+#include <Logger.h>
#include <fstream>
#include <iostream>
#include <map>
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
index d2c883d4d4386697d97691ed5c512d7e4c39a328..2cb5ea094a8e28e27c97eaef6b1b28f1a6caef6f 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
@@ -1,5 +1,5 @@
#include "CbmRichMirrorSortingAlignment.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
// ----- PART 1 ----- //
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
index e211e744d1e3e0e088c98328108ae003a4a479a3..936f50da40b83139050cc43c5cf487d1b6aa874d 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
@@ -1,5 +1,5 @@
#include "CbmRichMirrorSortingCorrection.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "alignment/CbmRichMirror.h"
diff --git a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
index 49a8a3f3a0966ceb8b632b4672ec77a1decb2a06..a1d1f6627ce5df3d3e7c44f537b96b3c77ef13c6 100644
--- a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
+++ b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
@@ -2,7 +2,7 @@
#ifndef RICH_CbmRichNavigationUtil2
#define RICH_CbmRichNavigationUtil2
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairTrackParam.h"
#include "TObject.h"
#include "TVector3.h"
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
index 2dd05536a0ed97994d379f299f89a2421dcf4e66..9890fffcabe5fa6a214e565584d83def73b2fe2b 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichPMTMapping.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
index fd6ed7524ebc5fc9cbf6c350e442611ae2841067..73df445db27ebad09237e46eea64128e5f6453b8 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
@@ -1,6 +1,6 @@
// ---------- Original Headers ---------- //
#include "CbmRichProjectionProducer2.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "CbmRichHit.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index 09426c39bd4b7000090fa530e06b8749512e4a09..7afae2f1fa463533456c94f95d0c71fdbcfe4e81 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
@@ -26,7 +26,7 @@
#include "CbmRichNavigationUtil.h"
#include "CbmRichPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <cmath>
#include <iostream>
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
index 251e9584cd55b9fb195c6a832e23b9e9f217ce7a..002535c9cd7812aca353a657bffd43421c2f51bb 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
@@ -36,7 +36,7 @@
#include "CbmGlobalTrack.h"
#include "CbmRichConverter.h"
#include "FairHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/alignment/CbmRichUtil.h b/reco/detectors/rich/alignment/CbmRichUtil.h
index a1298bbbc1fe8b7ab83418009fd10005d8cf80a3..da1c2afea59fe1166fbabb45a59c76bb3fde727f 100644
--- a/reco/detectors/rich/alignment/CbmRichUtil.h
+++ b/reco/detectors/rich/alignment/CbmRichUtil.h
@@ -3,7 +3,7 @@
#define RICH_CbmRichUtil
#include "CbmGlobalTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairTrackParam.h"
#include "TCanvas.h"
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
index f3939fe052b864349d6b592c20dc5362a061e452..052027a77b1a579daf3a2d6b5f0bc3c1143c5dad 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
@@ -12,7 +12,7 @@
#include "CbmRichHit.h"
#include "CbmRichRing.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TStopwatch.h"
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
index 54a048424c02c959bac050a037a8e2a1d978cfae..026f787a4b50cd15539c88528a574e4e4e9f95b3 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
@@ -21,7 +21,7 @@
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
#include "CbmRichRing.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
index 1c33f4f71c055f3540729e989fb6e2cac0e6d504..f6b3587153a3f2834e29f03881384d63d794e3c3 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
@@ -9,7 +9,7 @@
#include "Minuit2/Minuit2Minimizer.h"
-#include "FairLogger.h"
+#include <Logger.h>
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index bc6fc4fd68b44369fc71298821d138ccca3e750c..e1c61ec5a0dcac9cf9de6229780d9a8759209bb0 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -9,7 +9,7 @@
#include "CbmRichGeoManager.h"
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
index fea21da2b822858dee012e679a5ebc0c4de1ae9e..bd621ada4450f176c3dad90accd017b2b61d19cd 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
@@ -32,7 +32,7 @@
#include "elid/CbmLitGlobalElectronId.h"
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRunSim.h"
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index 88ef9dfa577c4852fc45dfcf787a687a9a548bd6..194c1f0ddfd6d18409a68983865e931bc7606152 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
@@ -25,7 +25,7 @@
#include "CbmRichGeoManager.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <cmath>
#include <iostream>
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
index 23a0c6c4261683f18cbeae740a19cf6b9b9f1ec1..1c6ff72b60b1a3ccea7c8b620109ea740e9fb927 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
@@ -24,7 +24,7 @@
#include "TVector3.h"
#include "utils/CbmRichNavigationUtil.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <cmath>
#include <iostream>
diff --git a/reco/detectors/rich/utils/CbmRichNavigationUtil.h b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
index 0f4d4a594edb501c5f57c0cfeafa9e2b7449d64d..e2586adb9881f68565da8f85bd20a438114703c8 100644
--- a/reco/detectors/rich/utils/CbmRichNavigationUtil.h
+++ b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
@@ -2,7 +2,7 @@
#ifndef RICH_CbmRichNavigationUtil
#define RICH_CbmRichNavigationUtil
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairTrackParam.h"
#include "TObject.h"
#include "TVector3.h"
diff --git a/reco/detectors/rich/utils/CbmRichUtil.h b/reco/detectors/rich/utils/CbmRichUtil.h
index b67b216af39633948e876e430dc96579de1c8b73..af9ddd83d6f72e7693f56cb3464aa106842c11a8 100644
--- a/reco/detectors/rich/utils/CbmRichUtil.h
+++ b/reco/detectors/rich/utils/CbmRichUtil.h
@@ -3,7 +3,7 @@
#define RICH_CbmRichUtil
#include "CbmGlobalTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairTrackParam.h"
#include "TCanvas.h"
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.cxx b/reco/detectors/sts/CbmStsFindTracksQa.cxx
index afba76850f4ef4d4952a6508a982df6e5a807b6f..01907ac66b81523984d14d99af3002daa33d5ca7 100644
--- a/reco/detectors/sts/CbmStsFindTracksQa.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksQa.cxx
@@ -17,7 +17,7 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRun.h"
// Includes from CbmRoot
@@ -246,7 +246,7 @@ void CbmStsFindTracksQa::Exec(Option_t* /*opt*/) {
<< fTimer.RealTime() << " s, MC tracks: all " << nMcTracks
<< ", acc. " << nAcc << ", rec. " << nRecAll << ", eff. "
<< setprecision(2) << 100. * effAll << " %";
- if (FairLogger::GetLogger()->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
LOG(debug) << "---------- StsFindTracksQa : Event summary ------------";
LOG(debug) << "MCTracks : " << nAll << ", reconstructible: " << nAcc
<< ", reconstructed: " << nRecAll;
diff --git a/reco/detectors/sts/CbmStsRecoModule.cxx b/reco/detectors/sts/CbmStsRecoModule.cxx
index b2b83b41e62ac6ac34be4388afe5b303020a80e8..e972b2590cbbd8b55a68546756876983abdea2f6 100644
--- a/reco/detectors/sts/CbmStsRecoModule.cxx
+++ b/reco/detectors/sts/CbmStsRecoModule.cxx
@@ -15,8 +15,8 @@
#include "CbmStsSensor.h"
#include <FairField.h>
-#include <FairLogger.h>
#include <FairRun.h>
+#include <Logger.h>
#include <TGeoBBox.h>
#include <TGeoPhysicalNode.h>
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
index 4637c9d6a353ebe7723c70984589c9e6f47594a4..63e8ba7079b362cbcfb321aed2e1587b55025db9 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
@@ -14,7 +14,7 @@
//#include "CbmTofDef.h" TODO
#include "FairFileSource.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 55763679ec885659674cbf2382f69a553d276453..91862f8d353f2b19b6250819f4f93207a5bd7a9e 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -21,7 +21,7 @@
#include "CbmTofTracklet.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
index f0ea4855c7009eb811083c27b91a4fc38baee771..ecaf1aa067726afabfe7f9da89fc2d75c2451716 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
@@ -27,7 +27,7 @@
#include "CbmMCTrack.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index 039e6f71e9026f56fc8f5c5895ea58d57d9bfd55..b0df65b868b8ff3bdd411f2a37b49557e1657cb4 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -35,7 +35,7 @@
// FAIR classes and includes
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootFileSink.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
diff --git a/reco/detectors/tof/CbmTofFindTracks.cxx b/reco/detectors/tof/CbmTofFindTracks.cxx
index 87ea6dbd0a8b7cbc3574e89e1c1a708331ed88e5..b681026c7818fe8aec01ee0a1d7d19eb8ec3ed5c 100644
--- a/reco/detectors/tof/CbmTofFindTracks.cxx
+++ b/reco/detectors/tof/CbmTofFindTracks.cxx
@@ -26,7 +26,7 @@
#include "CbmTofTrackletTools.h"
#include "CbmVertex.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
@@ -2128,7 +2128,7 @@ void CbmTofFindTracks::FillHistograms(CbmEvent* tEvent) {
vhXY_CSZ[iSt]->Fill(hitpos_local[0], hitpos_local[1], dCSZ);
// debugging consistency of geometry transformations ....
- if (FairLogger::GetLogger()->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
if (iSt == fNReqStations - 1) { // treat as if not found
Int_t iAddr = fMapStationRpcId[iSt];
CbmTofCell* fChannelInfoD = fDigiPar->GetCell(iAddr);
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index 071f0ee374c33933769ceebb585b92fc8d11c9c7..3be3941c50bac7b1d10e5244045fb5c781b70df3 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -26,7 +26,7 @@
// FAIR classes and includes
#include "FairEventHeader.h" // from CbmStsDigitize, for GetEventInfo
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h" // from CbmStsDigitize, for GetEventInfo
#include "FairRootManager.h"
#include "FairRunAna.h"
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.cxx b/reco/detectors/tof/CbmTofTBClusterizer.cxx
index c121f1a4062c3d2996b03f59dfdc7ee9360a6ec5..9c7b00c30a6fb881822e2e3271cc64dda4449702 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTBClusterizer.cxx
@@ -11,7 +11,7 @@
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
index 695d0f4922cf3c29a3702ac4e67d55d12e692d9a..155fb30e47bb0257953eaaf1554f0fa5e07b91b9 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
@@ -27,7 +27,7 @@
#include "CbmMCTrack.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 1b9af2a76d3f2d23132b0e8435fe4a3b3e16f01e..2571d8c752c0abd9020045d338f020ee88fc0726 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -14,7 +14,7 @@
// FAIR classes and includes
#include "FairEventManager.h" // for FairEventManager
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
@@ -743,7 +743,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits,
<< iDet;
/* live display insert
- if(gLogger->IsLogNeeded(debug3)) // update event display, if initialized
+ if(fair::Logger::Logging(fair::Severity::debug3)) // update event display, if initialized
{
Int_t ii;
CbmEvDisTracks* fDis = CbmEvDisTracks::Instance();
@@ -781,7 +781,7 @@ Int_t CbmTofTrackFinderNN::DoFind(TClonesArray* fTofHits,
CbmTofTracklet* pTrk =
new ((*fTofTracks)[fiNtrks++]) CbmTofTracklet(*fTracks[iTr]);
- if (gLogger->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
LOG(info) << "Found Trkl " << iTr << ", ";
pTrk->PrintInfo();
}
diff --git a/reco/detectors/tof/CbmTofTrackletTools.cxx b/reco/detectors/tof/CbmTofTrackletTools.cxx
index 118d0221fcaf1903c015692df268b4c80110f3a2..572c68d75ecf9a967962a490ee4b57c1bd69a7b7 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.cxx
+++ b/reco/detectors/tof/CbmTofTrackletTools.cxx
@@ -9,7 +9,7 @@
#include "CbmTofTracklet.h"
#include "LKFMinuit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "Rtypes.h" // for Double_t, Double32_t, Int_t, etc
#include "TDecompSVD.h"
diff --git a/reco/detectors/tof/LKFMinuit.cxx b/reco/detectors/tof/LKFMinuit.cxx
index f5b00d59d29782d5f27312da4f75e726e294f98a..e84c78fb2222f01e943186699569a73ed145e143 100644
--- a/reco/detectors/tof/LKFMinuit.cxx
+++ b/reco/detectors/tof/LKFMinuit.cxx
@@ -1,5 +1,5 @@
#include "LKFMinuit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <Math/Vector3D.h>
#include <TFitter.h>
#include <TGraph2D.h>
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index ecb64c6cd9beaf5c51702ef376bc45edeff675b6..2ced44fb0af98be6a326c42f4181d974b4180b70 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -17,10 +17,11 @@
#include "CbmTrdParSetGas.h"
#include "CbmTrdParSetGeo.h"
-#include <FairLogger.h>
+
#include <FairRootManager.h>
#include <FairRunAna.h>
#include <FairRuntimeDb.h>
+#include <Logger.h>
#include <RtypesCore.h>
#include <TArray.h>
diff --git a/reco/detectors/trd/CbmTrdHitProducer.cxx b/reco/detectors/trd/CbmTrdHitProducer.cxx
index e791c55b0c1d5f08dbbf21f2acb72e1960c48557..1962f1b4ddff10756d2c627ab268607767a5be2c 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.cxx
+++ b/reco/detectors/trd/CbmTrdHitProducer.cxx
@@ -20,10 +20,10 @@
#include "CbmTrdParSetGas.h"
#include "CbmTrdParSetGeo.h"
-#include <FairLogger.h>
#include <FairRootManager.h>
#include <FairRunAna.h>
#include <FairRuntimeDb.h>
+#include <Logger.h>
#include <TGeoManager.h>
#include <TGeoPhysicalNode.h>
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.cxx b/reco/detectors/trd/CbmTrdModuleRecR.cxx
index 172820625cf3ee1cf9333cf994925e85457a8ec5..70a51c90b7ac5cecf21ccb78329e178cdc5cf187 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecR.cxx
@@ -17,7 +17,7 @@
#include <iostream>
#include "CbmDigiManager.h"
-#include <FairLogger.h>
+#include <Logger.h>
constexpr Double_t CbmTrdModuleRecR::kxVar_Value[2][5];
constexpr Double_t CbmTrdModuleRecR::kyVar_Value[2][5];
diff --git a/reco/detectors/trd/CbmTrdModuleRecT.cxx b/reco/detectors/trd/CbmTrdModuleRecT.cxx
index f66ee5e894f54e707c8c06f1c276b78f8492fe16..2245e381d75dac833898f9af324635dd53fd0497 100644
--- a/reco/detectors/trd/CbmTrdModuleRecT.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecT.cxx
@@ -5,7 +5,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdParModDigi.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <TGeoPhysicalNode.h>
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
index 66233a46d3514e6a1a2534eb81dd5a449ca3af3f..f1e5a7f25769dc80f0d3207597dd29d516e6547b 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
@@ -13,7 +13,7 @@
#include "CbmTrdPoint.h"
#include "CbmTrdUtils.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
index f85150adae28ea956daf04f96f517318d99db82e..66b4aa4da35d0b8c2e7e2d8771d33811d2f2b90e 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
@@ -15,7 +15,7 @@
#include "CbmTrdParModDigi.h"
#include "CbmTrdParSetDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index 2b861d734b54d2b7956b2eb7707eda8d834b4110..8510653284eae40b590e1c1a4395442d5702c89c 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -5,8 +5,7 @@
#include "CbmBuildEventsIdeal.h"
-#include <FairLogger.h>
-#include <FairRootManager.h>
+#include <Logger.h>
#include <TClonesArray.h>
#include <TStopwatch.h>
#include <cassert>
@@ -162,7 +161,7 @@ void CbmBuildEventsIdeal::Exec(Option_t*) {
<< nDigisAmbig << " ambiguous), noise: " << nDigisNoise;
// --- For debug: event info
- if (gLogger->IsLogNeeded(fair::Severity::debug)) {
+ if (fair::Logger::Logging(fair::Severity::debug)) {
for (Int_t iEvent = 0; iEvent < fEvents->GetEntriesFast(); iEvent++) {
CbmEvent* event = (CbmEvent*) fEvents->At(iEvent);
LOG(info) << event->ToString();
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
index 73690b2e92f64bce315630ad7ab84a459e274499..bb3327a5d1aafa2d85b9155b8526091388f24c02 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
@@ -5,7 +5,7 @@
#include "CbmBuildEventsIdealNew.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h>
#include <TClonesArray.h>
#include <TStopwatch.h>
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
index 84c87f37c4af7400502be085d157efb8c0035758..6b89719e636a923509e2ee353734f047fc0aa570 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
@@ -12,7 +12,7 @@
#include "CbmModuleList.h"
#include "CbmStsDigi.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index 1f1aa6c620e6fbc6a874eebee051556c17434886..cb26754e623be8604f2ef552553e75adb2e72bab 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -8,7 +8,7 @@
#include "TClonesArray.h"
#include "TStopwatch.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "CbmEvent.h"
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.cxx b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
index affd1187cf4ec94e2222cad646fef4c519fcf645..8d73958af458e4947ced994320c4ae1ce8eafdcc 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.cxx
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
@@ -4,7 +4,7 @@
#include "TClonesArray.h"
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "CbmDigi.h"
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index d89299331eac9f60345fe0f98e2f2eee9a6204fd..d38950c2bb0d29bffb0db180ecef444c70233020 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -9,7 +9,7 @@
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
#include "CbmStsTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
#include "TStopwatch.h"
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
index 88a3a6c0b776818921d0fa95f3ad0a62fb5a1897..cbfddac45f1288300c3e5cac7881ccfba4f7129d 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
@@ -8,7 +8,7 @@
#include "CbmEvent.h"
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
#include "TStopwatch.h"
diff --git a/reco/global/CbmFindPrimaryVertex.cxx b/reco/global/CbmFindPrimaryVertex.cxx
index ce9ed1d90f5d47bc485d50c022b67b05d1a8e4d3..e4b2b20594dd40686d633bf679ea63cb5fa6c946 100644
--- a/reco/global/CbmFindPrimaryVertex.cxx
+++ b/reco/global/CbmFindPrimaryVertex.cxx
@@ -7,7 +7,7 @@
#include "CbmPrimaryVertexFinder.h"
#include "CbmVertex.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/global/CbmFindPrimaryVertexEvents.cxx b/reco/global/CbmFindPrimaryVertexEvents.cxx
index 94fe264466e4ea9ef09c930b3d23309b651e2013..40f1b086365888ddc100fa6a071020b23369bf0d 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.cxx
+++ b/reco/global/CbmFindPrimaryVertexEvents.cxx
@@ -10,7 +10,7 @@
#include "CbmEvent.h"
#include "CbmPrimaryVertexFinder.h"
#include "CbmVertex.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
#include <cassert>
diff --git a/reco/global/CbmPVFinderIdeal.cxx b/reco/global/CbmPVFinderIdeal.cxx
index 046e2a6a5bf92222b2ddbc343264b5c9bbfcada9..e3fb1126e1160cf5f22a2b6dd74aec93c4ce6a6b 100644
--- a/reco/global/CbmPVFinderIdeal.cxx
+++ b/reco/global/CbmPVFinderIdeal.cxx
@@ -7,7 +7,7 @@
#include "CbmVertex.h"
#include "CbmMCTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
index 4ab86db7963fda1854c01070882ef0080fba97fa..23ef92d80dbcd94d488e90c3baa70d4a4dfb41e5 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
@@ -2,7 +2,7 @@
#include "CbmMuchPixelHit.h"
#include "CbmStsTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairTrackParam.h"
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
index ef519448081d7062894060f05fc8b43566b26fab..80602c3b5e70543df8accbcdae7579b32250dee3 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
@@ -3,7 +3,7 @@
* \author Andrey Lebedev <andrey.lebedev@gsi.de>
* \date 2013
**/
-#include "FairLogger.h"
+#include <Logger.h>
#include "CbmGlobalTrack.h"
#include "CbmLitFindGlobalTracksParallel.h"
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
index e9760f58aef1a8cd8fabd4d351a6ba0f63836297..e6d2580b27b6d7cb224e92f1e4cae5c068065908 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
@@ -18,7 +18,7 @@
#include "CbmStsTrack.h"
#include "FairHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/reco/qa/CbmRecoQa.cxx b/reco/qa/CbmRecoQa.cxx
index ab3be442b89816f9d4979f14ab5ba72fd63c4e02..c20b94bbca8ad5b2e0064fb298e68c024699edc6 100644
--- a/reco/qa/CbmRecoQa.cxx
+++ b/reco/qa/CbmRecoQa.cxx
@@ -27,7 +27,7 @@
#include "CbmTofPoint.h"
#include "FairDetector.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCPoint.h"
#include "FairTask.h"
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
index 6e9df845abcd26aac783fd4dbb8e9fd4f6d22253..9c73c46a6969ddf0e6662c828efcac8711b4d93a 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
@@ -7,7 +7,7 @@
#include "CbmBinnedTrackerConfigurator.h"
#include "CbmMCDataManager.h"
#include "CbmStsSetup.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "GeoReader.h"
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
index 24167834b5017414336c65acbaafd02669d38a0c..fb772f37dde65dd96f860298cd47a443c3884319 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
@@ -8,7 +8,7 @@
#include "CbmMuchTrack.h"
#include "CbmStsTrack.h"
#include "CbmTrdTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "GeoReader.h"
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.cxx b/reco/tracking/global/CbmGlobalTrackingQA.cxx
index f2706b2cd5c78690297b11091589235cb934f189..27cf704dce0806165c16eebeea2d5a90ec6deb63 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQA.cxx
@@ -6,7 +6,7 @@
#include "CbmGlobalTrackingQA.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <map>
#include "CbmDigiManager.h"
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.cxx b/reco/tracking/global/CbmGlobalTrackingTask.cxx
index 4b2259c6671a76f4718fd573969522d87a94f746..e8414165eb45270c8172a25138eecb9683d16b14 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTask.cxx
@@ -12,7 +12,7 @@
#include "CbmStsCluster.h"
#include "CbmStsHit.h"
#include "CbmStsTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TH1F.h"
#include <iostream>
diff --git a/reco/tracking/lx/CalcStats/CalcStats.cxx b/reco/tracking/lx/CalcStats/CalcStats.cxx
index 89732f05d9041265a07e1c1a28ee1aef18012c6a..a44a5dd5902d96492e3da51ed349c4922a2fdcb0 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.cxx
+++ b/reco/tracking/lx/CalcStats/CalcStats.cxx
@@ -4,7 +4,7 @@
#include "CbmMuchPoint.h"
#include "CbmTrdAddress.h"
#include "CbmTrdPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include <TFile.h>
#include <list>
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
index 0ab3812a31ede5ae0fa451b198a088c92e644609..1bfcc11836686714a8b1e0f08bfbd2d00e429db1 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
@@ -3,7 +3,7 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPoint.h"
#include "CbmTrdPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TH1F.h"
diff --git a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
index b945957629889657d4194d4612cd8085026a677b..7d31940907b1a24659595aae005b07993bda27cd 100644
--- a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
@@ -12,7 +12,7 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "LxTBMatEffs.h"
#include "Simple/LxCA.h"
#include "Simple/LxSettings.h"
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.cxx b/reco/tracking/lx/TBBinned/LxTBTask.cxx
index 4674fb8490a71bfa7d1ec68e8072d498520874d2..3d0f089143e1661d18f21833fe7527f9f8431f27 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTask.cxx
@@ -12,7 +12,7 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmTrdHit.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "LxTBTieTracks.h"
#include "TClonesArray.h"
#include "TDatabasePDG.h"
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
index 6d326854f63c2a9172a09d4904d05796515a043e..169fadd7bbbb76998fed3e553778e40fb7fd7f9a 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
@@ -13,7 +13,7 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "LxTBTask.h"
#include "TClonesArray.h"
#include "TGeoBBox.h"
diff --git a/reco/tracking/vector/CbmMuchMergeVectors.cxx b/reco/tracking/vector/CbmMuchMergeVectors.cxx
index 186766fb282db0b99ea5fa96bc89bb7530e5c005..9c16ace4c4dee9079af9626f79f34989dcfffe75 100644
--- a/reco/tracking/vector/CbmMuchMergeVectors.cxx
+++ b/reco/tracking/vector/CbmMuchMergeVectors.cxx
@@ -16,7 +16,7 @@
#include "FairEventHeader.h"
#include "FairField.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include <TClonesArray.h>
diff --git a/reco/tracking/vector/CbmMuchToTrdVectors.cxx b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
index 2b2b3a70e917b0514fe761b0c437adb3a771f065..3834cf009ca3d13f4a856f7e89a5bfb4e4126c8f 100644
--- a/reco/tracking/vector/CbmMuchToTrdVectors.cxx
+++ b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
@@ -7,7 +7,7 @@
//#include "CbmSetup.h"
#include "CbmMuchTrack.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairTrackParam.h"
diff --git a/sim/detectors/much/CbmMuchDigitizeGem.cxx b/sim/detectors/much/CbmMuchDigitizeGem.cxx
index dd38dc25e4ec163b2a5b6aecc041b6450fd0231c..8fa12f51b0b53f4cd2708142280f19ce8bab9702 100644
--- a/sim/detectors/much/CbmMuchDigitizeGem.cxx
+++ b/sim/detectors/much/CbmMuchDigitizeGem.cxx
@@ -40,7 +40,7 @@
// Includes from base
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRootManager.h"
diff --git a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
index 3d75ee3db76766e9126db9692481c9f372485d55..94dbbc9f979bc8e381a0896106b3861e7aa9e8ce 100644
--- a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
@@ -7,7 +7,7 @@
#include "TClonesArray.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "CbmPsdDigi.h"
diff --git a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
index ff6f046c89bbca41d1f1556721f0ba7bde262359..5208b0ea5eef2a58c319f66aef7edfa21c1e5a49 100644
--- a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
@@ -10,7 +10,7 @@
#include "TClonesArray.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "CbmPsdDigi.h"
diff --git a/sim/detectors/rich/CbmRichDigitizer.cxx b/sim/detectors/rich/CbmRichDigitizer.cxx
index ad02f2d5a370f75547716008a530b241d57a5da3..752d68becd23cbdf09d4a140fbff949cc9f33ae7 100644
--- a/sim/detectors/rich/CbmRichDigitizer.cxx
+++ b/sim/detectors/rich/CbmRichDigitizer.cxx
@@ -15,7 +15,7 @@
#include "CbmRichGeoManager.h"
#include "CbmRichPoint.h"
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "TClonesArray.h"
diff --git a/sim/detectors/sts/CbmStsDigitize.cxx b/sim/detectors/sts/CbmStsDigitize.cxx
index e1efbf67d339cf79354fb28d1f855ae3a407f094..507bf1315208157d2c6b12aaec3e1de75f5d6e20 100644
--- a/sim/detectors/sts/CbmStsDigitize.cxx
+++ b/sim/detectors/sts/CbmStsDigitize.cxx
@@ -26,7 +26,7 @@
#include "FairEventHeader.h"
#include "FairField.h"
#include "FairLink.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRunAna.h"
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.cxx b/sim/detectors/sts/CbmStsDigitizeQa.cxx
index fa8c3f09620943f8327e78c27f7298eed79d8793..53c45401d85904ec8315d927b5661be6b4e576dd 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQa.cxx
@@ -17,7 +17,7 @@
#include "CbmStsParSetModule.h"
#include "CbmStsParSim.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/sim/detectors/sts/CbmStsMC.cxx b/sim/detectors/sts/CbmStsMC.cxx
index 66107cf8e0b8f4c42b670d8e29f7143cf92d0b55..1a83fe2db9ca9154a3e5e5b67acd8dfdffa1a1b6 100644
--- a/sim/detectors/sts/CbmStsMC.cxx
+++ b/sim/detectors/sts/CbmStsMC.cxx
@@ -16,7 +16,7 @@
#include "TVirtualMC.h"
#include <TFile.h>
-#include "FairLogger.h"
+#include <Logger.h>
#include "CbmGeometryUtils.h"
#include "CbmStack.h"
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
index 6029359aebd5c39f7babcac46c41e05995f59137..d059c6cf6dabb3ae0eef5ce87ab54f73e74cacaf 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
@@ -9,7 +9,7 @@
#include <TGeoPhysicalNode.h>
#include <TMath.h>
-#include <FairLogger.h>
+#include <Logger.h>
#include "CbmStsElement.h"
#include "CbmStsParSensorCond.h"
diff --git a/sim/detectors/sts/CbmStsSimSensorFactory.cxx b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
index 0ee08a746512646952eb4ba21aa3d25e2bde04f1..4795b3dae0134c12710ea6d81a21c8b8fda8d983 100644
--- a/sim/detectors/sts/CbmStsSimSensorFactory.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
@@ -9,7 +9,7 @@
#include "CbmStsParSensor.h"
#include "CbmStsSimSensorDssdOrtho.h"
#include "CbmStsSimSensorDssdStereo.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <cassert>
using UP_sensor = CbmStsSimSensorFactory::UP_sensor;
diff --git a/sim/detectors/tof/CbmTofDigitize.cxx b/sim/detectors/tof/CbmTofDigitize.cxx
index 8a61334625e7334491f23e51de969cb5fd90cbb9..4f3fe78d6c5f5f2fa28841708efcbb9c390ebab0 100644
--- a/sim/detectors/tof/CbmTofDigitize.cxx
+++ b/sim/detectors/tof/CbmTofDigitize.cxx
@@ -24,7 +24,7 @@
// FAIR classes and includes
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
@@ -407,7 +407,7 @@ Bool_t CbmTofDigitize::LoadBeamtimeValues() {
fDigiBdfPar->SetInputFile(fsBeamInputFile);
// Add Param printout only if DEBUG level ON
- if (gLogger->IsLogNeeded(fair::Severity::debug)) fDigiBdfPar->printParams();
+ if (fair::Logger::Logging(fair::Severity::debug)) fDigiBdfPar->printParams();
if (kFALSE == fDigiBdfPar->LoadBeamtimeHistos()) {
LOG(fatal) << "CbmTofDigitize::LoadBeamtimeValues: Cluster properties from "
diff --git a/sim/detectors/tof/CbmTofMergeMcPoints.cxx b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
index aa685c948c8e6f17dbd99449b3a51bd7a6223711..363e2e079a3edccd59045cf6c4ab77f541acf6ff 100644
--- a/sim/detectors/tof/CbmTofMergeMcPoints.cxx
+++ b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
@@ -18,7 +18,7 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
// ROOT Classes and includes
diff --git a/sim/detectors/trd/CbmTrd.cxx b/sim/detectors/trd/CbmTrd.cxx
index 1b00a4dd837872408e879a08f2da91e92da278e7..563df0918f6ee084f9b81513f8f1ab267ef0872d 100644
--- a/sim/detectors/trd/CbmTrd.cxx
+++ b/sim/detectors/trd/CbmTrd.cxx
@@ -16,7 +16,7 @@
#include "FairGeoMedia.h"
#include "FairGeoNode.h"
#include "FairGeoVolume.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRuntimeDb.h"
diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx
index 5525fd0efa6c57f82e648a8cb0d06f093e25e36c..4fa902b234eaa9ac1b9971c2076f36a58710d5c0 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.cxx
+++ b/sim/detectors/trd/CbmTrdDigitizer.cxx
@@ -24,7 +24,7 @@
#include <FairBaseParSet.h>
#include <FairEventHeader.h>
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h>
#include <FairRunAna.h>
#include <FairRunSim.h>
diff --git a/sim/detectors/trd/CbmTrdModuleSim.cxx b/sim/detectors/trd/CbmTrdModuleSim.cxx
index 05f5e794b3b66dad0a96f2aeda468c7cd1853e01..aae4df5340a23ed43d8a5fde63eb8c3c107e51bf 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSim.cxx
@@ -4,7 +4,7 @@
#include "CbmTrdParModGain.h"
#include "CbmTrdParModGas.h"
#include "CbmTrdParSetAsic.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <vector>
//_______________________________________________________________________________
diff --git a/sim/detectors/trd/CbmTrdModuleSimR.cxx b/sim/detectors/trd/CbmTrdModuleSimR.cxx
index 4eba11aaffa5f5ad28fe5a1fc34fd89db0cefc3b..4c7dad593b7e4f9be3eb84d593a340a282078e4d 100644
--- a/sim/detectors/trd/CbmTrdModuleSimR.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimR.cxx
@@ -14,7 +14,7 @@
#include "CbmMatch.h"
// Includes from FairRoot
-#include <FairLogger.h>
+#include <Logger.h>
// Includes from Root
#include <TClonesArray.h>
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.cxx b/sim/detectors/trd/CbmTrdModuleSimT.cxx
index bb45b5789419d1e5137e3dd478d1a2c055babd26..2286901aa8a0de4e8b80bcbf215dd229e9ca6cae 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimT.cxx
@@ -17,7 +17,7 @@
#include "CbmMatch.h"
#include "CbmTimeSlice.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRootManager.h>
#include <TGeoManager.h>
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
index 63fe73ab401cb60ed6888a84cb6c721471800359..15cd932a5a33b486736e703e0aa01dcc64a46204 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
@@ -12,7 +12,7 @@
#include "CbmTrdUtils.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.cxx b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
index ce8ac10542fa2c21552fd3a14318fd7ba4911adb..a530b3c14c698e9223ef1e16c7021823640d8519 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
@@ -6,7 +6,7 @@
#include "CbmTrdPoint.h"
//#include "CbmTrdMCQaReport.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "TClonesArray.h"
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index 9654e689348a1cce7f34486c3c81a0c803731370..971cf513411a5b9f638f0163e03ab62466233065 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -16,7 +16,7 @@
#include "CbmTofDigitize.h"
#include "CbmTrdDigitizer.h"
#include "FairFileSource.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMonitor.h"
#include "FairParAsciiFileIo.h"
diff --git a/sim/response/base/CbmDigitization.h b/sim/response/base/CbmDigitization.h
index 782e60bf8dc358ff60ac5bd453a61a3e65959a0b..0bdadd38995fa8b039a8d52a5f405ef58046cae7 100644
--- a/sim/response/base/CbmDigitization.h
+++ b/sim/response/base/CbmDigitization.h
@@ -10,7 +10,7 @@
#include "CbmDefs.h"
#include "CbmDigitizationSource.h"
#include "CbmDigitizeInfo.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TList.h"
#include "TNamed.h"
#include "TString.h"
diff --git a/sim/response/base/CbmDigitizationSource.h b/sim/response/base/CbmDigitizationSource.h
index eedea438d4c0f8e977ed59b6057d9498348bc2d0..5a8ec494f225a2301b97f4fa40b62f214cb3d625 100644
--- a/sim/response/base/CbmDigitizationSource.h
+++ b/sim/response/base/CbmDigitizationSource.h
@@ -9,7 +9,7 @@
#include "CbmDefs.h"
#include "CbmMCInputSet.h"
#include "FairEventHeader.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairSource.h"
#include "TObject.h"
diff --git a/sim/response/base/CbmMCInput.cxx b/sim/response/base/CbmMCInput.cxx
index 6e576327a5eccd2f7d3ea575f9525a315c0d0225..29bf9f24f160a43f6d5bf826f706928ea4c753ea 100644
--- a/sim/response/base/CbmMCInput.cxx
+++ b/sim/response/base/CbmMCInput.cxx
@@ -5,7 +5,7 @@
#include "CbmMCInput.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "TFile.h"
#include "TList.h"
diff --git a/sim/response/base/CbmMCInputSet.cxx b/sim/response/base/CbmMCInputSet.cxx
index 2deae6282483f659a1ca2b57660570b946a0fb31..ab841fd3c6aa250643891dbefc60c4be4dcdd818 100644
--- a/sim/response/base/CbmMCInputSet.cxx
+++ b/sim/response/base/CbmMCInputSet.cxx
@@ -5,7 +5,7 @@
#include "CbmMCInputSet.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include <cassert>
diff --git a/sim/transport/base/CbmEventGenerator.cxx b/sim/transport/base/CbmEventGenerator.cxx
index 87a7b9a27e53dbe906af386058c02a4ff069e326..2dac61acff85bcdbb2d22a9c7ae05764aa55b3ad 100644
--- a/sim/transport/base/CbmEventGenerator.cxx
+++ b/sim/transport/base/CbmEventGenerator.cxx
@@ -6,14 +6,16 @@
#include "CbmEventGenerator.h"
#include "CbmBeam.h"
+
#include <FairGenericStack.h>
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairMCEventHeader.h>
+
#include <TMath.h>
#include <TRandom.h>
#include <TVector3.h>
-#include <cassert>
+#include <cassert>
// ----- Constructor ---------------------------------------------------
CbmEventGenerator::CbmEventGenerator()
diff --git a/sim/transport/base/CbmMCEventFilter.cxx b/sim/transport/base/CbmMCEventFilter.cxx
index e3c280246e63f7355de991b2a45d6d7763b89f57..791fcf1b863f5482947bcf280e5575f73f1d2dda 100644
--- a/sim/transport/base/CbmMCEventFilter.cxx
+++ b/sim/transport/base/CbmMCEventFilter.cxx
@@ -5,7 +5,7 @@
#include "CbmMCEventFilter.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <cassert>
#include <iostream>
#include <sstream>
diff --git a/sim/transport/base/CbmStackFilter.cxx b/sim/transport/base/CbmStackFilter.cxx
index 90d22bc6d9ac608d9c9e5aba3f027ff39b2da584..93dcd07edfc8158453e620dacfc34ea41c68fbcc 100644
--- a/sim/transport/base/CbmStackFilter.cxx
+++ b/sim/transport/base/CbmStackFilter.cxx
@@ -8,7 +8,7 @@
#include "CbmStackFilter.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TMCProcess.h"
#include "TParticle.h"
diff --git a/sim/transport/generators/CbmPlutoGenerator.cxx b/sim/transport/generators/CbmPlutoGenerator.cxx
index 476ad6442d49f59bed68ee6dd72894d9f3604ec3..a51b92b9441351cd671ca9c2de9d79a924909436 100644
--- a/sim/transport/generators/CbmPlutoGenerator.cxx
+++ b/sim/transport/generators/CbmPlutoGenerator.cxx
@@ -6,7 +6,7 @@
#include "CbmFileUtils.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairPrimaryGenerator.h" // for FairPrimaryGenerator
#include "TArchiveFile.h" // for TArchiveFile
diff --git a/sim/transport/generators/CbmUnigenGenerator.cxx b/sim/transport/generators/CbmUnigenGenerator.cxx
index 56e686a5166f9b40707dbeff6fd4badf385b2197..835484f9a335abd12d229bc8618ce538bd597353 100644
--- a/sim/transport/generators/CbmUnigenGenerator.cxx
+++ b/sim/transport/generators/CbmUnigenGenerator.cxx
@@ -8,7 +8,7 @@
#include "CbmUnigenGenerator.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairPrimaryGenerator.h"
#include "FairRunSim.h"
diff --git a/sim/transport/generators/unigen/URun.cxx b/sim/transport/generators/unigen/URun.cxx
index c180a4c0f06738c7a040be565824b5c2aff6264d..ce394931ddfa8624d4c72671d364afea184ee8d7 100644
--- a/sim/transport/generators/unigen/URun.cxx
+++ b/sim/transport/generators/unigen/URun.cxx
@@ -5,7 +5,7 @@ using namespace std;
#include "URun.h"
-#include "FairLogger.h"
+#include <Logger.h>
//____________________________________________________________________
//
// URun
diff --git a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
index acb4bd792d9adf082c2819622d1393889d0721f7..93ee8fa5d821b8c9903fcbe24858571b2e5ac0e4 100644
--- a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
@@ -11,7 +11,7 @@
#include "TSQLRow.h"
#include "TSQLiteServer.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TSystem.h"
#include "CbmDefs.h"
diff --git a/sim/transport/geosetup/CbmGeoSetupProvider.cxx b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
index 535db2bd71f6ca3dc4d60020a61570aa71f612ab..3a7af7df1009636b83f212877f7b5ceb17bb0f20 100644
--- a/sim/transport/geosetup/CbmGeoSetupProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
@@ -5,7 +5,7 @@
#include "geosetup/CbmGeoSetupProvider.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairModule.h"
#include "FairRunSim.h"
diff --git a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
index d1f8093d996c441fde15e1cef596342151032fd1..1d17ba68e05fc1b8ea667b4b51894ab3d6eff874 100644
--- a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
@@ -13,7 +13,7 @@
#include "TSystem.h"
#include "TSystemDirectory.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "CbmDefs.h"
diff --git a/sim/transport/steer/CbmGeant3Settings.cxx b/sim/transport/steer/CbmGeant3Settings.cxx
index 8c47edd942105e21ae58bc4616fcd211073dff02..ae15c68a6d3486d756597c92ded0e10b54308921 100644
--- a/sim/transport/steer/CbmGeant3Settings.cxx
+++ b/sim/transport/steer/CbmGeant3Settings.cxx
@@ -1,6 +1,6 @@
#include "CbmGeant3Settings.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <TGeant3.h>
#include <TVirtualMC.h>
diff --git a/sim/transport/steer/CbmGeant4Settings.cxx b/sim/transport/steer/CbmGeant4Settings.cxx
index b3da278740f9f19c36597bff2b3dbbf438fac0d3..4860ac774b52d2000b075ca9d8429ddd931cf418 100644
--- a/sim/transport/steer/CbmGeant4Settings.cxx
+++ b/sim/transport/steer/CbmGeant4Settings.cxx
@@ -1,6 +1,6 @@
#include "CbmGeant4Settings.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <FairRunSim.h>
#include <TGeant4.h>
diff --git a/sim/transport/steer/CbmSetup.cxx b/sim/transport/steer/CbmSetup.cxx
index 4d984abbfa573e59f5dc51a99f1f8c531adca53f..9ec66e3d2685d66ea0562ddd43d214a372e8376f 100644
--- a/sim/transport/steer/CbmSetup.cxx
+++ b/sim/transport/steer/CbmSetup.cxx
@@ -9,7 +9,7 @@
#include "CbmFieldMap.h"
#include "CbmFieldMapSym2.h"
#include "CbmFieldMapSym3.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairModule.h"
#include "FairRunSim.h"
#include "TFile.h"
diff --git a/sim/transport/steer/CbmSetup.h b/sim/transport/steer/CbmSetup.h
index 361cb3eed7cf2dc1d355aee62603e7400889965e..fc6bfd64089c091bc7bf0297a2f60424793dea76 100644
--- a/sim/transport/steer/CbmSetup.h
+++ b/sim/transport/steer/CbmSetup.h
@@ -12,7 +12,7 @@
#include "CbmGeoSetupProvider.h"
#include "CbmGeoSetupRepoProvider.h"
#include "CbmModuleList.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "TNamed.h"
#include "TString.h"
#include "TVector3.h"
diff --git a/sim/transport/steer/CbmTransport.cxx b/sim/transport/steer/CbmTransport.cxx
index bda591e26f4998cbe4bc8fcf7f03501c738c37ea..e0e71760f7805fc72a5f6409a61194ef7b00c7b6 100644
--- a/sim/transport/steer/CbmTransport.cxx
+++ b/sim/transport/steer/CbmTransport.cxx
@@ -18,7 +18,7 @@
#include "CbmTarget.h"
#include "CbmUnigenGenerator.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairMonitor.h"
#include "FairParRootFileIo.h"
#include "FairRunSim.h"
diff --git a/sim/transport/steer/CbmVMCSettings.cxx b/sim/transport/steer/CbmVMCSettings.cxx
index f142a3dfd75d96bca90cb75854f762de07990f37..34dc6d5cac5ae9b55e8f9aa5d66b2e56cbdc9ebb 100644
--- a/sim/transport/steer/CbmVMCSettings.cxx
+++ b/sim/transport/steer/CbmVMCSettings.cxx
@@ -1,6 +1,6 @@
#include "CbmVMCSettings.h"
-#include <FairLogger.h>
+#include <Logger.h>
#include <TVirtualMC.h>
diff --git a/sim/transport/steer/CbmVMCSettings.h b/sim/transport/steer/CbmVMCSettings.h
index ce085a582b92fa18b9e60edfbb001c82011ee326..f61df12fc7dbcee0abbe839e87e6e55bb6f10e98 100644
--- a/sim/transport/steer/CbmVMCSettings.h
+++ b/sim/transport/steer/CbmVMCSettings.h
@@ -15,7 +15,7 @@
#include <TObject.h>
-#include "FairLogger.h"
+#include <Logger.h>
template<typename T>
void CheckValueInRange(const T& value,
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
index a30bc57336c3e6bd530b817c943aa604a4f8b127..495526dbcdf33969cd363fa8be1f11a42b1708a0 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx
@@ -8,7 +8,7 @@
#include "CbmTrdParSetGas.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include <TList.h>
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
index 253c565e1f6fb041710ad43b395494fff3601292..cc15d2be332585f2ca11fc8f5574637f569d5f90 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
@@ -6,7 +6,7 @@
#include "TClonesArray.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
index 4ab43349091a01a550150ca5ee8bb27ac1597295..44d5d50cf98638c502c235ab17b018d05fd87b46 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
@@ -6,7 +6,7 @@
#include "TClonesArray.h"
-#include "FairLogger.h"
+#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
diff --git a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
index 4006a251b9e53631d07e592058e1c40688847fa0..b43f0f66a37e95c1c6e95f152816790dc12b608e 100644
--- a/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
+++ b/tutorials/TaskToAlgo/CbmTemplateAlgo.cxx
@@ -6,7 +6,7 @@
#include "CbmTemplateAlgo.h"
-#include "FairLogger.h"
+#include <Logger.h>
// -------------------------------------------------------------------------
CbmTemplateAlgo::CbmTemplateAlgo() : CbmAlgo() {}