From 0fabeac2f4b8b73bff35163bbde061bbf6b533e9 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 11 Jul 2024 18:03:09 +0200
Subject: [PATCH] Revert back reco L1 to using only FairLogger
---
reco/L1/CbmL1.h | 3 ++-
reco/L1/CbmL1Counters.h | 3 ++-
reco/L1/CbmL1MCTrack.cxx | 9 +++++----
reco/L1/CbmL1Performance.cxx | 7 ++++---
reco/L1/L1Algo/utils/CaAlgoRandom.h | 3 +--
reco/L1/L1Algo/utils/L1AlgoEfficiencyPerformance.h | 3 ++-
reco/L1/L1Algo/utils/L1AlgoPulls.cxx | 2 +-
reco/L1/catools/CaToolsMaterialHelper.cxx | 4 ++--
reco/L1/qa/CbmCaInputQaSetup.cxx | 3 ++-
reco/L1/utils/CbmCaIdealHitProducerDet.h | 3 ++-
10 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index f7a7627acf..68bdc21a45 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 c8b6951f7b..d97869938f 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 dadc4f2c3d..06c559042c 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 00957dc9b6..b5766f6efd 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 ec0e9031cf..44ffeb4085 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 fa0857c561..05b4fa9a6d 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 c41e0cb6a8..b9a312b3cf 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 860ba5d99f..a12c1e450a 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 39298d4004..d04d5262d2 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 35c558cb6d..3ba917089f 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>
--
GitLab