From 6ef57ee807763d2f9f4a8c2dd4504702805aa2c1 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 1 Apr 2021 15:57:20 +0200
Subject: [PATCH] Apply clang-format
---
MQ/histoServer/CbmHistoServer.cxx | 3 +-
MQ/histoServer/CbmMqHistoServer.cxx | 3 +-
.../format/unigen/NicaUnigenSource.cxx | 10 ++--
.../conversion/CbmAnaConversion.cxx | 17 +++---
.../conversion/CbmAnaConversionPhotons.cxx | 4 +-
.../conversion/CbmAnaConversionPhotons2.cxx | 4 +-
.../conversion/CbmAnaConversionRecoFull.cxx | 4 +-
.../conversion/CbmAnaConversionTest.cxx | 6 ++-
.../conversion/CbmAnaConversionTest2.cxx | 6 ++-
.../papaframework/fastsim/CbmFastSim.cxx | 2 +-
.../pi0eta/CbmKresSelectGoodEvents.cxx | 2 +-
analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx | 23 ++++----
analysis/detectors/tof/CbmTofAnaTestbeam.cxx | 5 +-
.../tof/CbmTofAnaTestbeam_Template.cxx | 2 +-
analysis/detectors/tof/CbmTofGeometryQa.cxx | 2 +-
analysis/detectors/tof/CbmTofHitFinderQa.cxx | 2 +-
.../detectors/tof/CbmTofHitFinderTBQA.cxx | 3 ++
analysis/detectors/tof/CbmTofTests.cxx | 2 +-
core/base/CbmDaq.cxx | 2 +-
core/base/CbmDigiManager.h | 19 +++----
core/base/CbmDigitize.h | 17 +++---
core/base/CbmHistManager.h | 4 +-
core/base/CbmMCDataArray.cxx | 2 +-
core/base/CbmMCDataManager.cxx | 2 +-
core/base/CbmMCDataObject.cxx | 7 +--
core/base/CbmMatchRecoToMC.cxx | 2 +-
core/base/CbmRadDamage.cxx | 7 +--
core/base/CbmReadoutBuffer.h | 4 +-
core/base/utils/CbmGeometryUtils.cxx | 7 +--
core/data/CbmEventStore.h | 15 +++---
core/data/CbmMCEventList.cxx | 3 +-
core/data/CbmTimeSlice.cxx | 9 ++--
core/data/base/CbmDigiBranch.h | 11 ++--
core/data/base/CbmDigiVector.h | 7 +--
core/data/much/CbmMuchAddress.h | 6 +--
core/data/much/CbmMuchPoint.cxx | 2 +-
core/data/mvd/CbmMvdDetectorId.h | 6 +--
core/data/mvd/CbmMvdPoint.cxx | 2 +-
core/data/psd/CbmPsdPoint.cxx | 2 +-
core/data/rich/CbmRichPoint.cxx | 2 +-
core/data/test/global/_GTestCbmVertex.cxx | 4 +-
core/data/tof/CbmTofTracklet.cxx | 2 +-
core/data/trd/CbmTrdPoint.cxx | 2 +-
core/detectors/much/CbmMcbm2018MuchPar.cxx | 2 +-
core/detectors/much/CbmMuchContFact.cxx | 2 +-
core/detectors/much/CbmMuchGeoScheme.cxx | 4 +-
core/detectors/much/CbmMuchSectorRadial.cxx | 4 +-
core/detectors/much/CbmMuchSegmentSector.cxx | 5 +-
core/detectors/psd/CbmMcbm2018PsdPar.cxx | 2 +-
core/detectors/rich/CbmMcbm2018RichPar.cxx | 2 +-
core/detectors/rich/CbmRichDigiMapManager.cxx | 4 +-
core/detectors/rich/CbmRichGeoManager.cxx | 4 +-
.../rich/CbmRichMCbmDigiMapManager.cxx | 3 +-
core/detectors/rich/CbmRichPmt.cxx | 9 ++--
core/detectors/rich/CbmRichRecGeoPar.h | 7 +--
core/detectors/sts/CbmMcbm2018StsPar.cxx | 2 +-
core/detectors/sts/CbmStsContFact.cxx | 2 +-
core/detectors/sts/CbmStsElement.cxx | 4 +-
core/detectors/sts/CbmStsModule.cxx | 5 +-
core/detectors/sts/CbmStsParSetSensorCond.cxx | 7 +--
core/detectors/sts/CbmStsPhysics.cxx | 4 +-
core/detectors/sts/CbmStsSetup.cxx | 6 +--
core/detectors/sts/CbmStsSetup.h | 10 ++--
core/detectors/sts/CbmStsStation.cxx | 3 +-
core/detectors/tof/CbmMcbm2018TofPar.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/trd/CbmTrdContFact.cxx | 2 +-
core/detectors/trd/CbmTrdFASP.cxx | 4 +-
core/detectors/trd/CbmTrdHardwareSetupR.cxx | 2 +-
core/detectors/trd/CbmTrdParModDigi.cxx | 3 +-
core/detectors/trd/CbmTrdParSetAsic.cxx | 5 +-
core/detectors/trd/CbmTrdParSetDigi.cxx | 5 +-
core/detectors/trd/CbmTrdParSetGain.cxx | 2 +-
core/detectors/trd/CbmTrdParSetGas.cxx | 2 +-
core/detectors/trd/CbmTrdParSetGeo.cxx | 3 +-
core/detectors/trd/CbmTrdParSpadic.cxx | 2 +-
core/detectors/trd/CbmTrdSPADIC.cxx | 7 +--
core/detectors/trd/CbmTrdUtils.cxx | 3 +-
core/eventdisplay/CbmEvDisTracks.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 | 7 +--
.../monitor/CbmCosy2019MonitorAlgoHodo.cxx | 2 +-
.../monitor/CbmCosy2019MonitorTaskHodo.cxx | 2 +-
.../cosy2019/parameter/CbmCosy2019HodoPar.cxx | 2 +-
.../unpacker/CbmCosy2019UnpackerTaskHodo.cxx | 2 +-
fles/mcbm2018/CbmMcbm2018Source.cxx | 4 +-
.../monitor/CbmCheckDataFormatGdpb2018.cxx | 6 +--
.../monitor/CbmMcbm2018MonitorAlgoPsd.cxx | 6 +--
.../monitor/CbmMcbm2018MonitorAlgoT0.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorAlgoTof.cxx | 3 +-
.../CbmMcbm2018MonitorAlgoTofPulser.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorDataRates.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorMcbmPulser.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorMcbmRate.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorMcbmSync.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorMuch.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorMuchLite.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorSts.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorStsPulser.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorStsSync.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorTaskPsd.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorTaskT0.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorTaskTof.cxx | 3 +-
.../CbmMcbm2018MonitorTaskTofPulser.cxx | 3 +-
.../monitor/CbmMcbm2018MonitorTof.cxx | 12 ++---
.../monitor/CbmMcbm2018MonitorTofPulser.cxx | 12 ++---
.../mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx | 6 +--
.../monitor/CbmMcbm2018TofTestFee.cxx | 12 ++---
fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx | 12 ++---
fles/mcbm2018/tasks/CbmCheckEvents.cxx | 4 +-
fles/mcbm2018/tasks/CbmCheckTiming.cxx | 2 +-
.../tasks/CbmMcbm2018EventBuilder.cxx | 18 +++----
.../tasks/CbmMcbm2019CheckDigisMuch.cxx | 2 +-
.../tasks/CbmMcbm2019CheckDigisSts.cxx | 2 +-
.../tasks/CbmMcbm2019CheckDtInDet.cxx | 4 +-
.../mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx | 4 +-
.../tasks/CbmMcbm2019CheckTimingPairs.cxx | 4 +-
.../CbmMcbm2019TimeWinEventBuilderAlgo.cxx | 2 +-
.../CbmMcbm2019TimeWinEventBuilderTask.cxx | 2 +-
.../mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx | 2 +-
.../unpacker/CbmMcbm2018RawConverterGdpb.cxx | 2 +-
.../unpacker/CbmMcbm2018RawConverterSdpb.cxx | 2 +-
.../unpacker/CbmMcbm2018UnpackerAlgoRich.cxx | 4 +-
.../unpacker/CbmMcbm2018UnpackerTaskMuch.cxx | 3 +-
.../unpacker/CbmMcbm2018UnpackerTaskPsd.cxx | 3 +-
.../unpacker/CbmMcbm2018UnpackerTaskRich.cxx | 2 +-
.../unpacker/CbmMcbm2018UnpackerTaskSts.cxx | 3 +-
.../unpacker/CbmMcbm2018UnpackerTaskTof.cxx | 3 +-
.../unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx | 3 +-
.../CbmStar2019EventBuilderEtof.cxx | 3 +-
.../CbmStar2019EventBuilderEtofAlgo.cxx | 3 +-
.../monitor/CbmStar2019MonitorAlgo.cxx | 3 +-
.../monitor/CbmStar2019MonitorPulserAlgo.cxx | 3 +-
.../monitor/CbmStar2019MonitorPulserTask.cxx | 3 +-
.../monitor/CbmStar2019MonitorTask.cxx | 3 +-
.../monitor/CbmStar2019MonitorTof.cxx | 11 ++--
.../star2019/monitor/CbmStar2019TofFeeThr.cxx | 5 +-
fles/star2019/parameter/CbmStar2019TofPar.cxx | 6 +--
mvd/CbmMvdDigitizer.cxx | 2 +-
mvd/CbmMvdDigitizerTB.cxx | 8 ++-
mvd/CbmMvdSensor.cxx | 2 +-
mvd/CbmMvdStationPar.cxx | 1 +
.../tasks/CbmMvdSensorClusterfinderTask.cxx | 2 +
.../tasks/CbmMvdSensorDigiToHitTask.cxx | 6 +--
.../tasks/CbmMvdSensorDigitizerTBTask.cxx | 2 +-
.../tasks/CbmMvdSensorDigitizerTask.cxx | 2 +-
mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx | 3 +-
.../tasks/CbmMvdSensorHitfinderTask.cxx | 3 +-
mvd/qa/CbmMvdClusterAna.cxx | 2 +-
mvd/qa/CbmMvdQa.cxx | 2 +-
mvd/tools/CbmMvdGeoHandler.cxx | 7 ++-
mvd/tools/readout/CbmMvdReadoutSimple.cxx | 3 +-
reco/KF/CbmKFParticleFinder.cxx | 4 +-
reco/KF/Interface/CbmTofTrackFitterKF.cxx | 4 +-
.../much/CbmMuchHitProducerIdeal.cxx | 4 +-
reco/detectors/psd/CbmPsdHitProducer.cxx | 20 +++----
reco/detectors/psd/CbmPsdMCbmHitProducer.cxx | 3 +-
reco/detectors/rich/CbmRichElectronIdAnn.cxx | 5 +-
reco/detectors/rich/CbmRichHitProducer.cxx | 3 +-
reco/detectors/rich/CbmRichReconstruction.cxx | 8 +--
.../rich/alignment/CbmHistManager.cxx | 6 ++-
.../rich/alignment/CbmRichAlignment.cxx | 9 ++--
.../rich/alignment/CbmRichCorrection.cxx | 9 ++--
.../alignment/CbmRichCorrectionVector.cxx | 9 ++--
.../rich/alignment/CbmRichMirror.cxx | 3 +-
...CbmRichMirrorMisalignmentCorrectionUtils.h | 1 +
.../CbmRichMirrorSortingAlignment.cxx | 3 +-
.../CbmRichMirrorSortingCorrection.cxx | 4 +-
.../rich/alignment/CbmRichNavigationUtil2.h | 3 +-
.../rich/alignment/CbmRichPMTMapping.cxx | 9 ++--
.../alignment/CbmRichProjectionProducer2.cxx | 6 ++-
.../CbmRichProjectionProducerAnalytical.cxx | 14 ++---
.../rich/alignment/CbmRichReconstruction.cxx | 8 +--
reco/detectors/rich/alignment/CbmRichUtil.h | 5 +-
.../rich/finder/CbmRichRingFinderHough.cxx | 1 +
.../rich/finder/CbmRichRingFinderIdeal.cxx | 3 +-
.../fitter/CbmRichRingFitterEllipseMinuit.cxx | 4 +-
.../rich/mcbm/CbmRichMCbmHitProducer.cxx | 3 +-
reco/detectors/rich/qa/CbmRichRecoTbQa.cxx | 33 ++++++------
.../CbmRichProjectionProducerAnalytical.cxx | 11 ++--
.../tracks/CbmRichProjectionProducerTGeo.cxx | 12 +++--
.../rich/utils/CbmRichNavigationUtil.h | 3 +-
reco/detectors/rich/utils/CbmRichUtil.h | 5 +-
reco/detectors/sts/CbmStsFindTracksQa.cxx | 2 +-
reco/detectors/tof/CbmTofBuildDigiEvents.cxx | 2 +-
reco/detectors/tof/CbmTofCalibrator.cxx | 2 +-
.../detectors/tof/CbmTofCosmicClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofEventClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofFindTracks.cxx | 8 ++-
reco/detectors/tof/CbmTofSimpClusterizer.cxx | 4 +-
reco/detectors/tof/CbmTofTBClusterizer.cxx | 5 +-
.../tof/CbmTofTestBeamClusterizer.cxx | 2 +-
reco/detectors/tof/CbmTofTrackFinderNN.cxx | 3 +-
reco/detectors/tof/CbmTofTrackletTools.cxx | 4 +-
reco/detectors/tof/LKFMinuit.cxx | 5 +-
reco/detectors/trd/CbmTrdClusterFinder.cxx | 1 -
reco/detectors/trd/CbmTrdModuleRecR.cxx | 7 +--
reco/detectors/trd/CbmTrdModuleRecT.cxx | 4 +-
reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx | 7 ++-
reco/detectors/trd/qa/CbmTrdRecoQa.cxx | 13 ++---
.../digis/CbmBuildEventsIdeal.cxx | 14 ++---
.../digis/CbmBuildEventsIdealNew.cxx | 19 +++----
reco/eventbuilder/digis/CbmBuildEventsQA.cxx | 2 +-
.../digis/CbmBuildEventsSimple.cxx | 12 ++---
reco/eventbuilder/digis/CbmEvBuildSource.cxx | 15 +++---
.../tracks/CbmBuildEventsFromTracksIdeal.cxx | 16 +++---
.../tracks/CbmBuildEventsFromTracksReal.cxx | 5 +-
reco/global/CbmFindPrimaryVertex.cxx | 2 +-
reco/global/CbmFindPrimaryVertexEvents.cxx | 6 ++-
reco/global/CbmPVFinderIdeal.cxx | 4 +-
.../cbm/qa/CbmLitCreateStandaloneData.cxx | 3 +-
.../reco/CbmLitFindGlobalTracksParallel.cxx | 18 ++++---
.../littrack/cbm/reco/CbmLitFindMvdTracks.cxx | 24 +++++----
reco/qa/CbmRecoQa.cxx | 54 +++++++++----------
.../CbmBinnedTrackerConfigurator.cxx | 5 +-
.../BinnedTracker/CbmBinnedTrackerTask.cxx | 5 +-
reco/tracking/global/CbmGlobalTrackingQA.cxx | 7 +--
.../tracking/global/CbmGlobalTrackingTask.cxx | 3 ++
reco/tracking/lx/CalcStats/CalcStats.cxx | 4 ++
.../GenNoiseElectrons/GenNoiseElectrons.cxx | 3 ++
reco/tracking/lx/TBBinned/LxTBMLTask.cxx | 10 ++--
reco/tracking/lx/TBBinned/LxTBTask.cxx | 7 ++-
reco/tracking/lx/TBBinned/LxTBTrdTask.cxx | 7 ++-
reco/tracking/vector/CbmMuchMergeVectors.cxx | 2 +-
reco/tracking/vector/CbmMuchToTrdVectors.cxx | 2 +-
sim/detectors/much/CbmMuchDigitizeGem.cxx | 2 +-
sim/detectors/psd/CbmPsdIdealDigitizer.cxx | 15 +++---
sim/detectors/psd/CbmPsdSimpleDigitizer.cxx | 19 +++----
sim/detectors/rich/CbmRichDigitizer.cxx | 6 ++-
sim/detectors/sts/CbmStsDigitize.cxx | 10 ++--
sim/detectors/sts/CbmStsDigitizeQa.cxx | 7 ++-
sim/detectors/sts/CbmStsMC.cxx | 16 +++---
.../sts/CbmStsSimSensorDssdStereo.cxx | 12 ++---
sim/detectors/sts/CbmStsSimSensorFactory.cxx | 2 +
sim/detectors/tof/CbmTofDigitize.cxx | 2 +-
sim/detectors/tof/CbmTofMergeMcPoints.cxx | 2 +-
sim/detectors/trd/CbmTrd.cxx | 2 +-
sim/detectors/trd/CbmTrdDigitizer.cxx | 9 ++--
sim/detectors/trd/CbmTrdModuleSim.cxx | 2 +
sim/detectors/trd/CbmTrdModuleSimT.cxx | 9 ++--
sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx | 9 ++--
sim/detectors/trd/qa/CbmTrdMCQa.cxx | 2 +-
sim/response/base/CbmDigitization.cxx | 5 +-
sim/response/base/CbmDigitization.h | 3 ++
sim/response/base/CbmDigitizationSource.h | 5 +-
sim/response/base/CbmMCInput.cxx | 4 +-
sim/response/base/CbmMCInputSet.cxx | 3 +-
sim/transport/base/CbmEventGenerator.cxx | 2 +-
sim/transport/base/CbmMCEventFilter.cxx | 1 +
sim/transport/base/CbmStackFilter.cxx | 2 +
.../generators/CbmPlutoGenerator.cxx | 2 +-
.../generators/CbmUnigenGenerator.cxx | 9 ++--
sim/transport/generators/unigen/URun.cxx | 4 +-
.../geosetup/CbmGeoSetupDbProvider.cxx | 8 +--
.../geosetup/CbmGeoSetupProvider.cxx | 8 +--
.../geosetup/CbmGeoSetupRepoProvider.cxx | 10 ++--
sim/transport/steer/CbmGeant4Settings.cxx | 2 +-
sim/transport/steer/CbmSetup.cxx | 9 ++--
sim/transport/steer/CbmSetup.h | 3 ++
sim/transport/steer/CbmTransport.cxx | 2 +-
sim/transport/steer/CbmVMCSettings.h | 4 +-
.../CbmStsHitProducerIdealWrapper.cxx | 12 ++---
.../TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx | 14 ++---
269 files changed, 807 insertions(+), 646 deletions(-)
diff --git a/MQ/histoServer/CbmHistoServer.cxx b/MQ/histoServer/CbmHistoServer.cxx
index 22d0b0f84d..684b55bef4 100644
--- a/MQ/histoServer/CbmHistoServer.cxx
+++ b/MQ/histoServer/CbmHistoServer.cxx
@@ -10,13 +10,14 @@
#include "CbmHistoServer.h"
//#include "CbmHistoCanvasDrawer.h"
#include <Logger.h>
-#include "RootSerializer.h"
#include "TH1.h"
#include "THttpServer.h"
#include "TMessage.h"
#include "TObjArray.h"
+#include "RootSerializer.h"
+
std::mutex mtx;
CbmHistoServer::CbmHistoServer()
diff --git a/MQ/histoServer/CbmMqHistoServer.cxx b/MQ/histoServer/CbmMqHistoServer.cxx
index 7604d68d62..87948380ff 100644
--- a/MQ/histoServer/CbmMqHistoServer.cxx
+++ b/MQ/histoServer/CbmMqHistoServer.cxx
@@ -9,9 +9,8 @@
#include "CbmFlesCanvasTools.h"
-#include "BoostSerializer.h"
-#include <Logger.h>
#include "FairMQProgOptions.h" // device->fConfig
+#include <Logger.h>
#include "TCanvas.h"
#include "TEnv.h"
diff --git a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
index 8fce675503..df71fd758a 100644
--- a/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
+++ b/analysis/PWGC2F/femtoscopy/nicafemto/format/unigen/NicaUnigenSource.cxx
@@ -7,14 +7,18 @@
* Warsaw University of Technology, Faculty of Physics
*/
#include "NicaUnigenSource.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
-#include "UEvent.h"
-#include "UParticle.h"
+#include <Logger.h>
+
#include <TBranch.h>
+
#include <fstream>
#include <iostream>
+#include "UEvent.h"
+#include "UParticle.h"
+
NicaUnigenSource::NicaUnigenSource()
: fUnigenChain(NULL), fFileName("data.root"), fEvent(NULL) {}
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
index 1943a528e6..072d1cf885 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
@@ -12,25 +12,24 @@
// includes of CBMROOT classes
#include "CbmDrawHist.h"
#include "CbmGlobalTrack.h"
+#include "CbmKFParticleFinder.h"
+#include "CbmKFParticleFinderQA.h"
+#include "CbmL1PFFitter.h"
#include "CbmMCTrack.h"
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
#include "CbmRichRing.h"
+#include "CbmStsKFTrackFitter.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
-#include "FairMCPoint.h"
-#include "FairTrackParam.h"
-
#include "CbmUtils.h"
-#include "CbmL1PFFitter.h"
-#include "CbmStsKFTrackFitter.h"
-#include "L1Field.h"
+#include "FairMCPoint.h"
+#include "FairTrackParam.h"
+#include <Logger.h>
-#include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
#include "KFParticleTopoReconstructor.h"
+#include "L1Field.h"
// includes of standard c++ classes or ROOT classes
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
index 03a8cc5fd7..d16d712d6d 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons.cxx
@@ -15,8 +15,10 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "L1Field.h"
//#include "CbmStsKFTrackFitter.h"
#include "CbmLitGlobalElectronId.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
index f2bb2bf603..749b31cd00 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionPhotons2.cxx
@@ -18,8 +18,10 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "L1Field.h"
//#include "CbmStsKFTrackFitter.h"
#include "CbmLitGlobalElectronId.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
index 40e315d762..04a22e6f44 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionRecoFull.cxx
@@ -29,8 +29,10 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "L1Field.h"
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
index 0a4476c206..e33afd8fe0 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest.cxx
@@ -18,13 +18,15 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
-#include "L1Field.h"
+#include <Logger.h>
#include <algorithm>
#include <map>
+#include "L1Field.h"
+
using namespace std;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
index 7bbf7aee7e..f67d393fb2 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionTest2.cxx
@@ -17,13 +17,15 @@
#include "CbmRichRing.h"
#include "CbmStsTrack.h"
#include "CbmTrackMatchNew.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
-#include "L1Field.h"
+#include <Logger.h>
#include <algorithm>
#include <map>
+#include "L1Field.h"
+
using namespace std;
diff --git a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
index 359abde845..3c3514ff9c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/fastsim/CbmFastSim.cxx
@@ -10,8 +10,8 @@
#include <string>
//Fair class headers
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
//#include "FairRunAna.h"
#include "FairRun.h"
#include "FairRuntimeDb.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
index 213b025086..af06c57f8f 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
@@ -15,9 +15,9 @@
#include "CbmMCTrack.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunSim.h"
+#include <Logger.h>
#include <iostream>
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index ba9bef25cf..adc4ce0472 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -5,16 +5,6 @@
#include <iostream>
using namespace std;
-#include "TClonesArray.h"
-#include "TFile.h"
-#include "TH1.h"
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TMath.h"
-#include "TROOT.h"
-#include "TRandom.h"
-#include "TString.h"
-
#include "CbmCluster.h"
#include "CbmDigiManager.h"
#include "CbmEvent.h"
@@ -42,11 +32,22 @@ using namespace std;
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmVertex.h"
-#include <Logger.h>
+
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
+#include <Logger.h>
+
+#include "TClonesArray.h"
+#include "TFile.h"
+#include "TH1.h"
+#include "TH1F.h"
+#include "TH2F.h"
+#include "TMath.h"
+#include "TROOT.h"
+#include "TRandom.h"
+#include "TString.h"
CbmDigiManager* fDigiMan; // TOF Input Digis
TClonesArray* fEventsColl; // CBMEvents (time based)
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
index 31841fc646..c8baf40417 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
@@ -39,11 +39,11 @@
// CBMroot classes and includes
// FAIR classes and includes
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
@@ -5249,8 +5249,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos() {
LOG(debug) << Form("no valid match in %d hits for Addr 0x%08x found ",
iNbMatchedHits,
pHitRef->GetAddress());
- if (fair::Logger::Logging(fair::Severity::debug1))
- LOG(fatal) << "Check for consistency!";
+ 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 250d33f643..ba82caa438 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam_Template.cxx
@@ -22,10 +22,10 @@
// FAIR classes and includes
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
diff --git a/analysis/detectors/tof/CbmTofGeometryQa.cxx b/analysis/detectors/tof/CbmTofGeometryQa.cxx
index 4c50b9bb7f..e1201af495 100644
--- a/analysis/detectors/tof/CbmTofGeometryQa.cxx
+++ b/analysis/detectors/tof/CbmTofGeometryQa.cxx
@@ -18,11 +18,11 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
diff --git a/analysis/detectors/tof/CbmTofHitFinderQa.cxx b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
index 35458c9c93..dfd5450153 100644
--- a/analysis/detectors/tof/CbmTofHitFinderQa.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
@@ -22,11 +22,11 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
index 04928e529a..b86444eb8c 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
@@ -5,12 +5,15 @@
*/
#include "CbmTofHitFinderTBQA.h"
+
#include "CbmMCDataManager.h"
#include "CbmMatch.h"
#include "CbmTofAddress.h"
#include "CbmTofHit.h"
#include "CbmTofPoint.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 d26edb02a1..4190a4f379 100644
--- a/analysis/detectors/tof/CbmTofTests.cxx
+++ b/analysis/detectors/tof/CbmTofTests.cxx
@@ -30,10 +30,10 @@
*/
// FAIR classes and includes
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
diff --git a/core/base/CbmDaq.cxx b/core/base/CbmDaq.cxx
index c1d9ade460..2a5f1fda79 100644
--- a/core/base/CbmDaq.cxx
+++ b/core/base/CbmDaq.cxx
@@ -11,10 +11,10 @@
#include "CbmTimeSlice.h" // for CbmTimeSlice, CbmTimeSlice::kEvent
#include <FairEventHeader.h> // for FairEventHeader
-#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
+#include <Logger.h> // for Logger, LOG, Severity, Severity::debug
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TStopwatch.h> // for TStopwatch
diff --git a/core/base/CbmDigiManager.h b/core/base/CbmDigiManager.h
index 6ac21ae632..eb9b229ce0 100644
--- a/core/base/CbmDigiManager.h
+++ b/core/base/CbmDigiManager.h
@@ -7,22 +7,23 @@
#ifndef CBMDIGIMANAGER_H
#define CBMDIGIMANAGER_H 1
+#include "CbmDefs.h" // for ECbmModuleId
+#include "CbmDigiBranchBase.h" // for CbmDigiBranchBase
+
+#include <FairTask.h> // for InitStatus
+#include <Logger.h> // for LOG
+
#include <Rtypes.h> // for THashConsistencyHolder, Cla...
#include <RtypesCore.h> // for UInt_t, Bool_t, Int_t, kTRUE
-#include <Logger.h> // for LOG
-#include <FairTask.h> // for InitStatus
-
#include <boost/any.hpp> // for any_cast, bad_any_cast (ptr...
#include <boost/exception/exception.hpp> // for clone_impl, error_info_inje...
-#include <assert.h> // for assert
-#include <iosfwd> // for string
-#include <map> // for map, map<>::mapped_type
-#include <vector> // for vector
+#include <iosfwd> // for string
+#include <map> // for map, map<>::mapped_type
+#include <vector> // for vector
-#include "CbmDefs.h" // for ECbmModuleId
-#include "CbmDigiBranchBase.h" // for CbmDigiBranchBase
+#include <assert.h> // for assert
class CbmMatch;
diff --git a/core/base/CbmDigitize.h b/core/base/CbmDigitize.h
index 20d0bafd99..052957b070 100644
--- a/core/base/CbmDigitize.h
+++ b/core/base/CbmDigitize.h
@@ -6,12 +6,16 @@
#ifndef CBMDIGITIZE_H
#define CBMDIGITIZE_H 1
-#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
-#include <RtypesCore.h> // for Double_t, Bool_t, ULong64_t, kFALSE, kTRUE
-
+#include "CbmDaq.h"
+#include "CbmDigitizeBase.h"
+#include "CbmMatch.h"
+#include "CbmTimeSlice.h"
-#include <Logger.h> // for LOG
#include <FairTask.h>
+#include <Logger.h> // for LOG
+
+#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
+#include <RtypesCore.h> // for Double_t, Bool_t, ULong64_t, kFALSE, kTRUE
#include <map>
#include <memory>
@@ -19,11 +23,6 @@
#include <string>
#include <utility>
-#include "CbmDaq.h"
-#include "CbmDigitizeBase.h"
-#include "CbmMatch.h"
-#include "CbmTimeSlice.h"
-
/** @class CbmDigitize
** @brief Base class template for CBM digitisation tasks
diff --git a/core/base/CbmHistManager.h b/core/base/CbmHistManager.h
index fc95ae5564..fca2e76427 100644
--- a/core/base/CbmHistManager.h
+++ b/core/base/CbmHistManager.h
@@ -8,6 +8,8 @@
#ifndef CBMHISTMANAGER_H_
#define CBMHISTMANAGER_H_
+#include <Logger.h> // for Logger, LOG
+
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for Double_t, Int_t, Bool_t, Option_t
#include <TCanvas.h> // iwyu: keep for RootCling
@@ -21,8 +23,6 @@
#include <TProfile.h> // for TProfile
#include <TProfile2D.h> // for TProfile2D
-#include <Logger.h> // for Logger, LOG
-
#include <cassert> // for assert
#include <map> // for map, __map_const_iterator, operator!=
#include <ostream> // for string, operator<<, ostream
diff --git a/core/base/CbmMCDataArray.cxx b/core/base/CbmMCDataArray.cxx
index c0e1eefae2..d1b4ff9102 100644
--- a/core/base/CbmMCDataArray.cxx
+++ b/core/base/CbmMCDataArray.cxx
@@ -3,8 +3,8 @@
**/
#include "CbmMCDataArray.h"
-#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
+#include <Logger.h> // for Logger, LOG
#include <TChain.h> // for TChain
#include <TClonesArray.h> // for TClonesArray
diff --git a/core/base/CbmMCDataManager.cxx b/core/base/CbmMCDataManager.cxx
index 7bcddacf1a..ca2599b18c 100644
--- a/core/base/CbmMCDataManager.cxx
+++ b/core/base/CbmMCDataManager.cxx
@@ -3,9 +3,9 @@
#include "CbmMCDataArray.h" // for CbmMCDataArray
#include "CbmMCDataObject.h" // for CbmMCDataObject
-#include <Logger.h>
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kFATAL, kSUCCESS
+#include <Logger.h>
#include <utility> // for pair
diff --git a/core/base/CbmMCDataObject.cxx b/core/base/CbmMCDataObject.cxx
index c60fa16fad..4b97634bf6 100644
--- a/core/base/CbmMCDataObject.cxx
+++ b/core/base/CbmMCDataObject.cxx
@@ -3,10 +3,11 @@
**/
#include "CbmMCDataObject.h"
-#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
-#include <TChain.h> // for TChain
-#include <TObject.h> // for TObject
+#include <Logger.h> // for Logger, LOG
+
+#include <TChain.h> // for TChain
+#include <TObject.h> // for TObject
#include <utility> // for pair
diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index 7f1894c22d..05a343284c 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -27,10 +27,10 @@
#include "CbmTrack.h" // for CbmTrack
#include "CbmTrackMatchNew.h" // for CbmTrackMatchNew
-#include <Logger.h> // for LOG, Logger
#include <FairMCPoint.h> // for FairMCPoint
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus
+#include <Logger.h> // for LOG, Logger
#include <TClonesArray.h> // for TClonesArray
diff --git a/core/base/CbmRadDamage.cxx b/core/base/CbmRadDamage.cxx
index 8a8553d9a6..3de6e131c4 100644
--- a/core/base/CbmRadDamage.cxx
+++ b/core/base/CbmRadDamage.cxx
@@ -5,9 +5,10 @@
#include "CbmRadDamage.h"
#include <Logger.h> // for LOG
-#include <TMath.h> // for Exp, Qe, K
-#include <TMathBase.h> // for Abs
-#include <TString.h> // for TString, operator+, operator<<
+
+#include <TMath.h> // for Exp, Qe, K
+#include <TMathBase.h> // for Abs
+#include <TString.h> // for TString, operator+, operator<<
#include <stdlib.h> // for getenv
diff --git a/core/base/CbmReadoutBuffer.h b/core/base/CbmReadoutBuffer.h
index 9c3da669f8..192745c2dd 100644
--- a/core/base/CbmReadoutBuffer.h
+++ b/core/base/CbmReadoutBuffer.h
@@ -8,11 +8,13 @@
#ifndef CBMREADOUTBUFFER_H
#define CBMREADOUTBUFFER_H 1
-#include <Logger.h>
#include <FairRootManager.h>
#include <FairWriteoutBuffer.h>
+#include <Logger.h>
+
#include <TClonesArray.h>
#include <TObject.h>
+
#include <cassert>
#include <map>
#include <vector>
diff --git a/core/base/utils/CbmGeometryUtils.cxx b/core/base/utils/CbmGeometryUtils.cxx
index 463934bde7..ccc305aa52 100644
--- a/core/base/utils/CbmGeometryUtils.cxx
+++ b/core/base/utils/CbmGeometryUtils.cxx
@@ -4,13 +4,13 @@
#include <FairGeoInterface.h> // for FairGeoInterface
#include <FairGeoLoader.h> // for FairGeoLoader
#include <FairGeoMedia.h> // for FairGeoMedia
-#include <Logger.h> // for LOG, Logger, Severity, Severity::debug
#include <FairModule.h> // for FairModule
-#include <TFile.h> // for TFile, gFile
+#include <Logger.h> // for LOG, Logger, Severity, Severity::debug
#include <RtypesCore.h> // for Bool_t, Int_t, kTRUE, kFALSE
#include <TCollection.h> // for TIter
#include <TDirectory.h> // for gDirectory, TDirectory (ptr only)
+#include <TFile.h> // for TFile, gFile
#include <TGeoManager.h> // for TGeoManager, gGeoManager
#include <TGeoMaterial.h> // for TGeoMaterial
#include <TGeoMatrix.h> // for TGeoMatrix
@@ -23,7 +23,8 @@
#include <TObject.h> // for TObject
#include <TString.h> // for TString, operator<, operator<<
-#include <map> // for map
+#include <map> // for map
+
#include <string.h> // for strcmp
diff --git a/core/data/CbmEventStore.h b/core/data/CbmEventStore.h
index b20806a7c8..2fea1ba501 100644
--- a/core/data/CbmEventStore.h
+++ b/core/data/CbmEventStore.h
@@ -7,21 +7,22 @@
#ifndef CBMEVENTSTORE_H
#define CBMEVENTSTORE_H 1
+#include "CbmDefs.h" // for kNofSystems
+#include "CbmDigiContainer.h" // for CbmDigiContainer
+#include "CbmDigiVector.h" // for CbmDigiVector
+
+#include <Logger.h> // for LOG
+
#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
#include <RtypesCore.h> // for UInt_t, Bool_t, kFALSE, kTRUE
#include <TObjArray.h> // for TObjArray
#include <TObject.h> // for TObject
-#include <Logger.h> // for LOG
-
#include <boost/any.hpp> // for any_cast
-#include <assert.h> // for assert
-#include <string> // for string
+#include <string> // for string
-#include "CbmDefs.h" // for kNofSystems
-#include "CbmDigiContainer.h" // for CbmDigiContainer
-#include "CbmDigiVector.h" // for CbmDigiVector
+#include <assert.h> // for assert
class CbmMatch;
diff --git a/core/data/CbmMCEventList.cxx b/core/data/CbmMCEventList.cxx
index 52eb8c81b6..eda5bdc2d5 100644
--- a/core/data/CbmMCEventList.cxx
+++ b/core/data/CbmMCEventList.cxx
@@ -12,9 +12,10 @@
#include <algorithm> // for lower_bound, sort
#include <cassert> // for assert
#include <iostream> // for operator<<, basic_ostream, stringstream
-#include <string.h> // for strcmp, size_t
#include <string> // for char_traits
+#include <string.h> // for strcmp, size_t
+
using std::lower_bound;
using std::string;
using std::stringstream;
diff --git a/core/data/CbmTimeSlice.cxx b/core/data/CbmTimeSlice.cxx
index 3a9949ac20..266a9860cf 100644
--- a/core/data/CbmTimeSlice.cxx
+++ b/core/data/CbmTimeSlice.cxx
@@ -14,11 +14,12 @@
#include <TNamed.h> // for TNamed
#include <TString.h> // for operator<<
+#include <iomanip> // for operator<<, setprecision
+#include <sstream> // for operator<<, basic_ostream, stringstream
+#include <string> // for char_traits
+#include <utility> // for pair
+
#include <assert.h> // for assert
-#include <iomanip> // for operator<<, setprecision
-#include <sstream> // for operator<<, basic_ostream, stringstream
-#include <string> // for char_traits
-#include <utility> // for pair
using std::fixed;
using std::setprecision;
diff --git a/core/data/base/CbmDigiBranch.h b/core/data/base/CbmDigiBranch.h
index 248dd9efd9..579afad18e 100644
--- a/core/data/base/CbmDigiBranch.h
+++ b/core/data/base/CbmDigiBranch.h
@@ -3,15 +3,16 @@
** @since 4 June 2019
**/
-#include <vector>
+#include "CbmDefs.h"
+#include "CbmDigiBranchBase.h"
+#include "CbmMatch.h"
-#include <Logger.h>
#include <FairRootManager.h>
+#include <Logger.h>
+
#include <TClonesArray.h>
-#include "CbmDefs.h"
-#include "CbmDigiBranchBase.h"
-#include "CbmMatch.h"
+#include <vector>
/** @brief Class template for CBM digi branches
** @author V. Friese <v.friese@gsi.de>
diff --git a/core/data/base/CbmDigiVector.h b/core/data/base/CbmDigiVector.h
index 927ba7017c..02852caaa1 100644
--- a/core/data/base/CbmDigiVector.h
+++ b/core/data/base/CbmDigiVector.h
@@ -8,12 +8,13 @@
#define CBMDIGIVECTOR_H 1
-#include <Logger.h>
-#include <vector>
-
#include "CbmDigiContainer.h"
#include "CbmMatch.h"
+#include <Logger.h>
+
+#include <vector>
+
/** @class CbmDigiVector
** @brief std::vector implementation of CbmDigiContainer
** @author Volker Friese <v.friese@gsi.de>
diff --git a/core/data/much/CbmMuchAddress.h b/core/data/much/CbmMuchAddress.h
index a9e392822a..408c370e5d 100644
--- a/core/data/much/CbmMuchAddress.h
+++ b/core/data/much/CbmMuchAddress.h
@@ -1,12 +1,12 @@
#ifndef CBMMUCHADDRESS_H
#define CBMMUCHADDRESS_H 1
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t, UInt_t
+#include "CbmAddress.h" // for CbmAddress
#include <Logger.h> // for Logger, LOG
-#include "CbmAddress.h" // for CbmAddress
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t, UInt_t
/** Enumerator for MUCH element levels
** If this is changed, the initialisation of the static members
diff --git a/core/data/much/CbmMuchPoint.cxx b/core/data/much/CbmMuchPoint.cxx
index f8e2d02290..34e774259e 100644
--- a/core/data/much/CbmMuchPoint.cxx
+++ b/core/data/much/CbmMuchPoint.cxx
@@ -10,8 +10,8 @@
#include "CbmMuchPoint.h"
-#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
+#include <Logger.h> // for Logger, LOG
#include <TMathBase.h> // for Abs
#include <TVector3.h> // for TVector3
diff --git a/core/data/mvd/CbmMvdDetectorId.h b/core/data/mvd/CbmMvdDetectorId.h
index 734e1c6084..b8ac68224b 100644
--- a/core/data/mvd/CbmMvdDetectorId.h
+++ b/core/data/mvd/CbmMvdDetectorId.h
@@ -21,12 +21,12 @@
#define CBMMVDDETECTORID_H 1
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t
+#include "CbmDefs.h" // for ECbmModuleId::kMvd
#include <Logger.h> // for LOG
-#include "CbmDefs.h" // for ECbmModuleId::kMvd
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t
class CbmMvdDetectorId {
diff --git a/core/data/mvd/CbmMvdPoint.cxx b/core/data/mvd/CbmMvdPoint.cxx
index e9f4fcd11c..4e8e933652 100644
--- a/core/data/mvd/CbmMvdPoint.cxx
+++ b/core/data/mvd/CbmMvdPoint.cxx
@@ -4,11 +4,11 @@
// -------------------------------------------------------------------------
#include "CbmMvdPoint.h"
-#include <Logger.h> // for Logger, LOG
#include <FairMCEventHeader.h> // for FairMCEventHeader
#include <FairMCPoint.h> // for FairMCPoint
#include <FairPrimaryGenerator.h> // for FairPrimaryGenerator
#include <FairRunSim.h> // for FairRunSim
+#include <Logger.h> // for Logger, LOG
#include <TVector3.h> // for TVector3
diff --git a/core/data/psd/CbmPsdPoint.cxx b/core/data/psd/CbmPsdPoint.cxx
index 5b5416a6e1..838926c4f3 100644
--- a/core/data/psd/CbmPsdPoint.cxx
+++ b/core/data/psd/CbmPsdPoint.cxx
@@ -5,8 +5,8 @@
#include "CbmPsdPoint.h"
-#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
+#include <Logger.h> // for Logger, LOG
#include <sstream> // for stringstream
diff --git a/core/data/rich/CbmRichPoint.cxx b/core/data/rich/CbmRichPoint.cxx
index 3b33e65709..0ddefbecda 100644
--- a/core/data/rich/CbmRichPoint.cxx
+++ b/core/data/rich/CbmRichPoint.cxx
@@ -5,8 +5,8 @@
#include "CbmRichPoint.h"
-#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
+#include <Logger.h> // for Logger, LOG
#include <TVector3.h> // for TVector3
diff --git a/core/data/test/global/_GTestCbmVertex.cxx b/core/data/test/global/_GTestCbmVertex.cxx
index 0c6fee18f9..eb1b93d9e9 100644
--- a/core/data/test/global/_GTestCbmVertex.cxx
+++ b/core/data/test/global/_GTestCbmVertex.cxx
@@ -5,11 +5,11 @@
#include <TMatrixTSym.h>
#include <TVector3.h>
+#include <regex>
+
#include <gtest/gtest-spi.h>
#include <gtest/gtest.h>
-#include <regex>
-
#include "../compareVertex.h"
TEST(_GTestCbmVertex, CheckDefaultConstructor) {
diff --git a/core/data/tof/CbmTofTracklet.cxx b/core/data/tof/CbmTofTracklet.cxx
index d7e61eeae9..4050a4fc9e 100644
--- a/core/data/tof/CbmTofTracklet.cxx
+++ b/core/data/tof/CbmTofTracklet.cxx
@@ -7,8 +7,8 @@
#include "CbmTofHit.h" // for CbmTofHit
-#include <Logger.h> // for Logger, LOG
#include <FairTrackParam.h> // for FairTrackParam
+#include <Logger.h> // for Logger, LOG
#include <TMath.h> // for Power, Sqrt
#include <TObject.h> // for TObject
diff --git a/core/data/trd/CbmTrdPoint.cxx b/core/data/trd/CbmTrdPoint.cxx
index 81de745f43..f7f805eb62 100644
--- a/core/data/trd/CbmTrdPoint.cxx
+++ b/core/data/trd/CbmTrdPoint.cxx
@@ -5,8 +5,8 @@
#include "CbmTrdPoint.h"
-#include <Logger.h> // for Logger, LOG
#include <FairMCPoint.h> // for FairMCPoint
+#include <Logger.h> // for Logger, LOG
#include <TVector3.h> // for TVector3
diff --git a/core/detectors/much/CbmMcbm2018MuchPar.cxx b/core/detectors/much/CbmMcbm2018MuchPar.cxx
index 86611a3a04..ee5ec38169 100644
--- a/core/detectors/much/CbmMcbm2018MuchPar.cxx
+++ b/core/detectors/much/CbmMcbm2018MuchPar.cxx
@@ -7,9 +7,9 @@
#include "CbmMcbm2018MuchPar.h"
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TMath.h"
#include "TString.h"
diff --git a/core/detectors/much/CbmMuchContFact.cxx b/core/detectors/much/CbmMuchContFact.cxx
index febf765bfe..5453415e95 100644
--- a/core/detectors/much/CbmMuchContFact.cxx
+++ b/core/detectors/much/CbmMuchContFact.cxx
@@ -13,8 +13,8 @@
#include "CbmMcbm2018MuchPar.h" // for CbmMcbm2018MuchPar
#include <FairContFact.h> // for FairContainer
-#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for LOG
#include <TList.h> // for TList
#include <TString.h> // for TString
diff --git a/core/detectors/much/CbmMuchGeoScheme.cxx b/core/detectors/much/CbmMuchGeoScheme.cxx
index 67a1a29aaf..ed588498e0 100644
--- a/core/detectors/much/CbmMuchGeoScheme.cxx
+++ b/core/detectors/much/CbmMuchGeoScheme.cxx
@@ -30,13 +30,13 @@
#include <TObject.h> // for TObject
#include <TVector3.h> // for TVector3
-
#include <cassert> // for assert
-#include <math.h> // for sqrt
#include <stdexcept> // for out_of_range
#include <utility> // for pair
#include <vector>
+#include <math.h> // for sqrt
+
using std::vector;
CbmMuchGeoScheme* CbmMuchGeoScheme::fInstance = nullptr;
diff --git a/core/detectors/much/CbmMuchSectorRadial.cxx b/core/detectors/much/CbmMuchSectorRadial.cxx
index 5bc81cfad4..ce2203e36b 100644
--- a/core/detectors/much/CbmMuchSectorRadial.cxx
+++ b/core/detectors/much/CbmMuchSectorRadial.cxx
@@ -11,10 +11,10 @@
#include "CbmMuchAddress.h" // for CbmMuchAddress, kMuchChannel
#include "CbmMuchPadRadial.h" // for CbmMuchPadRadial
-#include <TMath.h> // for Ceil, Floor, Pi, TwoPi
-
#include <Logger.h> // for Logger, LOG
+#include <TMath.h> // for Ceil, Floor, Pi, TwoPi
+
#include <vector> // for vector
diff --git a/core/detectors/much/CbmMuchSegmentSector.cxx b/core/detectors/much/CbmMuchSegmentSector.cxx
index 9f65385206..86f5f4db4f 100644
--- a/core/detectors/much/CbmMuchSegmentSector.cxx
+++ b/core/detectors/much/CbmMuchSegmentSector.cxx
@@ -17,9 +17,9 @@
#include "CbmMuchSectorRadial.h" // for CbmMuchSectorRadial
#include "CbmMuchStation.h" // for CbmMuchStation
-#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
+#include <Logger.h> // for LOG
#include <TArc.h> // for TArc
#include <TCanvas.h> // for TCanvas
@@ -29,10 +29,11 @@
#include <TSystem.h> // for TSystem, gSystem
#include <TVector3.h> // for TVector3
+#include <vector> // for vector
+
#include <math.h> // for sqrt
#include <stdio.h> // for printf, fprintf, fclose
#include <string.h> // for strcat, strlen, strncpy
-#include <vector> // for vector
using std::ifstream;
using std::string;
diff --git a/core/detectors/psd/CbmMcbm2018PsdPar.cxx b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
index fc4a5cc07c..9e76569efa 100644
--- a/core/detectors/psd/CbmMcbm2018PsdPar.cxx
+++ b/core/detectors/psd/CbmMcbm2018PsdPar.cxx
@@ -7,9 +7,9 @@
#include "CbmMcbm2018PsdPar.h"
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TString.h"
diff --git a/core/detectors/rich/CbmMcbm2018RichPar.cxx b/core/detectors/rich/CbmMcbm2018RichPar.cxx
index c8ec993c1b..598746b141 100644
--- a/core/detectors/rich/CbmMcbm2018RichPar.cxx
+++ b/core/detectors/rich/CbmMcbm2018RichPar.cxx
@@ -8,8 +8,8 @@
#include "CbmMcbm2018RichPar.h"
// FairRoot
-#include <Logger.h>
#include "FairParamList.h"
+#include <Logger.h>
// C/C++
#include <iomanip>
diff --git a/core/detectors/rich/CbmRichDigiMapManager.cxx b/core/detectors/rich/CbmRichDigiMapManager.cxx
index 1fa3cf9cd3..7c3c2af778 100644
--- a/core/detectors/rich/CbmRichDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichDigiMapManager.cxx
@@ -17,10 +17,10 @@
#include <TGeoVolume.h> // for TGeoVolume
#include <TRandom.h> // for TRandom, gRandom
+#include <string> // for operator<, stoul
+#include <utility> // for pair
#include <stddef.h> // for size_t
-#include <string> // for operator<, stoul
-#include <utility> // for pair
using namespace std;
diff --git a/core/detectors/rich/CbmRichGeoManager.cxx b/core/detectors/rich/CbmRichGeoManager.cxx
index 931416f3f1..6c29d5521c 100644
--- a/core/detectors/rich/CbmRichGeoManager.cxx
+++ b/core/detectors/rich/CbmRichGeoManager.cxx
@@ -22,14 +22,14 @@
#include <TString.h> // for TString, operator==
#include <TVector3.h> // for TVector3
-
#include <algorithm> // for sort
#include <map> // for map, __map_iterator, map<>::iterator
-#include <stddef.h> // for size_t
#include <string> // for operator<, operator+
#include <utility> // for pair
#include <vector> // for vector
+#include <stddef.h> // for size_t
+
using namespace std;
CbmRichGeoManager::CbmRichGeoManager() : fGP(nullptr) { InitGeometry(); }
diff --git a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
index 5a9b105f70..6805385709 100644
--- a/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
+++ b/core/detectors/rich/CbmRichMCbmDigiMapManager.cxx
@@ -19,10 +19,11 @@
#include <TString.h> // for TString
#include <iostream> // for string, operator<<, basic_ostream
-#include <stddef.h> // for size_t
#include <string> // for operator<, stoul
#include <utility> // for pair
+#include <stddef.h> // for size_t
+
using namespace std;
CbmRichMCbmDigiMapManager::CbmRichMCbmDigiMapManager()
diff --git a/core/detectors/rich/CbmRichPmt.cxx b/core/detectors/rich/CbmRichPmt.cxx
index 92a063ffed..dc28967cdd 100644
--- a/core/detectors/rich/CbmRichPmt.cxx
+++ b/core/detectors/rich/CbmRichPmt.cxx
@@ -12,13 +12,14 @@
#include "CbmRichRecGeoPar.h" // for CbmRichRecGeoPar
#include <Logger.h> // for LOG, Logger
-#include <TAxis.h> // for TAxis
-#include <TRandom.h> // for TRandom, gRandom
-#include <TGraph.h> // for TGraph
+#include <TAxis.h> // for TAxis
+#include <TGraph.h> // for TGraph
+#include <TRandom.h> // for TRandom, gRandom
+
+#include <utility> // for pair
#include <stddef.h> // for size_t
-#include <utility> // for pair
using namespace std;
diff --git a/core/detectors/rich/CbmRichRecGeoPar.h b/core/detectors/rich/CbmRichRecGeoPar.h
index a6cec4c2a6..1c39144793 100644
--- a/core/detectors/rich/CbmRichRecGeoPar.h
+++ b/core/detectors/rich/CbmRichRecGeoPar.h
@@ -11,13 +11,14 @@
#ifndef CBM_RICH_REC_GEO_PAR
#define CBM_RICH_REC_GEO_PAR
+#include <Logger.h> // for LOG
+
#include <RtypesCore.h> // for Double_t, Bool_t
#include <TMath.h> // for Pi, Abs, IsNaN, Min, Max
#include <TVector3.h> // for TVector3
-#include <Logger.h> // for LOG
-#include <map> // for map
-#include <string> // for string
+#include <map> // for map
+#include <string> // for string
enum CbmRichGeometryType {
CbmRichGeometryTypeNotDefined = 0,
diff --git a/core/detectors/sts/CbmMcbm2018StsPar.cxx b/core/detectors/sts/CbmMcbm2018StsPar.cxx
index 1773ab6f59..cd83b090b0 100644
--- a/core/detectors/sts/CbmMcbm2018StsPar.cxx
+++ b/core/detectors/sts/CbmMcbm2018StsPar.cxx
@@ -6,9 +6,9 @@
#include "CbmMcbm2018StsPar.h"
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TMath.h"
#include "TString.h"
diff --git a/core/detectors/sts/CbmStsContFact.cxx b/core/detectors/sts/CbmStsContFact.cxx
index 0955d280ef..d12a37683b 100644
--- a/core/detectors/sts/CbmStsContFact.cxx
+++ b/core/detectors/sts/CbmStsContFact.cxx
@@ -10,9 +10,9 @@
#include "CbmStsParSetSensorCond.h" // for CbmStsParSetSensorCond
#include "CbmStsParSim.h" // for CbmStsParSim
-#include <Logger.h> // for Logger, LOG
#include <FairParSet.h> // for FairParSet
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for Logger, LOG
#include <TList.h> // for TList
#include <TString.h> // for TString
diff --git a/core/detectors/sts/CbmStsElement.cxx b/core/detectors/sts/CbmStsElement.cxx
index 6c8789ff98..63a6b7255e 100644
--- a/core/detectors/sts/CbmStsElement.cxx
+++ b/core/detectors/sts/CbmStsElement.cxx
@@ -4,11 +4,11 @@
**/
#include "CbmStsElement.h"
-#include <Logger.h> // for Logger, LOG
-
#include "CbmStsModule.h" // for CbmStsModule
#include "CbmStsSetup.h" // for CbmStsSetup
+#include <Logger.h> // for Logger, LOG
+
#include <TGeoManager.h> // for gGeoManager
#include <TGeoNode.h> // for TGeoNode
#include <TGeoPhysicalNode.h> // for TGeoPhysicalNode
diff --git a/core/detectors/sts/CbmStsModule.cxx b/core/detectors/sts/CbmStsModule.cxx
index 35dad23576..9264131e22 100644
--- a/core/detectors/sts/CbmStsModule.cxx
+++ b/core/detectors/sts/CbmStsModule.cxx
@@ -15,9 +15,10 @@
#include <TGeoNode.h> // for TGeoNode
#include <TGeoPhysicalNode.h> // for TGeoPhysicalNode
+#include <ostream> // for operator<<, basic_ostream, stringstream
+#include <string> // for string
+
#include <assert.h> // for assert
-#include <ostream> // for operator<<, basic_ostream, stringstream
-#include <string> // for string
using namespace std;
diff --git a/core/detectors/sts/CbmStsParSetSensorCond.cxx b/core/detectors/sts/CbmStsParSetSensorCond.cxx
index 13c03b9559..a5d33f2d72 100644
--- a/core/detectors/sts/CbmStsParSetSensorCond.cxx
+++ b/core/detectors/sts/CbmStsParSetSensorCond.cxx
@@ -11,10 +11,11 @@
#include <TString.h> // for TString, operator<<, operator+, ope...
#include <TSystem.h> // for TSystem, gSystem
+#include <sstream> // for operator<<, fstream, stringstream
+#include <string> // for char_traits
+#include <utility> // for pair
+
#include <assert.h> // for assert
-#include <sstream> // for operator<<, fstream, stringstream
-#include <string> // for char_traits
-#include <utility> // for pair
using std::string;
diff --git a/core/detectors/sts/CbmStsPhysics.cxx b/core/detectors/sts/CbmStsPhysics.cxx
index b360d4e98f..7670debf43 100644
--- a/core/detectors/sts/CbmStsPhysics.cxx
+++ b/core/detectors/sts/CbmStsPhysics.cxx
@@ -6,6 +6,7 @@
#include "CbmStsPhysics.h"
#include "CbmStsDefs.h" // for CbmSts, kProtonMass, kSiCharge, kSiDe...
+#include "CbmStsPhysics.h"
#include <Logger.h> // for Logger, LOG
@@ -18,10 +19,9 @@
#include <fstream> // for ifstream, basic_istream, right
#include <iomanip> // for setw, __iom_t6
-#include <math.h> // for log, sqrt
#include <utility> // for pair
-#include "CbmStsPhysics.h"
+#include <math.h> // for log, sqrt
using std::ifstream;
using std::map;
diff --git a/core/detectors/sts/CbmStsSetup.cxx b/core/detectors/sts/CbmStsSetup.cxx
index f88cc0b47b..36e290711d 100644
--- a/core/detectors/sts/CbmStsSetup.cxx
+++ b/core/detectors/sts/CbmStsSetup.cxx
@@ -14,9 +14,9 @@
#include "CbmStsSensor.h" // for CbmStsSensor
#include "CbmStsStation.h" // for CbmStsStation
-#include <FairField.h> // for FairField
-#include <Logger.h> // for FairLogger
-#include <FairRun.h> // for FairRun
+#include <FairField.h> // for FairField
+#include <FairRun.h> // for FairRun
+#include <Logger.h> // for FairLogger
#include <TCollection.h> // for TIter
#include <TDirectory.h> // for TDirectory, gDirectory
diff --git a/core/detectors/sts/CbmStsSetup.h b/core/detectors/sts/CbmStsSetup.h
index 370557e6d4..939f3f11dd 100644
--- a/core/detectors/sts/CbmStsSetup.h
+++ b/core/detectors/sts/CbmStsSetup.h
@@ -7,20 +7,20 @@
#ifndef CBMSTSSETUP_H
#define CBMSTSSETUP_H 1
-#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
-#include <RtypesCore.h> // for Int_t, Double_t, Bool_t, UInt_t, UChar_t
+#include "CbmStsElement.h" // for CbmStsElement
+#include "CbmStsSensor.h" // for CbmStsSensor
#include <Logger.h> // for LOG
+#include <Rtypes.h> // for THashConsistencyHolder, ClassDef
+#include <RtypesCore.h> // for Int_t, Double_t, Bool_t, UInt_t, UChar_t
+
#include <map> // for map, __map_const_iterator, operator!=
#include <set> // for set
#include <string> // for string
#include <utility> // for pair
#include <vector> // for vector
-#include "CbmStsElement.h" // for CbmStsElement
-#include "CbmStsSensor.h" // for CbmStsSensor
-
class CbmStsModule;
class CbmStsParSetModule;
class CbmStsParSetSensor;
diff --git a/core/detectors/sts/CbmStsStation.cxx b/core/detectors/sts/CbmStsStation.cxx
index d44f88576a..de7aa26f4b 100644
--- a/core/detectors/sts/CbmStsStation.cxx
+++ b/core/detectors/sts/CbmStsStation.cxx
@@ -21,10 +21,11 @@
#include <TNamed.h> // for TNamed
#include <cassert> // for assert
-#include <math.h> // for atan2
#include <sstream> // for operator<<, basic_ostream, stringstream
#include <string> // for char_traits
+#include <math.h> // for atan2
+
using std::string;
using std::stringstream;
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index a5ebd0ad3a..36ba8dca30 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -6,9 +6,9 @@
#include "CbmMcbm2018TofPar.h"
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TString.h"
diff --git a/core/detectors/tof/CbmTofContFact.cxx b/core/detectors/tof/CbmTofContFact.cxx
index c740bb2ab4..17647b635c 100644
--- a/core/detectors/tof/CbmTofContFact.cxx
+++ b/core/detectors/tof/CbmTofContFact.cxx
@@ -15,8 +15,8 @@
#include "CbmTofDigiPar.h" // for CbmTofDigiPar
#include <FairContFact.h> // for FairContainer
-#include <Logger.h> // for LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for LOG
#include <TList.h> // for TList
#include <TString.h> // for TString
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.cxx b/core/detectors/tof/CbmTofCreateDigiPar.cxx
index 00bc5509d0..dd695af157 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.cxx
+++ b/core/detectors/tof/CbmTofCreateDigiPar.cxx
@@ -4,11 +4,11 @@
#include "CbmTofDigiPar.h" // for CbmTofDigiPar
#include "CbmTofGeoHandler.h" // for CbmTofGeoHandler, k07a, k12b, k14a
-#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
+#include <Logger.h> // for LOG, Logger
#include <TArrayD.h> // for TArrayD
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.cxx b/core/detectors/tof/CbmTofDigiBdfPar.cxx
index acb2b1c7ea..746fbdfa92 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.cxx
+++ b/core/detectors/tof/CbmTofDigiBdfPar.cxx
@@ -6,9 +6,9 @@
#include "CbmTofAddress.h" // for CbmTofAddress
-#include <Logger.h> // for LOG, Logger
#include <FairParGenericSet.h> // for FairParGenericSet
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for LOG, Logger
#include <TArrayD.h> // for TArrayD
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/tof/CbmTofDigiPar.cxx b/core/detectors/tof/CbmTofDigiPar.cxx
index c78f127de2..5cd87afc48 100644
--- a/core/detectors/tof/CbmTofDigiPar.cxx
+++ b/core/detectors/tof/CbmTofDigiPar.cxx
@@ -2,9 +2,9 @@
#include "CbmTofCell.h" // for CbmTofCell
-#include <Logger.h> // for LOG, Logger
#include <FairParGenericSet.h> // for FairParGenericSet
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for LOG, Logger
#include <TArrayD.h> // for TArrayD
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdContFact.cxx b/core/detectors/trd/CbmTrdContFact.cxx
index 2a982c495a..b8a6f91b40 100644
--- a/core/detectors/trd/CbmTrdContFact.cxx
+++ b/core/detectors/trd/CbmTrdContFact.cxx
@@ -18,8 +18,8 @@
#include "CbmTrdParSetGeo.h" // for CbmTrdParSetGeo
#include <FairContFact.h> // for FairContainer
-#include <Logger.h> // for Logger, LOG
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for Logger, LOG
#include <TList.h> // for TList
#include <TString.h> // for TString
diff --git a/core/detectors/trd/CbmTrdFASP.cxx b/core/detectors/trd/CbmTrdFASP.cxx
index a988f194f6..a9912f531f 100644
--- a/core/detectors/trd/CbmTrdFASP.cxx
+++ b/core/detectors/trd/CbmTrdFASP.cxx
@@ -15,11 +15,11 @@
#include <TString.h> // for Form, TString
#include <TVirtualPad.h> // for TVirtualPad
-
#include <iostream> // for operator<<, basic_ostream, cout, ostream
+#include <utility> // for pair, make_pair
+
#include <stdio.h> // for printf, size_t
#include <string.h> // for memcpy, memset, strcmp
-#include <utility> // for pair, make_pair
#define VERBOSE 0
#define DRAW 0
diff --git a/core/detectors/trd/CbmTrdHardwareSetupR.cxx b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
index cd43a1ba07..dac6999c21 100644
--- a/core/detectors/trd/CbmTrdHardwareSetupR.cxx
+++ b/core/detectors/trd/CbmTrdHardwareSetupR.cxx
@@ -15,10 +15,10 @@
#include "CbmTrdParSetAsic.h" // for CbmTrdParSetAsic
#include "CbmTrdParSpadic.h" // for CbmTrdParSpadic
-#include <Logger.h> // for Logger, LOG
#include <FairParAsciiFileIo.h> // for FairParAsciiFileIo
#include <FairParamList.h> // for FairParamList
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for Logger, LOG
#include <TArrayI.h> // for TArrayI
#include <TString.h> // for Form, TString
diff --git a/core/detectors/trd/CbmTrdParModDigi.cxx b/core/detectors/trd/CbmTrdParModDigi.cxx
index efb3b94db6..547ef1b34b 100644
--- a/core/detectors/trd/CbmTrdParModDigi.cxx
+++ b/core/detectors/trd/CbmTrdParModDigi.cxx
@@ -9,7 +9,8 @@
#include <TString.h> // for TString
#include <TVector3.h> // for TVector3
-#include <iomanip> // for setprecision, __iom_t5
+#include <iomanip> // for setprecision, __iom_t5
+
#include <math.h> // for fabs
#include <stdio.h> // for printf
#include <string.h> // for strcmp
diff --git a/core/detectors/trd/CbmTrdParSetAsic.cxx b/core/detectors/trd/CbmTrdParSetAsic.cxx
index a2ff1e9df5..ad7197e9ac 100644
--- a/core/detectors/trd/CbmTrdParSetAsic.cxx
+++ b/core/detectors/trd/CbmTrdParSetAsic.cxx
@@ -5,17 +5,18 @@
#include "CbmTrdParMod.h" // for CbmTrdParMod
#include "CbmTrdParSpadic.h" // for CbmTrdParSpadic, NSPADICCH
-#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for Logger, LOG
#include <TArrayI.h> // for TArrayI
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TString.h> // for Form
+#include <utility> // for pair
+
#include <stdint.h> // for uint64_t
#include <stdio.h> // for printf
#include <string.h> // for strcmp
-#include <utility> // for pair
using std::map;
//_______________________________________________________________________________
diff --git a/core/detectors/trd/CbmTrdParSetDigi.cxx b/core/detectors/trd/CbmTrdParSetDigi.cxx
index db68496aae..1bbf21e9b0 100644
--- a/core/detectors/trd/CbmTrdParSetDigi.cxx
+++ b/core/detectors/trd/CbmTrdParSetDigi.cxx
@@ -3,8 +3,8 @@
#include "CbmTrdParMod.h" // for CbmTrdParMod
#include "CbmTrdParModDigi.h" // for CbmTrdParModDigi
-#include <Logger.h> // for LOG, Severity, Severity::debug
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for LOG, Severity, Severity::debug
#include <TArrayD.h> // for TArrayD
#include <TArrayI.h> // for TArrayI
@@ -102,8 +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 (fair::Logger::Logging(fair::Severity::debug))
- fModuleMap[moduleId[i]]->Print();
+ 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 10e075639e..502bc645c1 100644
--- a/core/detectors/trd/CbmTrdParSetGain.cxx
+++ b/core/detectors/trd/CbmTrdParSetGain.cxx
@@ -1,7 +1,7 @@
#include "CbmTrdParSetGain.h"
-#include <Logger.h> // for LOG, Logger
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for LOG, Logger
#include <TArrayI.h> // for TArrayI
diff --git a/core/detectors/trd/CbmTrdParSetGas.cxx b/core/detectors/trd/CbmTrdParSetGas.cxx
index ae80e4aabf..31b9f39340 100644
--- a/core/detectors/trd/CbmTrdParSetGas.cxx
+++ b/core/detectors/trd/CbmTrdParSetGas.cxx
@@ -2,8 +2,8 @@
#include "CbmTrdParModGas.h" // for CbmTrdParModGas
-#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for Logger, LOG
#include <TArrayI.h> // for TArrayI
#include <TDirectory.h> // for TDirectory (ptr only), gDirectory
diff --git a/core/detectors/trd/CbmTrdParSetGeo.cxx b/core/detectors/trd/CbmTrdParSetGeo.cxx
index bc00e57baa..de93883a38 100644
--- a/core/detectors/trd/CbmTrdParSetGeo.cxx
+++ b/core/detectors/trd/CbmTrdParSetGeo.cxx
@@ -12,9 +12,10 @@
#include <TString.h> // for operator+, TString, Form, TString::kI...
#include <map> // for map, map<>::const_iterator, operator!=
-#include <stdio.h> // for printf
#include <utility> // for pair
+#include <stdio.h> // for printf
+
//________________________________________________________________________________________
CbmTrdParSetGeo::CbmTrdParSetGeo(const char* name,
const char* title,
diff --git a/core/detectors/trd/CbmTrdParSpadic.cxx b/core/detectors/trd/CbmTrdParSpadic.cxx
index 9e50123981..e01a518e03 100644
--- a/core/detectors/trd/CbmTrdParSpadic.cxx
+++ b/core/detectors/trd/CbmTrdParSpadic.cxx
@@ -2,8 +2,8 @@
#include "CbmTrdDefs.h" // for eCbmTrdModuleTypes, eCbmTrdModuleType...
-#include <Logger.h> // for Logger, LOG
#include <FairParamList.h> // for FairParamList
+#include <Logger.h> // for Logger, LOG
#include <TArrayI.h> // for TArrayI
#include <TString.h> // for Form
diff --git a/core/detectors/trd/CbmTrdSPADIC.cxx b/core/detectors/trd/CbmTrdSPADIC.cxx
index 66aa45e087..1e80591db8 100644
--- a/core/detectors/trd/CbmTrdSPADIC.cxx
+++ b/core/detectors/trd/CbmTrdSPADIC.cxx
@@ -6,11 +6,11 @@
#include "CbmTrdParModDigi.h" // for CbmTrdParModDigi
#include "CbmTrdParSetDigi.h" // for CbmTrdParSetDigi
-#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
+#include <Logger.h> // for LOG, Logger
#include <TAxis.h> // for TAxis
#include <TCanvas.h> // for TCanvas
@@ -18,12 +18,13 @@
#include <TGenericClassInfo.h> // for TGenericClassInfo
#include <TH1.h> // for TH1D
-#include <cmath> // for pow, exp
#include <list> // for list, list<>::iterator, operator!=
#include <map> // for map, operator!=, map<>::iterator, __m...
-#include <stdio.h> // for printf
#include <utility> // for pair, make_pair
+#include <cmath> // for pow, exp
+#include <stdio.h> // for printf
+
CbmTrdSPADIC::CbmTrdSPADIC()
: FairTask("TrdSPADIC", 1)
, fSpadicResponse(nullptr)
diff --git a/core/detectors/trd/CbmTrdUtils.cxx b/core/detectors/trd/CbmTrdUtils.cxx
index ebe2dbbcd1..f50f707fb2 100644
--- a/core/detectors/trd/CbmTrdUtils.cxx
+++ b/core/detectors/trd/CbmTrdUtils.cxx
@@ -25,9 +25,10 @@
#include <TProfile.h> // for TProfile
#include <iostream> // for operator<<, cout, ostream, basic_ostream
-#include <stdio.h> // for printf
#include <utility> // for pair
+#include <stdio.h> // for printf
+
using std::cout;
using std::endl;
using std::flush;
diff --git a/core/eventdisplay/CbmEvDisTracks.cxx b/core/eventdisplay/CbmEvDisTracks.cxx
index 8b72c22c14..f2ebb7cb0d 100644
--- a/core/eventdisplay/CbmEvDisTracks.cxx
+++ b/core/eventdisplay/CbmEvDisTracks.cxx
@@ -13,9 +13,9 @@
#include "CbmTofTracklet.h" // for CbmTofTracklet
#include <FairEventManager.h> // for FairEventManager
-#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kERROR, kSUCCESS
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for ClassImp
#include <TClonesArray.h> // for TClonesArray
diff --git a/core/eventdisplay/CbmPointSetArrayDraw.cxx b/core/eventdisplay/CbmPointSetArrayDraw.cxx
index 6b98c8b61c..4c49c0da11 100644
--- a/core/eventdisplay/CbmPointSetArrayDraw.cxx
+++ b/core/eventdisplay/CbmPointSetArrayDraw.cxx
@@ -10,9 +10,9 @@
#include "CbmTofHit.h" // for CbmTofHit
#include <FairEventManager.h> // for FairEventManager
-#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kSUCCESS
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for kRed, ClassImp
#include <TClonesArray.h> // for TClonesArray
diff --git a/core/eventdisplay/CbmRecoTracks.cxx b/core/eventdisplay/CbmRecoTracks.cxx
index 7341442ae7..308d9ebff6 100644
--- a/core/eventdisplay/CbmRecoTracks.cxx
+++ b/core/eventdisplay/CbmRecoTracks.cxx
@@ -19,10 +19,10 @@
#include "CbmTrack.h" // for CbmTrack
#include <FairEventManager.h> // for FairEventManager
-#include <Logger.h> // for LOG, Logger
#include <FairRootManager.h> // for FairRootManager
#include <FairTask.h> // for FairTask, InitStatus, kERROR, kSUCCESS
#include <FairTrackParam.h> // for FairTrackParam
+#include <Logger.h> // for LOG, Logger
#include <Rtypes.h> // for ClassImp
#include <TClonesArray.h> // for TClonesArray
diff --git a/core/eventdisplay/CbmTrdDigiDraw.cxx b/core/eventdisplay/CbmTrdDigiDraw.cxx
index d96e4bab43..c0f276ea28 100644
--- a/core/eventdisplay/CbmTrdDigiDraw.cxx
+++ b/core/eventdisplay/CbmTrdDigiDraw.cxx
@@ -10,10 +10,10 @@
#include "CbmTrdParSetDigi.h" // for CbmTrdParSetDigi
#include <FairEventManager.h> // for FairEventManager
-#include <Logger.h> // for Logger, LOG
#include <FairRootManager.h> // for FairRootManager
#include <FairRunAna.h> // for FairRunAna
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for Logger, LOG
#include <TClonesArray.h> // for TClonesArray
#include <TEveBoxSet.h> // for TEveBoxSet, TEveBoxSet::kBT_AABox
diff --git a/core/field/CbmFieldContFact.cxx b/core/field/CbmFieldContFact.cxx
index 72b968a3ef..20ec36cdb2 100644
--- a/core/field/CbmFieldContFact.cxx
+++ b/core/field/CbmFieldContFact.cxx
@@ -7,8 +7,8 @@
#include "CbmFieldPar.h" // for CbmFieldPar
#include <FairContFact.h> // for FairContainer
-#include <Logger.h> // for LOG, Logger
#include <FairRuntimeDb.h> // for FairRuntimeDb
+#include <Logger.h> // for LOG, Logger
#include <TList.h> // for TList
#include <TString.h> // for TString
diff --git a/core/field/CbmFieldMap.cxx b/core/field/CbmFieldMap.cxx
index f138b4224e..94b3a0e03d 100644
--- a/core/field/CbmFieldMap.cxx
+++ b/core/field/CbmFieldMap.cxx
@@ -9,16 +9,17 @@
#include "CbmFieldMapData.h" // for CbmFieldMapData
#include "CbmFieldPar.h" // for CbmFieldPar
-#include <FairField.h> // for FairField
-#include <Logger.h> // for LOG, Logger
+#include <FairField.h> // for FairField
+#include <Logger.h> // for LOG, Logger
#include <TArrayF.h> // for TArrayF
#include <TFile.h> // for TFile, gFile
#include <TMath.h> // for Nint
-#include <assert.h> // for assert
#include <iomanip> // for operator<<, setw
#include <iostream> // for operator<<, basic_ostream, endl, ost...
+
+#include <assert.h> // for assert
#include <stdlib.h> // for div, div_t, getenv, exit
using std::cerr;
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
index a03af02d77..9c2805a0ba 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorAlgoHodo.cxx
@@ -11,11 +11,11 @@
//#include "CbmCosy2019HodoPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
diff --git a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
index 1eddbcf980..55d1d2a72a 100644
--- a/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
+++ b/fles/cosy2019/monitor/CbmCosy2019MonitorTaskHodo.cxx
@@ -11,12 +11,12 @@
//#include "CbmCosy2019HodoPar.h"
//#include "CbmHodoDigi.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "THttpServer.h"
diff --git a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
index d8333f025b..89d5626ede 100644
--- a/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
+++ b/fles/cosy2019/parameter/CbmCosy2019HodoPar.cxx
@@ -6,9 +6,9 @@
#include "CbmCosy2019HodoPar.h"
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TMath.h"
#include "TString.h"
diff --git a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
index 1eb6dbc27d..14943f65b4 100644
--- a/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmCosy2019UnpackerTaskHodo.cxx
@@ -13,12 +13,12 @@
//#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "THttpServer.h"
diff --git a/fles/mcbm2018/CbmMcbm2018Source.cxx b/fles/mcbm2018/CbmMcbm2018Source.cxx
index e8817f4221..96cfb3220c 100644
--- a/fles/mcbm2018/CbmMcbm2018Source.cxx
+++ b/fles/mcbm2018/CbmMcbm2018Source.cxx
@@ -8,17 +8,17 @@
#include "CbmMcbm2018Source.h"
#include "CbmMcbmUnpack.h"
-#include "TimesliceMetaData.h"
#include "MicrosliceContents.hpp"
#include "Timeslice.hpp"
#include "TimesliceInputArchive.hpp"
+#include "TimesliceMetaData.h"
#include "TimesliceMultiInputArchive.hpp"
#include "TimesliceMultiSubscriber.hpp"
#include "TimesliceSubscriber.hpp"
-#include <Logger.h>
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
index c85d3b18d4..548f92f2a2 100644
--- a/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
+++ b/fles/mcbm2018/monitor/CbmCheckDataFormatGdpb2018.cxx
@@ -6,17 +6,16 @@
// -----------------------------------------------------------------------------
#include "CbmCheckDataFormatGdpb2018.h"
-#include "CbmMcbm2018TofPar.h"
#include "CbmFormatMsHeaderPrintout.h"
-
#include "CbmHistManager.h"
+#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -39,6 +38,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bCheckFormatGdpbResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index eb996e7274..2c4d82548d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -12,11 +12,11 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmMcbm2018PsdPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TGraph.h"
@@ -31,6 +31,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
@@ -358,8 +359,7 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts,
}
PsdData::PsdGbtReader PsdReader(pInBuff);
- if (fair::Logger::Logging(fair::Severity::debug))
- PsdReader.SetPrintOutMode(true);
+ if (fair::Logger::Logging(fair::Severity::debug)) PsdReader.SetPrintOutMode(true);
if (uSize > 0) {
while (PsdReader.GetTotalGbtWordsRead() < uNbMessages) {
int ReadResult = PsdReader.ReadEventFles();
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
index 0dd89f4255..ea2b7acf6c 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
@@ -13,11 +13,11 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
@@ -31,6 +31,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
index eacdb5bec5..5fd3594382 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTof.cxx
@@ -13,11 +13,11 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
@@ -32,6 +32,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
index ffbb82a23b..a077def84d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoTofPulser.cxx
@@ -10,11 +10,11 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
index 7107d6f751..7cb0bf4a0d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorDataRates.cxx
@@ -10,11 +10,11 @@
#include "CbmFlesHistosTools.h"
#include "CbmFormatMsHeaderPrintout.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -37,6 +37,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbmMoniDataRateResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
index db02b2457e..1282c35124 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmPulser.cxx
@@ -14,11 +14,11 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
index db8c74b0f4..f562d2b971 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmRate.cxx
@@ -16,11 +16,11 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
index 9e9a19926a..1f0c6cdcad 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMcbmSync.cxx
@@ -14,11 +14,11 @@
#include "CbmMcbm2018TofPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
index 1b16a77606..9b0c831a8e 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuch.cxx
@@ -15,11 +15,11 @@
#include "CbmMcbm2018MuchPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
index 3004da6a12..4364735d7d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorMuchLite.cxx
@@ -17,11 +17,11 @@
#include "CbmMcbm2018MuchPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
index 8fd22d28f0..724c21ca01 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorSts.cxx
@@ -16,11 +16,11 @@
#include "CbmMcbm2018StsPar.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
index 7ef4465d8c..4ec5cd3590 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsPulser.cxx
@@ -14,11 +14,11 @@
#include "CbmHistManager.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
index b5717c7052..6e1d392110 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorStsSync.cxx
@@ -14,11 +14,11 @@
#include "CbmHistManager.h"
// FairRoot
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Root
#include "TClonesArray.h"
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
index e09b2352f5..faad81cfce 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskPsd.cxx
@@ -11,12 +11,12 @@
#include "CbmMcbm2018MonitorAlgoPsd.h"
#include "CbmMcbm2018PsdPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "THttpServer.h"
@@ -29,6 +29,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018MonitorTaskPsdResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
index a6eaf8afee..e2d5db0a1a 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskT0.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018MonitorAlgoT0.h"
#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "THttpServer.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018MonitorTaskT0ResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
index c4e060ae0c..467aa9ba28 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTof.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018MonitorAlgoTof.h"
#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "THttpServer.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018MonitorTaskTofResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
index 827dc1cbef..fc91d37fe7 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTaskTofPulser.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018MonitorAlgoTofPulser.h"
#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "THttpServer.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018MonitorTaskTofPulserResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
index 68a8c4cf9c..01bc72d550 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTof.cxx
@@ -6,18 +6,17 @@
// -----------------------------------------------------------------------------
#include "CbmMcbm2018MonitorTof.h"
-#include "CbmMcbm2018TofPar.h"
#include "CbmFormatDecHexPrintout.h"
#include "CbmFormatMsHeaderPrintout.h"
-
#include "CbmHistManager.h"
+#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -40,6 +39,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbmMoniTofResetHistos = kFALSE;
@@ -2206,8 +2206,7 @@ Bool_t CbmMcbm2018MonitorTof::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
} // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
@@ -2649,8 +2648,7 @@ Bool_t CbmMcbm2018MonitorTof::DoUnpack(const fles::Timeslice& ts,
void CbmMcbm2018MonitorTof::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018MonitorTof::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
index bd1cf46f4a..ea5939a6a1 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
@@ -6,18 +6,17 @@
// -----------------------------------------------------------------------------
#include "CbmMcbm2018MonitorTofPulser.h"
-#include "CbmMcbm2018TofPar.h"
#include "CbmFormatDecHexPrintout.h"
#include "CbmFormatMsHeaderPrintout.h"
-
#include "CbmHistManager.h"
+#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -40,6 +39,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbmMoniTofPulserResetHistos = kFALSE;
@@ -884,8 +884,7 @@ Bool_t CbmMcbm2018MonitorTofPulser::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
} // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
@@ -1116,8 +1115,7 @@ Bool_t CbmMcbm2018MonitorTofPulser::DoUnpack(const fles::Timeslice& ts,
void CbmMcbm2018MonitorTofPulser::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018MonitorTofPulser::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
index 499a3b2131..6525d4018d 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofFeeThr.cxx
@@ -6,17 +6,16 @@
// -----------------------------------------------------------------------------
#include "CbmMcbm2018TofFeeThr.h"
-#include "CbmMcbm2018TofPar.h"
#include "CbmFormatMsHeaderPrintout.h"
-
#include "CbmHistManager.h"
+#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -39,6 +38,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018TofFeeThrResetHistos = kFALSE;
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
index d55d1730e7..b88fba045c 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018TofTestFee.cxx
@@ -6,19 +6,18 @@
// -----------------------------------------------------------------------------
#include "CbmMcbm2018TofTestFee.h"
-#include "CbmMcbm2018TofPar.h"
#include "CbmFlesHistosTools.h"
#include "CbmFormatDecHexPrintout.h"
#include "CbmFormatMsHeaderPrintout.h"
-
#include "CbmHistManager.h"
+#include "CbmMcbm2018TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -41,6 +40,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbmTofTestFeeResetHistos = kFALSE;
@@ -1112,8 +1112,7 @@ Bool_t CbmMcbm2018TofTestFee::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
} // if( fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging( fair::Severity::debug2 ) )
@@ -1325,8 +1324,7 @@ Bool_t CbmMcbm2018TofTestFee::DoUnpack(const fles::Timeslice& ts,
void CbmMcbm2018TofTestFee::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info)
<< "CbmMcbm2018TofTestFee::ProcessEpochCyle => "
// << Form( " TS %5llu MS %3lu In data 0x%016llX Cycle 0x%016llX",
diff --git a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
index 72e764ffd2..1c8510d4fc 100644
--- a/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckDigisNbCorr.cxx
@@ -9,11 +9,16 @@
#include "CbmDigiManager.h"
#include "CbmMuchBeamTimeDigi.h"
+#include "CbmMuchDigi.h"
+#include "CbmRichDigi.h"
+#include "CbmStsDigi.h"
+#include "CbmTofDigi.h"
+
#include "TimesliceMetaData.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -23,11 +28,6 @@
#include <TDirectory.h>
#include <TFile.h>
-#include "CbmMuchDigi.h"
-#include "CbmRichDigi.h"
-#include "CbmStsDigi.h"
-#include "CbmTofDigi.h"
-
#include <iomanip>
using std::fixed;
using std::setprecision;
diff --git a/fles/mcbm2018/tasks/CbmCheckEvents.cxx b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
index b5c9bc2398..b8e18bacd3 100644
--- a/fles/mcbm2018/tasks/CbmCheckEvents.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
@@ -15,9 +15,9 @@
#include "CbmStsDigi.h"
#include "CbmTofDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -26,9 +26,9 @@
#include "TProfile.h"
#include <TDirectory.h>
#include <TFile.h>
+#include <typeinfo>
#include <iomanip>
-#include <typeinfo>
using std::fixed;
using std::setprecision;
diff --git a/fles/mcbm2018/tasks/CbmCheckTiming.cxx b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
index 23050d42e7..65db603f79 100644
--- a/fles/mcbm2018/tasks/CbmCheckTiming.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckTiming.cxx
@@ -16,9 +16,9 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
index e1f7e8dcf7..5900816d33 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
@@ -7,9 +7,17 @@
********************************************************************************/
#include "CbmMcbm2018EventBuilder.h"
-#include <Logger.h>
+#include "CbmMuchBeamTimeDigi.h"
+#include "CbmMuchDigi.h"
+#include "CbmPsdDigi.h"
+#include "CbmRichDigi.h"
+#include "CbmStsDigi.h"
+#include "CbmTofDigi.h"
+#include "CbmTrdDigi.h"
+
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -18,14 +26,6 @@
#include <TDirectory.h>
#include <TFile.h>
-#include "CbmMuchBeamTimeDigi.h"
-#include "CbmMuchDigi.h"
-#include "CbmPsdDigi.h"
-#include "CbmRichDigi.h"
-#include "CbmStsDigi.h"
-#include "CbmTofDigi.h"
-#include "CbmTrdDigi.h"
-
#include <iomanip>
using std::fixed;
using std::make_pair;
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
index 4de774c246..c79c71a24a 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisMuch.cxx
@@ -10,9 +10,9 @@
#include "CbmDigiManager.h"
#include "CbmMuchBeamTimeDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
index 6a339c9604..64c12cda89 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDigisSts.cxx
@@ -10,9 +10,9 @@
#include "CbmDigiManager.h"
#include "CbmStsDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
index 8e9ad5596d..d37a1e202c 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckDtInDet.cxx
@@ -16,9 +16,9 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -27,10 +27,10 @@
#include "TProfile.h"
#include <TDirectory.h>
#include <TFile.h>
+#include <type_traits>
#include <iomanip>
#include <iostream>
-#include <type_traits>
using std::fixed;
using std::setprecision;
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
index 8ce2887d84..05617ad566 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckPulser.cxx
@@ -16,9 +16,9 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -27,10 +27,10 @@
#include "TProfile.h"
#include <TDirectory.h>
#include <TFile.h>
+#include <type_traits>
#include <iomanip>
#include <iostream>
-#include <type_traits>
using std::fixed;
using std::setprecision;
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
index 584fd9d0db..fba4779c48 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019CheckTimingPairs.cxx
@@ -10,9 +10,9 @@
#include "CbmDigiManager.h"
#include "CbmFlesHistosTools.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -21,10 +21,10 @@
#include "TProfile.h"
#include <TDirectory.h>
#include <TFile.h>
+#include <type_traits>
#include <iomanip>
#include <iostream>
-#include <type_traits>
using std::fixed;
using std::setprecision;
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index b307c81195..8f229e9b1e 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -21,9 +21,9 @@
#include "CbmDigiManager.h"
/// FAIRROOT headers
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
/// FAIRSOFT headers (geant, boost, ...)
#include "TCanvas.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index e542852aa4..09352bd1fe 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -9,9 +9,9 @@
#include "CbmEvent.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
index 743097af7d..cc207438f4 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
@@ -16,9 +16,9 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunOnline.h"
+#include <Logger.h>
#include "TH1.h"
#include "TH2.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
index 696c3c7746..b26a7dd693 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterGdpb.cxx
@@ -11,12 +11,12 @@
#include "CbmMcbm2018TofPar.h"
#include "CbmStsDigi.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include <iomanip>
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
index 98fc7b8b2b..bca9ffe622 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018RawConverterSdpb.cxx
@@ -11,12 +11,12 @@
#include "CbmMcbm2018StsPar.h"
#include "CbmStsDigi.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include <iomanip>
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index ecdfb8d6d6..44e859414a 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -60,11 +60,11 @@ fullTimeCorr = (T - AZ0R) - (AC2R-AC0R) + MSidx
#include "CbmMcbm2018UnpackerAlgoRich.h"
// ROOT
+#include <Logger.h>
+
#include <TCanvas.h>
#include <TList.h>
-#include <Logger.h>
-
// CbmRoot
#include "CbmMcbm2018RichPar.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
index 18d707f037..ec17d8cb4c 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskMuch.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018MuchPar.h"
#include "CbmMcbm2018UnpackerAlgoMuch.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "THttpServer.h"
@@ -27,6 +27,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018UnpackerTaskMuchResetHistos = kFALSE;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index 639998d4e0..8994c1bbcb 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -11,12 +11,12 @@
#include "CbmMcbm2018PsdPar.h"
#include "CbmMcbm2018UnpackerAlgoPsd.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -29,6 +29,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018UnpackerTaskPsdResetHistos = kFALSE;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
index 240bced642..a4a3dcd390 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskRich.cxx
@@ -16,12 +16,12 @@
#include <TROOT.h>
// FairRoot
-#include <Logger.h>
#include <FairParGenericSet.h>
#include <FairRootManager.h>
#include <FairRun.h>
#include <FairRunOnline.h>
#include <FairRuntimeDb.h>
+#include <Logger.h>
// CbmRoot
#include "CbmMcbm2018RichPar.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
index 647a2445a9..7c2c6e2c37 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskSts.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018StsPar.h"
#include "CbmMcbm2018UnpackerAlgoSts.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "THttpServer.h"
@@ -27,6 +27,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018UnpackerTaskStsResetHistos = kFALSE;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
index f7ad02b437..6e7eda88a1 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTof.cxx
@@ -10,12 +10,12 @@
#include "CbmMcbm2018TofPar.h"
#include "CbmMcbm2018UnpackerAlgoTof.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbm2018UnpackerTaskTofResetHistos = kFALSE;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
index 926104ee1d..44a1d9fa59 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskTrdR.cxx
@@ -1,11 +1,12 @@
#include "CbmMcbm2018UnpackerTaskTrdR.h"
+
#include "CbmMcbm2018UnpackerAlgoTrdR.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include <TFile.h>
#include <THttpServer.h>
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
index 1e781e3c66..efaabfb2eb 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtof.cxx
@@ -10,12 +10,12 @@
#include "CbmStar2019EventBuilderEtofAlgo.h"
#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH2.h"
@@ -29,6 +29,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bStarEtof2019EventBuilderResetHistos = kFALSE;
diff --git a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
index b41453dca1..6eabf542ee 100644
--- a/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
+++ b/fles/star2019/eventbuilder/CbmStar2019EventBuilderEtofAlgo.cxx
@@ -10,11 +10,11 @@
#include "CbmHistManager.h"
#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
@@ -27,6 +27,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
index aa07eea7fc..b1e8c40465 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorAlgo.cxx
@@ -12,11 +12,11 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include <TCanvas.h>
#include <TFile.h>
@@ -31,6 +31,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
index 91e748cd38..d14c82810d 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserAlgo.cxx
@@ -10,11 +10,11 @@
#include "CbmFormatMsHeaderPrintout.h"
#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TH1.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
// -------------------------------------------------------------------------
diff --git a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
index fc7707210f..8ed08b53e2 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorPulserTask.cxx
@@ -10,12 +10,12 @@
#include "CbmStar2019MonitorPulserAlgo.h"
#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TClonesArray.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bStar2019MonitorPulserTaskResetHistos = kFALSE;
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
index 97d0720d73..2385a12fd1 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTask.cxx
@@ -10,12 +10,12 @@
#include "CbmStar2019MonitorAlgo.h"
#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TCanvas.h"
#include "TClonesArray.h"
@@ -28,6 +28,7 @@
#include <fstream>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bStar2019MonitorTaskResetHistos = kFALSE;
diff --git a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
index 6e78960c77..255fb03792 100644
--- a/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
+++ b/fles/star2019/monitor/CbmStar2019MonitorTof.cxx
@@ -6,15 +6,15 @@
// -----------------------------------------------------------------------------
#include "CbmStar2019MonitorTof.h"
-#include "CbmStar2019TofPar.h"
#include "CbmHistManager.h"
+#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -36,6 +36,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bMcbmMoniTofResetHistos = kFALSE;
@@ -2048,8 +2049,7 @@ Bool_t CbmStar2019MonitorTof::DoUnpack(const fles::Timeslice& ts,
gdpbv100::Message mess(ulData);
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
mess.printDataCout();
fuRawDataPrintMsgIdx++;
}
@@ -2443,8 +2443,7 @@ Bool_t CbmStar2019MonitorTof::DoUnpack(const fles::Timeslice& ts,
void CbmStar2019MonitorTof::ProcessEpochCycle(uint64_t ulCycleData) {
uint64_t ulEpochCycleVal = ulCycleData & gdpbv100::kulEpochCycleFieldSz;
- if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb
- || fair::Logger::Logging(fair::Severity::debug2)) {
+ if (fuRawDataPrintMsgIdx < fuRawDataPrintMsgNb || fair::Logger::Logging(fair::Severity::debug2)) {
LOG(info) << "CbmMcbm2018MonitorTof::ProcessEpochCyle => "
<< Form(" TS %5lu MS %3lu In data 0x%016lX Cycle 0x%016lX",
fulCurrentTsIndex,
diff --git a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
index ce5dd63ab3..cbcc7a79cd 100644
--- a/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
+++ b/fles/star2019/monitor/CbmStar2019TofFeeThr.cxx
@@ -6,15 +6,15 @@
// -----------------------------------------------------------------------------
#include "CbmStar2019TofFeeThr.h"
-#include "CbmStar2019TofPar.h"
#include "CbmHistManager.h"
+#include "CbmStar2019TofPar.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRunOnline.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "Rtypes.h"
#include "TCanvas.h"
@@ -36,6 +36,7 @@
#include <ctime>
#include <iomanip>
#include <iostream>
+
#include <stdint.h>
Bool_t bStar2019TofFeeThrResetHistos = kFALSE;
diff --git a/fles/star2019/parameter/CbmStar2019TofPar.cxx b/fles/star2019/parameter/CbmStar2019TofPar.cxx
index c20ec348cc..932c0315b0 100644
--- a/fles/star2019/parameter/CbmStar2019TofPar.cxx
+++ b/fles/star2019/parameter/CbmStar2019TofPar.cxx
@@ -5,15 +5,15 @@
#include "CbmStar2019TofPar.h"
-#include "gDpbMessv100.h"
-
#include "FairDetParIo.h"
-#include <Logger.h>
#include "FairParIo.h"
#include "FairParamList.h"
+#include <Logger.h>
#include "TString.h"
+#include "gDpbMessv100.h"
+
// ----- Standard constructor ------------------------------------------
CbmStar2019TofPar::CbmStar2019TofPar(const char* name,
const char* title,
diff --git a/mvd/CbmMvdDigitizer.cxx b/mvd/CbmMvdDigitizer.cxx
index 6e636f10d8..1d9c47b935 100644
--- a/mvd/CbmMvdDigitizer.cxx
+++ b/mvd/CbmMvdDigitizer.cxx
@@ -15,9 +15,9 @@
#include "CbmMvdPoint.h"
// Includes from FAIR
-#include <Logger.h>
#include "FairModule.h"
#include "FairRootManager.h"
+#include <Logger.h>
// Includes from ROOT
#include "TClonesArray.h"
diff --git a/mvd/CbmMvdDigitizerTB.cxx b/mvd/CbmMvdDigitizerTB.cxx
index 19c78dc44e..81d07bd00d 100644
--- a/mvd/CbmMvdDigitizerTB.cxx
+++ b/mvd/CbmMvdDigitizerTB.cxx
@@ -4,14 +4,18 @@
// Includes from MVD
#include "CbmMvdDigitizerTB.h"
+
#include "CbmMvdDetector.h"
#include "CbmMvdPoint.h"
-#include <Logger.h>
+
#include "FairModule.h"
#include "FairRootManager.h"
-#include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
+#include <Logger.h>
+
#include "tools/CbmMvdGeoHandler.h"
+#include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
+
// Includes from ROOT
#include "TClonesArray.h"
#include "TStopwatch.h"
diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx
index c4f60139e3..851d3be403 100644
--- a/mvd/CbmMvdSensor.cxx
+++ b/mvd/CbmMvdSensor.cxx
@@ -23,11 +23,11 @@
/// includes from FairRoot
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairPrimaryGenerator.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include <Logger.h>
/// includes from C
#include <iostream>
diff --git a/mvd/CbmMvdStationPar.cxx b/mvd/CbmMvdStationPar.cxx
index 1e245c2660..491e57eb1c 100644
--- a/mvd/CbmMvdStationPar.cxx
+++ b/mvd/CbmMvdStationPar.cxx
@@ -8,6 +8,7 @@
#include <Logger.h>
#include <iostream>
+
#include <math.h>
using std::cout;
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index 91330933b4..7d1a49f317 100644
--- a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -4,7 +4,9 @@
// -------------------------------------------------------------------------
#include "CbmMvdSensorClusterfinderTask.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 55e8d6ef3c..cd5cb630ec 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -5,19 +5,19 @@
#include "CbmMvdSensorDigiToHitTask.h"
-#include "TClonesArray.h"
#include <Logger.h>
-#include "TObjArray.h"
-#include <cstring>
#include "TArrayD.h"
+#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TGeoTube.h"
#include "TObjArray.h"
#include "TRefArray.h"
#include <TMatrixD.h>
+#include <cstring>
+
using std::cout;
using std::endl;
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
index 8479a47088..c0d7012230 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
@@ -28,10 +28,10 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include <Logger.h>
// Includes from C++
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
index 82003aafe0..aec889cc72 100644
--- a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
@@ -28,10 +28,10 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include <Logger.h>
// Includes from C++
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
index 9f77789ad8..392eff8a31 100644
--- a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
@@ -13,11 +13,12 @@
// Includes from base
#include "CbmMCTrack.h"
+
#include "FairGeoNode.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Includes from ROOT
#include "TArrayD.h"
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index 3e0458a327..cd248a3f48 100644
--- a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -13,11 +13,12 @@
// Includes from base
#include "CbmMCTrack.h"
+
#include "FairGeoNode.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Includes from ROOT
#include "TArrayD.h"
diff --git a/mvd/qa/CbmMvdClusterAna.cxx b/mvd/qa/CbmMvdClusterAna.cxx
index 0a6ee6529e..02129a670d 100644
--- a/mvd/qa/CbmMvdClusterAna.cxx
+++ b/mvd/qa/CbmMvdClusterAna.cxx
@@ -25,8 +25,8 @@
//-- Include from Fair --//
-#include <Logger.h>
#include "FairTrackParam.h"
+#include <Logger.h>
//-- Include from Root --//
diff --git a/mvd/qa/CbmMvdQa.cxx b/mvd/qa/CbmMvdQa.cxx
index c900aac48f..bbc0436432 100644
--- a/mvd/qa/CbmMvdQa.cxx
+++ b/mvd/qa/CbmMvdQa.cxx
@@ -26,8 +26,8 @@
//-- Include from Fair --//
-#include <Logger.h>
#include "FairTrackParam.h"
+#include <Logger.h>
//-- Include from Root --//
diff --git a/mvd/tools/CbmMvdGeoHandler.cxx b/mvd/tools/CbmMvdGeoHandler.cxx
index b013bdcbb9..6871bdd55d 100644
--- a/mvd/tools/CbmMvdGeoHandler.cxx
+++ b/mvd/tools/CbmMvdGeoHandler.cxx
@@ -6,6 +6,8 @@
#include "CbmMvdGeoHandler.h"
+#include "CbmMvdDetector.h"
+#include "CbmMvdStationPar.h"
#include <Logger.h>
@@ -17,14 +19,11 @@
#include "TString.h"
#include "TVirtualMC.h"
-#include "CbmMvdDetector.h"
-#include "CbmMvdStationPar.h"
+#include <cstdlib>
#include "SensorDataSheets/CbmMvdMimosa26AHR.h"
#include "SensorDataSheets/CbmMvdMimosa34.h"
#include "SensorDataSheets/CbmMvdMimosis.h"
-
-#include <cstdlib>
using std::atoi;
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
index f7e9fc844b..4d4a21c8c0 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
@@ -15,9 +15,8 @@
//-- Include from Fair --//
-#include <Logger.h>
-
#include "FairTrackParam.h"
+#include <Logger.h>
//-- Include from Root --//
diff --git a/reco/KF/CbmKFParticleFinder.cxx b/reco/KF/CbmKFParticleFinder.cxx
index 025192b07f..037980b4f9 100644
--- a/reco/KF/CbmKFParticleFinder.cxx
+++ b/reco/KF/CbmKFParticleFinder.cxx
@@ -15,11 +15,11 @@
#include "L1Field.h"
//KF Particle headers
+#include <Logger.h>
+
#include "KFPTrackVector.h"
#include "KFParticleTopoReconstructor.h"
-#include <Logger.h>
-
//ROOT headers
#include "TClonesArray.h" //to get arrays from the FairRootManager
#include "TMath.h" //to calculate Prob function
diff --git a/reco/KF/Interface/CbmTofTrackFitterKF.cxx b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
index bf4c00d8fe..1f067127cc 100644
--- a/reco/KF/Interface/CbmTofTrackFitterKF.cxx
+++ b/reco/KF/Interface/CbmTofTrackFitterKF.cxx
@@ -6,11 +6,11 @@
#include "CbmKFTofHit.h"
#include "CbmKFTrack.h"
-
#include "CbmTofHit.h"
#include "CbmTofTracklet.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
index 89225d91e1..62af150f6c 100644
--- a/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
+++ b/reco/detectors/much/CbmMuchHitProducerIdeal.cxx
@@ -5,11 +5,13 @@
*/
#include "CbmMuchHitProducerIdeal.h"
+
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TFile.h"
diff --git a/reco/detectors/psd/CbmPsdHitProducer.cxx b/reco/detectors/psd/CbmPsdHitProducer.cxx
index abd873b1bf..f646df1753 100644
--- a/reco/detectors/psd/CbmPsdHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdHitProducer.cxx
@@ -2,23 +2,23 @@
// ----- CbmPsdHitProducer source file -----
// ----- Created 15/05/12 by Alla & SELIM -----
// -------------------------------------------------------------------------
-#include <fstream>
-#include <iostream>
-#include <map>
-
-#include "TClonesArray.h"
-#include "TMath.h"
-#include <TFile.h>
-
-#include "FairRootManager.h"
+#include "CbmPsdHitProducer.h"
#include "CbmDigiManager.h"
#include "CbmPsdDigi.h"
#include "CbmPsdHit.h"
-#include "CbmPsdHitProducer.h"
+#include "FairRootManager.h"
#include <Logger.h>
+#include "TClonesArray.h"
+#include "TMath.h"
+#include <TFile.h>
+
+#include <fstream>
+#include <iostream>
+#include <map>
+
using std::cout;
using std::endl;
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index 55e3d1eabc..7dfaf963e9 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -4,9 +4,10 @@
#include "CbmEvent.h"
#include "CbmPsdDigi.h"
#include "CbmPsdMCbmHit.h"
+
#include <Logger.h>
-#include "TClonesArray.h"
+#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/rich/CbmRichElectronIdAnn.cxx b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
index 2eb7a15cc8..e014a57317 100644
--- a/reco/detectors/rich/CbmRichElectronIdAnn.cxx
+++ b/reco/detectors/rich/CbmRichElectronIdAnn.cxx
@@ -6,12 +6,15 @@
**/
#include "CbmRichElectronIdAnn.h"
+
#include "CbmGlobalTrack.h"
#include "CbmRichGeoManager.h"
#include "CbmRichRing.h"
#include "CbmRichUtil.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TMath.h"
#include "TMultiLayerPerceptron.h"
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index b40c4a7a55..b285815a51 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -15,9 +15,10 @@
#include "CbmRichGeoManager.h"
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
+
#include <Logger.h>
-#include "TClonesArray.h"
+#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/rich/CbmRichReconstruction.cxx b/reco/detectors/rich/CbmRichReconstruction.cxx
index ea54887ec3..cc3b65e053 100644
--- a/reco/detectors/rich/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/CbmRichReconstruction.cxx
@@ -24,20 +24,20 @@
//#include "CbmL1RichENNRingFinderParallel.h"
//#include "prototype/CbmRichProtRingFinderHough.h"
+#include "CbmGlobalTrack.h"
+#include "CbmRichConverter.h"
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterCircle.h"
#include "CbmRichRingFitterEllipseMinuit.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingFitterRobustCOP.h"
#include "CbmRichRingFitterTAU.h"
-
#include "CbmRichRingTrackAssignClosestD.h"
-#include "CbmGlobalTrack.h"
-#include "CbmRichConverter.h"
#include "FairHit.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/rich/alignment/CbmHistManager.cxx b/reco/detectors/rich/alignment/CbmHistManager.cxx
index 26068d2448..1903233c07 100644
--- a/reco/detectors/rich/alignment/CbmHistManager.cxx
+++ b/reco/detectors/rich/alignment/CbmHistManager.cxx
@@ -6,7 +6,6 @@
*/
#include "CbmHistManager.h"
-#include "utils/CbmUtils.h"
#include <Logger.h>
@@ -22,14 +21,17 @@
#include "TProfile.h"
#include "TProfile2D.h"
-#include <algorithm>
#include <boost/regex.hpp>
+
+#include <algorithm>
#include <cassert>
#include <iostream>
#include <map>
#include <string>
#include <vector>
+#include "utils/CbmUtils.h"
+
using std::exception;
using std::map;
using std::sort;
diff --git a/reco/detectors/rich/alignment/CbmRichAlignment.cxx b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
index 215ffa926b..78da2a8b48 100644
--- a/reco/detectors/rich/alignment/CbmRichAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichAlignment.cxx
@@ -1,13 +1,14 @@
// ---------- Original Headers ---------- //
#include "CbmRichAlignment.h"
-#include <Logger.h>
-#include "FairRootManager.h"
-
-#include "TClonesArray.h"
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
+
+#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TCanvas.h"
+#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrection.cxx b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
index 05b758840e..e8c272f6e1 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrection.cxx
@@ -1,13 +1,14 @@
// ---------- Original Headers ---------- //
#include "CbmRichCorrection.h"
-#include <Logger.h>
-#include "FairRootManager.h"
-
-#include "TClonesArray.h"
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
+
+#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TCanvas.h"
+#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
diff --git a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
index b3d29e581a..14a05cf7dc 100644
--- a/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
+++ b/reco/detectors/rich/alignment/CbmRichCorrectionVector.cxx
@@ -1,13 +1,14 @@
// ---------- Original Headers ---------- //
#include "CbmRichCorrectionVector.h"
-#include <Logger.h>
-#include "FairRootManager.h"
-
-#include "TClonesArray.h"
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
+
+#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TCanvas.h"
+#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirror.cxx b/reco/detectors/rich/alignment/CbmRichMirror.cxx
index 8d926405a0..9f7181daa6 100644
--- a/reco/detectors/rich/alignment/CbmRichMirror.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirror.cxx
@@ -1,7 +1,8 @@
// ---------- Original Headers ---------- //
#include "CbmRichMirror.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
ClassImp(CbmRichMirror)
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
index f03fa9765a..e0b1cc16ed 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
+++ b/reco/detectors/rich/alignment/CbmRichMirrorMisalignmentCorrectionUtils.h
@@ -4,6 +4,7 @@
using namespace std;
using std::string;
#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 2cb5ea094a..eda5e80886 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingAlignment.cxx
@@ -1,6 +1,7 @@
#include "CbmRichMirrorSortingAlignment.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
// ----- PART 1 ----- //
#include "CbmGlobalTrack.h"
diff --git a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
index 936f50da40..93aff13f17 100644
--- a/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
+++ b/reco/detectors/rich/alignment/CbmRichMirrorSortingCorrection.cxx
@@ -1,6 +1,8 @@
#include "CbmRichMirrorSortingCorrection.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "alignment/CbmRichMirror.h"
// ----- PART 1 ----- //
diff --git a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
index a1d1f6627c..fe449fe1f7 100644
--- a/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
+++ b/reco/detectors/rich/alignment/CbmRichNavigationUtil2.h
@@ -2,8 +2,9 @@
#ifndef RICH_CbmRichNavigationUtil2
#define RICH_CbmRichNavigationUtil2
-#include <Logger.h>
#include "FairTrackParam.h"
+#include <Logger.h>
+
#include "TObject.h"
#include "TVector3.h"
diff --git a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
index 9890fffcab..056bb3cff9 100644
--- a/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
+++ b/reco/detectors/rich/alignment/CbmRichPMTMapping.cxx
@@ -1,13 +1,14 @@
// ---------- Original Headers ---------- //
#include "CbmRichPMTMapping.h"
-#include <Logger.h>
-#include "FairRootManager.h"
-
-#include "TClonesArray.h"
#include "CbmDrawHist.h"
#include "CbmRichHit.h"
+
+#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TCanvas.h"
+#include "TClonesArray.h"
#include "TF1.h"
#include "TH1D.h"
#include "TH2D.h"
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
index 73df445db2..0989f4e276 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducer2.cxx
@@ -1,9 +1,11 @@
// ---------- Original Headers ---------- //
#include "CbmRichProjectionProducer2.h"
-#include <Logger.h>
-#include "FairRootManager.h"
#include "CbmRichHit.h"
+
+#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
// ---------- Included Headers ---------- //
diff --git a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
index 7afae2f1fa..8c3492eb9d 100644
--- a/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/alignment/CbmRichProjectionProducerAnalytical.cxx
@@ -8,6 +8,10 @@
#include "CbmRichProjectionProducerAnalytical.h"
#include "CbmMCTrack.h"
+#include "CbmRichGeoManager.h"
+#include "CbmRichNavigationUtil.h"
+#include "CbmRichPoint.h"
+
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -16,20 +20,16 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include "TGeoManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
+#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
-#include "CbmRichGeoManager.h"
-#include "CbmRichNavigationUtil.h"
-#include "CbmRichPoint.h"
-
-#include <Logger.h>
+#include <iostream>
#include <cmath>
-#include <iostream>
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
index 002535c9cd..df70054327 100644
--- a/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
+++ b/reco/detectors/rich/alignment/CbmRichReconstruction.cxx
@@ -24,20 +24,20 @@
//#include "CbmL1RichENNRingFinderParallel.h"
//#include "prototype/CbmRichProtRingFinderHough.h"
+#include "CbmGlobalTrack.h"
+#include "CbmRichConverter.h"
#include "CbmRichRingFitterCOP.h"
#include "CbmRichRingFitterCircle.h"
#include "CbmRichRingFitterEllipseMinuit.h"
#include "CbmRichRingFitterEllipseTau.h"
#include "CbmRichRingFitterRobustCOP.h"
#include "CbmRichRingFitterTAU.h"
-
#include "CbmRichRingTrackAssignClosestD.h"
-#include "CbmGlobalTrack.h"
-#include "CbmRichConverter.h"
#include "FairHit.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/rich/alignment/CbmRichUtil.h b/reco/detectors/rich/alignment/CbmRichUtil.h
index da1c2afea5..de9b7ecf0c 100644
--- a/reco/detectors/rich/alignment/CbmRichUtil.h
+++ b/reco/detectors/rich/alignment/CbmRichUtil.h
@@ -3,13 +3,16 @@
#define RICH_CbmRichUtil
#include "CbmGlobalTrack.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
#include "FairTrackParam.h"
+#include <Logger.h>
+
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH2.h"
#include "TObject.h"
+
#include <string>
using namespace std;
diff --git a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
index 052027a77b..d1b103e876 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderHough.cxx
@@ -13,6 +13,7 @@
#include "CbmRichRing.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 026f787a4b..ae9c6d4c8e 100644
--- a/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
+++ b/reco/detectors/rich/finder/CbmRichRingFinderIdeal.cxx
@@ -21,8 +21,9 @@
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
#include "CbmRichRing.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
index f6b3587153..a027c63b28 100644
--- a/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
+++ b/reco/detectors/rich/fitter/CbmRichRingFitterEllipseMinuit.cxx
@@ -7,10 +7,10 @@
#include "CbmRichRingFitterEllipseMinuit.h"
-#include "Minuit2/Minuit2Minimizer.h"
-
#include <Logger.h>
+#include "Minuit2/Minuit2Minimizer.h"
+
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index e1c61ec5a0..de78665308 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -9,9 +9,10 @@
#include "CbmRichGeoManager.h"
#include "CbmRichHit.h"
#include "CbmRichPoint.h"
+
#include <Logger.h>
-#include "TClonesArray.h"
+#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
index bd621ada44..4f42611065 100644
--- a/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
+++ b/reco/detectors/rich/qa/CbmRichRecoTbQa.cxx
@@ -1,20 +1,12 @@
#include "CbmRichRecoTbQa.h"
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TEllipse.h"
-#include "TF1.h"
-#include "TH1.h"
-#include "TH1D.h"
-#include "TMCProcess.h"
-#include "TMarker.h"
-#include "TStyle.h"
-#include <TFile.h>
#include "CbmDigiManager.h"
#include "CbmDrawHist.h"
#include "CbmGlobalTrack.h"
+#include "CbmHistManager.h"
#include "CbmMCDataArray.h"
#include "CbmMCDataManager.h"
+#include "CbmMCEventList.h"
#include "CbmMCTrack.h"
#include "CbmMatchRecoToMC.h"
#include "CbmRichDigi.h"
@@ -27,23 +19,30 @@
#include "CbmStsPoint.h"
#include "CbmTrackMatchNew.h"
#include "CbmUtils.h"
-#include "FairMCPoint.h"
-#include "FairTrackParam.h"
-#include "elid/CbmLitGlobalElectronId.h"
#include "FairEventHeader.h"
-#include <Logger.h>
+#include "FairMCPoint.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include "FairTrackParam.h"
+#include <Logger.h>
-#include "CbmHistManager.h"
-#include "CbmUtils.h"
+#include "TCanvas.h"
+#include "TClonesArray.h"
+#include "TEllipse.h"
+#include "TF1.h"
+#include "TH1.h"
+#include "TH1D.h"
+#include "TMCProcess.h"
+#include "TMarker.h"
+#include "TStyle.h"
+#include <TFile.h>
#include <iostream>
#include <sstream>
#include <string>
-#include "CbmMCEventList.h"
+#include "elid/CbmLitGlobalElectronId.h"
using namespace std;
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
index 194c1f0ddf..10d4e0c63d 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerAnalytical.cxx
@@ -8,6 +8,8 @@
#include "CbmRichProjectionProducerAnalytical.h"
#include "CbmMCTrack.h"
+#include "CbmRichGeoManager.h"
+
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -16,19 +18,16 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include "TGeoManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
+#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
-#include "CbmRichGeoManager.h"
-
-
-#include <Logger.h>
+#include <iostream>
#include <cmath>
-#include <iostream>
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
index 1c6ff72b60..467f4302ff 100644
--- a/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
+++ b/reco/detectors/rich/tracks/CbmRichProjectionProducerTGeo.cxx
@@ -8,6 +8,8 @@
#include "CbmRichProjectionProducerTGeo.h"
#include "CbmMCTrack.h"
+#include "CbmRichGeoManager.h"
+
#include "FairGeoNode.h"
#include "FairGeoTransform.h"
#include "FairGeoVector.h"
@@ -16,18 +18,18 @@
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
#include "FairTrackParam.h"
-#include "TGeoManager.h"
+#include <Logger.h>
-#include "CbmRichGeoManager.h"
#include "TClonesArray.h"
+#include "TGeoManager.h"
#include "TMatrixFSym.h"
#include "TVector3.h"
-#include "utils/CbmRichNavigationUtil.h"
-#include <Logger.h>
+#include <iostream>
#include <cmath>
-#include <iostream>
+
+#include "utils/CbmRichNavigationUtil.h"
using std::cout;
using std::endl;
diff --git a/reco/detectors/rich/utils/CbmRichNavigationUtil.h b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
index e2586adb98..60dc0ea9fd 100644
--- a/reco/detectors/rich/utils/CbmRichNavigationUtil.h
+++ b/reco/detectors/rich/utils/CbmRichNavigationUtil.h
@@ -2,8 +2,9 @@
#ifndef RICH_CbmRichNavigationUtil
#define RICH_CbmRichNavigationUtil
-#include <Logger.h>
#include "FairTrackParam.h"
+#include <Logger.h>
+
#include "TObject.h"
#include "TVector3.h"
diff --git a/reco/detectors/rich/utils/CbmRichUtil.h b/reco/detectors/rich/utils/CbmRichUtil.h
index af9ddd83d6..c3eeb1351e 100644
--- a/reco/detectors/rich/utils/CbmRichUtil.h
+++ b/reco/detectors/rich/utils/CbmRichUtil.h
@@ -3,13 +3,16 @@
#define RICH_CbmRichUtil
#include "CbmGlobalTrack.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
#include "FairTrackParam.h"
+#include <Logger.h>
+
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TH2.h"
#include "TObject.h"
+
#include <string>
using namespace std;
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.cxx b/reco/detectors/sts/CbmStsFindTracksQa.cxx
index 01907ac66b..a496a4ac3a 100644
--- a/reco/detectors/sts/CbmStsFindTracksQa.cxx
+++ b/reco/detectors/sts/CbmStsFindTracksQa.cxx
@@ -17,8 +17,8 @@
// Includes from FairRoot
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairRun.h"
+#include <Logger.h>
// Includes from CbmRoot
#include "CbmMCDataArray.h"
diff --git a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
index 63e8ba7079..4480d375a8 100644
--- a/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
+++ b/reco/detectors/tof/CbmTofBuildDigiEvents.cxx
@@ -14,8 +14,8 @@
//#include "CbmTofDef.h" TODO
#include "FairFileSource.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TMath.h"
diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index 91862f8d35..af6b73a4b4 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -21,9 +21,9 @@
#include "CbmTofTracklet.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include <TClonesArray.h>
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
index ecaf1aa067..2dfeb85db3 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.cxx
@@ -27,10 +27,10 @@
#include "CbmMCTrack.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx
index b0df65b868..af196d6229 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx
@@ -35,11 +35,11 @@
// FAIR classes and includes
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairRootFileSink.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofFindTracks.cxx b/reco/detectors/tof/CbmTofFindTracks.cxx
index 75fb022dd9..566f1e5fe6 100644
--- a/reco/detectors/tof/CbmTofFindTracks.cxx
+++ b/reco/detectors/tof/CbmTofFindTracks.cxx
@@ -5,10 +5,10 @@
// -------------------------------------------------------------------------
#include "CbmTofFindTracks.h"
-#include "CbmTofAddress.h" // in cbmdata/tof
#include "CbmEvent.h"
#include "CbmMatch.h"
+#include "CbmTofAddress.h" // in cbmdata/tof
#include "CbmTofCalibrator.h"
#include "CbmTofCell.h" // in tof/TofData
#include "CbmTofCreateDigiPar.h" // in tof/TofTools
@@ -26,10 +26,10 @@
#include "CbmTofTrackletTools.h"
#include "CbmVertex.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TDirectory.h"
@@ -1084,9 +1084,7 @@ Bool_t CbmTofFindTracks::WriteHistos() {
// ----- Public method Exec --------------------------------------------
void CbmTofFindTracks::Exec(Option_t* opt) {
- if (fair::Logger::Logging(fair::Severity::debug)) {
- fDigiBdfPar->printParams();
- }
+ if (fair::Logger::Logging(fair::Severity::debug)) { fDigiBdfPar->printParams(); }
if (!fEventsColl) {
// fTofHitArray = (TClonesArray*)fTofHitArrayIn->Clone();
fTofHitArray = (TClonesArray*) fTofHitArrayIn;
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index 3be3941c50..880c0a43d6 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -25,13 +25,13 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include "FairEventHeader.h" // from CbmStsDigitize, for GetEventInfo
-#include <Logger.h>
+#include "FairEventHeader.h" // from CbmStsDigitize, for GetEventInfo
#include "FairMCEventHeader.h" // from CbmStsDigitize, for GetEventInfo
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRunSim.h" // from CbmStsDigitize, for GetEventInfo
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofTBClusterizer.cxx b/reco/detectors/tof/CbmTofTBClusterizer.cxx
index 9c7b00c30a..82b7cc7978 100644
--- a/reco/detectors/tof/CbmTofTBClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTBClusterizer.cxx
@@ -5,17 +5,20 @@
*/
#include "CbmTofTBClusterizer.h"
+
#include "CbmDefs.h"
#include "CbmMatch.h"
#include "CbmTofGeoHandler.h"
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
+
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TH1.h"
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
index 155fb30e47..7bbc1f3455 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.cxx
@@ -27,10 +27,10 @@
#include "CbmMCTrack.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "TClonesArray.h"
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 2571d8c752..bb7e038adc 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -14,10 +14,11 @@
// FAIR classes and includes
#include "FairEventManager.h" // for FairEventManager
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
+
#include "TEveManager.h" // for TEveManager, gEve
// CBMroot classes and includes
diff --git a/reco/detectors/tof/CbmTofTrackletTools.cxx b/reco/detectors/tof/CbmTofTrackletTools.cxx
index 572c68d75e..3c9b3e318d 100644
--- a/reco/detectors/tof/CbmTofTrackletTools.cxx
+++ b/reco/detectors/tof/CbmTofTrackletTools.cxx
@@ -5,9 +5,9 @@
**/
#include "CbmTofTrackletTools.h"
+
#include "CbmTofHit.h"
#include "CbmTofTracklet.h"
-#include "LKFMinuit.h"
#include <Logger.h>
@@ -17,6 +17,8 @@
#include "TMatrixFSymfwd.h" // for TMatrixFSym
#include "TVectorD.h"
+#include "LKFMinuit.h"
+
using std::vector;
LKFMinuit fMinuit;
diff --git a/reco/detectors/tof/LKFMinuit.cxx b/reco/detectors/tof/LKFMinuit.cxx
index e84c78fb22..a18a3ac420 100644
--- a/reco/detectors/tof/LKFMinuit.cxx
+++ b/reco/detectors/tof/LKFMinuit.cxx
@@ -1,11 +1,14 @@
#include "LKFMinuit.h"
+
#include <Logger.h>
-#include <Math/Vector3D.h>
+
#include <TFitter.h>
#include <TGraph2D.h>
#include <TMath.h>
#include <TPolyLine3D.h>
+#include <Math/Vector3D.h>
+
using namespace ROOT::Math;
static LKFMinuit* LKF_obj;
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index 2ced44fb0a..40a92b48c0 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -17,7 +17,6 @@
#include "CbmTrdParSetGas.h"
#include "CbmTrdParSetGeo.h"
-
#include <FairRootManager.h>
#include <FairRunAna.h>
#include <FairRuntimeDb.h>
diff --git a/reco/detectors/trd/CbmTrdModuleRecR.cxx b/reco/detectors/trd/CbmTrdModuleRecR.cxx
index 70a51c90b7..f525f9a891 100644
--- a/reco/detectors/trd/CbmTrdModuleRecR.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecR.cxx
@@ -1,5 +1,6 @@
#include "CbmTrdModuleRecR.h"
+#include "CbmDigiManager.h"
#include "CbmTrdAddress.h"
#include "CbmTrdCluster.h"
#include "CbmTrdClusterFinder.h"
@@ -8,16 +9,16 @@
#include "CbmTrdParModDigi.h"
#include "CbmTrdParSetDigi.h"
+#include <Logger.h>
+
#include "TGeoMatrix.h"
#include <TCanvas.h>
#include <TClonesArray.h>
#include <TH2F.h>
#include <TImage.h>
#include <TVector3.h>
-#include <iostream>
-#include "CbmDigiManager.h"
-#include <Logger.h>
+#include <iostream>
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 2245e381d7..c8a0ec9183 100644
--- a/reco/detectors/trd/CbmTrdModuleRecT.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRecT.cxx
@@ -1,4 +1,5 @@
#include "CbmTrdModuleRecT.h"
+
#include "CbmTrdCluster.h"
#include "CbmTrdDigi.h"
#include "CbmTrdFASP.h"
@@ -7,10 +8,9 @@
#include <Logger.h>
-#include <TGeoPhysicalNode.h>
-
#include <TClonesArray.h>
#include <TF1.h>
+#include <TGeoPhysicalNode.h>
#include <TGraphErrors.h>
#include <iostream>
diff --git a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
index f1e5a7f257..da65402d4f 100644
--- a/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdHitDensityQa.cxx
@@ -13,12 +13,13 @@
#include "CbmTrdPoint.h"
#include "CbmTrdUtils.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TArray.h"
+#include "TCanvas.h"
#include "TClonesArray.h"
#include "TColor.h"
#include "TDatime.h"
@@ -28,12 +29,10 @@
#include "TH2D.h"
#include "TH2F.h"
#include "TH2I.h"
-#include "TMath.h"
-
-#include "TCanvas.h"
#include "TImage.h"
#include "TLegend.h"
#include "TLine.h"
+#include "TMath.h"
#include "TProfile.h"
#include "TStopwatch.h"
#include <TFile.h>
diff --git a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
index 66b4aa4da3..41ba3243d9 100644
--- a/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
+++ b/reco/detectors/trd/qa/CbmTrdRecoQa.cxx
@@ -5,24 +5,22 @@
#include "CbmTrdRecoQa.h"
+#include "CbmDigiManager.h"
#include "CbmMCTrack.h"
#include "CbmTrdCluster.h"
#include "CbmTrdDigi.h"
+#include "CbmTrdGeoHandler.h"
#include "CbmTrdHit.h"
-#include "CbmTrdPoint.h"
-
-#include "CbmMCTrack.h"
#include "CbmTrdParModDigi.h"
#include "CbmTrdParSetDigi.h"
+#include "CbmTrdPoint.h"
+#include "CbmTrdUtils.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
-#include "CbmDigiManager.h"
-#include "CbmTrdGeoHandler.h"
-#include "CbmTrdUtils.h"
#include "TCanvas.h"
#include "TClonesArray.h"
#include "TColor.h"
@@ -41,7 +39,6 @@
#include "TStopwatch.h"
#include "TVector3.h"
-
#include <iostream>
using std::cout;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index 8510653284..3f083a5a6d 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -5,19 +5,21 @@
#include "CbmBuildEventsIdeal.h"
+#include "CbmDigiManager.h"
+#include "CbmEvent.h"
+#include "CbmLink.h"
+#include "CbmMatch.h"
+#include "CbmModuleList.h"
+
#include <Logger.h>
+
#include <TClonesArray.h>
#include <TStopwatch.h>
+
#include <cassert>
#include <iomanip>
#include <iostream>
-#include "CbmDigiManager.h"
-#include "CbmEvent.h"
-#include "CbmLink.h"
-#include "CbmMatch.h"
-#include "CbmModuleList.h"
-
using namespace std;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
index bb3327a5d1..9b376a1df3 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdealNew.cxx
@@ -5,21 +5,12 @@
#include "CbmBuildEventsIdealNew.h"
-#include <Logger.h>
-#include <FairRootManager.h>
-#include <TClonesArray.h>
-#include <TStopwatch.h>
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-
#include "CbmDigiManager.h"
#include "CbmEvent.h"
#include "CbmEventStore.h"
#include "CbmLink.h"
#include "CbmMatch.h"
#include "CbmModuleList.h"
-
#include "CbmMuchDigi.h"
#include "CbmMvdDigi.h"
#include "CbmPsdDigi.h"
@@ -28,6 +19,16 @@
#include "CbmTofDigi.h"
#include "CbmTrdDigi.h"
+#include <FairRootManager.h>
+#include <Logger.h>
+
+#include <TClonesArray.h>
+#include <TStopwatch.h>
+
+#include <cassert>
+#include <iomanip>
+#include <iostream>
+
using namespace std;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
index 6b89719e63..290d94a8ca 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
@@ -12,8 +12,8 @@
#include "CbmModuleList.h"
#include "CbmStsDigi.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TH1.h"
diff --git a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
index cb26754e62..6d5311fdff 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsSimple.cxx
@@ -5,18 +5,18 @@
#include "CbmBuildEventsSimple.h"
-#include "TClonesArray.h"
-#include "TStopwatch.h"
-
-#include <Logger.h>
-#include "FairRootManager.h"
-
#include "CbmEvent.h"
#include "CbmLink.h"
#include "CbmMatch.h"
#include "CbmStsAddress.h"
#include "CbmStsDigi.h"
+#include "FairRootManager.h"
+#include <Logger.h>
+
+#include "TClonesArray.h"
+#include "TStopwatch.h"
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/eventbuilder/digis/CbmEvBuildSource.cxx b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
index 8d73958af4..54c6b24260 100644
--- a/reco/eventbuilder/digis/CbmEvBuildSource.cxx
+++ b/reco/eventbuilder/digis/CbmEvBuildSource.cxx
@@ -1,17 +1,16 @@
#include "CbmEvBuildSource.h"
-#include "TChain.h"
-#include "TClonesArray.h"
+#include "CbmDigi.h"
+#include "CbmStsAddress.h"
+#include "CbmStsDigi.h"
+#include "CbmTimeSlice.h"
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
-#include "CbmDigi.h"
-#include "CbmTimeSlice.h"
-
-#include "CbmStsAddress.h"
-#include "CbmStsDigi.h"
+#include "TChain.h"
+#include "TClonesArray.h"
#include <iostream>
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index d38950c2bb..e4f1e69a2d 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -6,24 +6,26 @@
#include "CbmBuildEventsFromTracksIdeal.h"
#include "CbmEvent.h"
+#include "CbmMCDataArray.h"
+#include "CbmMCDataManager.h"
+#include "CbmMCEventList.h"
+#include "CbmMCTrack.h"
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
#include "CbmStsTrack.h"
-#include <Logger.h>
+#include "CbmTrackMatchNew.h"
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TStopwatch.h"
+
#include <cassert>
#include <iomanip>
#include <iostream>
#include <map>
-#include "CbmMCDataArray.h"
-#include "CbmMCDataManager.h"
-#include "CbmMCEventList.h"
-#include "CbmMCTrack.h"
-#include "CbmTrackMatchNew.h"
-
using namespace std;
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
index cbfddac45f..16006f56fc 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksReal.cxx
@@ -8,10 +8,13 @@
#include "CbmEvent.h"
#include "CbmStsDigi.h"
#include "CbmStsHit.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TStopwatch.h"
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/global/CbmFindPrimaryVertex.cxx b/reco/global/CbmFindPrimaryVertex.cxx
index e4b2b20594..6264f106da 100644
--- a/reco/global/CbmFindPrimaryVertex.cxx
+++ b/reco/global/CbmFindPrimaryVertex.cxx
@@ -7,8 +7,8 @@
#include "CbmPrimaryVertexFinder.h"
#include "CbmVertex.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/global/CbmFindPrimaryVertexEvents.cxx b/reco/global/CbmFindPrimaryVertexEvents.cxx
index 40f1b08636..c36619c27e 100644
--- a/reco/global/CbmFindPrimaryVertexEvents.cxx
+++ b/reco/global/CbmFindPrimaryVertexEvents.cxx
@@ -6,13 +6,15 @@
#include "CbmFindPrimaryVertexEvents.h"
-
#include "CbmEvent.h"
#include "CbmPrimaryVertexFinder.h"
#include "CbmVertex.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/reco/global/CbmPVFinderIdeal.cxx b/reco/global/CbmPVFinderIdeal.cxx
index e3fb1126e1..a72fe577b8 100644
--- a/reco/global/CbmPVFinderIdeal.cxx
+++ b/reco/global/CbmPVFinderIdeal.cxx
@@ -4,11 +4,11 @@
// -------------------------------------------------------------------------
#include "CbmPVFinderIdeal.h"
+#include "CbmMCTrack.h"
#include "CbmVertex.h"
-#include "CbmMCTrack.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TMatrixTSym.h"
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
index 23ef92d80d..c74680e783 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.cxx
@@ -2,9 +2,10 @@
#include "CbmMuchPixelHit.h"
#include "CbmStsTrack.h"
-#include <Logger.h>
+
#include "FairRootManager.h"
#include "FairTrackParam.h"
+#include <Logger.h>
#include "TClonesArray.h"
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
index 80602c3b5e..798c072cc0 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
@@ -3,27 +3,29 @@
* \author Andrey Lebedev <andrey.lebedev@gsi.de>
* \date 2013
**/
-#include <Logger.h>
+#include "CbmLitFindGlobalTracksParallel.h"
#include "CbmGlobalTrack.h"
-#include "CbmLitFindGlobalTracksParallel.h"
#include "CbmStsTrack.h"
#include "CbmTrack.h"
#include "cbm/base/CbmLitTrackingGeometryConstructor.h"
#include "cbm/utils/CbmLitConverterParallel.h"
-#include "parallel/LitDetectorLayout.h"
-#include "parallel/LitScalPixelHit.h"
-#include "parallel/LitScalTrack.h"
-#include "parallel/LitTrackFinderNN.h"
-#include "std/utils/CbmLitMemoryManagment.h"
+
+#include <Logger.h>
#include "TClonesArray.h"
+#include <boost/assign/list_of.hpp>
+
#include <algorithm>
#include <iostream>
#include <set>
-#include <boost/assign/list_of.hpp>
+#include "parallel/LitDetectorLayout.h"
+#include "parallel/LitScalPixelHit.h"
+#include "parallel/LitScalTrack.h"
+#include "parallel/LitTrackFinderNN.h"
+#include "std/utils/CbmLitMemoryManagment.h"
using boost::assign::list_of;
using std::cout;
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
index e6d2580b27..5649bb314d 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.cxx
@@ -5,28 +5,30 @@
* \date 2011
*/
#include "CbmLitFindMvdTracks.h"
-#include "base/CbmLitToolFactory.h"
-#include "base/CbmLitTrackingGeometryConstructor.h"
-#include "data/CbmLitHit.h"
-#include "data/CbmLitPixelHit.h"
-#include "data/CbmLitTrack.h"
-#include "data/CbmLitTrackParam.h"
-#include "finder/CbmLitTrackFinderNN.h"
-#include "utils/CbmLitConverter.h"
-#include "utils/CbmLitConverterFairTrackParam.h"
-#include "utils/CbmLitMemoryManagment.h"
#include "CbmStsTrack.h"
+
#include "FairHit.h"
-#include <Logger.h>
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include <algorithm>
#include <iostream>
+#include "base/CbmLitToolFactory.h"
+#include "base/CbmLitTrackingGeometryConstructor.h"
+#include "data/CbmLitHit.h"
+#include "data/CbmLitPixelHit.h"
+#include "data/CbmLitTrack.h"
+#include "data/CbmLitTrackParam.h"
+#include "finder/CbmLitTrackFinderNN.h"
+#include "utils/CbmLitConverter.h"
+#include "utils/CbmLitConverterFairTrackParam.h"
+#include "utils/CbmLitMemoryManagment.h"
+
CbmLitFindMvdTracks::CbmLitFindMvdTracks()
: fStsTracks(NULL)
, fMvdHits(NULL)
diff --git a/reco/qa/CbmRecoQa.cxx b/reco/qa/CbmRecoQa.cxx
index c20b94bbca..d7b181d511 100644
--- a/reco/qa/CbmRecoQa.cxx
+++ b/reco/qa/CbmRecoQa.cxx
@@ -3,46 +3,42 @@
** @since Jun 2019
**/
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include "TClonesArray.h"
-#include "TFile.h"
-#include "TH1.h"
-#include "TH1F.h"
-#include "TList.h"
-#include "TROOT.h"
-#include "TString.h"
-#include "TTask.h"
-#include "TVector3.h"
+#include "CbmRecoQa.h"
+#include "CbmHit.h"
+#include "CbmLink.h"
+#include "CbmMCDataArray.h"
+#include "CbmMatch.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
-
-#include "CbmTrdHit.h"
-#include "CbmTrdPoint.h"
-
+#include "CbmMvdHit.h"
+#include "CbmMvdPoint.h"
+#include "CbmStsDigi.h"
+#include "CbmStsHit.h"
+#include "CbmStsPoint.h"
#include "CbmTofHit.h"
#include "CbmTofPoint.h"
+#include "CbmTrdHit.h"
+#include "CbmTrdPoint.h"
#include "FairDetector.h"
-#include <Logger.h>
#include "FairMCPoint.h"
#include "FairTask.h"
+#include <Logger.h>
-#include "CbmStsDigi.h"
-#include "CbmStsHit.h"
-#include "CbmStsPoint.h"
-
-#include "CbmMvdHit.h"
-#include "CbmMvdPoint.h"
+#include "TClonesArray.h"
+#include "TFile.h"
+#include "TH1.h"
+#include "TH1F.h"
+#include "TList.h"
+#include "TROOT.h"
+#include "TString.h"
+#include "TTask.h"
+#include "TVector3.h"
-#include "CbmHit.h"
-#include "CbmLink.h"
-#include "CbmMCDataArray.h"
-#include "CbmMatch.h"
-#include "CbmRecoQa.h"
+#include <iostream>
+#include <string>
+#include <vector>
CbmRecoQa* CbmRecoQa::instance = 0;
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
index 9c73c46a69..d180c3d77b 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerConfigurator.cxx
@@ -5,11 +5,14 @@
*/
#include "CbmBinnedTrackerConfigurator.h"
+
#include "CbmMCDataManager.h"
#include "CbmStsSetup.h"
-#include <Logger.h>
+
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
+
#include "GeoReader.h"
CbmBinnedTrackerConfigurator::CbmBinnedTrackerConfigurator(bool useAllDetectors)
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
index fb772f37dd..b19b6a2ed6 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerTask.cxx
@@ -5,12 +5,15 @@
*/
#include "CbmBinnedTrackerTask.h"
+
#include "CbmMuchTrack.h"
#include "CbmStsTrack.h"
#include "CbmTrdTrack.h"
-#include <Logger.h>
+
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
+
#include "GeoReader.h"
#include "global/CbmGlobalTrack.h"
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.cxx b/reco/tracking/global/CbmGlobalTrackingQA.cxx
index 27cf704dce..aa5d32ef1e 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQA.cxx
@@ -6,9 +6,6 @@
#include "CbmGlobalTrackingQA.h"
-#include <Logger.h>
-#include <map>
-
#include "CbmDigiManager.h"
#include "CbmGlobalTrack.h"
#include "CbmMCDataManager.h"
@@ -20,6 +17,10 @@
#include "CbmStsTrack.h"
#include "CbmTofPoint.h"
+#include <Logger.h>
+
+#include <map>
+
using std::cout;
using std::endl;
using std::list;
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.cxx b/reco/tracking/global/CbmGlobalTrackingTask.cxx
index e8414165eb..7b033fa8c3 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTask.cxx
@@ -5,6 +5,7 @@
*/
#include "CbmGlobalTrackingTask.h"
+
#include "CbmGlobalTrack.h"
#include "CbmKFParticleInterface.h"
#include "CbmKFStsHit.h"
@@ -12,7 +13,9 @@
#include "CbmStsCluster.h"
#include "CbmStsHit.h"
#include "CbmStsTrack.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 a44a5dd590..557a2f7aae 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.cxx
+++ b/reco/tracking/lx/CalcStats/CalcStats.cxx
@@ -1,12 +1,16 @@
#include "CalcStats.h"
+
#include "CbmMCTrack.h"
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPoint.h"
#include "CbmTrdAddress.h"
#include "CbmTrdPoint.h"
+
#include <Logger.h>
+
#include "TClonesArray.h"
#include <TFile.h>
+
#include <list>
#include <map>
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
index 1bfcc11836..648cf7bb40 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
@@ -1,9 +1,12 @@
#include "GenNoiseElectrons.h"
+
#include "CbmMCTrack.h"
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPoint.h"
#include "CbmTrdPoint.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 7d31940907..0d926f887c 100644
--- a/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBMLTask.cxx
@@ -5,6 +5,7 @@
*/
#include "LxTBMLTask.h"
+
#include "CbmCluster.h"
#include "CbmMCDataManager.h"
#include "CbmMCTrack.h"
@@ -12,10 +13,9 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmMuchPoint.h"
+
#include <Logger.h>
-#include "LxTBMatEffs.h"
-#include "Simple/LxCA.h"
-#include "Simple/LxSettings.h"
+
#include "TClonesArray.h"
#include "TDatabasePDG.h"
#include "TGeoArb8.h"
@@ -26,6 +26,10 @@
#include "TMath.h"
#include "TRandom3.h"
+#include "LxTBMatEffs.h"
+#include "Simple/LxCA.h"
+#include "Simple/LxSettings.h"
+
#ifdef __MACH__
#include <mach/mach_time.h>
#include <sys/time.h>
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.cxx b/reco/tracking/lx/TBBinned/LxTBTask.cxx
index 3d0f089143..06105b4642 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTask.cxx
@@ -5,6 +5,7 @@
*/
#include "LxTBTask.h"
+
#include "CbmCluster.h"
#include "CbmMCDataManager.h"
#include "CbmMCTrack.h"
@@ -12,8 +13,9 @@
#include "CbmMuchGeoScheme.h"
#include "CbmMuchPixelHit.h"
#include "CbmTrdHit.h"
+
#include <Logger.h>
-#include "LxTBTieTracks.h"
+
#include "TClonesArray.h"
#include "TDatabasePDG.h"
#include "TGeoArb8.h"
@@ -22,9 +24,12 @@
#include "TMath.h"
#include "TParticlePDG.h"
#include "TRandom3.h"
+
#include <map>
#include <set>
+#include "LxTBTieTracks.h"
+
#ifdef LXTB_QA
#include "CbmStsHit.h"
#include "TH1F.h"
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
index 169fadd7bb..481c75ed6d 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
@@ -5,6 +5,7 @@
*/
#include "LxTBTrdTask.h"
+
#include "CbmCluster.h"
#include "CbmGlobalTrack.h"
#include "CbmMCDataManager.h"
@@ -13,16 +14,18 @@
#include "CbmTrdHit.h"
#include "CbmTrdPoint.h"
#include "CbmTrdTrack.h"
+
#include <Logger.h>
-#include "LxTBTask.h"
+
#include "TClonesArray.h"
#include "TGeoBBox.h"
#include "TGeoManager.h"
#include "TH1F.h"
#include "TMath.h"
-
#include <TFile.h>
+#include "LxTBTask.h"
+
using std::cout;
using std::endl;
using std::ifstream;
diff --git a/reco/tracking/vector/CbmMuchMergeVectors.cxx b/reco/tracking/vector/CbmMuchMergeVectors.cxx
index 9c16ace4c4..ccb85d9af5 100644
--- a/reco/tracking/vector/CbmMuchMergeVectors.cxx
+++ b/reco/tracking/vector/CbmMuchMergeVectors.cxx
@@ -16,8 +16,8 @@
#include "FairEventHeader.h"
#include "FairField.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include <TClonesArray.h>
#include <TGeoManager.h>
diff --git a/reco/tracking/vector/CbmMuchToTrdVectors.cxx b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
index 3834cf009c..88a6ea46c1 100644
--- a/reco/tracking/vector/CbmMuchToTrdVectors.cxx
+++ b/reco/tracking/vector/CbmMuchToTrdVectors.cxx
@@ -7,9 +7,9 @@
//#include "CbmSetup.h"
#include "CbmMuchTrack.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairTrackParam.h"
+#include <Logger.h>
#include <TClonesArray.h>
//#include <TGeoManager.h>
diff --git a/sim/detectors/much/CbmMuchDigitizeGem.cxx b/sim/detectors/much/CbmMuchDigitizeGem.cxx
index 8fa12f51b0..6928f0a7e2 100644
--- a/sim/detectors/much/CbmMuchDigitizeGem.cxx
+++ b/sim/detectors/much/CbmMuchDigitizeGem.cxx
@@ -40,12 +40,12 @@
// Includes from base
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include <Logger.h>
// Includes from Cbm
#include "CbmMCTrack.h"
diff --git a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
index 94dbbc9f97..67549c9f36 100644
--- a/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdIdealDigitizer.cxx
@@ -2,19 +2,20 @@
// ----- CbmPsdIdealDigitizer source file -----
// ----- Created 15/05/12 by Alla & SELIM & FLORIAN -----
// -------------------------------------------------------------------------
-#include <iostream>
-#include <map>
+#include "CbmPsdIdealDigitizer.h"
-#include "TClonesArray.h"
+#include "CbmPsdDigi.h"
+#include "CbmPsdPoint.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
-#include "CbmPsdDigi.h"
-#include "CbmPsdIdealDigitizer.h"
-#include "CbmPsdPoint.h"
+#include "TClonesArray.h"
#include "TMath.h"
+#include <iostream>
+#include <map>
+
using std::cout;
using std::endl;
using std::map;
diff --git a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
index 5208b0ea5e..8d31c4d38c 100644
--- a/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
+++ b/sim/detectors/psd/CbmPsdSimpleDigitizer.cxx
@@ -3,22 +3,23 @@
// ----- Created 15/05/12 by Alla & SELIM & FLORIAN -----
// ----- Modified 17/03/18 by Sergey Morozov -----
// -------------------------------------------------------------------------
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-#include <map>
+#include "CbmPsdSimpleDigitizer.h"
-#include "TClonesArray.h"
+#include "CbmPsdDigi.h"
+#include "CbmPsdPoint.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
-#include "CbmPsdDigi.h"
-#include "CbmPsdPoint.h"
-#include "CbmPsdSimpleDigitizer.h"
+#include "TClonesArray.h"
#include "TMath.h"
#include "TStopwatch.h"
+#include <cassert>
+#include <iomanip>
+#include <iostream>
+#include <map>
+
using std::cout;
using std::endl;
using std::fixed;
diff --git a/sim/detectors/rich/CbmRichDigitizer.cxx b/sim/detectors/rich/CbmRichDigitizer.cxx
index 752d68becd..11fcbb9fb3 100644
--- a/sim/detectors/rich/CbmRichDigitizer.cxx
+++ b/sim/detectors/rich/CbmRichDigitizer.cxx
@@ -6,6 +6,7 @@
**/
#include "CbmRichDigitizer.h"
+
#include "CbmLink.h"
#include "CbmMCTrack.h"
#include "CbmMatch.h"
@@ -14,14 +15,17 @@
#include "CbmRichDigiMapManager.h"
#include "CbmRichGeoManager.h"
#include "CbmRichPoint.h"
+
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairRunAna.h"
#include "FairRunSim.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TRandom.h"
#include "TStopwatch.h"
+
#include <cassert>
#include <iomanip>
#include <iostream>
diff --git a/sim/detectors/sts/CbmStsDigitize.cxx b/sim/detectors/sts/CbmStsDigitize.cxx
index a1c1649649..169235b81d 100644
--- a/sim/detectors/sts/CbmStsDigitize.cxx
+++ b/sim/detectors/sts/CbmStsDigitize.cxx
@@ -26,12 +26,12 @@
#include "FairEventHeader.h"
#include "FairField.h"
#include "FairLink.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMCPoint.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// Includes from CbmRoot
#include "CbmMCTrack.h"
@@ -199,9 +199,7 @@ void CbmStsDigitize::Exec(Option_t* /*opt*/)
LOG(debug) << GetName() << ": " << fNofSignalsF + fNofSignalsB << " signals generated ( " << fNofSignalsF << " / "
<< fNofSignalsB << " )";
// --- For debug: status of analogue buffers
- if (fair::Logger::Logging(fair::Severity::debug)) {
- LOG(debug) << GetName() << ": " << BufferStatus();
- }
+ if (fair::Logger::Logging(fair::Severity::debug)) { LOG(debug) << GetName() << ": " << BufferStatus(); }
// --- Readout time: in stream mode the time of the current event.
// --- Analogue buffers will be digitised for signals at times smaller than
@@ -214,9 +212,7 @@ void CbmStsDigitize::Exec(Option_t* /*opt*/)
ProcessAnalogBuffers(readoutTime);
// --- Check status of analogue module buffers
- if (fair::Logger::Logging(fair::Severity::debug)) {
- LOG(debug) << GetName() << ": " << BufferStatus();
- }
+ if (fair::Logger::Logging(fair::Severity::debug)) { LOG(debug) << GetName() << ": " << BufferStatus(); }
// --- Event log
LOG(info) << left << setw(15) << GetName() << "[" << fixed << setprecision(3) << fTimer.RealTime() << " s]"
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.cxx b/sim/detectors/sts/CbmStsDigitizeQa.cxx
index 53c45401d8..f7a6f869ef 100644
--- a/sim/detectors/sts/CbmStsDigitizeQa.cxx
+++ b/sim/detectors/sts/CbmStsDigitizeQa.cxx
@@ -17,17 +17,16 @@
#include "CbmStsParSetModule.h"
#include "CbmStsParSim.h"
-#include <Logger.h>
#include "FairMCPoint.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRuntimeDb.h"
-
-#include "TGeoMatrix.h"
-#include "TGeoPhysicalNode.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TF1.h"
+#include "TGeoMatrix.h"
+#include "TGeoPhysicalNode.h"
#include "TH1.h"
#include "TH1D.h"
#include "TH2.h"
diff --git a/sim/detectors/sts/CbmStsMC.cxx b/sim/detectors/sts/CbmStsMC.cxx
index 1a83fe2db9..4c52ca715a 100644
--- a/sim/detectors/sts/CbmStsMC.cxx
+++ b/sim/detectors/sts/CbmStsMC.cxx
@@ -7,6 +7,14 @@
#include "CbmStsMC.h"
+#include "CbmGeometryUtils.h"
+#include "CbmStack.h"
+#include "CbmStsElement.h"
+#include "CbmStsPoint.h"
+#include "CbmStsSetup.h"
+
+#include <Logger.h>
+
#include "TGeoBBox.h"
#include "TGeoManager.h"
#include "TGeoPhysicalNode.h"
@@ -16,14 +24,6 @@
#include "TVirtualMC.h"
#include <TFile.h>
-#include <Logger.h>
-
-#include "CbmGeometryUtils.h"
-#include "CbmStack.h"
-#include "CbmStsElement.h"
-#include "CbmStsPoint.h"
-#include "CbmStsSetup.h"
-
using std::map;
using std::pair;
diff --git a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
index d059c6cf6d..781a5d29c3 100644
--- a/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorDssdStereo.cxx
@@ -5,17 +5,17 @@
#include "CbmStsSimSensorDssdStereo.h"
-#include <TGeoBBox.h>
-#include <TGeoPhysicalNode.h>
-#include <TMath.h>
-
-#include <Logger.h>
-
#include "CbmStsElement.h"
#include "CbmStsParSensorCond.h"
#include "CbmStsParSim.h"
#include "CbmStsPhysics.h"
+#include <Logger.h>
+
+#include <TGeoBBox.h>
+#include <TGeoPhysicalNode.h>
+#include <TMath.h>
+
using std::stringstream;
diff --git a/sim/detectors/sts/CbmStsSimSensorFactory.cxx b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
index 4795b3dae0..bcb3a9e3c5 100644
--- a/sim/detectors/sts/CbmStsSimSensorFactory.cxx
+++ b/sim/detectors/sts/CbmStsSimSensorFactory.cxx
@@ -9,7 +9,9 @@
#include "CbmStsParSensor.h"
#include "CbmStsSimSensorDssdOrtho.h"
#include "CbmStsSimSensorDssdStereo.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 4f3fe78d6c..e73d3e3602 100644
--- a/sim/detectors/tof/CbmTofDigitize.cxx
+++ b/sim/detectors/tof/CbmTofDigitize.cxx
@@ -24,12 +24,12 @@
// FAIR classes and includes
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRunSim.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
// CBM includes
#include "CbmLink.h"
diff --git a/sim/detectors/tof/CbmTofMergeMcPoints.cxx b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
index 363e2e079a..d203379711 100644
--- a/sim/detectors/tof/CbmTofMergeMcPoints.cxx
+++ b/sim/detectors/tof/CbmTofMergeMcPoints.cxx
@@ -18,8 +18,8 @@
#include "CbmMatch.h"
// FAIR classes and includes
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
// ROOT Classes and includes
#include "Riostream.h"
diff --git a/sim/detectors/trd/CbmTrd.cxx b/sim/detectors/trd/CbmTrd.cxx
index 563df0918f..b65b611110 100644
--- a/sim/detectors/trd/CbmTrd.cxx
+++ b/sim/detectors/trd/CbmTrd.cxx
@@ -16,11 +16,11 @@
#include "FairGeoMedia.h"
#include "FairGeoNode.h"
#include "FairGeoVolume.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRuntimeDb.h"
#include "FairVolume.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TGeoManager.h"
diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx
index 4fa902b234..669b7e78ab 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.cxx
+++ b/sim/detectors/trd/CbmTrdDigitizer.cxx
@@ -3,6 +3,7 @@
#include "CbmMCTrack.h"
#include "CbmMatch.h"
#include "CbmTrdAddress.h"
+#include "CbmTrdCheckUtil.h"
#include "CbmTrdDigi.h"
#include "CbmTrdGeoHandler.h"
#include "CbmTrdModuleSim.h"
@@ -21,25 +22,25 @@
#include "CbmTrdParSetGeo.h"
#include "CbmTrdPoint.h"
#include "CbmTrdRadiator.h"
+#include "CbmTrdRawToDigiR.h"
#include <FairBaseParSet.h>
#include <FairEventHeader.h>
-#include <Logger.h>
#include <FairRootManager.h>
#include <FairRunAna.h>
#include <FairRunSim.h>
#include <FairRuntimeDb.h>
+#include <Logger.h>
-#include "CbmTrdCheckUtil.h"
-#include "CbmTrdRawToDigiR.h"
#include <TClonesArray.h>
#include <TRandom.h>
#include <TStopwatch.h>
#include <TVector3.h>
-#include <cmath>
#include <iomanip>
#include <iostream>
+
+#include <cmath>
using std::cout;
using std::endl;
using std::make_pair;
diff --git a/sim/detectors/trd/CbmTrdModuleSim.cxx b/sim/detectors/trd/CbmTrdModuleSim.cxx
index aae4df5340..460cd80faa 100644
--- a/sim/detectors/trd/CbmTrdModuleSim.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSim.cxx
@@ -4,7 +4,9 @@
#include "CbmTrdParModGain.h"
#include "CbmTrdParModGas.h"
#include "CbmTrdParSetAsic.h"
+
#include <Logger.h>
+
#include <vector>
//_______________________________________________________________________________
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.cxx b/sim/detectors/trd/CbmTrdModuleSimT.cxx
index 2286901aa8..64598751b4 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimT.cxx
@@ -1,5 +1,8 @@
#include "CbmTrdModuleSimT.h"
+#include "CbmDigitizeBase.h"
+#include "CbmMatch.h"
+#include "CbmTimeSlice.h"
#include "CbmTrdAddress.h"
#include "CbmTrdDigi.h"
#include "CbmTrdDigitizer.h"
@@ -13,12 +16,8 @@
#include "CbmTrdRadiator.h"
#include "CbmTrdTrianglePRF.h"
-#include "CbmDigitizeBase.h"
-#include "CbmMatch.h"
-#include "CbmTimeSlice.h"
-
-#include <Logger.h>
#include <FairRootManager.h>
+#include <Logger.h>
#include <TGeoManager.h>
#include <TMath.h>
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
index 15cd932a5a..4502afcac3 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.cxx
@@ -9,13 +9,12 @@
#include "CbmTrdParSetDigi.h"
#include "CbmTrdParSetGeo.h"
#include "CbmTrdRadiator.h"
-
#include "CbmTrdUtils.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
#include "TBox.h"
#include "TCanvas.h"
@@ -31,12 +30,14 @@
#include "TStyle.h"
#include <TFile.h>
-#include "Riostream.h"
-#include <cmath>
#include <fstream>
#include <iostream>
#include <vector>
+#include <cmath>
+
+#include "Riostream.h"
+
#define winsize 6000 // 1500 // 5500 // 6000
using std::cin;
diff --git a/sim/detectors/trd/qa/CbmTrdMCQa.cxx b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
index a530b3c14c..9d4789fee2 100644
--- a/sim/detectors/trd/qa/CbmTrdMCQa.cxx
+++ b/sim/detectors/trd/qa/CbmTrdMCQa.cxx
@@ -6,8 +6,8 @@
#include "CbmTrdPoint.h"
//#include "CbmTrdMCQaReport.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
#include "TClonesArray.h"
#include "TF1.h"
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index 971cf51341..6dd7585f98 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -15,16 +15,19 @@
#include "CbmStsDigitize.h"
#include "CbmTofDigitize.h"
#include "CbmTrdDigitizer.h"
+
#include "FairFileSource.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairMonitor.h"
#include "FairParAsciiFileIo.h"
#include "FairParRootFileIo.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
+
#include "TClonesArray.h"
#include "TGeoManager.h"
#include "TROOT.h"
+
#include <cassert>
diff --git a/sim/response/base/CbmDigitization.h b/sim/response/base/CbmDigitization.h
index 0bdadd3899..039cb118a8 100644
--- a/sim/response/base/CbmDigitization.h
+++ b/sim/response/base/CbmDigitization.h
@@ -10,11 +10,14 @@
#include "CbmDefs.h"
#include "CbmDigitizationSource.h"
#include "CbmDigitizeInfo.h"
+
#include <Logger.h>
+
#include "TList.h"
#include "TNamed.h"
#include "TString.h"
#include "TSystem.h"
+
#include <map>
#include <vector>
diff --git a/sim/response/base/CbmDigitizationSource.h b/sim/response/base/CbmDigitizationSource.h
index 5a8ec494f2..3e0089cc1d 100644
--- a/sim/response/base/CbmDigitizationSource.h
+++ b/sim/response/base/CbmDigitizationSource.h
@@ -8,12 +8,15 @@
#include "CbmDefs.h"
#include "CbmMCInputSet.h"
+
#include "FairEventHeader.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairSource.h"
+#include <Logger.h>
+
#include "TObject.h"
#include "TString.h"
+
#include <map>
#include <set>
diff --git a/sim/response/base/CbmMCInput.cxx b/sim/response/base/CbmMCInput.cxx
index 29bf9f24f1..8c2740f36b 100644
--- a/sim/response/base/CbmMCInput.cxx
+++ b/sim/response/base/CbmMCInput.cxx
@@ -5,12 +5,14 @@
#include "CbmMCInput.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
+#include <Logger.h>
+
#include "TFile.h"
#include "TList.h"
#include "TObjString.h"
#include "TRandom.h"
+
#include <cassert>
diff --git a/sim/response/base/CbmMCInputSet.cxx b/sim/response/base/CbmMCInputSet.cxx
index ab841fd3c6..d26ee6ae7d 100644
--- a/sim/response/base/CbmMCInputSet.cxx
+++ b/sim/response/base/CbmMCInputSet.cxx
@@ -5,8 +5,9 @@
#include "CbmMCInputSet.h"
-#include <Logger.h>
#include "FairRootManager.h"
+#include <Logger.h>
+
#include <cassert>
diff --git a/sim/transport/base/CbmEventGenerator.cxx b/sim/transport/base/CbmEventGenerator.cxx
index 2dac61acff..ff674d7be6 100644
--- a/sim/transport/base/CbmEventGenerator.cxx
+++ b/sim/transport/base/CbmEventGenerator.cxx
@@ -8,8 +8,8 @@
#include "CbmBeam.h"
#include <FairGenericStack.h>
-#include <Logger.h>
#include <FairMCEventHeader.h>
+#include <Logger.h>
#include <TMath.h>
#include <TRandom.h>
diff --git a/sim/transport/base/CbmMCEventFilter.cxx b/sim/transport/base/CbmMCEventFilter.cxx
index 791fcf1b86..62703c9d5e 100644
--- a/sim/transport/base/CbmMCEventFilter.cxx
+++ b/sim/transport/base/CbmMCEventFilter.cxx
@@ -6,6 +6,7 @@
#include "CbmMCEventFilter.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 93dcd07edf..673e6a4ca5 100644
--- a/sim/transport/base/CbmStackFilter.cxx
+++ b/sim/transport/base/CbmStackFilter.cxx
@@ -9,9 +9,11 @@
#include "CbmStackFilter.h"
#include <Logger.h>
+
#include "TClonesArray.h"
#include "TMCProcess.h"
#include "TParticle.h"
+
#include <cassert>
diff --git a/sim/transport/generators/CbmPlutoGenerator.cxx b/sim/transport/generators/CbmPlutoGenerator.cxx
index a51b92b944..34146cf56d 100644
--- a/sim/transport/generators/CbmPlutoGenerator.cxx
+++ b/sim/transport/generators/CbmPlutoGenerator.cxx
@@ -6,8 +6,8 @@
#include "CbmFileUtils.h"
-#include <Logger.h>
#include "FairPrimaryGenerator.h" // for FairPrimaryGenerator
+#include <Logger.h>
#include "TArchiveFile.h" // for TArchiveFile
#include "TChain.h" // for TChain
diff --git a/sim/transport/generators/CbmUnigenGenerator.cxx b/sim/transport/generators/CbmUnigenGenerator.cxx
index 835484f9a3..90213e8a24 100644
--- a/sim/transport/generators/CbmUnigenGenerator.cxx
+++ b/sim/transport/generators/CbmUnigenGenerator.cxx
@@ -8,19 +8,22 @@
#include "CbmUnigenGenerator.h"
-#include <Logger.h>
#include "FairMCEventHeader.h"
#include "FairPrimaryGenerator.h"
#include "FairRunSim.h"
+#include <Logger.h>
+
#include "TFile.h"
#include "TRandom.h"
#include "TTree.h"
#include "TVector3.h"
+
+#include <cassert>
+#include <sstream>
+
#include "UEvent.h"
#include "UParticle.h"
#include "URun.h"
-#include <cassert>
-#include <sstream>
// ----- Constructor ----------------------------------------------------
diff --git a/sim/transport/generators/unigen/URun.cxx b/sim/transport/generators/unigen/URun.cxx
index ce394931dd..146ec6b68c 100644
--- a/sim/transport/generators/unigen/URun.cxx
+++ b/sim/transport/generators/unigen/URun.cxx
@@ -1,11 +1,11 @@
#include <iostream>
using namespace std;
+#include <Logger.h>
+
#include "TMath.h"
#include "URun.h"
-
-#include <Logger.h>
//____________________________________________________________________
//
// URun
diff --git a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
index 93ee8fa5d8..b72ae7f626 100644
--- a/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupDbProvider.cxx
@@ -5,16 +5,16 @@
#include "geosetup/CbmGeoSetupDbProvider.h"
-#include <iostream>
+#include "CbmDefs.h"
+
+#include <Logger.h>
#include "TSQLResult.h"
#include "TSQLRow.h"
#include "TSQLiteServer.h"
-
-#include <Logger.h>
#include "TSystem.h"
-#include "CbmDefs.h"
+#include <iostream>
ClassImp(CbmGeoSetupDbProvider);
diff --git a/sim/transport/geosetup/CbmGeoSetupProvider.cxx b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
index 3a7af7df10..37f420e1aa 100644
--- a/sim/transport/geosetup/CbmGeoSetupProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupProvider.cxx
@@ -5,10 +5,6 @@
#include "geosetup/CbmGeoSetupProvider.h"
-#include <Logger.h>
-#include "FairModule.h"
-#include "FairRunSim.h"
-
#include "CbmCave.h"
#include "CbmDefs.h"
#include "CbmMagnet.h"
@@ -20,6 +16,10 @@
#include "CbmTarget.h"
#include "CbmTof.h"
#include "CbmTrd.h"
+
+#include "FairModule.h"
+#include "FairRunSim.h"
+#include <Logger.h>
//#include "CbmEcal.h"
#include "CbmPsdMC.h"
//#include "CbmShield.h"
diff --git a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
index 1d17ba68e0..2a5b360e5b 100644
--- a/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
+++ b/sim/transport/geosetup/CbmGeoSetupRepoProvider.cxx
@@ -5,17 +5,17 @@
#include "geosetup/CbmGeoSetupRepoProvider.h"
-#include <fstream>
-#include <regex>
+#include "CbmDefs.h"
-#include <boost/algorithm/string.hpp>
+#include <Logger.h>
#include "TSystem.h"
#include "TSystemDirectory.h"
-#include <Logger.h>
+#include <boost/algorithm/string.hpp>
-#include "CbmDefs.h"
+#include <fstream>
+#include <regex>
ClassImp(CbmGeoSetupRepoProvider);
diff --git a/sim/transport/steer/CbmGeant4Settings.cxx b/sim/transport/steer/CbmGeant4Settings.cxx
index 4860ac774b..3725981c3c 100644
--- a/sim/transport/steer/CbmGeant4Settings.cxx
+++ b/sim/transport/steer/CbmGeant4Settings.cxx
@@ -1,7 +1,7 @@
#include "CbmGeant4Settings.h"
-#include <Logger.h>
#include <FairRunSim.h>
+#include <Logger.h>
#include <TGeant4.h>
#include <TPythia6Decayer.h>
diff --git a/sim/transport/steer/CbmSetup.cxx b/sim/transport/steer/CbmSetup.cxx
index 9ec66e3d26..c598547e9f 100644
--- a/sim/transport/steer/CbmSetup.cxx
+++ b/sim/transport/steer/CbmSetup.cxx
@@ -5,24 +5,27 @@
#include "CbmSetup.h"
+
#include "CbmAddress.h"
#include "CbmFieldMap.h"
+#include "CbmFieldMapData.h"
#include "CbmFieldMapSym2.h"
#include "CbmFieldMapSym3.h"
-#include <Logger.h>
+
#include "FairModule.h"
#include "FairRunSim.h"
+#include <Logger.h>
+
#include "TFile.h"
#include "TGeoMatrix.h"
#include "TGeoNode.h"
#include "TGeoVolume.h"
#include "TKey.h"
#include "TSystem.h"
+
#include <iomanip>
#include <sstream>
-#include "CbmFieldMapData.h"
-
using std::string;
using std::stringstream;
diff --git a/sim/transport/steer/CbmSetup.h b/sim/transport/steer/CbmSetup.h
index fc6bfd6408..6a0a32aacd 100644
--- a/sim/transport/steer/CbmSetup.h
+++ b/sim/transport/steer/CbmSetup.h
@@ -12,10 +12,13 @@
#include "CbmGeoSetupProvider.h"
#include "CbmGeoSetupRepoProvider.h"
#include "CbmModuleList.h"
+
#include <Logger.h>
+
#include "TNamed.h"
#include "TString.h"
#include "TVector3.h"
+
#include <map>
class FairModule;
diff --git a/sim/transport/steer/CbmTransport.cxx b/sim/transport/steer/CbmTransport.cxx
index e0e71760f7..fa2980e8b4 100644
--- a/sim/transport/steer/CbmTransport.cxx
+++ b/sim/transport/steer/CbmTransport.cxx
@@ -18,13 +18,13 @@
#include "CbmTarget.h"
#include "CbmUnigenGenerator.h"
-#include <Logger.h>
#include "FairMonitor.h"
#include "FairParRootFileIo.h"
#include "FairRunSim.h"
#include "FairRuntimeDb.h"
#include "FairSystemInfo.h"
#include "FairUrqmdGenerator.h"
+#include <Logger.h>
#include "TDatabasePDG.h"
#include "TG4RunConfiguration.h"
diff --git a/sim/transport/steer/CbmVMCSettings.h b/sim/transport/steer/CbmVMCSettings.h
index f61df12fc7..d8dd8d4e72 100644
--- a/sim/transport/steer/CbmVMCSettings.h
+++ b/sim/transport/steer/CbmVMCSettings.h
@@ -13,10 +13,10 @@
** @since 21.01.2020
**/
-#include <TObject.h>
-
#include <Logger.h>
+#include <TObject.h>
+
template<typename T>
void CheckValueInRange(const T& value,
const T& low,
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
index cc15d2be33..50c21ad278 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerIdealWrapper.cxx
@@ -2,20 +2,20 @@
// ----- CbmStsHitProducerIdealWrapper source file -----
// ----- Created 10/01/06 by V. Friese -----
// -------------------------------------------------------------------------
-#include <iostream>
+#include "CbmStsHitProducerIdealWrapper.h"
-#include "TClonesArray.h"
+#include "CbmStsHit.h"
+#include "CbmTrdParSetGas.h"
-#include <Logger.h>
#include "FairParGenericSet.h"
#include "FairRootManager.h"
#include "FairRun.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
-#include "CbmStsHit.h"
-#include "CbmStsHitProducerIdealWrapper.h"
+#include "TClonesArray.h"
-#include "CbmTrdParSetGas.h"
+#include <iostream>
using std::cout;
using std::endl;
diff --git a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
index 44d5d50cf9..e8a070a804 100644
--- a/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmStsHitProducerTaskIdeal.cxx
@@ -2,20 +2,20 @@
// ----- CbmStsHitProducerTaskIdeal source file -----
// ----- Created 10/01/06 by V. Friese -----
// -------------------------------------------------------------------------
-#include <iostream>
+#include "CbmStsHitProducerTaskIdeal.h"
-#include "TClonesArray.h"
+#include "CbmStsHit.h"
+#include "CbmStsPoint.h"
+#include "CbmTrdParSetGas.h"
-#include <Logger.h>
#include "FairRootManager.h"
#include "FairRunAna.h"
#include "FairRuntimeDb.h"
+#include <Logger.h>
-#include "CbmStsHit.h"
-#include "CbmStsHitProducerTaskIdeal.h"
-#include "CbmStsPoint.h"
+#include "TClonesArray.h"
-#include "CbmTrdParSetGas.h"
+#include <iostream>
using std::cout;
using std::endl;
--
GitLab