Skip to content
Snippets Groups Projects
Commit 1f0e7453 authored by Dominik Smith's avatar Dominik Smith Committed by Volker Friese
Browse files

CbmTaskBuildEvents: Replaced CbmModuleList::GetModuleNameCaps() with ToString.

parent 96aeb56f
No related branches found
No related tags found
1 merge request!1178Added TRD2D support in cbm::algo::EventBuilder and dependent classes.
Pipeline #22743 passed
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "CbmDigiBranchBase.h" #include "CbmDigiBranchBase.h"
#include "CbmDigiManager.h" #include "CbmDigiManager.h"
#include "CbmDigiTimeslice.h" #include "CbmDigiTimeslice.h"
#include "CbmModuleList.h"
#include <FairRootManager.h> #include <FairRootManager.h>
#include <Logger.h> #include <Logger.h>
...@@ -171,7 +170,7 @@ void CbmTaskBuildEvents::Exec(Option_t*) ...@@ -171,7 +170,7 @@ void CbmTaskBuildEvents::Exec(Option_t*)
for (const auto& entry : fEventWindows) { for (const auto& entry : fEventWindows) {
auto system = entry.first; auto system = entry.first;
logOut << ", frac " << CbmModuleList::GetModuleNameCaps(system) << " digis " logOut << ", frac " << ToString(system) << " digis "
<< 100. * double(numDigisEv[system]) / double(numDigisTs[system]) << " %"; << 100. * double(numDigisEv[system]) / double(numDigisTs[system]) << " %";
} }
...@@ -201,11 +200,9 @@ void CbmTaskBuildEvents::Finish() ...@@ -201,11 +200,9 @@ void CbmTaskBuildEvents::Finish()
LOG(info) << "Events : " << fNumEvents; LOG(info) << "Events : " << fNumEvents;
for (const auto& entry : fEventWindows) { for (const auto& entry : fEventWindows) {
auto system = entry.first; auto system = entry.first;
LOG(info) << setw(4) << left << CbmModuleList::GetModuleNameCaps(system) LOG(info) << setw(4) << left << ToString(system) << " digis in TS : " << fNumDigisTs[system];
<< " digis in TS : " << fNumDigisTs[system]; LOG(info) << setw(4) << left << ToString(system) << " digis in events : " << fNumDigisEv[system] << " = " << fixed
LOG(info) << setw(4) << left << CbmModuleList::GetModuleNameCaps(system) << setprecision(2) << 100. * double(fNumDigisEv[system]) / double(fNumDigisTs[system]) << " %";
<< " digis in events : " << fNumDigisEv[system] << " = " << fixed << setprecision(2)
<< 100. * double(fNumDigisEv[system]) / double(fNumDigisTs[system]) << " %";
} }
LOG(info) << "Time / TS : " << fixed << setprecision(2) << 1000. * fTimeTot / double(fNumTs) << " ms"; LOG(info) << "Time / TS : " << fixed << setprecision(2) << 1000. * fTimeTot / double(fNumTs) << " ms";
LOG(info) << "Time fill TS : " << fixed << setprecision(2) << 1000. * fTimeFillTs / double(fNumTs) LOG(info) << "Time fill TS : " << fixed << setprecision(2) << 1000. * fTimeFillTs / double(fNumTs)
...@@ -260,10 +257,10 @@ InitStatus CbmTaskBuildEvents::Init() ...@@ -260,10 +257,10 @@ InitStatus CbmTaskBuildEvents::Init()
for (const auto& entry : fEventWindows) { for (const auto& entry : fEventWindows) {
auto system = entry.first; auto system = entry.first;
if (!fDigiMan->IsPresent(system)) { if (!fDigiMan->IsPresent(system)) {
LOG(fatal) << GetName() << ": No digi branch for " << CbmModuleList::GetModuleNameCaps(system); LOG(fatal) << GetName() << ": No digi branch for " << ToString(system);
return kFATAL; return kFATAL;
} }
LOG(info) << "--- Found digi branch for " << CbmModuleList::GetModuleNameCaps(system); LOG(info) << "--- Found digi branch for " << ToString(system);
} }
} }
...@@ -302,7 +299,7 @@ InitStatus CbmTaskBuildEvents::Init() ...@@ -302,7 +299,7 @@ InitStatus CbmTaskBuildEvents::Init()
const double tMax = entry.second.second; const double tMax = entry.second.second;
fAlgo.SetEventWindow(system, tMin, tMax); fAlgo.SetEventWindow(system, tMin, tMax);
LOG(info) << "--- Use algo EventBuilder with event window [" << tMin << ", " << tMax << "] ns for " LOG(info) << "--- Use algo EventBuilder with event window [" << tMin << ", " << tMax << "] ns for "
<< CbmModuleList::GetModuleNameCaps(system); << ToString(system);
} }
LOG(info) << "=================================================="; LOG(info) << "==================================================";
......
...@@ -120,7 +120,7 @@ private: // members ...@@ -120,7 +120,7 @@ private: // members
double fTimeSelectorEvt = 0.; double fTimeSelectorEvt = 0.;
double fTimeTot = 0.; double fTimeTot = 0.;
ClassDef(CbmTaskBuildEvents, 2); ClassDef(CbmTaskBuildEvents, 1);
}; };
#endif /* CBMTASKBUILDEVENTS_H */ #endif /* CBMTASKBUILDEVENTS_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment