feat(Logger): Do not use FairMQLogger.h any more

Since FairMQ v1.4.0 `FairMQLogger.h` was just a wrapper around `fairlogger/Logger.h` because all logging features have been factored out to FairLogger already. See https://github.com/FairRootGroup/FairMQ/blob/v1.4.0/fairmq/FairMQLogger.h
FairRootGroup · Apr 13, 2022 · a4d8466 · a4d8466
1 parent c51b8a1
commit a4d8466
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 54 deletions.
diff --git a/base/MQ/devices/BaseMQFileSink.h b/base/MQ/devices/BaseMQFileSink.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -17,7 +17,7 @@
 #define BASEMQFILESINK_H
 
 #include <FairMQDevice.h>
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 
 template<typename InputPolicy, typename OutputPolicy>
 class BaseMQFileSink

diff --git a/base/MQ/devices/FairMQLmdSampler.h b/base/MQ/devices/FairMQLmdSampler.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,9 +23,9 @@ extern "C"
 }
 
 #include <FairMQDevice.h>
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <boost/filesystem.hpp>
+#include <fairlogger/Logger.h>
 #include <map>
 #include <string>
 #include <tuple>

diff --git a/base/MQ/devices/FairMQProcessor.h b/base/MQ/devices/FairMQProcessor.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -18,7 +18,7 @@
 #include "FairMQProcessorTask.h"
 
 #include <FairMQDevice.h>
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 
 template<typename Task>
 class FairMQProcessor : public FairMQDevice

diff --git a/base/MQ/devices/FairMQSampler.h b/base/MQ/devices/FairMQSampler.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -23,8 +23,8 @@
 #include "FairRuntimeDb.h"
 
 #include <FairMQDevice.h>
-#include <FairMQLogger.h>
 #include <chrono>
+#include <fairlogger/Logger.h>
 #include <thread>
 
 /**

diff --git a/base/MQ/policies/Sampler/FairSourceMQInterface.h b/base/MQ/policies/Sampler/FairSourceMQInterface.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -13,7 +13,7 @@
 #include "FairFileSource.h"
 #include "FairRunAna.h"
 
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 #include <functional>
 #include <type_traits>
 

diff --git a/base/MQ/policies/Sampler/SimpleTreeReader.h b/base/MQ/policies/Sampler/SimpleTreeReader.h
@@ -29,8 +29,8 @@
 #include <TTree.h>
 
 // FairRoot
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
+#include <fairlogger/Logger.h>
 
 template<typename DataType>
 class BaseSimpleTreeReader

diff --git a/base/MQ/policies/Serialization/BoostSerializer.h b/base/MQ/policies/Serialization/BoostSerializer.h
@@ -16,7 +16,6 @@
 #ifndef BOOSTSERIALIZER_H
 #define BOOSTSERIALIZER_H
 
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <TClonesArray.h>
 
@@ -28,6 +27,7 @@ class access;
 #include <boost/archive/binary_iarchive.hpp>   // input: a non-portable native binary archive
 #include <boost/archive/binary_oarchive.hpp>   // output: a non-portable native binary archive
 #include <boost/serialization/vector.hpp>
+#include <fairlogger/Logger.h>
 #include <memory>
 #include <sstream>
 #include <string>

diff --git a/base/MQ/policies/Storage/BinaryOutFileManager.h b/base/MQ/policies/Storage/BinaryOutFileManager.h
@@ -37,7 +37,6 @@ class access;
 #include "TriviallyCopyableDataSaver.h"
 #include "baseMQtools.h"
 
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 
 #define GET_POLICY_ID(Policy) #Policy

diff --git a/examples/MQ/Lmd/FairMBSUnpacker.cxx b/examples/MQ/Lmd/FairMBSUnpacker.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -10,7 +10,7 @@
 #include <TClonesArray.h>
 
 // Fair headers
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 
 // Land headers
 #include "FairMBSRawItem.h"

diff --git a/examples/MQ/parameters/FairMQExParamsClient.cxx b/examples/MQ/parameters/FairMQExParamsClient.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -17,8 +17,8 @@
 #include "FairMQExParamsParOne.h"
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <chrono>
+#include <fairlogger/Logger.h>
 #include <thread>   // this_thread::sleep_for
 
 using namespace std;

diff --git a/examples/MQ/pixelAlternative/src/devices/FairMQPixAltFileSinkBin.cxx b/examples/MQ/pixelAlternative/src/devices/FairMQPixAltFileSinkBin.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,7 +16,7 @@
 
 #include "PixelPayload.h"
 
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 
 using namespace std;
 

diff --git a/examples/MQ/pixelAlternative/src/devices/FairMQPixAltSamplerBin.cxx b/examples/MQ/pixelAlternative/src/devices/FairMQPixAltSamplerBin.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -14,11 +14,11 @@
 
 #include "FairMQPixAltSamplerBin.h"
 
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <TBranch.h>
 #include <TChain.h>
 #include <cstddef>
+#include <fairlogger/Logger.h>
 #include <utility>
 
 using namespace std;

diff --git a/examples/MQ/pixelDetector/src/FairOnlineSink.cxx b/examples/MQ/pixelDetector/src/FairOnlineSink.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *         GNU Lesser General Public Licence version 3 (LGPL) version 3,        *
@@ -17,7 +17,7 @@
 #include "FairMQRunDevice.h"
 #include "FairRootManager.h"
 
-#include <FairMQLogger.h>
+#include <fairlogger/Logger.h>
 
 FairOnlineSink::FairOnlineSink()
     : FairSink()

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelFileSink.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelFileSink.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -16,11 +16,11 @@
 
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <TFile.h>
 #include <TObject.h>
 #include <TTree.h>
 #include <cstdlib>
+#include <fairlogger/Logger.h>
 #include <memory>
 #include <vector>
 

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelFileSinkBin.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelFileSinkBin.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -18,7 +18,6 @@
 #include "PixelHit.h"
 #include "PixelPayload.h"
 
-#include <FairMQLogger.h>
 #include <TClonesArray.h>
 #include <TFile.h>
 #include <TFolder.h>
@@ -27,6 +26,7 @@
 #include <TObject.h>
 #include <TTree.h>
 #include <TVector3.h>
+#include <fairlogger/Logger.h>
 
 using namespace std;
 

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelMerger.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelMerger.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -17,10 +17,10 @@
 #include "PixelEventHeader.h"
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <TClonesArray.h>
 #include <TObject.h>
 #include <cstring>   // strcmp
+#include <fairlogger/Logger.h>
 
 using namespace std;
 

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelSampler.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelSampler.cxx
@@ -19,12 +19,12 @@
 #include "FairSource.h"
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <Rtypes.h>
 #include <TClonesArray.h>
 #include <TObject.h>
 #include <cstring>
+#include <fairlogger/Logger.h>
 #include <utility>   // move
 
 using namespace std;

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQPixelSamplerBin.cxx b/examples/MQ/pixelDetector/src/devices/FairMQPixelSamplerBin.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -20,11 +20,11 @@
 #include "PixelDigi.h"
 #include "PixelPayload.h"
 
-#include <FairMQLogger.h>
 #include <Rtypes.h>   // for Int_t, Long64_t
 #include <TClonesArray.h>
 #include <TObject.h>
 #include <cstring>
+#include <fairlogger/Logger.h>
 #include <utility>   // move
 
 using namespace std;

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQRunDevice.cxx b/examples/MQ/pixelDetector/src/devices/FairMQRunDevice.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *         GNU Lesser General Public Licence version 3 (LGPL) version 3,        *
@@ -18,12 +18,12 @@
 #include "FairRootManager.h"
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <Rtypes.h>
 #include <TList.h>
 #include <TObjString.h>
 #include <cstdio>   // printf
+#include <fairlogger/Logger.h>
 
 using namespace std;
 

diff --git a/examples/MQ/pixelDetector/src/devices/FairMQSimDevice.cxx b/examples/MQ/pixelDetector/src/devices/FairMQSimDevice.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *         GNU Lesser General Public Licence version 3 (LGPL) version 3,        *
@@ -21,11 +21,11 @@
 #include "FairRuntimeDb.h"
 
 #include <FairMQDevice.h>
-#include <FairMQLogger.h>
 #include <TCollection.h>
 #include <TList.h>
 #include <TObjArray.h>
 #include <cstdio>   // printf
+#include <fairlogger/Logger.h>
 
 using namespace std;
 

diff --git a/examples/MQ/pixelDetector/src/devices/PixelFindHitsTask.cxx b/examples/MQ/pixelDetector/src/devices/PixelFindHitsTask.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -19,7 +19,6 @@
 #include "PixelDigiPar.h"
 #include "PixelHit.h"
 
-#include <FairMQLogger.h>
 #include <TClonesArray.h>
 #include <TGeoBBox.h>
 #include <TGeoManager.h>
@@ -29,6 +28,7 @@
 #include <TMath.h>
 #include <TString.h>
 #include <TVector3.h>
+#include <fairlogger/Logger.h>
 
 PixelFindHitsTask::PixelFindHitsTask()
     : fGeoParSet(nullptr)

diff --git a/examples/MQ/pixelSimSplit/src/devices/FairMQChunkMerger.cxx b/examples/MQ/pixelSimSplit/src/devices/FairMQChunkMerger.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2014-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -19,11 +19,11 @@
 #include "FairMCTrack.h"
 #include "RootSerializer.h"
 
-#include <FairMQLogger.h>
 #include <TClonesArray.h>
 #include <TObject.h>
 #include <algorithm>
 #include <cstring>
+#include <fairlogger/Logger.h>
 #include <vector>
 
 using namespace std;