From 41ceacba1398bf513896f90b6d791373885486a0 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 9 Sep 2020 10:16:06 +0200
Subject: [PATCH] Use Logger class instead of FairLogger
The class FairLogger is meanwhile only a wrapper around the Logger class,
so use the Logger directly. This also helps to reduce many warnings when
using the Eclipse IDE.
---
MQ/histoServer/CMakeLists.txt | 1 +
MQ/histoServer/CbmHistoServer.cxx | 2 +-
MQ/histoServer/CbmMqHistoServer.cxx | 3 ++-
MQ/mcbm/CMakeLists.txt | 1 +
MQ/source/CMakeLists.txt | 1 +
.../femtoscopy/nicafemto/format/mc/NicaCbmMCTrack.cxx | 2 ++
.../nicafemto/format/unigen/NicaUnigenSource.cxx | 2 +-
.../PWGDIL/dielectron/conversion/CbmAnaConversion.cxx | 2 +-
.../dielectron/conversion/CbmAnaConversionPhotons.cxx | 2 +-
.../dielectron/conversion/CbmAnaConversionPhotons2.cxx | 2 +-
.../dielectron/conversion/CbmAnaConversionRecoFull.cxx | 2 +-
.../dielectron/conversion/CbmAnaConversionTest.cxx | 2 +-
.../dielectron/conversion/CbmAnaConversionTest2.cxx | 2 +-
.../dielectron/papaframework/fastsim/CbmFastSim.cxx | 2 +-
.../dielectron/pi0eta/CbmKresSelectGoodEvents.cxx | 2 +-
analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx | 6 +++---
analysis/detectors/tof/CbmTofAnaTestbeam.cxx | 4 ++--
analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx | 2 +-
analysis/detectors/tof/CbmTofGeometryQa.cxx | 2 +-
analysis/detectors/tof/CbmTofHitFinderQa.cxx | 2 +-
analysis/detectors/tof/CbmTofHitFinderTBQA.cxx | 2 +-
analysis/detectors/tof/CbmTofTests.cxx | 2 +-
core/base/CbmDaq.cxx | 5 ++---
core/base/CbmDigiManager.h | 2 +-
core/base/CbmDigitize.h | 2 +-
core/base/CbmHistManager.h | 2 +-
core/base/CbmMCDataArray.cxx | 2 +-
core/base/CbmMCDataManager.cxx | 2 +-
core/base/CbmMCDataObject.cxx | 2 +-
core/base/CbmMatchRecoToMC.cxx | 2 +-
core/base/CbmRadDamage.cxx | 2 +-
core/base/CbmReadoutBuffer.h | 2 +-
core/base/utils/CbmGeometryUtils.cxx | 3 +--
core/data/CbmEventStore.h | 2 +-
core/data/CbmMCEventList.cxx | 2 +-
core/data/CbmMCTrack.cxx | 2 +-
core/data/CbmModuleList.cxx | 2 +-
core/data/CbmTimeSlice.cxx | 2 +-
core/data/base/CbmDigiBranch.h | 2 +-
core/data/base/CbmDigiVector.h | 2 +-
core/data/global/CbmGlobalTrack.cxx | 2 +-
core/data/global/CbmVertex.cxx | 2 +-
core/data/much/CbmMuchAddress.h | 2 +-
core/data/much/CbmMuchPoint.cxx | 2 +-
core/data/mvd/CbmMvdDetectorId.h | 2 +-
core/data/mvd/CbmMvdDigi.cxx | 2 +-
core/data/mvd/CbmMvdHit.cxx | 2 +-
core/data/mvd/CbmMvdPoint.cxx | 2 +-
core/data/psd/CbmPsdHit.cxx | 2 +-
core/data/psd/CbmPsdPoint.cxx | 2 +-
core/data/rich/CbmRichPoint.cxx | 2 +-
core/data/rich/CbmRichRing.cxx | 2 +-
core/data/sts/CbmStsAddress.cxx | 2 +-
core/data/test/global/_GTestCbmVertex.cxx | 2 +-
core/data/tof/CbmTofDetectorId_v07a.cxx | 2 +-
core/data/tof/CbmTofTracklet.cxx | 2 +-
core/data/tof/CbmTofTrackletParam.cxx | 2 +-
core/data/trd/CbmTrdCluster.cxx | 2 +-
core/data/trd/CbmTrdDigi.cxx | 2 +-
core/data/trd/CbmTrdPoint.cxx | 2 +-
core/data/trd/CbmTrdRawMessageSpadic.cxx | 2 +-
core/detectors/much/CbmMcbm2018MuchPar.cxx | 2 +-
core/detectors/much/CbmMuchContFact.cxx | 2 +-
core/detectors/much/CbmMuchGeoScheme.cxx | 2 +-
core/detectors/much/CbmMuchModuleGemRadial.cxx | 2 +-
core/detectors/much/CbmMuchSector.cxx | 2 +-
core/detectors/much/CbmMuchSectorRadial.cxx | 2 +-
core/detectors/much/CbmMuchSegmentSector.cxx | 2 +-
core/detectors/psd/CbmMcbm2018PsdPar.cxx | 2 +-
core/detectors/rich/CbmMcbm2018RichPar.cxx | 4 ++--
core/detectors/rich/CbmRichDigiMapManager.cxx | 2 +-
core/detectors/rich/CbmRichGeoManager.cxx | 2 +-
core/detectors/rich/CbmRichMCbmDigiMapManager.cxx | 2 +-
core/detectors/rich/CbmRichPmt.cxx | 2 +-
core/detectors/rich/CbmRichRecGeoPar.h | 2 +-
core/detectors/sts/CbmMcbm2018StsPar.cxx | 2 +-
core/detectors/sts/CbmStsContFact.cxx | 2 +-
core/detectors/sts/CbmStsElement.cxx | 2 +-
core/detectors/sts/CbmStsModule.cxx | 2 +-
core/detectors/sts/CbmStsParSetModule.cxx | 2 +-
core/detectors/sts/CbmStsParSetSensor.cxx | 2 +-
core/detectors/sts/CbmStsParSetSensorCond.cxx | 2 +-
core/detectors/sts/CbmStsParSim.cxx | 2 +-
core/detectors/sts/CbmStsPhysics.cxx | 2 +-
core/detectors/sts/CbmStsSetup.cxx | 2 +-
core/detectors/sts/CbmStsSetup.h | 2 +-
core/detectors/sts/CbmStsStation.cxx | 2 +-
core/detectors/tof/CbmMcbm2018TofPar.cxx | 2 +-
core/detectors/tof/CbmTofCell.cxx | 2 +-
core/detectors/tof/CbmTofContFact.cxx | 2 +-
core/detectors/tof/CbmTofCreateDigiPar.cxx | 2 +-
core/detectors/tof/CbmTofDigiBdfPar.cxx | 2 +-
core/detectors/tof/CbmTofDigiPar.cxx | 2 +-
core/detectors/tof/CbmTofGeoHandler.cxx | 2 +-
core/detectors/trd/CbmTrdContFact.cxx | 2 +-
core/detectors/trd/CbmTrdFASP.cxx | 2 +-
core/detectors/trd/CbmTrdGas.cxx | 2 +-
core/detectors/trd/CbmTrdGeoHandler.cxx | 2 +-
core/detectors/trd/CbmTrdHardwareSetupR.cxx | 2 +-
core/detectors/trd/CbmTrdParAsic.cxx | 2 +-
core/detectors/trd/CbmTrdParMod.cxx | 2 +-
core/detectors/trd/CbmTrdParModDigi.cxx | 4 ++--
core/detectors/trd/CbmTrdParModGas.cxx | 2 +-
core/detectors/trd/CbmTrdParSetAsic.cxx | 2 +-
core/detectors/trd/CbmTrdParSetDigi.cxx | 4 ++--
core/detectors/trd/CbmTrdParSetGain.cxx | 2 +-
core/detectors/trd/CbmTrdParSetGas.cxx | 2 +-
core/detectors/trd/CbmTrdParSetGeo.cxx | 2 +-
core/detectors/trd/CbmTrdParSpadic.cxx | 2 +-
core/detectors/trd/CbmTrdRadiator.cxx | 2 +-
core/detectors/trd/CbmTrdSPADIC.cxx | 2 +-
core/detectors/trd/CbmTrdUtils.cxx | 2 +-
core/eventdisplay/CbmEvDisTracks.cxx | 2 +-
core/eventdisplay/CbmPixelHitSetDraw.cxx | 2 +-
core/eventdisplay/CbmPointSetArray.cxx | 2 +-
core/eventdisplay/CbmPointSetArrayDraw.cxx | 2 +-
core/eventdisplay/CbmRecoTracks.cxx | 2 +-
core/eventdisplay/CbmTrdDigiDraw.cxx | 2 +-
core/field/CbmFieldContFact.cxx | 2 +-
core/field/CbmFieldMap.cxx | 2 +-
fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx | 2 +-
fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx | 2 +-
fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx | 2 +-
fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx | 2 +-
fles/mcbm2018/CbmMcbm2018MsCrcCheck.cxx | 2 +-
fles/mcbm2018/CbmMcbm2018Source.cxx | 2 +-
fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx | 6 +++---
fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx | 6 +++---
fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx | 6 +++---
fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx | 6 +++---
fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorTaskTofPulser.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx | 10 +++++-----
fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx | 10 +++++-----
fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx | 2 +-
fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx | 10 +++++-----
fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx | 2 +-
fles/mcbm2018/tasks/CbmCheckEvents.cxx | 2 +-
fles/mcbm2018/tasks/CbmCheckTiming.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx | 2 +-
.../tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx | 2 +-
.../tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx | 2 +-
fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx | 2 +-
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx | 2 +-
.../eventbuilder/CbmStar2019EventBuilderEtof.cxx | 2 +-
.../eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx | 2 +-
fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx | 2 +-
fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx | 2 +-
fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx | 2 +-
fles/star2019/monitor/CbmStar2019MonitorTask.cxx | 2 +-
fles/star2019/monitor/CbmStar2019MonitorTof.cxx | 2 +-
fles/star2019/monitor/CbmStar2019TofFeeThr.cxx | 2 +-
fles/star2019/parameter/CbmStar2019TofPar.cxx | 2 +-
mvd/CbmMvdDetector.cxx | 2 +-
mvd/CbmMvdDigitizer.cxx | 2 +-
mvd/CbmMvdDigitizerTB.cxx | 2 +-
mvd/CbmMvdSensor.cxx | 2 +-
mvd/CbmMvdStationPar.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx | 2 +-
mvd/qa/CbmMvdClusterAna.cxx | 2 +-
mvd/qa/CbmMvdQa.cxx | 2 +-
mvd/tools/CbmMvdGeoHandler.cxx | 2 +-
mvd/tools/readout/CbmMvdReadoutCluster.cxx | 2 +-
mvd/tools/readout/CbmMvdReadoutSimple.cxx | 2 +-
reco/KF/CbmKFParticleFinder.cxx | 2 +-
reco/KF/Interface/CbmTofTrackFitterKF.cxx | 2 +-
reco/detectors/much/CbmMuchHitProducerIdeal.cxx | 2 +-
reco/detectors/psd/CbmPsdHitProducer.cxx | 2 +-
reco/detectors/psd/CbmPsdMCbmHitProducer.cxx | 2 +-
reco/detectors/rich/CbmRichElectronIdAnn.cxx | 2 +-
reco/detectors/rich/CbmRichHitProducer.cxx | 2 +-
reco/detectors/rich/CbmRichReconstruction.cxx | 2 +-
reco/detectors/rich/alignment/CbmHistManager.cxx | 2 +-
reco/detectors/rich/alignment/CbmRichAlignment.cxx | 2 +-
reco/detectors/rich/alignment/CbmRichCorrection.cxx | 2 +-
.../rich/alignment/CbmRichCorrectionVector.cxx | 2 +-
reco/detectors/rich/alignment/CbmRichMirror.cxx | 2 +-
.../CbmRichMirrorMisalignmentCorrectionUtils.h | 2 +-
.../rich/alignment/CbmRichMirrorSortingAlignment.cxx | 2 +-
.../rich/alignment/CbmRichMirrorSortingCorrection.cxx | 2 +-
reco/detectors/rich/alignment/CbmRichNavigationUtil2.h | 2 +-
reco/detectors/rich/alignment/CbmRichPMTMapping.cxx | 2 +-
.../rich/alignment/CbmRichProjectionProducer2.cxx | 2 +-
.../alignment/CbmRichProjectionProducerAnalytical.cxx | 2 +-
.../detectors/rich/alignment/CbmRichReconstruction.cxx | 2 +-
reco/detectors/rich/alignment/CbmRichUtil.h | 2 +-
reco/detectors/rich/finder/CbmRichRingFinderHough.cxx | 2 +-
reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx | 2 +-
.../rich/fitter/CbmRichRingFitterEllipseMinuit.cxx | 2 +-
reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx | 2 +-
reco/detectors/rich/qa/CbmRichRecoTbQa.cxx | 2 +-
.../tracks/CbmRichProjectionProducerAnalytical.cxx | 2 +-
.../rich/tracks/CbmRichProjectionProducerTGeo.cxx | 2 +-
reco/detectors/rich/utils/CbmRichNavigationUtil.h | 2 +-
reco/detectors/rich/utils/CbmRichUtil.h | 2 +-
reco/detectors/sts/CbmStsFindTracksQa.cxx | 4 ++--
reco/detectors/sts/CbmStsRecoModule.cxx | 2 +-
reco/detectors/tof/CbmTofBuildDigiEvents.cxx | 2 +-
reco/detectors/tof/CbmTofCalibrator.cxx | 2 +-
reco/detectors/tof/CbmTofCosmicClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofEventClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofFindTracks.cxx | 4 ++--
reco/detectors/tof/CbmTofSimpClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofTBClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofTestBeamClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofTrackFinderNN.cxx | 6 +++---
reco/detectors/tof/CbmTofTrackletTools.cxx | 2 +-
reco/detectors/tof/LKFMinuit.cxx | 2 +-
reco/detectors/trd/CbmTrdClusterFinder.cxx | 3 ++-
reco/detectors/trd/CbmTrdHitProducer.cxx | 2 +-
reco/detectors/trd/CbmTrdModuleRecR.cxx | 2 +-
reco/detectors/trd/CbmTrdModuleRecT.cxx | 2 +-
reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx | 2 +-
reco/detectors/trd/qa/CbmTrdRecoQa.cxx | 2 +-
reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx | 5 ++---
reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx | 2 +-
reco/eventbuilder/digis/CbmBuildEventsQA.cxx | 2 +-
reco/eventbuilder/digis/CbmBuildEventsSimple.cxx | 2 +-
reco/eventbuilder/digis/CbmEvBuildSource.cxx | 2 +-
.../tracks/CbmBuildEventsFromTracksIdeal.cxx | 2 +-
.../tracks/CbmBuildEventsFromTracksReal.cxx | 2 +-
reco/global/CbmFindPrimaryVertex.cxx | 2 +-
reco/global/CbmFindPrimaryVertexEvents.cxx | 2 +-
reco/global/CbmPVFinderIdeal.cxx | 2 +-
reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx | 2 +-
.../cbm/reco/CbmLitFindGlobalTracksParallel.cxx | 2 +-
reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx | 2 +-
reco/qa/CbmRecoQa.cxx | 2 +-
.../BinnedTracker/CbmBinnedTrackerConfigurator.cxx | 2 +-
reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx | 2 +-
reco/tracking/global/CbmGlobalTrackingQA.cxx | 2 +-
reco/tracking/global/CbmGlobalTrackingTask.cxx | 2 +-
reco/tracking/lx/CalcStats/CalcStats.cxx | 2 +-
.../lx/GenNoiseElectrons/GenNoiseElectrons.cxx | 2 +-
reco/tracking/lx/TBBinned/LxTBMLTask.cxx | 2 +-
reco/tracking/lx/TBBinned/LxTBTask.cxx | 2 +-
reco/tracking/lx/TBBinned/LxTBTrdTask.cxx | 2 +-
reco/tracking/vector/CbmMuchMergeVectors.cxx | 2 +-
reco/tracking/vector/CbmMuchToTrdVectors.cxx | 2 +-
sim/detectors/much/CbmMuchDigitizeGem.cxx | 2 +-
sim/detectors/psd/CbmPsdIdealDigitizer.cxx | 2 +-
sim/detectors/psd/CbmPsdSimpleDigitizer.cxx | 2 +-
sim/detectors/rich/CbmRichDigitizer.cxx | 2 +-
sim/detectors/sts/CbmStsDigitize.cxx | 2 +-
sim/detectors/sts/CbmStsDigitizeQa.cxx | 2 +-
sim/detectors/sts/CbmStsMC.cxx | 2 +-
sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx | 2 +-
sim/detectors/sts/CbmStsSimSensorFactory.cxx | 2 +-
sim/detectors/tof/CbmTofDigitize.cxx | 4 ++--
sim/detectors/tof/CbmTofMergeMcPoints.cxx | 2 +-
sim/detectors/trd/CbmTrd.cxx | 2 +-
sim/detectors/trd/CbmTrdDigitizer.cxx | 2 +-
sim/detectors/trd/CbmTrdModuleSim.cxx | 2 +-
sim/detectors/trd/CbmTrdModuleSimR.cxx | 2 +-
sim/detectors/trd/CbmTrdModuleSimT.cxx | 2 +-
sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx | 2 +-
sim/detectors/trd/qa/CbmTrdMCQa.cxx | 2 +-
sim/response/base/CbmDigitization.cxx | 2 +-
sim/response/base/CbmDigitization.h | 2 +-
sim/response/base/CbmDigitizationSource.h | 2 +-
sim/response/base/CbmMCInput.cxx | 2 +-
sim/response/base/CbmMCInputSet.cxx | 2 +-
sim/transport/base/CbmEventGenerator.cxx | 6 ++++--
sim/transport/base/CbmMCEventFilter.cxx | 2 +-
sim/transport/base/CbmStackFilter.cxx | 2 +-
sim/transport/generators/CbmPlutoGenerator.cxx | 2 +-
sim/transport/generators/CbmUnigenGenerator.cxx | 2 +-
sim/transport/generators/unigen/URun.cxx | 2 +-
sim/transport/geosetup/CbmGeoSetupDbProvider.cxx | 2 +-
sim/transport/geosetup/CbmGeoSetupProvider.cxx | 2 +-
sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx | 2 +-
sim/transport/steer/CbmGeant3Settings.cxx | 2 +-
sim/transport/steer/CbmGeant4Settings.cxx | 2 +-
sim/transport/steer/CbmSetup.cxx | 2 +-
sim/transport/steer/CbmSetup.h | 2 +-
sim/transport/steer/CbmTransport.cxx | 2 +-
sim/transport/steer/CbmVMCSettings.cxx | 2 +-
sim/transport/steer/CbmVMCSettings.h | 2 +-
tutorials/TaskToAlgo/CbmStsHitProducerIdealAlgo.cxx | 2 +-
tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx | 2 +-
tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx | 2 +-
tutorials/TaskToAlgo/CbmTemplateAlgo.cxx | 2 +-
313 files changed, 352 insertions(+), 346 deletions(-)
diff --git a/MQ/histoServer/CMakeLists.txt b/MQ/histoServer/CMakeLists.txt
index 189fbff313..a338e1bdab 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 cefb6a5e22..22d0b0f84d 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 0ec75bbed1..7604d68d62 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 a70169740c..142c438608 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 c8d90b5fd5..383431039e 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 4a28206293..c9643df51d 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 d6b9e5bf1b..8fce675503 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 4e4f791fdc..1943a528e6 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 d9c1fb2e7d..03a8cc5fd7 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 61f29cf594..f2bb2bf603 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 8495c80be5..40e315d762 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 5b17e12b48..0a4476c206 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 c05c5f569b..7bbf7aee7e 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 86ddcca6c0..359abde845 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 ec4aacf0ad..213b025086 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 8ef5b6558a..ba9bef25cf 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 97ead1b203..31841fc646 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 1096b7a444..250d33f643 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 80591216cc..4c50b9bb7f 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 89358379ef..35458c9c93 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 37d8657551..04928e529a 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 c225ffa61d..d26edb02a1 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 9f07f72624..c1d9ade460 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 c503ce5da3..6ac21ae632 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 bd9ad69bb4..20d0bafd99 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 82799a606d..fc95ae5564 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 2cfdff7d74..c0e1eefae2 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 96b5a159eb..7bcddacf1a 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 ce1409d6ae..c60fa16fad 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 c3dc5e4a24..7f1894c22d 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 d22dcd890a..8a8553d9a6 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 e4a2c4e340..9c3da669f8 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 1334ab85a7..08586b0aab 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 a70f6f5ef1..b20806a7c8 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 79e287020f..52eb8c81b6 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 7b78439a88..b86c26fb36 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 e81849aa4d..51247cf7c7 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 c879b5771a..3a9949ac20 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 18a5ab491a..248dd9efd9 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 b26ae81ad8..927ba7017c 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 fec7060999..bf039f0b90 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 733a404ce6..5d26f38538 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 dd015dea5e..a9e392822a 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 1a50272771..f8e2d02290 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 19e803afae..734e1c6084 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 67a915adc2..223a0598a5 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 d08e0b1b9a..07677aa05d 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 2b1b184035..e9f4fcd11c 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 f7fcb659fb..5e102b188b 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 dad0260457..5b5416a6e1 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 2f5860a9b2..3b33e65709 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 05c1fbe1b9..649f80e159 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 2682685a05..31b5d4f180 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 2d64bee367..0c6fee18f9 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 09c2d0a90f..12a9b0f605 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 22ac0e4ec0..d7e61eeae9 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 0c0d4c78c9..ba9446e84a 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 504de9f878..fbc976de94 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 3063a5bbd7..5a215d42b3 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 954879c432..81de745f43 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 29a18389c1..ece0cb42e1 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 ffbab96cca..86611a3a04 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 9b5283cd45..febf765bfe 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 84e8628bb9..67a1a29aaf 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 70f9892d73..dc83892c44 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 d66490c858..1eeaf16a45 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 4f9ebccd3c..5bc81cfad4 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 466535a0f7..9f65385206 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 a80d869f15..fc4a5cc07c 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 420ce2a8ac..c8ec993c1b 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 6e0e85a771..1fa3cf9cd3 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 14b408a03b..931416f3f1 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 024c3b66b4..5a9b105f70 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 d4343b060c..92a063ffed 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 e1410f16da..a6cec4c2a6 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 adaf6e4499..1773ab6f59 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 5d8256ff43..0955d280ef 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 7955a18e54..6c8789ff98 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 41fa57c4d6..35dad23576 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 df72b0c936..e5bf10a7eb 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 2c22ffb52f..86716abb2c 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 bc5f0a9c24..13c03b9559 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 36b79ee641..bac486c9d9 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 3a6ba9b3c9..b360d4e98f 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 b7a59d51eb..c4759b0102 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 332ab444d2..370557e6d4 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 e96ca00ade..d44f88576a 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 c3c98d6877..a5ebd0ad3a 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 526371f371..806c9d1d6b 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 8f7c20063a..c740bb2ab4 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 2891b4d9ef..00bc5509d0 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 80521e043b..acb2b1c7ea 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 20012d86dc..c78f127de2 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 bdfdfac290..37ae3fff72 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 56a4f34c5c..2a982c495a 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 d9fff1e555..a988f194f6 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 45d8dc22fb..339552d4df 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 98f3d2bb26..660f5f86de 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 b4e0267947..cd43a1ba07 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 b35f605334..a575adc4bc 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 0d5fbd41ac..eb09757d63 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 cbd9df7fad..efb3b94db6 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 dd24bc8135..a4bcaf74c1 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 e172131270..a2ff1e9df5 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 b54eb40eba..db68496aae 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 abf36c3a40..10e075639e 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 bd58b60e5a..3716fa66c3 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 801100ad4e..bc00e57baa 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 b05f20606d..9e50123981 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 12df210026..6dbce89622 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 1ca6c15e79..66aa45e087 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 6accef4b9b..ebe2dbbcd1 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 ba9b0712a7..8b72c22c14 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 c5940e970a..a86f0e55c1 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 fe83926c4b..74673c3909 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 3a05297197..6b98c8b61c 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 a687aef2e3..7341442ae7 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 971b779841..d96e4bab43 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 64fc4211f0..72b968a3ef 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 c3a7f90cf6..f138b4224e 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 c67eae149f..a03af02d77 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 d2cb0f0c2d..1eddbcf980 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 542455249d..d8333f025b 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 8d5059694c..1eb6dbc27d 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 6d054a5eb8..6377a1bd49 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 3e42ec0d9c..e8817f4221 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 ab09f0795b..c85d3b18d4 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 cdcc1f1cfd..eb996e7274 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 fb766fb55a..0dd89f4255 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 f412d0367f..eacdb5bec5 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 742261b674..ffbb82a23b 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 af06f1eefd..7107d6f751 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 1e1e229b0a..db02b2457e 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 3f35bd67de..db8c74b0f4 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 5132d801d0..9e9a19926a 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 a788a645bc..1b16a77606 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 d37d5f5fa6..3004da6a12 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 8416ea06d6..8fd22d28f0 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 70b9a39368..7ef4465d8c 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 9114f57e5b..b5717c7052 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 861b4c477b..e09b2352f5 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 6afc8f5beb..a6eaf8afee 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 3574413d5a..c4e060ae0c 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 23353307da..827dc1cbef 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 1de7fb8380..68a8c4cf9c 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 8bba5ddaa9..bd1cf46f4a 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 36fc7876a2..499a3b2131 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 87cbd73cfe..d55d1730e7 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 62613aa695..72e764ffd2 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 35e2dc0ad3..b5c9bc2398 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 ddb16f0f4e..23050d42e7 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 28ae219ea4..e1f7e8dcf7 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 63f3bffae8..4de774c246 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 110db892f9..6a339c9604 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 88c58aad45..8e9ad5596d 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 40fb17690d..8ce2887d84 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 c4da8780fc..584fd9d0db 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 ba02951e84..b307c81195 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 683a1f8e67..e542852aa4 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 af8c47e657..743097af7d 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 5fd266077b..d5dc6b2eec 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 e92f2a7da9..696c3c7746 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 58eb897e99..98fc7b8b2b 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 f01bdc155e..ecdfb8d6d6 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 42bcf9fb8f..18d707f037 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 c6a5e5c4f8..639998d4e0 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 13c85b393b..240bced642 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 b29bb7e501..647a2445a9 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 8046bcb2d9..f7ad02b437 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 70638ccdf8..926104ee1d 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 17b7dc6e28..1e781e3c66 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 0c04ab7a73..112a624e09 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 9999cab24c..aa07eea7fc 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 ca683c0e3e..91e748cd38 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 1070b15736..fc7707210f 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 3040170b0b..97d0720d73 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 d1224c9269..eef1cd41c3 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 f45f57aa36..ce5dd63ab3 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 286986d68a..c20ec348cc 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 9c6bbb1bcd..a7f3936ba3 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 54d11c68be..6e636f10d8 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 3a0e361ea2..19c78dc44e 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 532fa49572..c4f60139e3 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 0402444ea6..1e245c2660 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 e4c6498690..91330933b4 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 8f2448a75e..55e8d6ef3c 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 791927b5ca..8479a47088 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 874f344ef7..82003aafe0 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 70d4b8fa93..9f77789ad8 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 266b30eb71..3e0458a327 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 7bed714204..0a6ee6529e 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 d5e490f78e..c900aac48f 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 bc4892f888..b013bdcbb9 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 19625d6dc9..f2772e6317 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 cda2ca1cbd..f7e9fc844b 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 3d8b2f0c1c..025192b07f 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 1272fdae49..bf4c00d8fe 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 c3bc60e1fa..89225d91e1 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 00e1016204..abd873b1bf 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 4624ecaae4..55e3d1eabc 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 4c69891845..2eb7a15cc8 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 f2d1a9b614..b40c4a7a55 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 0d93679599..ea54887ec3 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 8bbf29dcde..26068d2448 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 399db90249..215ffa926b 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 b31a6e4d9a..05b758840e 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 3dd0d65da9..b3d29e581a 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 e1d9fb511b..8d926405a0 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 57740ad0e1..f03fa9765a 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 d2c883d4d4..2cb5ea094a 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 e211e744d1..936f50da40 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 49a8a3f3a0..a1d1f6627c 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 2dd05536a0..9890fffcab 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 fd6ed7524e..73df445db2 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 09426c39bd..7afae2f1fa 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 251e9584cd..002535c9cd 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 a1298bbbc1..da1c2afea5 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 f3939fe052..052027a77b 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 54a048424c..026f787a4b 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 1c33f4f71c..f6b3587153 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 bc6fc4fd68..e1c61ec5a0 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 fea21da2b8..bd621ada44 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 88ef9dfa57..194c1f0ddf 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 23a0c6c426..1c6ff72b60 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 0f4d4a594e..e2586adb98 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 b67b216af3..af9ddd83d6 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 afba76850f..01907ac66b 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 b2b83b41e6..e972b2590c 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 4637c9d6a3..63e8ba7079 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 55763679ec..91862f8d35 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 f0ea4855c7..ecaf1aa067 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 039e6f71e9..b0df65b868 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 87ea6dbd0a..b681026c78 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 071f0ee374..3be3941c50 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 c121f1a406..9c7b00c30a 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 695d0f4922..155fb30e47 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 1b9af2a76d..2571d8c752 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 118d0221fc..572c68d75e 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 f5b00d59d2..e84c78fb22 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 ecb64c6cd9..2ced44fb0a 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 e791c55b0c..1962f1b4dd 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 172820625c..70a51c90b7 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 f66ee5e894..2245e381d7 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 66233a46d3..f1e5a7f257 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 f85150adae..66b4aa4da3 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 2b861d734b..8510653284 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 73690b2e92..bb3327a5d1 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 84c87f37c4..6b89719e63 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 1f1aa6c620..cb26754e62 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 affd1187cf..8d73958af4 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 d89299331e..d38950c2bb 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 88a3a6c0b7..cbfddac45f 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 ce9ed1d90f..e4b2b20594 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 94fe264466..40f1b08636 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 046e2a6a5b..e3fb1126e1 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 4ab86db796..23ef92d80d 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 ef51944808..80602c3b5e 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 e9760f58ae..e6d2580b27 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 ab3be442b8..c20b94bbca 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 6e9df845ab..9c73c46a69 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 24167834b5..fb772f37dd 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 f2706b2cd5..27cf704dce 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 4b2259c667..e8414165eb 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 89732f05d9..a44a5dd590 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 0ab3812a31..1bfcc11836 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 b945957629..7d31940907 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 4674fb8490..3d0f089143 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 6d326854f6..169fadd7bb 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 186766fb28..9c16ace4c4 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 2b2b3a70e9..3834cf009c 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 dd38dc25e4..8fa12f51b0 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 3d75ee3db7..94dbbc9f97 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 ff6f046c89..5208b0ea5e 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 ad02f2d5a3..752d68becd 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 e1efbf67d3..507bf13152 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 fa8c3f0962..53c45401d8 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 66107cf8e0..1a83fe2db9 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 6029359aeb..d059c6cf6d 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 0ee08a7465..4795b3dae0 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 8a61334625..4f3fe78d6c 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 aa685c948c..363e2e079a 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 1b00a4dd83..563df0918f 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 5525fd0efa..4fa902b234 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 05f5e794b3..aae4df5340 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 4eba11aaff..4c7dad593b 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 bb45b57894..2286901aa8 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 63fe73ab40..15cd932a5a 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 ce8ac10542..a530b3c14c 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 9654e68934..971cf51341 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 782e60bf8d..0bdadd3899 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 eedea438d4..5a8ec494f2 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 6e576327a5..29bf9f24f1 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 2deae62824..ab841fd3c6 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 87a7b9a27e..2dac61acff 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 e3c280246e..791fcf1b86 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 90d22bc6d9..93dcd07edf 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 476ad6442d..a51b92b944 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 56e686a516..835484f9a3 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 c180a4c0f0..ce394931dd 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 acb4bd792d..93ee8fa5d8 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 535db2bd71..3a7af7df10 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 d1f8093d99..1d17ba68e0 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 8c47edd942..ae15c68a6d 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 b3da278740..4860ac774b 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 4d984abbfa..9ec66e3d26 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 361cb3eed7..fc6bfd6408 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 bda591e26f..e0e71760f7 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 f142a3dfd7..34dc6d5cac 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 ce085a582b..f61df12fc7 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 a30bc57336..495526dbcd 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 253c565e1f..cc15d2be33 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 4ab4334909..44d5d50cf9 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 4006a251b9..b43f0f66a3 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() {}
--
GitLab