diff --git a/MQ/histoServer/CbmHistoServer.cxx b/MQ/histoServer/CbmHistoServer.cxx
index 22d0b0f84ddc3e73aa22b706f935473110dfd4cb..684b55bef4c2fe6e84a552a1a242d122b68e45cf 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 7604d68d62715005074492c2cca6f62828be59d0..87948380ffbe4a750454e5cb2a2a07b3e41eedac 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 8fce67550321f1bf2ebd769a10e9f3359e518233..df71fd758a9b2242bf2d4c71f790deb85c82d14b 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 1943a528e6a5c1c40800d0b383a61a7a7c81ac57..072d1cf8855a87193a33afaa835057b30804c299 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 03a8cc5fd76044d2f53fcf15c45b8584237291b3..d16d712d6dd65768c466b5a3fba374b238682289 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 f2bb2bf603e8e60a509e206999c925fbe1a21897..749b31cd0077574dcac2453f5090e90d8d36e1af 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 40e315d762976f762dfbf4a6f330bc19f1a09f22..04a22e6f44742b1c52fd6554aefddf611e6ac738 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 0a4476c206dcc84329d476d15d1d94781593c499..e33afd8fe052433dcb489d7a67a2ea68f434ef4a 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 7bbf7aee7e13783e71ebc29032c7d317757ea95d..f67d393fb284d101942ef57d8ba98dc7c4ddfbd6 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 359abde845d5dd55c9d0b0b382fdc9db37392524..3c3514ff9c401c59e99f63b1e59728aa9f59ff49 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 213b025086902cbb13b6075ba1bf24cd10f38ff5..af06c57f8f0b39a4db7d58424e320127f4835cd8 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 ba9bef25cfe9c4b58a610a9c0c43b16dea764109..adc4ce04722770876fcc50f43f56286c4d702215 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 31841fc646503097e7bbf71434ad04841ee1c995..c8baf404171128aece0de0f7efa412c7d2a5a037 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 250d33f643adef9813360d26f990a6042fb4e1aa..ba82caa4384c8c3da984e7b0f3cd763d690f7a07 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 4c50b9bb7fc9ab938e5b52b95012ecdc2425d9bf..e1201af4950fbd9dd6681e53a1655a81a0ea0ca6 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 35458c9c93b07a13752902e4523f3f335bf79714..dfd5450153462df12e91eee87356087b0dced488 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 04928e529af79b8d625c1dd31779f96aad2828cc..b86444eb8cbc47dc2fa81f3ad60c3b1ecd476ea5 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 d26edb02a1064aad661f4f8fb44683cdec29245a..4190a4f3799a9c79cabce3a5a7c85ca507bda12f 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 c1d9ade4608ef9378a18682a1e5535b553ba74f4..2a5f1fda79acc3162f7c2e099a974d16e7b4fb9b 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 6ac21ae6324e3545325dacd07bd6d8fb3eb2091e..eb9b229ce076db44a9247b62314672ebf62d2d2c 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 20d0bafd99264c3019febcd2f4f46fd83999c6d0..052957b0701c2ac0d604866526d4226267df0a7c 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 fc95ae5564906e7d5a4e99a9172aef076406071f..fca2e76427cad9d5a902f38ea43b0b48128a6e47 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 c0e1eefae29c7d5a6e0d3246894ee4fa7473aeb9..d1b4ff91029ee8e8ff3a37db3d4c21b7eda0bdd5 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 7bcddacf1aa791b2affba12504ffeb16af50cce1..ca2599b18c2c75bdf3b339adaa8b3ab694642a37 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 c60fa16fadd00d3fe1faec1fadaa713c3188ab5f..4b97634bf66e5b8e1587937c08abee9b14d61979 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 7f1894c22de3e9f9c0a517517e57200dd49d1e19..05a343284c902748f57d4424d964b226550bcaec 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 8a8553d9a6526af23296af8846bd1d1afb6c4f34..3de6e131c48131277218214246bd97f7a04bd44d 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 9c3da669f8cdd7437f5a32e3622055685bab88b8..192745c2dd4982bc27959fa0c34b59ebda6263fe 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 463934bde7fc861ebfa6d0dce10f63c3a2f1de84..ccc305aa52ea7181673e38a5b1b26b7ebee6b30d 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 b20806a7c81e90b714e53c2499d677170e98cb67..2fea1ba501f2f9b0ee80ba90b4c810cec2cb6f6c 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 52eb8c81b6dd3fdf73bc0090382bbac1fe743c2a..eda5bdc2d57b4949c644b3f9ea8f7ca72f4adf12 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 3a9949ac20d91eb5632a9f4bd540e9371c592a5e..266a9860cf6d72df9be5e923bd8a8258277c9f25 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 248dd9efd9911fdfea8e56794f5abe8367ef251d..579afad18e95f57466b3443a3c76e6a2cbbbfd38 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 927ba7017cd1b5012436827fef3df2a73665e6ce..02852caaa10ad1313db4f2e489c007de0681adf7 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 a9e392822a94c26ff4324a71ecb36989983a409e..408c370e5d1f1527b8c489e32aeb13c498447746 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 f8e2d02290c6254d78bb4348439617f6a463ff6c..34e774259ebe1453b6a6514df810caca55f81749 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 734e1c6084742ab043317fad341f5273c9d72150..b8ac68224bb81e83463b84a223d837e8ef8d2bb2 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 e9f4fcd11c4b7b40b89afacf1b2f578b27ded76f..4e8e93365275d676836c217f7eaed801a6df0e75 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 5b5416a6e1c6aa04490182641a2b3421411a9d57..838926c4f3119734f11df42868f1276f8f22e30d 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 3b33e6570944f75ecb105315ce43566e6fd49fba..0ddefbecdaf1fad1664d1b99f3b846035ee74d14 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 0c6fee18f91c6dd996b4429a6e0e2f3020037074..eb1b93d9e90669920fd43eee20aca2c5652c1355 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 d7e61eeae90a48ef8d0c6801d99567a7e6aed555..4050a4fc9ec0bda1f045037466698576422b4a1d 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 81de745f4310e13385bfafb9810e1f48a33da6f1..f7f805eb621dc69c4eb163419a4ed63279faaa4a 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 86611a3a046ad22cfe1b6b597010edbf53515505..ee5ec3816920a615bae8b53ea813a657d987b78c 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 febf765bfefcb3245b2b469e4b34f358932bfb0d..5453415e95bedcc0e36769dce84e607507b80319 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 67a1a29aafda5b0defb7cd36ee57a01e56334cfa..ed588498e0542407158bcb01dda220103f9cab33 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 5bc81cfad47cf3af3f558b67e972f731ca1a3ae4..ce2203e36b6fa8713775e65bcbccb98897e0fe77 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 9f6538520636745c1d80ff1202ed7dd181c2bfae..86f5f4db4f5daaab6a1f93e5cea1fa9e720f4024 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 fc4a5cc07c069a1ad11e9e3fdd42cbbdd0251784..9e76569efa95aba0f5b7df758bffd98f1b00d60a 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 c8ec993c1b66d26488a55bf6a5b548c372d2f50c..598746b1412e9d51f351d286f9845810d7fb1579 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 1fa3cf9cd3bd49ada8283e156f9da9be35a6d711..7c3c2af7787706948cea1cfa465c2444c89fd84f 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 931416f3f1ea9a8a67258490913f185f17165733..6c29d5521c983d2782be3fa12934e4eaf80bcfbf 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 5a9b105f70b58d715180bfa5de3095f29dd0a754..680538570936675360982c3b053d7faa4d104407 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 92a063ffed3c7573b7cb133dbc5192c4046198f8..dc28967cdd370b1ad000470710c75251711b0da0 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 a6cec4c2a6a0f8262b5ee3911cb260ae2bfa1209..1c391447935b7a92f6e24dd593b4bec211d72f46 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 1773ab6f59a229c9c28ebd9f0d9f0d57141c05e1..cd83b090b035ff2457c0a87666cfdd99d9b57895 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 0955d280efc60dc6c8103afdf28ba7e916314d07..d12a37683b290d44ab2d5601d8971afec7e9e693 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 6c8789ff98e73300c4ed0f417608ed01cb3aa651..63a6b7255e2e4159b75de747d1647c25c9782113 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 35dad23576d4a428e4bc5ef24d9fefdd23e186bd..9264131e225f93537b5c42c746b6fbd517388c23 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 13c03b9559420e211dc0ad53bda33c39322fb7ff..a5d33f2d7236c2703245c8fc3d7052ff94d8e483 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 b360d4e98f27e0794e92e673f02afa305386dd5a..7670debf4366c54cdb8fc470a23ca571f461cf7e 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 f88cc0b47bdcc0744a888277363c86bb0674a3eb..36e290711d9fc661335db0578b7b60d8afefb4e9 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 370557e6d4b97ca7effdb2261cf7832ebfb44cca..939f3f11dda0c5efd8ff9b0055227347ede126ac 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 d44f88576addde842b6856b99da11ae84d6a26a3..de7aa26f4b019f5db47439ab5539f1814d69b182 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 a5ebd0ad3a1372a83c9c513ab75fb2e7a4384c63..36ba8dca30fcb8ff585d134eb2563518bf1a567a 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 c740bb2ab4bc00ad4770a07b6dc8f1598cfaaea0..17647b635cbe178cd2b7a97a4245f3994f60e399 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 00bc5509d01eaf7da449f284cd66251d60180af1..dd695af1579575e80e0ab8aba1edd2ced708272a 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 acb2b1c7ea9ffd42180688d173bcf10ab7365c71..746fbdfa92167c22ef2e66724cfa24113244edf2 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 c78f127de2f2c7c1f89ccff1c87a7492d16c1d86..5cd87afc4877a1d4967ed49073bf1ec302159a20 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 2a982c495a8f79fc9e1c670c8d6d21dda21a9b80..b8a6f91b4092607dfcb00d8e813299ca9a987256 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 a988f194f66b9209027bc5f3bbe0a7194e35eedf..a9912f531f2e1dcd65c5f5e8a4c5f75b0c9c1148 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 cd43a1ba078b003b0fbe450a6831451e870de0af..dac6999c21edc228f4f5cac8d762cee80f7beb0a 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 efb3b94db6e08d9bc93d0b3d326e0b868a7fd4a5..547ef1b34b8507fc14fdde68fa7573ec26b6745e 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 a2ff1e9df5f7abcf3cfc70f3330708e94366908a..ad7197e9ac5876f0073d0b829a3bb356216174f5 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 db68496aaec2a6ca187a52a18ddb45ae3ea31a8e..1bbf21e9b014581d90e555ba49830b496cee3d85 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 10e075639e7123119410c83bc781ec3632a9172b..502bc645c1b31038df3492390f03ed8068570cd3 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 ae80e4aabf50e373be1d89c909a955bfb76a48ca..31b9f39340c786f7253c6bc1c6c7a088010513a9 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 bc00e57baa5835e96d3ab3316fcda20dce6868a3..de93883a387bed67f85ae53868dcff7a06b31574 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 9e50123981c545a9c7b41cc50b49d14b7a32869d..e01a518e0304519dc0d55b3573718ba0d1216d51 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 66aa45e087248bc51dfb9b95a0bfa75854ffb578..1e80591db80f73df92ae09e56b92bb9e266211f2 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 ebe2dbbcd1d92d69bf70976774fcada991616e73..f50f707fb2106162a06af9fbc94cf4965b4d49ab 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 8b72c22c143090ba37cbc4cf077d156331508b9f..f2ebb7cb0de6ed5ab1ac436fee2cf83cb54f901b 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 6b98c8b61ce85f23012c87ee2015cd51dac9e0c0..4c49c0da1110eb6627c96407836a86b626ee70e1 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 7341442ae7c37d5bca94a17d2b1d6b9f390d8ad5..308d9ebff66b5e02dcced9c2028a8cfed6110e04 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 d96e4bab430712b0115f1a6fccf3a21c59071d89..c0f276ea28020ce88159e83dee5c0cb04b8900f6 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 72b968a3ef7242d789dcc7e6e3b6bd96ed9ffd1c..20ec36cdb23a02f062f95c116824710690ae6a9c 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 f138b4224e3a283c5626b040b527c0614a214e07..94b3a0e03dd675122d1beeae712bb0b415d03db6 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 a03af02d772fcb58e80bb75c6adcdf320ff5ed5f..9c2805a0babced22cfdfe55473fa38453f512c23 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 1eddbcf980385bac6f5941936bd6cb728d44057b..55d1d2a72a6ee02a6ae0e5f71eba76dee81e3c4b 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 d8333f025bd747bed8eb491db5c14d6521584b66..89d5626ede5971d9272020d8e7a5a76ce1f646de 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 1eb6dbc27dfce5e3c594779623cc312b065ae7ca..14943f65b4a99cd345d6416bbc0b46c8a3fb2ce7 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 e8817f42212ba24f8799cba44211f5bd16487e95..96cfb3220c3c0e9a88b877e0141e89b101a8486a 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 c85d3b18d4e038f5476a2bd1516988cbf4e13b67..548f92f2a294a4cffc2d0863dd48b633770512fc 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 eb996e7274427027ac8917a5a200ea41f9c79f00..2c4d82548d4369bf9c430d2690c55856524995d9 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 0dd89f4255f9ff95ca0abdecf62ec25601d98a71..ea2b7acf6c96f19fc50efca74dc6e69f8bdd4588 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 eacdb5bec56df0ce2c8690b2bd996a9543ee36d2..5fd35943823abd1869d96ff8d55630a906cdc0f3 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 ffbb82a23bd9e508550ac40a352988aa6a6b5873..a077def84d0aa213da78cfad94d3ea8c01866d37 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 7107d6f751198b3a0afd3bf992d46ad0b3d47ed8..7cb0bf4a0dc7505d00ffcd9500b75ed5a2c7ccfa 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 db02b2457e8d4e2b5a0729a15a6d1f18e4c3a678..1282c3512473dace6422cfb036916e7781f49d0d 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 db8c74b0f470b5d19c04ff102aa6c748177a3fd4..f562d2b9712179e0b3c5e79b3737f4ec17ea2a8e 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 9e9a19926aeb6a5c2be2b13a62a2fec4da0f7c4d..1f0c6cdcada2cb4ceefdd628f58512fe1b1d264c 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 1b16a776065655b61d058e58802dde07a24e5f2e..9b0c831a8edf1e226f18699775d99c37be2c7ef8 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 3004da6a12f6c25173a214a527e02c69925d8d73..4364735d7df7a68dd8fe2ea50516128b15114588 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 8fd22d28f055c092a99362f7dd1b03d30a1d9038..724c21ca01ce791166b8e9d6799c1d7c149ca9eb 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 7ef4465d8cc9e06b177038f1f5b6896bb85d6324..4ec5cd35904985802cae60268a3e581acfb5f7de 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 b5717c705264edece788de83d1765cb43e438311..6e1d392110ae023b4970d92dc1c35a88fe1d2b8b 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 e09b2352f5ad6a47220e7f0144d1e74db2403618..faad81cfceda3a5cf7146d1ac4317ba7f382c1e1 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 a6eaf8afeee70aa92027fe4bf1a1136d80892734..e2d5db0a1a1913c0c07cc04833577d95d0bbd2fe 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 c4e060ae0c3c912e8cf41a2b82c0de46afb9360b..467aa9ba289e21c7f7c8ead0fe4361dcd8c62dac 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 827dc1cbef902b7586d03e1db7deebd728b578a2..fc91d37fe78e198b2c5488c6cfc42fdaecfe796e 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 68a8c4cf9c20549c921af9c53263e1dae729f826..01bc72d550d1a739f3639ff775be2474d8cb6bf7 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 bd1cf46f4a998e909bfad53c10a1b8b138700515..ea5939a6a1bcbadf0d8079734cff414130ad146a 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 499a3b21316b693bbcfaa2472f272c2e7924cb4d..6525d4018d318fee8785bb2cdcb73fd0abac64d4 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 d55d1730e7ebb7bd07d6de0299bb27c70d688176..b88fba045cd66e26ceb7f802b67e5bce57e7b6af 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 72e764ffd204dbb5a4d20f5127540740fac87be1..1c8510d4fc993a27b2348d1f6e5d26efc5b4505c 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 b5c9bc2398ab25e470d13e7ca5b3dde171d92662..b8e18bacd3da0c2525b2319911515bea0641e76f 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 23050d42e79c05de40055d7faa9ba9785799b157..65db603f799eb252c85fd5b8ecc7f513e70abe46 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 e1f7e8dcf7e2d6088dcba2ad8647ac4f01dc5662..5900816d33f16ac07f409c5b775004678b876b06 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 4de774c246cf9155ba78dc28741fa05cae9df7b5..c79c71a24adc640b39b4b4dbdce43710f826433e 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 6a339c9604c966351ea2cd1005a919ffceab2c02..64c12cda897abaa77550a1e99763a04a3b02ddf4 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 8e9ad5596d7209a2146f1930a155d71e008b8121..d37a1e202c0f72dd7fcdb7850446ef905348e129 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 8ce2887d84f0ba8fe6aab54278cfd2a39db7603c..05617ad5668d2bf3eae7d7571c697a439ac9ee8d 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 584fd9d0dbf620488defd4a401f84c8ca8a7381e..fba4779c480bff8fe95457ee157a217983ee0ec3 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 b307c81195f6711c334785b536cf933375aa6635..8f229e9b1ec81a5ee7faacb3d4dd3d89573124cf 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 e542852aa4b056361557e6b3580c1fc7bbd0118e..09352bd1fe9cc7a4abd9b462d26c18e23c64b6e5 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 743097af7d4a4b60c6f1944decc1518eb348adf4..cc207438f4e74c395b70a17a82d396ea28d40b8e 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 696c3c7746e76f46ecc977e932687678383f63f2..b26a7dd693efebbbe2689df560041e91a43057fc 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 98fc7b8b2be02d946ad1b6019404737ef5ef0b53..bca9ffe622d4624fdb52ae85166e04e362f3b6a7 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 ecdfb8d6d6f25dc55217e3e2ca9edd708bbed08b..44e859414aa6a6945f47f926de55feef987cf99f 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 18d707f03743f8a5fb11d273012efbec8f3fdd9b..ec17d8cb4c03b0d52bd1deb4d717d154529c59c6 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 639998d4e07b743b1bb47e9fcffd11a04d39cb55..8994c1bbcb773496c1ad72cbf2c455a3633715f1 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 240bced642163e7db6e0da2ee2a1ef414dc1d8c7..a4a3dcd39034d00dc059ad08083c2c0b91abef30 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 647a2445a9a965cfc660678a5be3508506339dff..7c2c6e2c374a84c4640f54bfb4d810d5fe51d70b 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 f7ad02b437eb6d6365196f098a2c0b6d0d1197b9..6e7eda88a161d9dc6ea92528817ef68b49de1416 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 926104ee1d4b99151a23abf4be94c57565380366..44a1d9fa59f210d9d817fc81c3fb47b81a18d294 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 1e781e3c667ca266f25a07f6b268e7a97288dd70..efaabfb2eb87cd19ca6f492902e5680455f2aa8f 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 b41453dca10a38756dde93f107c8230f70ed8933..6eabf542eeaf12ce56d79c8386e8fdf025cb33ff 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 aa07eea7fcdb7f0de870710d37f6aa5a162153cd..b1e8c404655cbbf7abc5369b1bb0edf21f0624c6 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 91e748cd38c482393bf22376e1c04d1facd634d9..d14c82810dd51eeb1c124df174cb111ce4a01643 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 fc7707210f80c6d8ec3f76fbaf5a3b7bfe295003..8ed08b53e2c4483f96c6d183285172e19f45c78f 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 97d0720d73543eadb2b218a256481eb4085147d1..2385a12fd1862610f19e0dc00168ddf0a7d30129 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 6e78960c77482c7cd7d53e888e1afb1b5c69dd2b..255fb037928556f48c749e6fcbeed66fbcd5305d 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 ce5dd63ab3b8b9b60c0b48f83e40490cf5dbad09..cbcc7a79cdaffeef73e20ec7c53a72fb5e06e754 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 c20ec348ccf89fb0de304b3ff1b72a8694d6b900..932c0315b0207171d3547d33c8f5271371e3dde6 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 6e636f10d87f0fd5830343cc60bb14ba850aa0b0..1d9c47b93584cf3d2aa80c58141c2687b392c1ef 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 19c78dc44e8aea2ce43667e118eb90e9c8442f46..81d07bd00dcf2f80a3378977d7ba2728d4f164e2 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 c4f60139e3bbda981608ac737c4db5cdf654eba7..851d3be4038d341850b4d304a0d4e116d2cbad72 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 1e245c266022ca71e43ea8d824b0e7d1b9839eb5..491e57eb1cada6c0a7ce9c66087fb943fe1d7df4 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 91330933b45e4e756cd483b6b3e232313c154cbe..7d1a49f317633c4a558fabae6b0780ad57422726 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 55e8d6ef3c11b8659c72f51ca6f0a12c156a50f3..cd5cb630ec84e3b82ab47abefedfa00d04c545bc 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 8479a47088b776b1f0b8e696aa3b878491ab9050..c0d7012230bf41c379f1bce9f132a44062e86153 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 82003aafe02b611922f8501127abcb44a965007c..aec889cc72de1467981d3a19318d933986325114 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 9f77789ad8be2b96f2fe9bd56f240ccf6e5cc25f..392eff8a3120d2f9b43b98ad124922dd69fbd9da 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 3e0458a327ff7b86d7d7ccf47be63a76226c96ae..cd248a3f481478755d51fd889bdf50f2d1940762 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 0a6ee6529ebab85b8dc3c85162bdae22c01e76c6..02129a670d5f192ed77fc5738ac1962d4bc17ae3 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 c900aac48fd2adb352730e0cf9a0a289b6f4c3f6..bbc043643204cd03f10d004bb5bf0c6d0cdb12ee 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 b013bdcbb929422b40310582d4c6ffb20969b322..6871bdd55d0fc2d5bf1b94d303151ad7b4af0c49 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 f7e9fc844b936b8c5084490e5529c5beaed549f0..4d4a21c8c0a99ea9c69e2a473a39a5ed37cf8ef0 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 025192b07f00e5bb03e62d86fe0271df358c8ef2..037980b4f9d11bc896ecf5ab6044ce71fc8d3cd9 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 bf4c00d8fe27170b37da68c3cc9e7548ad8b9df6..1f067127cc5796a762d694fc10a1d7a6197cd416 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 89225d91e18bf7e793fa163a52992ec9c6e05f3b..62af150f6ccb388350cc5c16cc9c625b41b0a21c 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 abd873b1bfeb8b28db7f2e16c72aafc0532778e6..f646df175355e7817b80bd0b965bec36dd3f52c0 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 55e3d1eabc5eaf24a8efbe8891721dbc7c075ff9..7dfaf963e97ea4b4fcd2dec835d746d98d5d131e 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 2eb7a15cc87cdf90a724159eb1102e97c5188b85..e014a573171ffb16800b9ef2d4ad54fdb54a894e 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 b40c4a7a55c7c0301b678257d5096d928426acf1..b285815a516a5a71f4f42ed6907ae7c0e7cc38c6 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 ea54887ec36ce4f15f0e0b61903ac7758606983a..cc3b65e0538c0e404e78cf226b513d5ac5886808 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 26068d2448ea88fc6959ebb407dfb7e8a8dea70f..1903233c07278a317e81245ccf9a35536ec02a04 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 215ffa926b0a0a86fa68e539d97bdff655866237..78da2a8b4804d0fdfa23ca3fc3bd7bafbbb65693 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 05b758840e2f2ff81a552f019358d266acaf7019..e8c272f6e1d8ffb35aaf71da25e7bc81298de9d4 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 b3d29e581a7eb1422024cca4d2fef75ada79224a..14a05cf7dc78b3b9ec609f954d2805afed6cd7e2 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 8d926405a07535bc954c3fb2b46277c963ea003e..9f7181daa63ca83f5038686648fc61cdf3670a1b 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 f03fa9765a7d80d7971c29c974259d0728df6cf2..e0b1cc16edf1b0260b5a8a42d3931a5ab12a5be3 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 2cb5ea094a8e28e27c97eaef6b1b28f1a6caef6f..eda5e808867ecb070ee315428665834a399b1dd5 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 936f50da40b83139050cc43c5cf487d1b6aa874d..93aff13f17bcac1ade108291be32056fa45d4b6a 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 a1d1f6627ce5df3d3e7c44f537b96b3c77ef13c6..fe449fe1f73aac16800e6b53c0fd07283b2f1014 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 9890fffcabe5fa6a214e565584d83def73b2fe2b..056bb3cff9c5130677392301b953d614385a6cc8 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 73df445db27ebad09237e46eea64128e5f6453b8..0989f4e2762a6a1b3504854d30f3cdc96066fe17 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 7afae2f1fa463533456c94f95d0c71fdbcfe4e81..8c3492eb9d2d81e6116686cbbab38de8ad5fc441 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 002535c9cd7812aca353a657bffd43421c2f51bb..df7005432769c28b122731331c701f78d0f20fdb 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 da1c2afea59fe1166fbabb45a59c76bb3fde727f..de9b7ecf0cce7585a7fb5968abb9956980f7d908 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 052027a77b1a579daf3a2d6b5f0bc3c1143c5dad..d1b103e8760b3be0b1dacfa499338e0b0d68fd3c 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 026f787a4b50cd15539c88528a574e4e4e9f95b3..ae9c6d4c8e63c295be4b543bcd71f104a4fbe752 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 f6b3587153a3f2834e29f03881384d63d794e3c3..a027c63b28d0d34cfeaa714909888711aa10da5e 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 e1c61ec5a0dcac9cf9de6229780d9a8759209bb0..de786653089306b1b127fd53ab8d3f10af5193b1 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 bd621ada4450f176c3dad90accd017b2b61d19cd..4f4261106582ee34cc1f7df7578d9d983af429b5 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 194c1f0ddfd6d18409a68983865e931bc7606152..10d4e0c63de76997be45c70e852d0a7b4a7c3ce7 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 1c6ff72b60b1a3ccea7c8b620109ea740e9fb927..467f4302ffdcb890b5dfd68d5eb97d4e1b7a4593 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 e2586adb9881f68565da8f85bd20a438114703c8..60dc0ea9fd0652e3131a0382b0aa8fa8d1187c75 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 af9ddd83d6f72e7693f56cb3464aa106842c11a8..c3eeb1351ea91c54812de338c414c0b8ccd87bd8 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 01907ac66b81523984d14d99af3002daa33d5ca7..a496a4ac3aa38f2d0f9148aaec6370840cefbb6a 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 63e8ba7079b362cbcfb321aed2e1587b55025db9..4480d375a88e52f6ae867f8a8efab918254064f0 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 91862f8d353f2b19b6250819f4f93207a5bd7a9e..af6b73a4b45264fe877cc97631f725dc14502bbf 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 ecaf1aa067726afabfe7f9da89fc2d75c2451716..2dfeb85db33a56373519c0590b263d69c11cfcf8 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 b0df65b868b8ff3bdd411f2a37b49557e1657cb4..af196d622900a4a726dc8c7c00fc7bac993a4ef9 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 75fb022dd9a2b490863900e0ffccad50e873d0b5..566f1e5fe64db8ec218767931eca8e0bbaad2b04 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 3be3941c50bac7b1d10e5244045fb5c781b70df3..880c0a43d67989f8215b12516e83ec46f0692932 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 9c7b00c30a6fb881822e2e3271cc64dda4449702..82b7cc7978666a007b9352e0504728eb0f63e032 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 155fb30e47bb0257953eaaf1554f0fa5e07b91b9..7bbc1f3455db7d7ab43f48835d4fa0e14d833f69 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 2571d8c752c0abd9020045d338f020ee88fc0726..bb7e038adcf8506b03fa6a9602a71f0fca87c531 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 572c68d75ecf9a967962a490ee4b57c1bd69a7b7..3c9b3e318db0f07ffd75a180983c58212f4ebe50 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 e84c78fb2222f01e943186699569a73ed145e143..a18a3ac420e512aa5f50eba21ffb07e0e039d238 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 2ced44fb0af98be6a326c42f4181d974b4180b70..40a92b48c0ffcb6abe5631a37a89439ed39e0cf0 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 70a51c90b7ac5cecf21ccb78329e178cdc5cf187..f525f9a891f25b73f660f8a1653143ec960e0248 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 2245e381d75dac833898f9af324635dd53fd0497..c8a0ec9183f87816030a2c30170d962d5e8e1acc 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 f1e5a7f25769dc80f0d3207597dd29d516e6547b..da65402d4f99053d8e1e83b295ef45a62e40f51f 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 66b4aa4da35d0b8c2e7e2d8771d33811d2f2b90e..41ba3243d99fcc0a8ffd9edcd5041536a88525d5 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 8510653284eae40b590e1c1a4395442d5702c89c..3f083a5a6dfb1f716b3ffb55579d69f025bd7f72 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 bb3327a5d1aafa2d85b9155b8526091388f24c02..9b376a1df393f1504d30f53bec77f476d4163bdb 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 6b89719e636a923509e2ee353734f047fc0aa570..290d94a8ca17feef835a747e4549047d17bbeeb5 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 cb26754e623be8604f2ef552553e75adb2e72bab..6d5311fdff4980f97d9d8ef665bb9c29f89dc5e2 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 8d73958af458e4947ced994320c4ae1ce8eafdcc..54c6b24260c6be7c4f1bb0ac1f29417c35f4c446 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 d38950c2bb0d29bffb0db180ecef444c70233020..e4f1e69a2d84ebb684e2c47e73e6fb620687c7ae 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 cbfddac45f1288300c3e5cac7881ccfba4f7129d..16006f56fc676235416d4d4a9ad6c5f71aa77443 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 e4b2b20594dd40686d633bf679ea63cb5fa6c946..6264f106da031ee5cb92db3fa48862b5807bad60 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 40f1b086365888ddc100fa6a071020b23369bf0d..c36619c27e37773bd285bc6b7de913c0e8e8257f 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 e3fb1126e1160cf5f22a2b6dd74aec93c4ce6a6b..a72fe577b8ffcbef98484eb6f8fdc9a9e18971b7 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 23ef92d80dbcd94d488e90c3baa70d4a4dfb41e5..c74680e783c8e70546011ba6af84bb08dbb051f9 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 80602c3b5e70543df8accbcdae7579b32250dee3..798c072cc094b23e9f0b2373dc21b81607228bef 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 e6d2580b27b6d7cb224e92f1e4cae5c068065908..5649bb314db0df22b91b38ce173ceee173468e83 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 c20b94bbca8ad5b2e0064fb298e68c024699edc6..d7b181d5114d2fcef5df5a69c4788637e697dd21 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 9c73c46a6969ddf0e6662c828efcac8711b4d93a..d180c3d77bc6af7ea6ae98ddfc62a629581c4214 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 fb772f37dde65dd96f860298cd47a443c3884319..b19b6a2ed66e8d4b51bf6c6797eba658aaab7d6f 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 27cf704dce0806165c16eebeea2d5a90ec6deb63..aa5d32ef1e30272788b70b3282b4d3208147ebaa 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 e8414165eb45270c8172a25138eecb9683d16b14..7b033fa8c38d1546c1aabd78215e45f0c82b2cb0 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 a44a5dd5902d96492e3da51ed349c4922a2fdcb0..557a2f7aae05148a1cdfb3285c37f6dba614ba6f 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 1bfcc11836686714a8b1e0f08bfbd2d00e429db1..648cf7bb403d22e8cf0327bc26841f1fb856c1a2 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 7d31940907b1a24659595aae005b07993bda27cd..0d926f887c8dac3190519c6c32178751023bb8b0 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 3d0f089143e1661d18f21833fe7527f9f8431f27..06105b46420c7fda55cc7c0070710607c0f467f6 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 169fadd7bbbb76998fed3e553778e40fb7fd7f9a..481c75ed6d3bc528c22c28bcb77a1119b33e4e6c 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 9c16ace4c4dee9079af9626f79f34989dcfffe75..ccb85d9af5804134ccf6697463859314f0df796d 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 3834cf009ca3d13f4a856f7e89a5bfb4e4126c8f..88a6ea46c1cac0b4dfc5b74123b8ed6ec6043217 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 8fa12f51b0b53f4cd2708142280f19ce8bab9702..6928f0a7e20ec68cb099de131d3837af126d8fb1 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 94dbbc9f979bc8e381a0896106b3861e7aa9e8ce..67549c9f36fb1b59d5aa994512012f0d268900b9 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 5208b0ea5eef2a58c319f66aef7edfa21c1e5a49..8d31c4d38c6cc3d8c233a1427d9fe2cb7d0b3765 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 752d68becd23cbdf09d4a140fbff949cc9f33ae7..11fcbb9fb361bce03e0226616431e04f1e4e75ab 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 a1c1649649dd9940b18c95b378997406afc92670..169235b81d5d138acefa4baaf1f564b22e8b46dd 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 53c45401d85904ec8315d927b5661be6b4e576dd..f7a6f869ef2128aa9d4ffa87acf96438b7db32e1 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 1a83fe2db9ca9154a3e5e5b67acd8dfdffa1a1b6..4c52ca715a4300418c0f99970f765eed358533b8 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 d059c6cf6dabb3ae0eef5ce87ab54f73e74cacaf..781a5d29c38f55f773db53a0b56d99ba600e584e 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 4795b3dae0134c12710ea6d81a21c8b8fda8d983..bcb3a9e3c5211b0f2db1e9be86a4ec6d872a6bed 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 4f3fe78d6c5f5f2fa28841708efcbb9c390ebab0..e73d3e360238001ac9d833ba5f74e4f987143590 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 363e2e079a3edccd59045cf6c4ab77f541acf6ff..d203379711467bf507733e23a7ccd920ca26b415 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 563df0918f6ee084f9b81513f8f1ab267ef0872d..b65b61111071ed0873268e96f56536a00af9b84b 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 4fa902b234eaa9ac1b9971c2076f36a58710d5c0..669b7e78abb7c1683237cfa6989750b9153f4a1b 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 aae4df5340a23ed43d8a5fde63eb8c3c107e51bf..460cd80faa082d259c12bb456e6e904a3ebf41f1 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 2286901aa8a0de4e8b80bcbf215dd229e9ca6cae..64598751b4537cf4cf139e2bda94830e3e3e43c2 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 15cd932a5a33b486736e703e0aa01dcc64a46204..4502afcac3333351ebbffb368e330db36a2b90f6 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 a530b3c14c698e9223ef1e16c7021823640d8519..9d4789fee27faa363a0257983e76833d1f498eb7 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 971cf513411a5b9f638f0163e03ab62466233065..6dd7585f98c720e95a57ad0a6b5f67954f5a03f2 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 0bdadd38995fa8b039a8d52a5f405ef58046cae7..039cb118a84b4219813d471ce621bd0f14a8a5e3 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 5a8ec494f225a2301b97f4fa40b62f214cb3d625..3e0089cc1ddb8cf299c54dc3d131fc440789681c 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 29bf9f24f160a43f6d5bf826f706928ea4c753ea..8c2740f36bdce9435f761ca3cba65a8c749d39a2 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 ab841fd3c6aa250643891dbefc60c4be4dcdd818..d26ee6ae7d123a3664a82f4a0f1c3b156d277ea0 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 2dac61acff85bcdbb2d22a9c7ae05764aa55b3ad..ff674d7be6ee986ba9cdb6d5778a4be7773042aa 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 791fcf1b863f5482947bcf280e5575f73f1d2dda..62703c9d5e6ff36de75eee4277a1a28f2187dff0 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 93dcd07edfc8158453e620dacfc34ea41c68fbcc..673e6a4ca5516a99b181a409eaf96d12590398bf 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 a51b92b9441351cd671ca9c2de9d79a924909436..34146cf56d7930aa58e1494273da6cb2f5f8c7aa 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 835484f9a335abd12d229bc8618ce538bd597353..90213e8a2475895702d8f24ec3fe3e09cf208b20 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 ce394931ddfa8624d4c72671d364afea184ee8d7..146ec6b68c18dbeb79b172a9c04b576f24f9bb59 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 93ee8fa5d821b8c9903fcbe24858571b2e5ac0e4..b72ae7f626fdb9324e4bf2b36f40ab1d96925cb0 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 3a7af7df1009636b83f212877f7b5ceb17bb0f20..37f420e1aa4cd56514ff874c44d1bc89ccacbc1c 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 1d17ba68e05fc1b8ea667b4b51894ab3d6eff874..2a5b360e5b96733a517c55563c08ef56adb0e7df 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 4860ac774b52d2000b075ca9d8429ddd931cf418..3725981c3c833957b52385481512ec84ae9a7d89 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 9ec66e3d2685d66ea0562ddd43d214a372e8376f..c598547e9f7044e9ac32a26180eec87572381e30 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 fc6bfd64089c091bc7bf0297a2f60424793dea76..6a0a32aacd16e8ebc76170773db665df4eb1ca56 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 e0e71760f7805fc72a5f6409a61194ef7b00c7b6..fa2980e8b4554b4d1759925e4405f7ed7ce23436 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 f61df12fc7dbcee0abbe839e87e6e55bb6f10e98..d8dd8d4e724a8c0e3fcd251b9600895bb4caadc6 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 cc15d2be332585f2ca11fc8f5574637f569d5f90..50c21ad2781498542d4730c2fbd7511ec25b8e83 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 44d5d50cf98638c502c235ab17b018d05fd87b46..e8a070a804c128ce243d52fe6213e160ef038e49 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;