diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx index ff40b9ad5eb0418fec3bfa4f47104b847712804e..486e9171c8052f49e74151e906b41a7dffba4c23 100644 --- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx +++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx @@ -24,13 +24,16 @@ #include <iomanip> // for setprecision, setw #include <iostream> // for operator<<, endl #include <map> // for allocator, __map_i... +#include <sstream> // for stringstream #include <utility> // for pair using std::endl; using std::fixed; using std::left; +using std::right; using std::setprecision; using std::setw; +using std::stringstream; // ----- Default constructor ------------------------------------------ CbmMvdClusterfinder::CbmMvdClusterfinder() @@ -106,9 +109,18 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/) } } - fNofTs++; - fTimer.Stop(); + + stringstream logOut; + logOut << setw(20) << left << GetName() << " ["; + logOut << fixed << setw(8) << setprecision(1) << right << fTimer.RealTime() * 1000. << " ms] "; + logOut << "TS " << fNofTs; + if (fEvents) logOut << ", events " << fEvents->GetEntriesFast(); + logOut << ", digis " << fDigiMan->GetNofDigis(ECbmModuleId::kMvd); + logOut << ", clusters " << fCluster->GetEntriesFast(); + LOG(info) << logOut.str(); + + fNofTs++; } void CbmMvdClusterfinder::ProcessData(CbmEvent* event) @@ -150,11 +162,6 @@ void CbmMvdClusterfinder::ProcessData(CbmEvent* event) //fDetector->GetMatchArray (nTargetPlugin, fTmpMatch); //fCluster->AbsorbObjects(fDetector->GetOutputCluster(), 0, fDetector->GetOutputCluster()->GetEntriesFast() - 1); - - if (fVerbose) LOG(debug) << "Total of " << fCluster->GetEntriesFast() << " Cluster in this Event"; - if (fVerbose) LOG(debug) << "//----------------------------------------//"; - LOG(info) << "+ " << setw(20) << GetName() << ": Created: " << fCluster->GetEntriesFast() << " cluster in " << fixed - << setprecision(6) << fTimer.RealTime() << " s"; } } // ----------------------------------------------------------------------------- diff --git a/reco/detectors/mvd/CbmMvdHitfinder.cxx b/reco/detectors/mvd/CbmMvdHitfinder.cxx index cba21040e6f7b3649bd0e179fa35e38d2e3eac0b..272450191ddfad1580f5cc3788c67914ab74784a 100644 --- a/reco/detectors/mvd/CbmMvdHitfinder.cxx +++ b/reco/detectors/mvd/CbmMvdHitfinder.cxx @@ -27,13 +27,16 @@ #include <iomanip> // for setprecision, setw #include <iostream> // for operator<<, endl #include <map> // for allocator, __map_i... +#include <sstream> // for stringstream; #include <utility> // for pair using std::endl; using std::fixed; using std::ios_base; +using std::right; using std::setprecision; using std::setw; +using std::stringstream; // ----- Default constructor ------------------------------------------ CbmMvdHitfinder::CbmMvdHitfinder() @@ -139,8 +142,17 @@ void CbmMvdHitfinder::Exec(Option_t* /*opt*/) } } - fNofTs++; fTimer.Stop(); + stringstream logOut; + logOut << setw(20) << left << GetName() << " ["; + logOut << fixed << setw(8) << setprecision(1) << right << fTimer.RealTime() * 1000. << " ms] "; + logOut << "TS " << fNofTs; + if (fEvents) logOut << ", events " << fEvents->GetEntriesFast(); + logOut << ", clusters " << fInputCluster->GetEntriesFast(); + logOut << ", hits " << fHits->GetEntriesFast(); + LOG(info) << logOut.str(); + + fNofTs++; } @@ -181,12 +193,6 @@ void CbmMvdHitfinder::ProcessData(CbmEvent* event) //fDetector->GetMatchArray (nTargetPlugin, fTmpMatch); //fHits->AbsorbObjects(fDetector->GetOutputHits(), 0, fDetector->GetOutputHits()->GetEntriesFast() - 1); - - //LOG(debug) << "Total of " << fHits->GetEntriesFast() << " hits found"; - if (fVerbose) LOG(debug) << "Finished writing Hits"; - if (fVerbose) LOG(debug) << "//----------------------------------------//"; - LOG(info) << "+ " << setw(20) << GetName() << ": Created: " << fHits->GetEntriesFast() << " hits in " << fixed - << setprecision(6) << fTimer.RealTime() << " s"; } } // -----------------------------------------------------------------------------