diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h index f7a7627acf87b5ec53a6c16c0c576ff622117fd2..68bdc21a4539a6ca707cecf2f2f47b1f61ea31f3 100644 --- a/reco/L1/CbmL1.h +++ b/reco/L1/CbmL1.h @@ -21,7 +21,6 @@ #ifndef _CbmL1_h_ #define _CbmL1_h_ -#include "AlgoFairloggerCompat.h" #include "CaDataManager.h" #include "CaFramework.h" #include "CaInitManager.h" @@ -42,6 +41,8 @@ #include "TClonesArray.h" #include "TH1.h" +#include <Logger.h> + #include <boost/functional/hash.hpp> #include <algorithm> diff --git a/reco/L1/CbmL1Counters.h b/reco/L1/CbmL1Counters.h index c8b6951f7b1be0507c6ae36f3b4583d66cd30338..d97869938f20f5a82a61ffea86d5fc8b6d7c7ded 100644 --- a/reco/L1/CbmL1Counters.h +++ b/reco/L1/CbmL1Counters.h @@ -5,10 +5,11 @@ #ifndef CbmL1Counters_H #define CbmL1Counters_H -#include "AlgoFairloggerCompat.h" #include "CaVector.h" #include "TString.h" +#include <Logger.h> + #include <fstream> #include <iomanip> #include <map> diff --git a/reco/L1/CbmL1MCTrack.cxx b/reco/L1/CbmL1MCTrack.cxx index dadc4f2c3d9b1fae31cc5e8d7d6245c7c715fedb..06c559042c930030df49558d51a8603e3db4afd8 100644 --- a/reco/L1/CbmL1MCTrack.cxx +++ b/reco/L1/CbmL1MCTrack.cxx @@ -5,11 +5,11 @@ /* *==================================================================== * - * CBM Level 1 Reconstruction - * + * CBM Level 1 Reconstruction + * * Authors: I.Kisel, S.Gorbunov * - * e-mail : ikisel@kip.uni-heidelberg.de + * e-mail : ikisel@kip.uni-heidelberg.de * *==================================================================== * @@ -20,12 +20,13 @@ #include "CbmL1MCTrack.h" -#include "AlgoFairloggerCompat.h" #include "CaConstants.h" #include "CaHit.h" #include "CbmL1.h" #include "CbmL1Constants.h" +#include <Logger.h> + #include <iomanip> #include <sstream> diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx index 00957dc9b692b8076914c59c0fdf3abb5db6c190..b5766f6efd44b3294cdb1db21fb2b947f28080fb 100644 --- a/reco/L1/CbmL1Performance.cxx +++ b/reco/L1/CbmL1Performance.cxx @@ -13,12 +13,11 @@ * *==================================================================== * - * L1 Fit performance + * L1 Fit performance * *==================================================================== */ -#include "AlgoFairloggerCompat.h" #include "CaFramework.h" #include "CaToolsDebugger.h" #include "CaTrackFit.h" @@ -49,6 +48,8 @@ #include "TNtuple.h" #include "TProfile.h" +#include <Logger.h> + #include <boost/filesystem.hpp> #include <cmath> @@ -1446,7 +1447,7 @@ void CbmL1::TrackFitPerformance() // last TRD point /* do { - break; // only produce these plots in debug mode + break; // only produce these plots in debug mode if (it->GetNMCTracks() < 1) { break; } if (!fpTrdPoints) break; diff --git a/reco/L1/L1Algo/utils/CaAlgoRandom.h b/reco/L1/L1Algo/utils/CaAlgoRandom.h index ec0e9031cf55990c78148bc828747d8971172aac..44ffeb408582f8208e9900f1905d6910f08f29c9 100644 --- a/reco/L1/L1Algo/utils/CaAlgoRandom.h +++ b/reco/L1/L1Algo/utils/CaAlgoRandom.h @@ -10,8 +10,7 @@ #ifndef CaAlgoRandom_h #define CaAlgoRandom_h 1 -//#include "AlgoFairloggerCompat.h" -#include "FairLogger.h" +#include <Logger.h> #include <cstdint> #include <random> diff --git a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h index fa0857c561462efa6ad3ae9e2e7aec9eef2cf811..05b4fa9a6d7a890e7bebbe144f46c44ae3e9912d 100644 --- a/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h +++ b/reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h @@ -12,11 +12,12 @@ * Reconstructable mcTracklet is one, which has all 3 hits and momentum bigger than fL1->MinRecoMom. */ -#include "AlgoFairloggerCompat.h" #include "CbmL1.h" #include "CbmL1Counters.h" #include "CbmL1MCTrack.h" +#include <Logger.h> + #include <iostream> #include <vector> diff --git a/reco/L1/L1Algo/utils/L1AlgoPulls.cxx b/reco/L1/L1Algo/utils/L1AlgoPulls.cxx index c41e0cb6a8a4c9f7518d298606ca639f75fa49cf..b9a312b3cfca68a743c51322ece9de48c999e98f 100644 --- a/reco/L1/L1Algo/utils/L1AlgoPulls.cxx +++ b/reco/L1/L1Algo/utils/L1AlgoPulls.cxx @@ -4,7 +4,7 @@ #include "L1AlgoPulls.h" -#include "AlgoFairloggerCompat.h" +#include <Logger.h> using namespace cbm::algo::ca; diff --git a/reco/L1/catools/CaToolsMaterialHelper.cxx b/reco/L1/catools/CaToolsMaterialHelper.cxx index 860ba5d99fe4409a8ec2fabfb9bf67fc4bcb870a..a12c1e450a3fdccf593848c3658cf14b74e40c05 100644 --- a/reco/L1/catools/CaToolsMaterialHelper.cxx +++ b/reco/L1/catools/CaToolsMaterialHelper.cxx @@ -5,8 +5,6 @@ #include "CaToolsMaterialHelper.h" -#include "AlgoFairloggerCompat.h" -#include "Logger.h" #include "TGeoManager.h" #include "TGeoMedium.h" #include "TGeoNavigator.h" @@ -14,6 +12,8 @@ #include "TGeoPhysicalNode.h" #include "TGeoVoxelFinder.h" +#include <Logger.h> + #include <sstream> #include <thread> diff --git a/reco/L1/qa/CbmCaInputQaSetup.cxx b/reco/L1/qa/CbmCaInputQaSetup.cxx index 39298d40043eb905d07a833f04ba22063a371c4a..d04d5262d2695621b26a69cd7b3851ed002f51db 100644 --- a/reco/L1/qa/CbmCaInputQaSetup.cxx +++ b/reco/L1/qa/CbmCaInputQaSetup.cxx @@ -9,12 +9,13 @@ #include "CbmCaInputQaSetup.h" -#include "AlgoFairloggerCompat.h" #include "CaInitManager.h" #include "CbmMCDataManager.h" #include "FairRootManager.h" #include "TAxis.h" +#include <Logger.h> + using cbm::algo::ca::InitManager; using cbm::algo::ca::Parameters; using cbm::ca::InputQaSetup; diff --git a/reco/L1/utils/CbmCaIdealHitProducerDet.h b/reco/L1/utils/CbmCaIdealHitProducerDet.h index 35c558cb6dee65d77c36489246cffa4064db4498..3ba917089f210ed2cbe93f74b73dddc3fa545c82 100644 --- a/reco/L1/utils/CbmCaIdealHitProducerDet.h +++ b/reco/L1/utils/CbmCaIdealHitProducerDet.h @@ -9,7 +9,6 @@ #pragma once -#include "AlgoFairloggerCompat.h" #include "CaAlgoRandom.h" #include "CaConstants.h" #include "CaUvConverter.h" @@ -44,6 +43,8 @@ #include "TClonesArray.h" #include "TVector3.h" +#include <Logger.h> + #include <array> #include <optional> #include <sstream>