From b69a1c178e7975b719fd27c5de87dbdf342bb990 Mon Sep 17 00:00:00 2001
From: Jan de Cuveland <cuveland@compeng.uni-frankfurt.de>
Date: Tue, 21 Jun 2022 23:11:52 +0200
Subject: [PATCH] Remove direct std::cout access from reco/task classes
---
reco/tasks/CbmReco.cxx | 6 ------
reco/tasks/CbmSourceTs.cxx | 3 ---
reco/tasks/CbmTaskBuildEvents.cxx | 4 ----
reco/tasks/CbmTaskDigiEventQa.cxx | 4 ----
reco/tasks/CbmTaskMakeRecoEvents.cxx | 4 ----
reco/tasks/CbmTaskTriggerDigi.cxx | 5 -----
reco/tasks/CbmTaskUnpack.cxx | 4 ----
7 files changed, 30 deletions(-)
diff --git a/reco/tasks/CbmReco.cxx b/reco/tasks/CbmReco.cxx
index 54ab2384f8..e9b7065bb7 100644
--- a/reco/tasks/CbmReco.cxx
+++ b/reco/tasks/CbmReco.cxx
@@ -20,14 +20,11 @@
#include <THttpServer.h>
#include <TRootSniffer.h>
-#include <iostream>
#include <memory>
#include <string>
#include <yaml-cpp/yaml.h>
-using std::cout;
-using std::endl;
using std::make_unique;
using std::string;
@@ -212,7 +209,6 @@ int32_t CbmReco::Run()
timer.Stop();
double timeSetup = timer.RealTime();
timer.Start();
- cout << endl << endl;
LOG(info) << "Reco: Initialising...";
run.Init();
timer.Stop();
@@ -220,13 +216,11 @@ int32_t CbmReco::Run()
// --- Start run
timer.Start();
- cout << endl << endl;
run.Run(0, fNumTs);
timer.Stop();
double timeRun = timer.RealTime();
// --- Run log
- std::cout << std::endl;
size_t numTs = 1;
if (!isRootInput) {
auto src = dynamic_cast<CbmSourceTs*>(run.GetSource());
diff --git a/reco/tasks/CbmSourceTs.cxx b/reco/tasks/CbmSourceTs.cxx
index afbcfb44f1..86cbfa7d62 100644
--- a/reco/tasks/CbmSourceTs.cxx
+++ b/reco/tasks/CbmSourceTs.cxx
@@ -9,8 +9,6 @@
#include <FairSource.h>
#include <Logger.h>
-#include <iostream>
-
using fles::Timeslice;
using std::string;
@@ -58,7 +56,6 @@ Int_t CbmSourceTs::ReadEvent(UInt_t)
// It appears that the first call to this method from FairRunOnline is in the
// init stage. In order not to always lose the first timeslice, a call to
// TimesliceSource::get is avoided in the first call.
- std::cout << std::endl;
if (fNumCalls == 0) LOG(info) << "SourceTs: Init call to ReadEvent";
else {
fFlesTs = nullptr;
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index dc18dac91d..d5fb029fb6 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -15,7 +15,6 @@
#include <cassert>
#include <iomanip>
-#include <iostream>
using namespace std;
@@ -177,7 +176,6 @@ void CbmTaskBuildEvents::Exec(Option_t*)
// ----- End-of-timeslice action ------------------------------------------
void CbmTaskBuildEvents::Finish()
{
- std::cout << std::endl;
LOG(info) << "=====================================";
LOG(info) << GetName() << ": Run summary";
LOG(info) << "Timeslices : " << fNumTs;
@@ -227,7 +225,6 @@ InitStatus CbmTaskBuildEvents::Init()
FairRootManager* ioman = FairRootManager::Instance();
assert(ioman);
- std::cout << std::endl;
LOG(info) << "==================================================";
LOG(info) << GetName() << ": Initialising...";
@@ -288,7 +285,6 @@ InitStatus CbmTaskBuildEvents::Init()
}
LOG(info) << "==================================================";
- std::cout << std::endl;
return kSUCCESS;
}
diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index d45ff3c4e3..5574c4aaac 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -19,7 +19,6 @@
#include <cassert>
#include <iomanip>
-#include <iostream>
using namespace std;
@@ -109,7 +108,6 @@ void CbmTaskDigiEventQa::Exec(Option_t*)
// ----- End-of-timeslice action ------------------------------------------
void CbmTaskDigiEventQa::Finish()
{
- std::cout << std::endl;
LOG(info) << "=====================================";
LOG(info) << GetName() << ": Run summary";
LOG(info) << "Timeslices : " << fNumTs;
@@ -132,7 +130,6 @@ InitStatus CbmTaskDigiEventQa::Init()
FairRootManager* ioman = FairRootManager::Instance();
assert(ioman);
- std::cout << std::endl;
LOG(info) << "==================================================";
LOG(info) << GetName() << ": Initialising...";
@@ -154,7 +151,6 @@ InitStatus CbmTaskDigiEventQa::Init()
LOG(info) << "--- No Http server present";
LOG(info) << "==================================================";
- std::cout << std::endl;
return kSUCCESS;
}
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index 9fa1a0bdc3..e2876f4954 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -16,7 +16,6 @@
#include <algorithm>
#include <cassert>
#include <iomanip>
-#include <iostream>
#include <vector>
@@ -109,8 +108,6 @@ void CbmTaskMakeRecoEvents::Exec(Option_t*)
// ----- End-of-timeslice action ------------------------------------------
void CbmTaskMakeRecoEvents::Finish()
{
-
- std::cout << std::endl;
LOG(info) << "=====================================";
LOG(info) << GetName() << ": Run summary";
LOG(info) << "Timeslices : " << fNumTs;
@@ -190,7 +187,6 @@ InitStatus CbmTaskMakeRecoEvents::Init()
}
LOG(info) << "==================================================";
- std::cout << std::endl;
return kSUCCESS;
}
diff --git a/reco/tasks/CbmTaskTriggerDigi.cxx b/reco/tasks/CbmTaskTriggerDigi.cxx
index 82f9cc1517..9e339010c1 100644
--- a/reco/tasks/CbmTaskTriggerDigi.cxx
+++ b/reco/tasks/CbmTaskTriggerDigi.cxx
@@ -22,7 +22,6 @@
#include <algorithm>
#include <cassert>
#include <iomanip>
-#include <iostream>
#include <vector>
// ----- Constructor -----------------------------------------------------
@@ -197,8 +196,6 @@ std::vector<double> CbmTaskTriggerDigi::GetDigiTimes(ECbmModuleId system)
// ----- End-of-timeslice action ------------------------------------------
void CbmTaskTriggerDigi::Finish()
{
-
- std::cout << std::endl;
LOG(info) << "=====================================";
LOG(info) << GetName() << ": Run summary";
LOG(info) << "Timeslices : " << fNumTs;
@@ -222,7 +219,6 @@ InitStatus CbmTaskTriggerDigi::Init()
FairRootManager* ioman = FairRootManager::Instance();
assert(ioman);
- std::cout << std::endl;
LOG(info) << "==================================================";
LOG(info) << GetName() << ": Initialising...";
@@ -259,7 +255,6 @@ InitStatus CbmTaskTriggerDigi::Init()
LOG(info) << "--- Use algo TimeClusterTrigger with TriggerWin " << fTriggerWindow << " ns, threshold " << fMinNumDigis
<< ", dead time " << fDeadTime << " ns";
LOG(info) << "==================================================";
- std::cout << std::endl;
return kSUCCESS;
}
diff --git a/reco/tasks/CbmTaskUnpack.cxx b/reco/tasks/CbmTaskUnpack.cxx
index bb01fbd1be..ef821c48de 100644
--- a/reco/tasks/CbmTaskUnpack.cxx
+++ b/reco/tasks/CbmTaskUnpack.cxx
@@ -26,7 +26,6 @@
#include <execution>
#endif
#include <iomanip>
-#include <iostream>
#include <memory>
#include <sstream>
#include <vector>
@@ -197,7 +196,6 @@ void CbmTaskUnpack::Exec(Option_t*)
// ----- End-of-run action ------------------------------------------------
void CbmTaskUnpack::Finish()
{
- std::cout << std::endl;
double timePerTs = 1000. * fTime / double(fNumTs); // in ms
double rate = fNumBytes / 1.e6 / fTime; // in MB/s
LOG(info) << "=====================================";
@@ -216,7 +214,6 @@ void CbmTaskUnpack::Finish()
InitStatus CbmTaskUnpack::Init()
{
- std::cout << std::endl;
LOG(info) << "==================================================";
LOG(info) << GetName() << ": Initialising...";
@@ -289,7 +286,6 @@ InitStatus CbmTaskUnpack::Init()
LOG(info) << "--- Configured " << fAlgoSts.size() << " unpacker algorithms for STS.";
LOG(debug) << "Readout map:" << fStsConfig.PrintReadoutMap();
LOG(info) << "==================================================";
- std::cout << std::endl;
return kSUCCESS;
}
--
GitLab