From a32e84fe9a4d6f0e88c55f3632e707d542367860 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 2 Oct 2020 09:38:12 +0200
Subject: [PATCH] Remove unecessary include statements

All unpackers are independent of the FairRoot framework, so the includes
can be removed.
Use the generic Logger instead of FairLogger which is meanwhile only a wrapper
around the Logger.
---
 CMakeLists.txt                                         | 1 +
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx | 6 +-----
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx | 6 +-----
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx  | 6 +-----
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx | 4 ++--
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx  | 7 +------
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx  | 6 +-----
 fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx | 5 +----
 8 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b69f85d7..40d3181b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -283,6 +283,7 @@ SET(ROOT_INCLUDE_PATH ${ROOT_INCLUDE_PATH} "${GEANT3_INCLUDE_DIR}")
 Set(BASE_INCLUDE_DIRECTORIES
 ${BASE_INCLUDE_DIRECTORIES}
 ${SYSTEM_INCLUDE_DIRECTORIES}
+${FAIRLOGGER_INCLUDE_DIR}
 )
 
 # Set the library version in the main CMakeLists.txt
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
index 30d47d9a..472b0da7 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoHodo.cxx
@@ -10,11 +10,7 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018HodoPar.h"
 
-#include "FairLogger.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/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
index 9fc564a7..fff27555 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoMuch.cxx
@@ -10,11 +10,7 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018MuchPar.h"
 
-#include "FairLogger.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/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index 5f04d435..6061e880 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -12,11 +12,7 @@
 #include "CbmMcbm2018PsdPar.h"
 #include "CbmPsdAddress.h"
 
-#include "FairLogger.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/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index 7a6a7ff6..f01bdc15 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -62,8 +62,8 @@ fullTimeCorr = (T - AZ0R) - (AC2R-AC0R) + MSidx
 // ROOT
 #include <TCanvas.h>
 #include <TList.h>
-// FairRoot
-#include <FairLogger.h>
+// FairLogger
+#include <Logger.h>
 
 // CbmRoot
 #include "CbmMcbm2018RichPar.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
index f86ae58c..522d71c6 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoSts.cxx
@@ -10,13 +10,8 @@
 #include "CbmFormatMsHeaderPrintout.h"
 #include "CbmMcbm2018StsPar.h"
 
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRun.h"
-#include "FairRunOnline.h"
-#include "FairRuntimeDb.h"
+#include <Logger.h>
 
-//#include "TProfile2D.h"
 #include "TCanvas.h"
 #include "TH1.h"
 #include "TH2.h"
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
index 144f2c87..d4f3bdfc 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
@@ -13,11 +13,7 @@
 #include "CbmTofAddress.h"
 #include "CbmTofDetectorId_v14a.h"  // in cbmdata/tof
 
-#include "FairLogger.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/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
index 0ea5097f..19b5bce3 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTrdR.cxx
@@ -4,10 +4,7 @@
 #include "CbmTrdParModDigi.h"
 #include "CbmTrdParSpadic.h"
 
-#include "FairLogger.h"
-#include "FairParAsciiFileIo.h"
-#include "FairRun.h"
-#include "FairRuntimeDb.h"
+#include <Logger.h>
 
 #include "TH2I.h"
 #include "TObjString.h"
-- 
GitLab