From e28b5110ebcd38b22c51004ae59a15243f9bd052 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 27 Apr 2022 10:29:47 +0200
Subject: [PATCH] Prepare CbmRoot for FairSoft apr22
Fix deprecation warnings about upercase log levels. Use lowercase ones.
---
MQ/source/CbmMQTsaMultiSamplerTof.cxx | 2 +-
MQ/sts/CbmDeviceStsLocalReco.cxx | 32 ++++----
MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx | 2 +-
.../pi0eta/CbmKresSelectGoodEvents.cxx | 2 +-
.../PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx | 24 +++---
analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx | 28 +++----
analysis/detectors/tof/CbmTofAnaTestbeam.cxx | 28 +++----
analysis/detectors/tof/CbmTofHitFinderQa.cxx | 12 +--
core/data/tof/CbmTofTracklet.cxx | 2 +-
core/detectors/tof/CbmMcbm2018TofPar.cxx | 2 +-
core/detectors/tof/CbmTofCreateDigiPar.cxx | 2 +-
core/detectors/tof/CbmTofDigiBdfPar.cxx | 12 +--
.../monitor/CbmMcbm2018MonitorAlgoT0.cxx | 8 +-
fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx | 8 +-
.../unpacker/CbmMcbm2018UnpackerAlgoRich.cxx | 6 +-
.../CbmMcbm2018UnpackerAlgoRich2020.cxx | 74 +++++++++----------
.../unpacker/CbmMcbm2018UnpackerAlgoTof.cxx | 18 ++---
macro/reco/CMakeLists.txt | 15 ++--
reco/L1/L1Algo/L1Vector.h | 20 ++---
.../rich/unpack/CbmRichUnpackAlgo.cxx | 4 +-
.../rich/unpack/CbmRichUnpackAlgo2022.cxx | 4 +-
reco/detectors/tof/CbmTofSimpClusterizer.cxx | 4 +-
reco/detectors/tof/CbmTofTrackFinderNN.cxx | 2 +-
.../cbm/reco/CbmLitFindGlobalTracks.cxx | 36 ++++-----
reco/littrack/cbm/utils/CbmLitConverter.h | 2 +-
sim/detectors/tof/CbmTofDigitize.cxx | 10 +--
sim/transport/base/CbmBeamProfile.cxx | 16 ++--
sim/transport/base/CbmMCEventFilter.cxx | 14 ++--
sim/transport/base/CbmTarget.cxx | 26 +++----
.../generators/CbmUnigenGenerator.cxx | 6 +-
.../CbmDeviceStsHitProducerIdeal.cxx | 8 +-
31 files changed, 215 insertions(+), 214 deletions(-)
diff --git a/MQ/source/CbmMQTsaMultiSamplerTof.cxx b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
index 9edbf4d9b3..bcefa65be1 100644
--- a/MQ/source/CbmMQTsaMultiSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
@@ -107,7 +107,7 @@ try {
}
else if (0 == fFileName.size() && 0 == fDirName.size() && 0 != fHost.size() && 0 == fPort) {
isGoodInputCombi = true;
- LOG(INFO) << "Host string: " << fHost;
+ LOG(info) << "Host string: " << fHost;
}
else {
isGoodInputCombi = false;
diff --git a/MQ/sts/CbmDeviceStsLocalReco.cxx b/MQ/sts/CbmDeviceStsLocalReco.cxx
index dcc6ea6315..5559ea2a8d 100644
--- a/MQ/sts/CbmDeviceStsLocalReco.cxx
+++ b/MQ/sts/CbmDeviceStsLocalReco.cxx
@@ -89,16 +89,16 @@ try {
//logger::SetLogLevel("INFO");
int noChannel = fChannels.size();
- LOG(INFO) << "Number of defined channels: " << noChannel;
+ LOG(info) << "Number of defined channels: " << noChannel;
for (auto const& entry : fChannels) {
- LOG(INFO) << "Channel name: " << entry.first;
+ LOG(info) << "Channel name: " << entry.first;
if (!IsChannelNameAllowed(entry.first)) throw InitTaskError("Channel name does not match.");
OnData(entry.first, &CbmDeviceStsLocalReco::HandleData);
}
InitContainers();
}
catch (InitTaskError& e) {
- LOG(ERROR) << e.what();
+ LOG(error) << e.what();
// Wrapper defined in CbmMQDefs.h to support different FairMQ versions
cbm::mq::ChangeState(this, cbm::mq::Transition::ErrorFound);
}
@@ -112,13 +112,13 @@ bool CbmDeviceStsLocalReco::IsChannelNameAllowed(std::string channelName)
const std::vector<std::string>::const_iterator pos =
std::find(fAllowedChannels.begin(), fAllowedChannels.end(), entry);
const std::vector<std::string>::size_type idx = pos - fAllowedChannels.begin();
- LOG(INFO) << "Found " << entry << " in " << channelName;
- LOG(INFO) << "Channel name " << channelName << " found in list of allowed channel names at position " << idx;
+ LOG(info) << "Found " << entry << " in " << channelName;
+ LOG(info) << "Channel name " << channelName << " found in list of allowed channel names at position " << idx;
return true;
}
}
- LOG(INFO) << "Channel name " << channelName << " not found in list of allowed channel names.";
- LOG(ERROR) << "Stop device.";
+ LOG(info) << "Channel name " << channelName << " not found in list of allowed channel names.";
+ LOG(error) << "Stop device.";
return false;
}
@@ -131,14 +131,14 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
fvmcworkdir = fConfig->GetValue<string>("vmcworkdir");
fMaxTimeslices = fConfig->GetValue<uint64_t>("max-timeslices");
- LOG(INFO) << "Init parameter containers for CbmDeviceStsLocalReco.";
+ LOG(info) << "Init parameter containers for CbmDeviceStsLocalReco.";
// NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
// Should only be used for small data because of the cost of an additional copy
std::string message {"CbmStsDigitizeParameters,"};
message += fRunId;
- LOG(INFO) << "Requesting parameter container CbmStsDigitizeParameters, "
+ LOG(info) << "Requesting parameter container CbmStsDigitizeParameters, "
"sending message: "
<< message;
@@ -150,7 +150,7 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
if (rep->GetSize() != 0) {
CbmMqTMessage tmsg(rep->GetData(), rep->GetSize());
fDigiPar = dynamic_cast<CbmStsDigitizeParameters*>(tmsg.ReadObject(tmsg.GetClass()));
- LOG(INFO) << "Received unpack parameter from parmq server: " << fDigiPar;
+ LOG(info) << "Received unpack parameter from parmq server: " << fDigiPar;
// TODO: check if fDigiPar is properly initialized from the file
fDigiPar->Print();
LOG(info) << fDigiPar->ToString();
@@ -163,7 +163,7 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
std::string message1 {"FairGeoParSet,"};
message1 += fRunId;
- LOG(INFO) << "Requesting parameter container FairGeoParSet, sending message: " << message1;
+ LOG(info) << "Requesting parameter container FairGeoParSet, sending message: " << message1;
FairMQMessagePtr req1(NewSimpleMessage(message1));
FairMQMessagePtr rep1(NewMessage());
@@ -173,7 +173,7 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
if (rep1->GetSize() != 0) {
CbmMqTMessage tmsg(rep1->GetData(), rep1->GetSize());
fGeoPar = static_cast<FairGeoParSet*>(tmsg.ReadObject(tmsg.GetClass()));
- LOG(INFO) << "Received unpack parameter from parmq server: " << fGeoPar;
+ LOG(info) << "Received unpack parameter from parmq server: " << fGeoPar;
fGeoPar->Print();
if (!gGeoManager) { throw InitTaskError("No gGeoManager found in FairGeoParSet"); }
else {
@@ -188,7 +188,7 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
std::string message2 {"CbmFieldPar,"};
message2 += fRunId;
- LOG(INFO) << "Requesting parameter container CbmFieldPar, sending message: " << message2;
+ LOG(info) << "Requesting parameter container CbmFieldPar, sending message: " << message2;
FairMQMessagePtr req2(NewSimpleMessage(message2));
FairMQMessagePtr rep2(NewMessage());
@@ -210,7 +210,7 @@ Bool_t CbmDeviceStsLocalReco::InitContainers()
}
}
else {
- LOG(ERROR) << "Received empty reply. Parameter not available";
+ LOG(error) << "Received empty reply. Parameter not available";
}
}
}
@@ -265,7 +265,7 @@ bool CbmDeviceStsLocalReco::HandleData(FairMQMessagePtr& msg, int /*index*/)
// Maybe add an message counter which counts the incomming messages and add
// an output
fNumMessages++;
- LOG(DEBUG) << "Received message number " << fNumMessages << " with size " << msg->GetSize();
+ LOG(debug) << "Received message number " << fNumMessages << " with size " << msg->GetSize();
std::string msgStr(static_cast<char*>(msg->GetData()), msg->GetSize());
std::istringstream iss(msgStr);
@@ -273,7 +273,7 @@ bool CbmDeviceStsLocalReco::HandleData(FairMQMessagePtr& msg, int /*index*/)
DoWork();
- if (fNumMessages % 10000 == 0) LOG(INFO) << "Processed " << fNumMessages << " time slices";
+ if (fNumMessages % 10000 == 0) LOG(info) << "Processed " << fNumMessages << " time slices";
SendData();
diff --git a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
index 665eba65b0..a92ab7ee7a 100644
--- a/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
+++ b/MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
@@ -488,7 +488,7 @@ Bool_t CbmDeviceUnpackTofMcbm2018::ReInitContainers()
fviRpcSide[iGbtx], fviRpcType[iGbtx]);
else
fviRpcChUId[iCh] = 0;
- // LOG(DEBUG)<<Form("Map Ch %d to Address 0x%08x",iCh,fviRpcChUId[iCh]);
+ // LOG(debug)<<Form("Map Ch %d to Address 0x%08x",iCh,fviRpcChUId[iCh]);
iCh += iChNext;
}
}
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
index 48271d2912..304707a4e2 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
@@ -128,7 +128,7 @@ void CbmKresSelectGoodEvents::Exec(Option_t*)
cout << "CbmKresSelectGoodEvents, EtaConversion = " << EtaConversion << endl;
// if (fApp && EtaConversion == 0) {
- // LOG(WARNING) << "No double converted Eta";
+ // LOG(warning) << "No double converted Eta";
// fApp->SetSaveCurrentEvent(kFALSE);
// }
}
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
index e0f6f529ff..f57030e7f8 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
@@ -120,28 +120,28 @@ InitStatus CbmAnaDimuonAnalysis::Init()
// Get and check FairRootManager
FairRootManager* fManager = FairRootManager::Instance();
fMCTracks = (TClonesArray*) fManager->GetObject("MCTrack");
- if (nullptr == fMCTracks) LOG(FATAL) << "No MCTrack in input";
+ if (nullptr == fMCTracks) LOG(fatal) << "No MCTrack in input";
fStsTracks = (TClonesArray*) fManager->GetObject("StsTrack");
- if (nullptr == fStsTracks) LOG(FATAL) << "No StsTrack in input";
+ if (nullptr == fStsTracks) LOG(fatal) << "No StsTrack in input";
if (fUseMC) fStsTrackMatches = (TClonesArray*) fManager->GetObject("StsTrackMatch");
- if (nullptr == fStsTrackMatches && fUseMC) LOG(FATAL) << "No StsTrackMatch in input";
+ if (nullptr == fStsTrackMatches && fUseMC) LOG(fatal) << "No StsTrackMatch in input";
fMuchTracks = (TClonesArray*) fManager->GetObject("MuchTrack");
- if (nullptr == fMuchTracks) LOG(FATAL) << "No MuchTrack in input";
+ if (nullptr == fMuchTracks) LOG(fatal) << "No MuchTrack in input";
if (fUseMC) fMuchTrackMatches = (TClonesArray*) fManager->GetObject("MuchTrackMatch");
- if (nullptr == fMuchTrackMatches && fUseMC) LOG(FATAL) << "No MuchTrackMatch in input";
+ if (nullptr == fMuchTrackMatches && fUseMC) LOG(fatal) << "No MuchTrackMatch in input";
fGlobalTracks = (TClonesArray*) fManager->GetObject("GlobalTrack");
- if (nullptr == fGlobalTracks) LOG(FATAL) << "No GlobalTrack in input";
+ if (nullptr == fGlobalTracks) LOG(fatal) << "No GlobalTrack in input";
fTrdTracks = (TClonesArray*) fManager->GetObject("TrdTrack");
- if (nullptr == fTrdTracks) LOG(FATAL) << "No TrdTrack in input";
+ if (nullptr == fTrdTracks) LOG(fatal) << "No TrdTrack in input";
fTofHit = (TClonesArray*) fManager->GetObject("TofHit");
- if (nullptr == fTofHit) LOG(FATAL) << "No TofHit in input";
+ if (nullptr == fTofHit) LOG(fatal) << "No TofHit in input";
fVertex = dynamic_cast<CbmVertex*>(fManager->GetObject("PrimaryVertex."));
@@ -515,11 +515,11 @@ void CbmAnaDimuonAnalysis::Exec(Option_t* /*opt*/)
Int_t nMuchTracks = fMuchTracks->GetEntriesFast();
Int_t nGlobalTracks = fGlobalTracks->GetEntriesFast();
- LOG(DEBUG) << "------------------------";
- LOG(DEBUG) << GetName() << ": Event " << fEvent;
- LOG(DEBUG) << "Number of tracks: MC - " << nMCTracks << ", global - " << nGlobalTracks << ", STS - " << nStsTracks
+ LOG(debug) << "------------------------";
+ LOG(debug) << GetName() << ": Event " << fEvent;
+ LOG(debug) << "Number of tracks: MC - " << nMCTracks << ", global - " << nGlobalTracks << ", STS - " << nStsTracks
<< ", MUCH - " << nMuchTracks;
- LOG(DEBUG) << "------------------------";
+ LOG(debug) << "------------------------";
TLorentzVector pMC1, pMC2, M;
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index 076d95fcdf..4d32d3554d 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -1387,7 +1387,7 @@ void CbmHadronAnalysis::ExecEvent(Option_t*)
for (Int_t j = 0; j < nTofHits; j++) {
TofHit = (CbmTofHit*) fTofHits->At(j);
if (NULL == TofHit) continue;
- LOG(DEBUG) << Form("TofHit %d, addr 0x%08x, x %6.1f, y %6.1f, z %6.1f, t %6.1f ", j, TofHit->GetAddress(),
+ LOG(debug) << Form("TofHit %d, addr 0x%08x, x %6.1f, y %6.1f, z %6.1f, t %6.1f ", j, TofHit->GetAddress(),
TofHit->GetX(), TofHit->GetY(), TofHit->GetZ(), TofHit->GetTime());
}
}
@@ -1411,7 +1411,7 @@ void CbmHadronAnalysis::ExecEvent(Option_t*)
for (Int_t j = 0; j < nTofHits; j++) {
TofHit = (CbmTofHit*) fTofHits->At(j);
if (NULL == TofHit) continue;
- LOG(DEBUG) << Form("TofHit %d, addr 0x%08x, x %6.1f, y %6.1f, z %6.1f, t %6.1f ", j, TofHit->GetAddress(),
+ LOG(debug) << Form("TofHit %d, addr 0x%08x, x %6.1f, y %6.1f, z %6.1f, t %6.1f ", j, TofHit->GetAddress(),
TofHit->GetX(), TofHit->GetY(), TofHit->GetZ(), TofHit->GetTime());
}
}
@@ -1746,7 +1746,7 @@ void CbmHadronAnalysis::ExecEvent(Option_t*)
for (Int_t l = 0; l < nTofPoints; l++) {
TofPoint = (CbmTofPoint*) fTofPoints->At(l);
if (NULL == TofPoint) {
- LOG(WARNING) << " Missing TofPoint at " << l << ", mul " << nTofPoints;
+ LOG(warning) << " Missing TofPoint at " << l << ", mul " << nTofPoints;
continue;
}
Int_t k = TofPoint->GetTrackID();
@@ -2184,11 +2184,11 @@ void CbmHadronAnalysis::ExecEvent(Option_t*)
//cout << Form("HadronAnalysis:: hit %d, poi %d, MCt %d, Eff %d ",j,lp,k,TrackP[k]) << endl;
/*
if(TofHit->GetX()<-90.) { //nh-debug
- LOG(INFO) << Form(" Invalid Hit in ev %d: %6.1f, %6.1f, %6.1f, poi: %6.1f, %6.1f, %6.1f, pdg: %d",
+ LOG(info) << Form(" Invalid Hit in ev %d: %6.1f, %6.1f, %6.1f, poi: %6.1f, %6.1f, %6.1f, pdg: %d",
fEvents,TofHit->GetX(),TofHit->GetY(),TofHit->GetZ(),
TofPoint->GetX(),TofPoint->GetY(),TofPoint->GetZ(),
pdgCode);
- LOG(FATAL) << "<D-hit> j " << j << ", l " << l << ", k " << k << ", lp ";
+ LOG(fatal) << "<D-hit> j " << j << ", l " << l << ", k " << k << ", lp ";
}
*/
if (TrackP[k] == 0) { // for efficiency
@@ -3705,7 +3705,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
Int_t nTrdHits = 0;
if (NULL != fTrdHits) nTrdHits = fTrdHits->GetEntriesFast();
- LOG(DEBUG) << "Secondaries from " << nTofHits << " TofHits, " << nStsHits << " StsHits and " << nTrdHits
+ LOG(debug) << "Secondaries from " << nTofHits << " TofHits, " << nStsHits << " StsHits and " << nTrdHits
<< " TrdHits in event " << iCandEv;
if (iCandEv == 0) { //initialize
@@ -3946,7 +3946,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
Double_t dDx = pTofHit->GetX() - pStsHit->GetX();
Double_t dDy = pTofHit->GetY() - pStsHit->GetY();
Double_t dDz = pTofHit->GetZ() - pStsHit->GetZ();
- LOG(DEBUG) << "Check for TRD hits between STS " << j << " and TOF " << i;
+ LOG(debug) << "Check for TRD hits between STS " << j << " and TOF " << i;
for (Int_t l = 0; l < nTrdHits; l++) {
CbmTrdHit* pTrdHit = (CbmTrdHit*) fTrdHits->At(l);
@@ -3956,7 +3956,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
Double_t dDtrans =
TMath::Sqrt(TMath::Power(dXexp - pTrdHit->GetX(), 2) + TMath::Power(dYexp - pTrdHit->GetY(), 2));
UInt_t iTrdLayer = CbmTrdAddress::GetLayerId(pTrdHit->GetAddress());
- LOG(DEBUG) << "Inspect TRD hit " << l << " in "
+ LOG(debug) << "Inspect TRD hit " << l << " in "
<< Form("Module 0x%08x, layer %d", pTrdHit->GetAddress(),
CbmTrdAddress::GetLayerId(pTrdHit->GetAddress()))
<< " at z= " << pTrdHit->GetZ() << " dD = " << dDtrans << " < " << fdDistTRD;
@@ -3975,7 +3975,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
iTRD[i].resize(iMul + 1);
iTRD[i][iMul] = l;
}
- LOG(DEBUG) << "assign TrdHit " << l << " to TofHit " << i << " in layer " << iTrdLayer
+ LOG(debug) << "assign TrdHit " << l << " to TofHit " << i << " in layer " << iTrdLayer
<< " with d = " << dDtrans << ", TrdMul" << iMul << ", dEdx = " << pTrdHit->GetELoss();
}
}
@@ -4039,7 +4039,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
//4. secondary pion candidate
for (Int_t i = 0; i < nTofHits; i++) {
- LOG(DEBUG) << "Tof " << i << Form(" sec cand Min %6.3f > %6.3f ?", dStsDistMin[i], fdDistPrimLim);
+ LOG(debug) << "Tof " << i << Form(" sec cand Min %6.3f > %6.3f ?", dStsDistMin[i], fdDistPrimLim);
if (dStsDistMin[i] > fdDistPrimLim) { // Tof hit not in the primary class
Double_t dDistMin = 100.;
Int_t jbest = -1;
@@ -4122,7 +4122,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
iTRD[i].resize(iMul + 1);
iTRD[i][iMul] = l;
}
- LOG(DEBUG) << "assign TrdHit " << l << " to TofHit " << i << " in layer " << iTrdLayer
+ LOG(debug) << "assign TrdHit " << l << " to TofHit " << i << " in layer " << iTrdLayer
<< " with d = " << dDtrans << ", TrdMul" << iMul << ", dEdx = " << pTrdHit->GetELoss();
}
}
@@ -4154,7 +4154,7 @@ void CbmHadronAnalysis::ReconstructSecondaries()
Double_t E = TMath::Sqrt(pmag * pmag + m * m);
P[i].SetPxPyPzE(px, py, pz, E);
X[i].SetXYZT(pTofHit->GetX(), pTofHit->GetY(), pTofHit->GetZ(), pTofHit->GetTime());
- LOG(DEBUG) << "Init pion LV at ind " << i << " with beta = " << bet << ", minv = " << P[i].M() << ", tof "
+ LOG(debug) << "Init pion LV at ind " << i << " with beta = " << bet << ", minv = " << P[i].M() << ", tof "
<< X[i].T() << ", TRDHmul " << iTRD[i].size();
X0[i].SetXYZ(pSts2Hit->GetX(), pSts2Hit->GetY(), pSts2Hit->GetZ());
DX[i].SetXYZ(dDx, dDy, dDz);
@@ -4163,9 +4163,9 @@ void CbmHadronAnalysis::ReconstructSecondaries()
}
} //if( dStsDistMin[i] > dDistPrimLim) { // Sts hit not in the primary class
} //for (Int_t i=0; i<nTofHits; i++)
- LOG(DEBUG) << " Ev " << iCandEv << " has " << proton_cand << " protons and " << pion_cand << " pion candidates";
+ LOG(debug) << " Ev " << iCandEv << " has " << proton_cand << " protons and " << pion_cand << " pion candidates";
if (proton_cand > 0 && pion_cand > 0) {
- LOG(DEBUG) << "add event " << iCandEv << " to mixing class " << iMixClass << " of size " << fvP[iMixClass].size();
+ LOG(debug) << "add event " << iCandEv << " to mixing class " << iMixClass << " of size " << fvP[iMixClass].size();
fvP[iMixClass].push_front(P); //insert to mixed event vector
fvX[iMixClass].push_front(X); //insert to mixed event vector
diff --git a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
index d6f37d60d1..3585ac2a0f 100644
--- a/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
+++ b/analysis/detectors/tof/CbmTofAnaTestbeam.cxx
@@ -671,7 +671,7 @@ InitStatus CbmTofAnaTestbeam::Init()
if (NULL == fFindTracks) {
//fdTShift += fChannelInfoDut->GetZ()/30.; // in ns
//if ( NULL != fChannelInfoSel2 ) fdSel2TOff += fChannelInfoSel2->GetZ()/30.;
- LOG(WARNING) << Form("no FindTracks instance found, use TShift = %8.3f, Sel2Toff = %8.3f", fdTShift, fdSel2TOff);
+ LOG(warning) << Form("no FindTracks instance found, use TShift = %8.3f, Sel2Toff = %8.3f", fdTShift, fdSel2TOff);
}
else { // reinitialize Offsets
fdTShift += -fFindTracks->GetTOff(fiMrpcRefAddr) + fFindTracks->GetTOff(fiBeamRefAddr);
@@ -777,7 +777,7 @@ void CbmTofAnaTestbeam::Exec(Option_t* opt)
const CbmTofDigi* tDigi = fDigiMan->Get<CbmTofDigi>(iDigiIndex);
// CbmTofDigi* tDigi = dynamic_cast<CbmTofDigi*>(fTofDigisCollIn->At(iDigiIndex));
assert (tDigi);
- //LOG(INFO) << "Copy TofDigi " << iDigi << " from " << iDigiIndex << " to " << iNbDigi;
+ //LOG(info) << "Copy TofDigi " << iDigi << " from " << iDigiIndex << " to " << iNbDigi;
//new((*fTofDigisColl)[iNbDigi++]) CbmTofDigi(*tDigi); // does not work for tDigi, since no TObject
}
*/
@@ -940,7 +940,7 @@ Bool_t CbmTofAnaTestbeam::RegisterInputs()
if (NULL == fTofDigisColl) fTofDigisColl = (TClonesArray*) fManager->GetObject("TofCalDigi");
if (NULL == fTofDigisColl) {
- LOG(WARNING) << "CbmTofAnaTestbeam::RegisterInputs => Could not get the TofDigi "
+ LOG(warning) << "CbmTofAnaTestbeam::RegisterInputs => Could not get the TofDigi "
"TClonesArray!!! ... continuing with incomplete input ";
// return kFALSE;
} // if( NULL == fTofDigisColl)
@@ -1093,7 +1093,7 @@ Bool_t CbmTofAnaTestbeam::RegisterInputs()
fTofDigisCollIn = (TClonesArray *) fManager->GetObject("TofDigi");
*/
if (NULL == fTofDigisCollIn) {
- LOG(WARNING) << "CbmTofAnaTestbeam::RegisterInputs => Could not get the TofDigi "
+ LOG(warning) << "CbmTofAnaTestbeam::RegisterInputs => Could not get the TofDigi "
"TClonesArray!!! ... continuing with incomplete input ";
//return kFALSE;
} // if( NULL == fTofDigisColl)
@@ -4375,7 +4375,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos()
pHit = pTrk->HitPointerOfAddr(fiDutAddr);
}
- if (NULL == pHit) LOG(WARNING) << "Dut not found in full length track";
+ if (NULL == pHit) LOG(warning) << "Dut not found in full length track";
//fChannelInfo = fDigiPar->GetCell(pHit->GetAddress());
//gGeoManager->FindNode(fChannelInfo->GetX(),fChannelInfo->GetY(),fChannelInfo->GetZ());
@@ -4672,7 +4672,7 @@ Bool_t CbmTofAnaTestbeam::FillHistos()
gGeoManager->MasterToLocal(hitpos, hitpos_local);
if (fhLHTime.size() > 0) {
if (static_cast<size_t>(iDet) >= fhLHTime.size()) {
- LOG(WARNING) << " LHdeb: invalid iDet index " << iDet << " of " << fhLHTime.size();
+ LOG(warning) << " LHdeb: invalid iDet index " << iDet << " of " << fhLHTime.size();
fFindTracks->PrintMapRpcIdParInd();
continue;
}
@@ -5482,7 +5482,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhDTD4DT04D4Off not found ";
+ LOG(warning) << "Histo fhDTD4DT04D4Off not found ";
}
// fhDTD4DT04D4best->Write();
htmp1D->Write();
@@ -5507,7 +5507,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhDTX4D4Off not found ";
+ LOG(warning) << "Histo fhDTX4D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5532,7 +5532,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhDTY4D4Off not found ";
+ LOG(warning) << "Histo fhDTY4D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5557,7 +5557,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhDTTexpD4Off not found ";
+ LOG(warning) << "Histo fhDTTexpD4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5582,7 +5582,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhCluSize0DT04D4Off not found ";
+ LOG(warning) << "Histo fhCluSize0DT04D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5607,7 +5607,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhCluSize4DT04D4Off not found ";
+ LOG(warning) << "Histo fhCluSize4DT04D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5632,7 +5632,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhTot0DT04D4Off not found ";
+ LOG(warning) << "Histo fhTot0DT04D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
@@ -5657,7 +5657,7 @@ Bool_t CbmTofAnaTestbeam::WriteHistos()
}
}
else {
- LOG(WARNING) << "Histo fhTot4DT04D4Off not found ";
+ LOG(warning) << "Histo fhTot4DT04D4Off not found ";
}
htmpx1D->Write();
if (fhDTD4DT04D4Off != NULL) fhDTD4DT04D4Off->Write();
diff --git a/analysis/detectors/tof/CbmTofHitFinderQa.cxx b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
index fda12a9e6d..d9c8732fa8 100644
--- a/analysis/detectors/tof/CbmTofHitFinderQa.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderQa.cxx
@@ -758,17 +758,17 @@ Bool_t CbmTofHitFinderQa::RegisterInputs()
fTofDigisColl = (TClonesArray*) fManager->GetObject("TofDigi");
if (NULL == fTofDigisColl) {
- LOG(WARNING) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
+ LOG(warning) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
"TofDigi TClonesArray!!!";
- LOG(WARNING) << " => Assuming that the "
+ LOG(warning) << " => Assuming that the "
"CbmTofHitProducerNew is used!!!";
// return kFALSE;
} // if( NULL == fTofDigisColl)
fTofDigiMatchPointsColl = (TClonesArray*) fManager->GetObject("TofDigiMatchPoints");
if (NULL == fTofDigiMatchPointsColl) {
- LOG(WARNING) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
+ LOG(warning) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
"TofDigiMatchPoints TClonesArray!!!";
- LOG(WARNING) << " => Assuming that the "
+ LOG(warning) << " => Assuming that the "
"CbmTofHitProducerNew is used!!!";
// return kFALSE;
} // if( NULL == fTofDigiMatchPointsColl)
@@ -781,9 +781,9 @@ Bool_t CbmTofHitFinderQa::RegisterInputs()
} // if( NULL == fTofHitsColl)
fTofDigiMatchColl = (TClonesArray*) fManager->GetObject("TofDigiMatch");
if (NULL == fTofDigiMatchColl) {
- LOG(WARNING) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
+ LOG(warning) << "CbmTofHitFinderQa::RegisterInputs => Could not get the "
"TofDigiMatch TClonesArray!!!";
- LOG(WARNING) << " => Assuming that the "
+ LOG(warning) << " => Assuming that the "
"CbmTofHitProducerNew is used!!!";
// return kFALSE;
} // if( NULL == fTofDigiMatchColl)
diff --git a/core/data/tof/CbmTofTracklet.cxx b/core/data/tof/CbmTofTracklet.cxx
index 99a1b46cb8..5179c02b0b 100644
--- a/core/data/tof/CbmTofTracklet.cxx
+++ b/core/data/tof/CbmTofTracklet.cxx
@@ -307,7 +307,7 @@ double CbmTofTracklet::UpdateTt()
}
}
if (iNt == 0) {
- LOG(WARNING) << "No valid hit pair ";
+ LOG(warning) << "No valid hit pair ";
return fTt;
}
fTt = dTt / (double) iNt;
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index b01535d2cb..9212ad578a 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -332,7 +332,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapStar(UInt_t& uCh, UInt_t uGbtx)
CbmTofAddress::GetUniqueAddress(fiModuleId[uGbtx], iRpcMap, iStrMap, fiRpcSide[uGbtx], fiRpcType[uGbtx]);
else
fviRpcChUId[uCh] = 0;
- // LOG(DEBUG)<<Form("Map Ch %d to Address 0x%08x",uCh,fviRpcChUId[uCh]);
+ // LOG(debug)<<Form("Map Ch %d to Address 0x%08x",uCh,fviRpcChUId[uCh]);
uCh += uChNext;
}
}
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.cxx b/core/detectors/tof/CbmTofCreateDigiPar.cxx
index 94849055d9..1f9722e054 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.cxx
+++ b/core/detectors/tof/CbmTofCreateDigiPar.cxx
@@ -342,7 +342,7 @@ void CbmTofCreateDigiPar::FillCellMapRootGeometry()
TObjArray* modarray = keep->GetNodes();
if (nullptr == modarray) {
- LOG(WARNING) << " No modules found in geometry ";
+ LOG(warning) << " No modules found in geometry ";
return;
}
// Loop over the different found modules
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.cxx b/core/detectors/tof/CbmTofDigiBdfPar.cxx
index 5d884a377a..773b9386bc 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.cxx
+++ b/core/detectors/tof/CbmTofDigiBdfPar.cxx
@@ -72,9 +72,9 @@ ClassImp(CbmTofDigiBdfPar)
CbmTofDigiBdfPar::~CbmTofDigiBdfPar(void)
{
- LOG(DEBUG4) << "Enter CbmTofDigiBdfPar destructor";
+ LOG(debug4) << "Enter CbmTofDigiBdfPar destructor";
clear();
- LOG(DEBUG4) << "Leave CbmTofDigiBdfPar destructor";
+ LOG(debug4) << "Leave CbmTofDigiBdfPar destructor";
}
void CbmTofDigiBdfPar::clear(void)
@@ -189,7 +189,7 @@ Bool_t CbmTofDigiBdfPar::getParams(FairParamList* l)
for (Int_t iSmType = 0; iSmType < fiNbSmTypes; iSmType++) {
fdSigVel[iSmType].Set(fiNbSm[iSmType] * fiNbRpc[iSmType]);
if (!l->fill(Form("SigVel%03d", iSmType), &(fdSigVel[iSmType]))) {
- LOG(WARNING) << "CbmTofDigiBdfPar::getParams => parameter " << Form("SigVel%03d", iSmType)
+ LOG(warning) << "CbmTofDigiBdfPar::getParams => parameter " << Form("SigVel%03d", iSmType)
<< " not found in the text file. "
<< "This is normal for geometries < 14a but may indicate file "
"corruption "
@@ -496,16 +496,16 @@ Bool_t CbmTofDigiBdfPar::GetLandauParFromBeamDataFit()
else {
// Pair is not unique
// => Do nothing, as default parameters should have been previously loaded
- LOG(WARNING) << "CbmTofDigiBdfPar::GetLandauParFromBeamDataFit => Fit "
+ LOG(warning) << "CbmTofDigiBdfPar::GetLandauParFromBeamDataFit => Fit "
"values matching a non-unique param pair for Sm Type "
<< iSmType << ": " << hFitR0CntAll->GetBinContent(hFitR0CntAll->FindBin(dMpv, dSigma));
- LOG(WARNING) << " => Use default values from ASCII parameter file";
+ LOG(warning) << " => Use default values from ASCII parameter file";
} // Nor unique pair
} // if( kTRUE == pResult->IsValid() )
else {
// Fit failed
// => Do nothing, as default parameters should have been previously loaded
- LOG(WARNING) << "CbmTofDigiBdfPar::GetLandauParFromBeamDataFit => Fit "
+ LOG(warning) << "CbmTofDigiBdfPar::GetLandauParFromBeamDataFit => Fit "
"failed for Sm Type "
<< iSmType << " => Use default values from ASCII parameter file";
} // else of if( kTRUE == pResult->IsValid() )
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
index 75d7b909b1..62aa368f73 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
@@ -253,10 +253,10 @@ Bool_t CbmMcbm2018MonitorAlgoT0::ProcessMs(const fles::Timeslice& ts, size_t uMs
* Should be only for first detected TS
*/
if (fulCurrentTsIdx < 10 && 0 == uMsIdx) {
- LOG(INFO) << "---------------------------------------------------------------";
- LOG(INFO) << "Component " << uMsCompIdx << " TS Idx " << fulCurrentTsIdx;
- LOG(INFO) << "hi hv eqid flag si sv idx/start crc size offset";
- LOG(INFO) << Form("%02x %02x %04x %04x %02x %02x %016lx %08x %08x %016lx",
+ LOG(info) << "---------------------------------------------------------------";
+ LOG(info) << "Component " << uMsCompIdx << " TS Idx " << fulCurrentTsIdx;
+ LOG(info) << "hi hv eqid flag si sv idx/start crc size offset";
+ LOG(info) << Form("%02x %02x %04x %04x %02x %02x %016lx %08x %08x %016lx",
static_cast<unsigned int>(msDescriptor.hdr_id), static_cast<unsigned int>(msDescriptor.hdr_ver),
msDescriptor.eq_id, msDescriptor.flags, static_cast<unsigned int>(msDescriptor.sys_id),
static_cast<unsigned int>(msDescriptor.sys_ver), static_cast<unsigned long>(msDescriptor.idx),
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index 540771e020..dcf90bc736 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -256,10 +256,10 @@ Bool_t CbmMcbmSpillFindAlgo::ProcessMs(const fles::Timeslice& ts, size_t uMsComp
* Should be only for first detected TS
*/
if (fulCurrentTsIdx < 10 && 0 == uMsIdx) {
- LOG(INFO) << "---------------------------------------------------------------";
- LOG(INFO) << "Component " << uMsCompIdx << " TS Idx " << fulCurrentTsIdx;
- LOG(INFO) << "hi hv eqid flag si sv idx/start crc size offset";
- LOG(INFO) << Form("%02x %02x %04x %04x %02x %02x %016lx %08x %08x %016lx",
+ LOG(info) << "---------------------------------------------------------------";
+ LOG(info) << "Component " << uMsCompIdx << " TS Idx " << fulCurrentTsIdx;
+ LOG(info) << "hi hv eqid flag si sv idx/start crc size offset";
+ LOG(info) << Form("%02x %02x %04x %04x %02x %02x %016lx %08x %08x %016lx",
static_cast<unsigned int>(msDescriptor.hdr_id), static_cast<unsigned int>(msDescriptor.hdr_ver),
msDescriptor.eq_id, msDescriptor.flags, static_cast<unsigned int>(msDescriptor.sys_id),
static_cast<unsigned int>(msDescriptor.sys_ver), static_cast<unsigned long>(msDescriptor.idx),
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
index 8876857e65..1d8fbfa6fe 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
@@ -88,7 +88,7 @@ void CbmMcbm2018UnpackerAlgoRich::AddMsComponentToList(size_t component, UShort_
if (fvMsComponentsList.size() == 1) { fRICHcompIdx = component; }
else {
- LOG(WARN) << "fvMsComponentsList.size() > 1 for RICH. Unpacking may not work due to implementation limitations.";
+ LOG(warning) << "fvMsComponentsList.size() > 1 for RICH. Unpacking may not work due to implementation limitations.";
}
LOG(info) << "CbmMcbm2018UnpackerAlgoRich::AddMsComponentToList => Component " << component << " with detector ID 0x"
@@ -211,10 +211,10 @@ Bool_t CbmMcbm2018UnpackerAlgoRich::ProcessMs(const fles::Timeslice& ts, size_t
}
uint32_t msIndexWord1 = reader.NextWord();
- if (IsLog()) LOG(DEBUG4) << GetLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
+ if (IsLog()) LOG(debug4) << GetLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
uint32_t msIndexWord2 = reader.NextWord();
- if (IsLog()) LOG(DEBUG4) << GetLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
+ if (IsLog()) LOG(debug4) << GetLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
return kTRUE;
}
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
index f8d7ae6f3f..cae047fee5 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
@@ -189,8 +189,8 @@ void CbmMcbm2018UnpackerAlgoRich2020::AddMsComponentToList(size_t component, USh
if (fvMsComponentsList.size() == 1) { fRICHcompIdx = component; }
else {
- LOG(WARN) << "fvMsComponentsList.size() > 1 for RICH. Unpacking may not "
- "work due to implementation limitations.";
+ LOG(warning) << "fvMsComponentsList.size() > 1 for RICH. Unpacking may not "
+ "work due to implementation limitations.";
}
LOG(info) << "CbmMcbm2018UnpackerAlgoRich2020::AddMsComponentToList => Component " << component
@@ -559,18 +559,18 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBevent(size_t const size, uint8_
}
}
else {
- LOG(WARN) << "[" << fGwordCnt << "]\t" << mRichSupport::GetWordHexRepr(ptr + offset) << "\t"
- << "ok"
- << "\t"
- << "hub ID = 0x" << mRichSupport::GetHexRepresentation(2, ptr + offset) << "\t"
- << "subevent size = " << SubEvSize << "\n"
- << "This is not a valid Combiner Id!"
- << "\n"
- << "prev prev2:" << mRichSupport::GetWordHexRepr(ptr + offset - 12) << "\n"
- << "prev prev: " << mRichSupport::GetWordHexRepr(ptr + offset - 8) << "\n"
- << "prev: " << mRichSupport::GetWordHexRepr(ptr + offset - 4) << "\n"
- << "next: " << mRichSupport::GetWordHexRepr(ptr + offset + 4) << "\n"
- << "next next: " << mRichSupport::GetWordHexRepr(ptr + offset + 8) << "\n";
+ LOG(warning) << "[" << fGwordCnt << "]\t" << mRichSupport::GetWordHexRepr(ptr + offset) << "\t"
+ << "ok"
+ << "\t"
+ << "hub ID = 0x" << mRichSupport::GetHexRepresentation(2, ptr + offset) << "\t"
+ << "subevent size = " << SubEvSize << "\n"
+ << "This is not a valid Combiner Id!"
+ << "\n"
+ << "prev prev2:" << mRichSupport::GetWordHexRepr(ptr + offset - 12) << "\n"
+ << "prev prev: " << mRichSupport::GetWordHexRepr(ptr + offset - 8) << "\n"
+ << "prev: " << mRichSupport::GetWordHexRepr(ptr + offset - 4) << "\n"
+ << "next: " << mRichSupport::GetWordHexRepr(ptr + offset + 4) << "\n"
+ << "next next: " << mRichSupport::GetWordHexRepr(ptr + offset + 8) << "\n";
//////////////////////////////////////////////////////////////
offset += (4 + SubEvSize * 4);
//////////////////////////////////////////////////////////////
@@ -580,10 +580,10 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBevent(size_t const size, uint8_
////LOG(debug4) << "Done processing TRB event. offset=" << offset << "\tsize=" << size;
//TODO implement checks
if (size != static_cast<size_t>(offset)) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBevent() warning:"
- << "Number of processed bytes is not equal to the expected size. "
- "This should not happen. ("
- << size << " VS " << offset << ")";
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBevent() warning:"
+ << "Number of processed bytes is not equal to the expected size. "
+ "This should not happen. ("
+ << size << " VS " << offset << ")";
}
return size; //TODO check
@@ -721,9 +721,9 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessSKIPsubevent(size_t const size, ui
////LOG(debug4) << "Done processing SKIP subevent. offset=" << offset << "\tsize=" << size;
//TODO implement checks
if (size != static_cast<size_t>(offset - 4)) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessSKIPsubevent() warning:"
- << "Number of processed bytes is not equal to the expected size. "
- "This should not happen.";
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessSKIPsubevent() warning:"
+ << "Number of processed bytes is not equal to the expected size. "
+ "This should not happen.";
}
return size; //TODO check
@@ -805,9 +805,9 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessCTSsubevent(size_t const size, uin
////LOG(debug4) << "Done processing CTS subevent. offset-4=" << offset-4 << "\tsize=" << size;
//TODO implement checks
if (size != static_cast<size_t>(offset - 4)) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessCTSsubevent() warning:"
- << "Number of processed bytes is not equal to the expected size. "
- "This should not happen.";
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessCTSsubevent() warning:"
+ << "Number of processed bytes is not equal to the expected size. "
+ "This should not happen.";
}
return size; //TODO check
@@ -896,9 +896,9 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent(size_t const size, uin
fGwordCnt++;
if (size + 4 < static_cast<size_t>(offset + 4 + SubSubEvSize * 4 - fTdcWordCorrectionCnt * 2)) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
- << "SubEvent out of bounds. This should not happen. (" << size << " VS "
- << (offset + 4 + SubSubEvSize * 4 - fTdcWordCorrectionCnt * 2) << ")";
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
+ << "SubEvent out of bounds. This should not happen. (" << size << " VS "
+ << (offset + 4 + SubSubEvSize * 4 - fTdcWordCorrectionCnt * 2) << ")";
/// Probably corrupted MS, stop there and skip remaining data
//fSkipMs = kTRUE;
@@ -942,11 +942,11 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent(size_t const size, uin
////LOG(debug4) << "Done processing TRB subevent. offset-4=" << offset-4 << "\tsize=" << size;
if (size != static_cast<size_t>(offset - 4)) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
- << "Number of processed bytes is not equal to the expected size. "
- "This should not happen. ("
- << size << " VS " << (offset - 4) << ")"
- << " Correction: " << fTdcWordCorrectionCnt * 2 << " fLastFeeOnHub:" << fLastFeeOnHub;
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
+ << "Number of processed bytes is not equal to the expected size. "
+ "This should not happen. ("
+ << size << " VS " << (offset - 4) << ")"
+ << " Correction: " << fTdcWordCorrectionCnt * 2 << " fLastFeeOnHub:" << fLastFeeOnHub;
/// Probably corrupted MS, stop there and skip remaining data
//fSkipMs = kTRUE;
@@ -1023,10 +1023,10 @@ Int_t CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubsubevent(size_t const size,
//if (size != static_cast<size_t>((WordCnt)*4) && fTdcWordCorrectionCnt == 0) {
if (!((!break_flag && ((size) == static_cast<size_t>((WordCnt) *4)))
|| (break_flag && ((size - (fTdcWordCorrectionCnt * 2)) == static_cast<size_t>((WordCnt) *4))))) {
- LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubsubevent() warning:"
- << "Number of processed bytes is not equal to the expected size. "
- "This should not happen."
- << static_cast<size_t>(WordCnt * 4) << " " << size;
+ LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubsubevent() warning:"
+ << "Number of processed bytes is not equal to the expected size. "
+ "This should not happen."
+ << static_cast<size_t>(WordCnt * 4) << " " << size;
/// Probably corrupted MS, stop there and skip remaining data
//fSkipMs = kTRUE;
}
@@ -1837,7 +1837,7 @@ void CbmMcbm2018UnpackerAlgoRich2020::findTDCAlignmentError(uint8_t const* const
// mRichSupport::SwapBytes(4, ptr+size);
// if((((((Int_t*)(ptr+size))[0]) >> 28) & 0xF) != 0x0) {
- // LOG(WARN) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
+ // LOG(warning) << "CbmMcbm2018UnpackerAlgoRich2020::ProcessTRBsubevent() warning:"
// << "End on Hub is not where expected. Is it a Buffer overflow? LastWord: "<<mRichSupport::GetWordHexRepr(ptr+size);
// }
// mRichSupport::SwapBytes(4, ptr+size);
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
index 8f4670e923..dd14e5c653 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
@@ -139,7 +139,7 @@ void CbmMcbm2018UnpackerAlgoTof::Finish()
{
/*
/// Printout Goodbye message and stats
- LOG(INFO)<<"<I> MS statistics - Good: " << fiMsGood <<", Bad: " << fiMsBad;
+ LOG(info)<<"<I> MS statistics - Good: " << fiMsGood <<", Bad: " << fiMsBad;
*/
/// Write Output histos
}
@@ -160,7 +160,7 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::ReInitContainers()
fUnpackPar = (CbmMcbm2018TofPar*) fParCList->FindObject("CbmMcbm2018TofPar");
if (nullptr == fUnpackPar) {
- LOG(ERROR) << " CbmMcbm2018TofPar not found ";
+ LOG(error) << " CbmMcbm2018TofPar not found ";
return kFALSE;
}
Bool_t initOK = InitParameters();
@@ -177,7 +177,7 @@ TList* CbmMcbm2018UnpackerAlgoTof::GetParList()
}
Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters()
{
- LOG(INFO) << "InitParameters from " << fUnpackPar;
+ LOG(info) << "InitParameters from " << fUnpackPar;
fdMsSizeInNs = fUnpackPar->GetSizeMsInNs();
fuNrOfGdpbs = fUnpackPar->GetNrOfGdpbs();
@@ -277,7 +277,7 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters()
fviRpcSide[iGbtx], fviRpcType[iGbtx]);
else
fviRpcChUId[iCh] = 0;
- // LOG(DEBUG)<<Form("Map Ch %d to Address 0x%08x",iCh,fviRpcChUId[iCh]);
+ // LOG(debug)<<Form("Map Ch %d to Address 0x%08x",iCh,fviRpcChUId[iCh]);
iCh += iChNext;
}
}
@@ -534,7 +534,7 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::InitParameters()
// Request masks
/*
- LOG(INFO) << " Load " << fUnpackPar->GetNrReqPattern() << " GET4 Request masks for " << fuNrOfGdpbs << " Gdpbs ";
+ LOG(info) << " Load " << fUnpackPar->GetNrReqPattern() << " GET4 Request masks for " << fuNrOfGdpbs << " Gdpbs ";
if(fUnpackPar->GetNrReqPattern()>0){
bGdpbOK.resize(fuNrOfGdpbs);
Pat_Request.resize(fuNrOfGdpbs);
@@ -609,7 +609,7 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::ProcessTs(const fles::Timeslice& ts)
{
fulCurrentTsIdx = ts.index();
fdTsStartTime = static_cast<Double_t>(ts.descriptor(0, 0).idx);
- LOG(DEBUG) << "ProcessTs " << fulCurrentTsIdx;
+ LOG(debug) << "ProcessTs " << fulCurrentTsIdx;
/// Ignore First TS as first MS is typically corrupt
if (0 == fulCurrentTsIdx) { return kTRUE; } // if( 0 == fulCurrentTsIdx )
@@ -665,11 +665,11 @@ Bool_t CbmMcbm2018UnpackerAlgoTof::ProcessTs(const fles::Timeslice& ts)
} // if( fuTsMaxVectorSize < fDigiVect.size() )
/*
if(!bEnableOut) {
- LOG(DEBUG) << "Ts "<< fulCurrentTsIdx << " removed ";
+ LOG(debug) << "Ts "<< fulCurrentTsIdx << " removed ";
fiMsBad++;
fDigiVect.clear();
}else {
- LOG(DEBUG) << "Ts "<< fulCurrentTsIdx << " accepted ";
+ LOG(debug) << "Ts "<< fulCurrentTsIdx << " accepted ";
fiMsGood++;
}
*/
@@ -1287,7 +1287,7 @@ void CbmMcbm2018UnpackerAlgoTof::ProcessPattern(const gdpbv100::FullMessage& mes
TString Tok;
if (bEnableOut) Tok="Ena";
else Tok="Dis";
- LOG(DEBUG) << Form( "Mismatch pat in TS %llu, MS %llu, Gdpb %u, T %u, Pattern 0x%08X %08X %08X %08X %08X %08X %08X %08X ",
+ LOG(debug) << Form( "Mismatch pat in TS %llu, MS %llu, Gdpb %u, T %u, Pattern 0x%08X %08X %08X %08X %08X %08X %08X %08X ",
fulCurrentTsIdx, fulCurrentMsIdx, fuCurrDpbIdx, usType,
pat_mess[0], pat_mess[1], pat_mess[2], pat_mess[3], pat_mess[4], pat_mess[5], pat_mess[6], pat_mess[7] )
<< Tok;
diff --git a/macro/reco/CMakeLists.txt b/macro/reco/CMakeLists.txt
index b97fa05599..311a5b987d 100644
--- a/macro/reco/CMakeLists.txt
+++ b/macro/reco/CMakeLists.txt
@@ -81,7 +81,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED reco_cleanup
- FIXTURES_SETUP fixt_tra_coll_${setup}
+ FIXTURES_SETUP fixt_reco_tra_coll_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -96,7 +96,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED reco_cleanup
- FIXTURES_SETUP fixt_tra_sign_${setup}
+ FIXTURES_SETUP fixt_reco_tra_sign_${setup}
RESOURCE_LOCK signParDb_${setup}
)
@@ -110,7 +110,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
FIXTURES_REQUIRED reco_cleanup
- FIXTURES_SETUP fixt_tra_beam_${setup}
+ FIXTURES_SETUP fixt_reco_tra_beam_${setup}
RESOURCE_LOCK beamParDb_${setup}
)
@@ -126,8 +126,9 @@ foreach(setup IN LISTS cbm_setup)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
- FIXTURES_REQUIRED "fixt_tra_coll_${setup};fixt_tra_sign_${setup};fixt_tra_beam_${setup}"
- FIXTURES_SETUP fixt_digi_ts_${setup}
+ FIXTURES_REQUIRED
+ "fixt_reco_tra_coll_${setup};fixt_reco_tra_sign_${setup};fixt_reco_tra_beam_${setup}"
+ FIXTURES_SETUP fixt_reco_digi_ts_${setup}
RESOURCE_LOCK collParDb_${setup}
)
@@ -139,8 +140,8 @@ foreach(setup IN LISTS cbm_setup)
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeOutTime}
PASS_REGULAR_EXPRESSION "Macro finished successfully"
- FIXTURES_REQUIRED fixt_digi_ts_${setup}
- FIXTURES_SETUP fixt_reco_sim_${setup}
+ FIXTURES_REQUIRED fixt_reco_digi_ts_${setup}
+ FIXTURES_SETUP fixt_reco_digi_${setup}
RESOURCE_LOCK collParDb_${setup}
)
diff --git a/reco/L1/L1Algo/L1Vector.h b/reco/L1/L1Algo/L1Vector.h
index 06b644f2dc..f5d39e5f1c 100644
--- a/reco/L1/L1Algo/L1Vector.h
+++ b/reco/L1/L1Algo/L1Vector.h
@@ -86,13 +86,13 @@ public:
void enlarge(std::size_t count, Tinput... value)
{
if (count < Tbase::size()) {
- LOG(FATAL) << "L1Vector \"" << fName << "\"::enlarge(" << count
+ LOG(fatal) << "L1Vector \"" << fName << "\"::enlarge(" << count
<< "): the new size is smaller than the current one " << Tbase::size() << ", something goes wrong."
<< std::endl;
assert(count >= Tbase::size());
}
if ((!Tbase::empty()) && (count > Tbase::capacity())) {
- LOG(WARNING) << "L1Vector \"" << fName << "\"::enlarge(" << count << "): allocated capacity of "
+ LOG(warning) << "L1Vector \"" << fName << "\"::enlarge(" << count << "): allocated capacity of "
<< Tbase::capacity() << " is reached, the vector of size " << Tbase::size()
<< " will be copied to the new place." << std::endl;
}
@@ -102,7 +102,7 @@ public:
void reduce(std::size_t count)
{
if (count > Tbase::size()) {
- LOG(FATAL) << "L1Vector \"" << fName << "\"::reduce(" << count
+ LOG(fatal) << "L1Vector \"" << fName << "\"::reduce(" << count
<< "): the new size is bigger than the current one " << Tbase::size() << ", something goes wrong."
<< std::endl;
assert(count < Tbase::size());
@@ -113,7 +113,7 @@ public:
void reserve(std::size_t count)
{
if (!Tbase::empty()) {
- LOG(FATAL) << "L1Vector \"" << fName << "\"::reserve(" << count << "): the vector is not empty; "
+ LOG(fatal) << "L1Vector \"" << fName << "\"::reserve(" << count << "): the vector is not empty; "
<< " it will be copied to the new place." << std::endl;
assert(Tbase::empty());
}
@@ -126,7 +126,7 @@ public:
{
#ifndef FAST_CODE
if (Tbase::size() >= Tbase::capacity()) {
- LOG(WARNING) << "L1Vector \"" << fName << "\"::push_back(): allocated capacity of " << Tbase::capacity()
+ LOG(warning) << "L1Vector \"" << fName << "\"::push_back(): allocated capacity of " << Tbase::capacity()
<< " is reached, re-allocate and copy." << std::endl;
}
#endif
@@ -144,7 +144,7 @@ public:
{
#ifndef FAST_CODE
if (Tbase::size() >= Tbase::capacity()) {
- LOG(WARNING) << "L1Vector \"" << fName << "\"::emplace_back(): allocated capacity of " << Tbase::capacity()
+ LOG(warning) << "L1Vector \"" << fName << "\"::emplace_back(): allocated capacity of " << Tbase::capacity()
<< " is reached, re-allocate and copy." << std::endl;
}
#endif
@@ -155,7 +155,7 @@ public:
{
#ifndef FAST_CODE
if (pos >= Tbase::size()) {
- LOG(FATAL) << "L1Vector \"" << fName << "\": trying to access element " << pos
+ LOG(fatal) << "L1Vector \"" << fName << "\": trying to access element " << pos
<< " outside of the vector of the size of " << Tbase::size() << std::endl;
assert(pos < Tbase::size());
}
@@ -167,7 +167,7 @@ public:
{
#ifndef FAST_CODE
if (pos >= Tbase::size()) {
- LOG(FATAL) << "L1Vector \"" << fName << "\": trying to access element " << pos
+ LOG(fatal) << "L1Vector \"" << fName << "\": trying to access element " << pos
<< " outside of the vector of the size of " << Tbase::size() << std::endl;
assert(pos < Tbase::size());
}
@@ -179,7 +179,7 @@ public:
{
#ifndef FAST_CODE
if (Tbase::size() == 0) {
- LOG(FATAL) << "L1Vector \"" << fName << "\": trying to access element of an empty vector" << std::endl;
+ LOG(fatal) << "L1Vector \"" << fName << "\": trying to access element of an empty vector" << std::endl;
assert(Tbase::size() > 0);
}
#endif
@@ -190,7 +190,7 @@ public:
{
#ifndef FAST_CODE
if (Tbase::size() == 0) {
- LOG(FATAL) << "L1Vector \"" << fName << "\": trying to access element of an empty vector" << std::endl;
+ LOG(fatal) << "L1Vector \"" << fName << "\": trying to access element of an empty vector" << std::endl;
assert(Tbase::size() > 0);
}
#endif
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
index 3d0e08f8f5..496ad04f29 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.cxx
@@ -44,10 +44,10 @@ bool CbmRichUnpackAlgo::unpack(const fles::Timeslice* ts, std::uint16_t icomp, U
}
uint32_t msIndexWord1 = reader.NextWord();
- if (isLog()) LOG(DEBUG4) << getLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
+ if (isLog()) LOG(debug4) << getLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
uint32_t msIndexWord2 = reader.NextWord();
- if (isLog()) LOG(DEBUG4) << getLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
+ if (isLog()) LOG(debug4) << getLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
return true;
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
index 1669fe9761..9b9a89c237 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
@@ -53,10 +53,10 @@ bool CbmRichUnpackAlgo2022::unpack(const fles::Timeslice* ts, std::uint16_t icom
}
uint32_t msIndexWord1 = reader.NextWord();
- if (isLog()) LOG(DEBUG4) << getLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
+ if (isLog()) LOG(debug4) << getLogHeader(reader) << "Microslice Index 1:" << reader.GetWordAsHexString(msIndexWord1);
uint32_t msIndexWord2 = reader.NextWord();
- if (isLog()) LOG(DEBUG4) << getLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
+ if (isLog()) LOG(debug4) << getLogHeader(reader) << "Microslice Index 2:" << reader.GetWordAsHexString(msIndexWord2);
//Output debugging info
if (fMonitor) {
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index 1c0b2dd59f..267ea58ed3 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -1629,7 +1629,7 @@ pair<Int_t, Int_t> CbmTofSimpClusterizer::BuildClusters(CbmEvent* event)
// Save pointer on CbmTofPoint
// vPtsRef.push_back( (CbmTofPoint*)(xDigiA->GetLinks()) );
// Save next digi address
- LOG(DEBUG4) << " Next fStor Digi " << iSmType << ", SR " << iSm * iNbRpc + iRpc << ", Ch" << iCh
+ LOG(debug4) << " Next fStor Digi " << iSmType << ", SR " << iSm * iNbRpc + iRpc << ", Ch" << iCh
<< ", Dig0 " << (fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh][0]) << ", Dig1 "
<< (fStorDigiInd[iSmType][iSm * iNbRpc + iRpc][iCh][1]);
@@ -1861,7 +1861,7 @@ pair<Int_t, Int_t> CbmTofSimpClusterizer::BuildClusters(CbmEvent* event)
vDigiIndRef.clear();
} // else of if( 1 == fDigiBdfPar->GetChanOrient( iSmType, iRpc ) )
} // if( 0 < iNbChanInHit)
- LOG(DEBUG4) << " Fini-A " << Form(" %3d %3d %3d ", iSmType, iSm, iRpc);
+ LOG(debug4) << " Fini-A " << Form(" %3d %3d %3d ", iSmType, iSm, iRpc);
} // for each sm/rpc pair
LOG(debug3) << " Fini-B " << Form(" %3d ", iSmType);
} // for( Int_t iSmType = 0; iSmType < iNbSmTypes; iSmType++ )
diff --git a/reco/detectors/tof/CbmTofTrackFinderNN.cxx b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
index 1995999c45..91ce00f217 100644
--- a/reco/detectors/tof/CbmTofTrackFinderNN.cxx
+++ b/reco/detectors/tof/CbmTofTrackFinderNN.cxx
@@ -742,7 +742,7 @@ Int_t CbmTofTrackFinderNN::HitUsed(Int_t iHit)
Int_t iUsed = 0;
// LOG(debug1)<<"CbmTofTrackFinderNN::HitUsed of Hind "<<iHit<<", TrkMap.size "<<fvTrkMap[iHit].size()
- LOG(DEBUG4) << "CbmTofTrackFinderNN::HitUsed of Hind " << iHit << ", TrkVec.size " << fvTrkVec[iHit].size();
+ LOG(debug4) << "CbmTofTrackFinderNN::HitUsed of Hind " << iHit << ", TrkVec.size " << fvTrkVec[iHit].size();
/*
for ( std::map<CbmTofTracklet*,Int_t>::iterator it=fvTrkMap[iHit].begin(); it != fvTrkMap[iHit].end(); it++){
if(it->first->GetNofHits() > 2) return iUsed=1;
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
index fcef947c84..b13bf39ead 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracks.cxx
@@ -232,30 +232,30 @@ void CbmLitFindGlobalTracks::ReadInputBranches()
// --- STS hits
fStsHits = dynamic_cast<TClonesArray*>(ioman->GetObject("StsHit"));
if (!fStsHits) {
- LOG(FATAL) << GetName() << ": No StsHit branch!";
+ LOG(fatal) << GetName() << ": No StsHit branch!";
fDet.SetDet(ECbmModuleId::kSts, false);
}
else
- LOG(INFO) << GetName() << ": Found StsHit branch";
+ LOG(info) << GetName() << ": Found StsHit branch";
// --- STS tracks
fStsTracks = dynamic_cast<TClonesArray*>(ioman->GetObject("StsTrack"));
if (!fStsTracks) {
- LOG(FATAL) << GetName() << ": No StsTrack branch!";
+ LOG(fatal) << GetName() << ": No StsTrack branch!";
fDet.SetDet(ECbmModuleId::kSts, false);
}
else
- LOG(INFO) << GetName() << ": Found StsTrack branch";
+ LOG(info) << GetName() << ": Found StsTrack branch";
// --- MUCH hits
if (fDet.GetDet(ECbmModuleId::kMuch)) {
fMuchPixelHits = dynamic_cast<TClonesArray*>(ioman->GetObject("MuchPixelHit"));
if (!fMuchPixelHits) {
- LOG(WARNING) << GetName() << "No MuchPixelHit branch!";
+ LOG(warning) << GetName() << "No MuchPixelHit branch!";
fDet.SetDet(ECbmModuleId::kMuch, false);
}
else {
- if (fMuchPixelHits) LOG(INFO) << GetName() << ": Found MuchPixelHit branch";
+ if (fMuchPixelHits) LOG(info) << GetName() << ": Found MuchPixelHit branch";
}
} //? MUCH in geometry
@@ -263,35 +263,35 @@ void CbmLitFindGlobalTracks::ReadInputBranches()
if (fDet.GetDet(ECbmModuleId::kTrd)) {
fTrdHits = dynamic_cast<TClonesArray*>(ioman->GetObject("TrdHit"));
if (NULL == fTrdHits) {
- LOG(WARNING) << GetName() << ": No TrdHit branch!";
+ LOG(warning) << GetName() << ": No TrdHit branch!";
fDet.SetDet(ECbmModuleId::kTrd, false);
}
- LOG(INFO) << GetName() << ": Found TrdHit branch";
+ LOG(info) << GetName() << ": Found TrdHit branch";
} //? TRD in geometry
// --- TOF hits
if (fDet.GetDet(ECbmModuleId::kTof)) {
fTofHits = dynamic_cast<TClonesArray*>(ioman->GetObject("TofHit"));
if (NULL == fTofHits) {
- LOG(WARNING) << GetName() << ": No TofHit branch!";
+ LOG(warning) << GetName() << ": No TofHit branch!";
fDet.SetDet(ECbmModuleId::kTof, false);
}
else
- LOG(INFO) << GetName() << ": Found TofHit branch";
+ LOG(info) << GetName() << ": Found TofHit branch";
} //? TOF in geometry
// --- Events
fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
- if (fEvents) LOG(INFO) << GetName() << ": Found Event branch";
+ if (fEvents) LOG(info) << GetName() << ": Found Event branch";
else
- LOG(INFO) << GetName() << ": No Event branch; run in time-based mode";
+ LOG(info) << GetName() << ": No Event branch; run in time-based mode";
// --- Primary vertex
fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex."));
if (nullptr == fPrimVertex) { fPrimVertex = dynamic_cast<CbmVertex*>(ioman->GetObject("PrimaryVertex")); }
- if (nullptr == fPrimVertex) LOG(WARNING) << GetName() << ": No PrimaryVertex branch!";
+ if (nullptr == fPrimVertex) LOG(warning) << GetName() << ": No PrimaryVertex branch!";
else
- LOG(INFO) << GetName() << ": Found PrimaryVertex branch";
+ LOG(info) << GetName() << ": Found PrimaryVertex branch";
}
void CbmLitFindGlobalTracks::RegisterOutputBranches()
@@ -303,27 +303,27 @@ void CbmLitFindGlobalTracks::RegisterOutputBranches()
if (fDet.GetDet(ECbmModuleId::kMuch)) {
fMuchTracks = new TClonesArray("CbmMuchTrack", 100);
ioman->Register("MuchTrack", "Much", fMuchTracks, IsOutputBranchPersistent("MuchTrack"));
- LOG(INFO) << GetName() << ": Register MuchTrack branch";
+ LOG(info) << GetName() << ": Register MuchTrack branch";
}
// --- TrdTrack
if (fDet.GetDet(ECbmModuleId::kTrd)) {
fTrdTracks = new TClonesArray("CbmTrdTrack", 100);
ioman->Register("TrdTrack", "Trd", fTrdTracks, IsOutputBranchPersistent("TrdTrack"));
- LOG(INFO) << GetName() << ": Register TrdTrack branch";
+ LOG(info) << GetName() << ": Register TrdTrack branch";
}
// --- TofTrack
if (fDet.GetDet(ECbmModuleId::kTof)) {
fTofTracks = new TClonesArray("CbmTofTrack", 100);
ioman->Register("TofTrack", "Tof", fTofTracks, IsOutputBranchPersistent("TofTrack"));
- LOG(INFO) << GetName() << ": Register TofTrack branch";
+ LOG(info) << GetName() << ": Register TofTrack branch";
}
// --- GlobalTrack
fGlobalTracks = new TClonesArray("CbmGlobalTrack", 100);
ioman->Register("GlobalTrack", "Global", fGlobalTracks, IsOutputBranchPersistent("GlobalTrack"));
- LOG(INFO) << GetName() << ": Register GlobalTrack branch";
+ LOG(info) << GetName() << ": Register GlobalTrack branch";
}
void CbmLitFindGlobalTracks::InitTrackReconstruction()
diff --git a/reco/littrack/cbm/utils/CbmLitConverter.h b/reco/littrack/cbm/utils/CbmLitConverter.h
index c50302f49b..93d9374bf6 100644
--- a/reco/littrack/cbm/utils/CbmLitConverter.h
+++ b/reco/littrack/cbm/utils/CbmLitConverter.h
@@ -223,7 +223,7 @@ public:
if (litTrack->GetQuality() == kLITBAD) { continue; }
if (litTrack->GetNofHits() < 1) { continue; }
if (static_cast<size_t>(litTrack->GetNofHits()) != litTrack->GetFitNodes().size()) {
- LOG(ERROR) << "CbmLitConverter::LitTrackVectorToGlobalTrackArray: "
+ LOG(error) << "CbmLitConverter::LitTrackVectorToGlobalTrackArray: "
"unequal number of hits and fit nodes"
<< std::endl
<< litTrack->ToString();
diff --git a/sim/detectors/tof/CbmTofDigitize.cxx b/sim/detectors/tof/CbmTofDigitize.cxx
index c8ce975ad5..9453373af2 100644
--- a/sim/detectors/tof/CbmTofDigitize.cxx
+++ b/sim/detectors/tof/CbmTofDigitize.cxx
@@ -1072,7 +1072,7 @@ Bool_t CbmTofDigitize::MergeSameChanDigis()
if (0 < iNbDigis) {
CbmMatch* digiMatch;
for (Int_t iDigi = 0; iDigi < iNbDigis; iDigi++) { //store matches with digis
- LOG(DEBUG) << Form(
+ LOG(debug) << Form(
" Create match for Digi %d(%d), addr 0x%08x; %d", iDigi, iNbDigis,
fStorDigi[iSmType][iSm * iNbRpc + iRpc][iNbSides * iCh + iSide][iDigi].first->GetAddress(),
fStorDigiMatch[iSmType][iSm * iNbRpc + iRpc][iNbSides * iCh + iSide][iDigi]);
@@ -1380,7 +1380,7 @@ Bool_t CbmTofDigitize::DigitizeDirectClusterSize()
// Get a pointer to the TOF point
pPoint = (CbmTofPoint*) fTofPointsColl->At(iPntInd);
if (NULL == pPoint) {
- LOG(WARNING) << "CbmTofDigitize::DigitizeDirectClusterSize => Be "
+ LOG(warning) << "CbmTofDigitize::DigitizeDirectClusterSize => Be "
"careful: hole in the CbmTofPoint TClonesArray!";
continue;
} // if( pPoint )
@@ -1830,7 +1830,7 @@ Bool_t CbmTofDigitize::DigitizeFlatDisc()
// Get a pointer to the TOF point
pPoint = (CbmTofPoint*) fTofPointsColl->At(iPntInd);
if (NULL == pPoint) {
- LOG(WARNING) << "CbmTofDigitize::DigitizeFlatDisc => Be careful: hole in "
+ LOG(warning) << "CbmTofDigitize::DigitizeFlatDisc => Be careful: hole in "
"the CbmTofPoint TClonesArray!"
<< endl;
continue;
@@ -1943,7 +1943,7 @@ Bool_t CbmTofDigitize::DigitizeFlatDisc()
pPoint->Position(vPntPos);
fChannelInfo = fDigiPar->GetCell(iChanId);
if (NULL == fChannelInfo) {
- LOG(WARNING) << "CbmTofDigitize::DigitizeFlatDisc: No DigPar for iChanId = "
+ LOG(warning) << "CbmTofDigitize::DigitizeFlatDisc: No DigPar for iChanId = "
<< Form("0x%08x, addr 0x%08x", iChanId, (unsigned int) iDetId);
continue;
}
@@ -2604,7 +2604,7 @@ Bool_t CbmTofDigitize::DigitizeGaussCharge()
// Get a pointer to the TOF point
pPoint = (CbmTofPoint*) fTofPointsColl->At(iPntInd);
if (NULL == pPoint) {
- LOG(WARNING) << "CbmTofDigitize::DigitizeGaussCharge => Be careful: hole "
+ LOG(warning) << "CbmTofDigitize::DigitizeGaussCharge => Be careful: hole "
"in the CbmTofPoint TClonesArray!"
<< endl;
continue;
diff --git a/sim/transport/base/CbmBeamProfile.cxx b/sim/transport/base/CbmBeamProfile.cxx
index 2d93d0b929..8de85299f2 100644
--- a/sim/transport/base/CbmBeamProfile.cxx
+++ b/sim/transport/base/CbmBeamProfile.cxx
@@ -39,10 +39,10 @@ Bool_t CbmBeamProfile::CheckWithTarget(const CbmTarget& target) const
TVector3 sect1 = ExtrapolateToPlane(surf1, target.GetNormal());
Double_t dist1 = (sect1 - surf1).Mag();
if (dist1 > 0.5 * target.GetDiameter()) {
- LOG(ERROR) << "EventGen: Average beam does not hit first target surface!";
- LOG(ERROR) << " Surface centre is (" << surf1.X() << ", " << surf1.Y() << ", " << surf1.Z() << ") cm";
- LOG(ERROR) << " Intersection point is (" << sect1.X() << ", " << sect1.Y() << ", " << sect1.Z() << ") cm";
- LOG(ERROR) << " Distance to target surface centre is " << dist1 << " cm, target radius is "
+ LOG(error) << "EventGen: Average beam does not hit first target surface!";
+ LOG(error) << " Surface centre is (" << surf1.X() << ", " << surf1.Y() << ", " << surf1.Z() << ") cm";
+ LOG(error) << " Intersection point is (" << sect1.X() << ", " << sect1.Y() << ", " << sect1.Z() << ") cm";
+ LOG(error) << " Distance to target surface centre is " << dist1 << " cm, target radius is "
<< 0.5 * target.GetDiameter() << " cm";
return kFALSE;
}
@@ -52,10 +52,10 @@ Bool_t CbmBeamProfile::CheckWithTarget(const CbmTarget& target) const
TVector3 sect2 = ExtrapolateToPlane(surf2, target.GetNormal());
Double_t dist2 = (sect2 - surf2).Mag();
if (dist2 > 0.5 * target.GetDiameter()) {
- LOG(ERROR) << "EventGen: Average beam does not hit second target surface!";
- LOG(ERROR) << " Surface centre is (" << surf2.X() << ", " << surf2.Y() << ", " << surf2.Z() << ") cm";
- LOG(ERROR) << " Intersection point is (" << sect2.X() << ", " << sect2.Y() << ", " << sect2.Z() << ") cm";
- LOG(ERROR) << " Distance to target surface centre is " << dist2 << " cm, target radius is "
+ LOG(error) << "EventGen: Average beam does not hit second target surface!";
+ LOG(error) << " Surface centre is (" << surf2.X() << ", " << surf2.Y() << ", " << surf2.Z() << ") cm";
+ LOG(error) << " Intersection point is (" << sect2.X() << ", " << sect2.Y() << ", " << sect2.Z() << ") cm";
+ LOG(error) << " Distance to target surface centre is " << dist2 << " cm, target radius is "
<< 0.5 * target.GetDiameter() << " cm";
return kFALSE;
}
diff --git a/sim/transport/base/CbmMCEventFilter.cxx b/sim/transport/base/CbmMCEventFilter.cxx
index a70ee54744..d7fd0287cc 100644
--- a/sim/transport/base/CbmMCEventFilter.cxx
+++ b/sim/transport/base/CbmMCEventFilter.cxx
@@ -47,11 +47,11 @@ void CbmMCEventFilter::Exec(Option_t*)
fNofEventsIn++;
Bool_t test = SelectEvent();
if (test) {
- LOG(INFO) << GetName() << ": Current event " << fNofEventsIn << " selected for output";
+ LOG(info) << GetName() << ": Current event " << fNofEventsIn << " selected for output";
fNofEventsOut++;
} //? Event selected
else
- LOG(INFO) << GetName() << ": Current event " << fNofEventsIn << " discarded for output";
+ LOG(info) << GetName() << ": Current event " << fNofEventsIn << " discarded for output";
FairMCApplication::Instance()->SetSaveCurrentEvent(test);
}
// --------------------------------------------------------------------------
@@ -62,8 +62,8 @@ void CbmMCEventFilter::Finish()
{
cout << endl;
- LOG(INFO) << GetName() << ": Number of input events " << fNofEventsIn;
- LOG(INFO) << GetName() << ": Number of output events " << fNofEventsOut << " = "
+ LOG(info) << GetName() << ": Number of input events " << fNofEventsIn;
+ LOG(info) << GetName() << ": Number of output events " << fNofEventsOut << " = "
<< 100. * Double_t(fNofEventsOut) / Double_t(fNofEventsIn) << " %";
cout << endl;
}
@@ -98,7 +98,7 @@ void CbmMCEventFilter::GetBranch(ECbmDataType type)
TString branchName = GetBranchName(type);
if (!branchName.IsNull()) {
fData[type] = dynamic_cast<TClonesArray*>(rm->GetObject(branchName));
- if (fData.at(type)) { LOG(INFO) << GetName() << ": Add branch " << branchName; }
+ if (fData.at(type)) { LOG(info) << GetName() << ": Add branch " << branchName; }
}
}
// --------------------------------------------------------------------------
@@ -130,11 +130,11 @@ TString CbmMCEventFilter::GetBranchName(ECbmDataType type) const
Bool_t CbmMCEventFilter::SelectEvent() const
{
- LOG(INFO) << GetName() << ": " << Statistics();
+ LOG(info) << GetName() << ": " << Statistics();
Bool_t check = kTRUE;
for (auto cut : fMinNofData) {
if (GetNofData(cut.first) < cut.second) {
- LOG(INFO) << GetName() << ": Cut on branch " << GetBranchName(cut.first) << " not passed (number of data "
+ LOG(info) << GetName() << ": Cut on branch " << GetBranchName(cut.first) << " not passed (number of data "
<< GetNofData(cut.first) << ", required " << cut.second << ")";
check = kFALSE;
break;
diff --git a/sim/transport/base/CbmTarget.cxx b/sim/transport/base/CbmTarget.cxx
index 7b777fcaca..c609851c55 100644
--- a/sim/transport/base/CbmTarget.cxx
+++ b/sim/transport/base/CbmTarget.cxx
@@ -101,16 +101,16 @@ void CbmTarget::ConstructGeometry()
// --- Construct from ROOT file if specified
if (fBuildFromFile) {
if (!fgeoName.EndsWith(".geo.root")) {
- LOG(INFO) << GetName() << ": geometry file is " << fgeoName;
- LOG(FATAL) << GetName() << ": only ROOT geometry files are supported!";
+ LOG(info) << GetName() << ": geometry file is " << fgeoName;
+ LOG(fatal) << GetName() << ": only ROOT geometry files are supported!";
return;
}
- LOG(INFO) << GetName() << ": Constructing geometry from " << fgeoName;
+ LOG(info) << GetName() << ": Constructing geometry from " << fgeoName;
ConstructRootGeometry();
return;
}
- LOG(INFO) << GetName() << ": Constructing geometry...";
+ LOG(info) << GetName() << ": Constructing geometry...";
// --- Get TGeoManager instance
TGeoManager* geoMan = gGeoManager;
@@ -121,26 +121,26 @@ void CbmTarget::ConstructGeometry()
if (fZ) {
targElem = geoMan->GetElementTable()->GetElement(fZ);
if (!targElem) {
- LOG(FATAL) << GetName() << ": Unknown element " << fZ;
+ LOG(fatal) << GetName() << ": Unknown element " << fZ;
return;
}
fMaterial = targElem->GetTitle();
}
else if (!fMaterial.IsNull()) {
targElem = geoMan->GetElementTable()->FindElement(fMaterial.Data());
- if (!targElem) { LOG(FATAL) << GetName() << ": Unknown element " << fMaterial; }
+ if (!targElem) { LOG(fatal) << GetName() << ": Unknown element " << fMaterial; }
fZ = targElem->Z();
}
else {
- LOG(FATAL) << GetName() << ": Target material not specified!";
+ LOG(fatal) << GetName() << ": Target material not specified!";
return;
}
- LOG(INFO) << GetName() << ": Use material " << fMaterial << ", z = " << fZ;
+ LOG(info) << GetName() << ": Use material " << fMaterial << ", z = " << fZ;
// --- Get density, if not set through the constructor
fDensity = fDensity > 0. ? fDensity : GetStandardDensity(fZ);
if (fDensity < 0.) {
- LOG(FATAL) << GetName() << ": No standard density for element " << fMaterial
+ LOG(fatal) << GetName() << ": No standard density for element " << fMaterial
<< " available: density must be set explicitly.";
return;
}
@@ -158,10 +158,10 @@ void CbmTarget::ConstructGeometry()
// --- Get mother node
TGeoNode* motherNode = geoMan->FindNode(fPosX, fPosY, fPosZ);
if (!motherNode) {
- LOG(FATAL) << GetName() << ": No mother node found at target position!";
+ LOG(fatal) << GetName() << ": No mother node found at target position!";
return;
}
- LOG(INFO) << GetName() << ": Mother node is " << motherNode->GetName();
+ LOG(info) << GetName() << ": Mother node is " << motherNode->GetName();
// Construct the transformation matrix for positioning of the target
// in its mother volume. The matrix is the inverse of the global
@@ -181,7 +181,7 @@ void CbmTarget::ConstructGeometry()
// --- Check the resulting transformation from target to global
TGeoNode* testNode = geoMan->FindNode(fPosX, fPosY, fPosZ);
- LOG(DEBUG) << GetName() << ": Test node is " << testNode->GetName();
+ LOG(debug) << GetName() << ": Test node is " << testNode->GetName();
TGeoHMatrix* testMatrix = geoMan->GetCurrentMatrix();
if (fair::Logger::Logging("DEBUG")) testMatrix->Print();
@@ -237,7 +237,7 @@ TVector3 CbmTarget::GetSurfaceCentreUp() const
void CbmTarget::SetGeometryFileName(TString name, TString version)
{
fBuildFromFile = kTRUE;
- LOG(INFO) << "Using target file name " << name;
+ LOG(info) << "Using target file name " << name;
return FairModule::SetGeometryFileName(name, version);
}
// --------------------------------------------------------------------------
diff --git a/sim/transport/generators/CbmUnigenGenerator.cxx b/sim/transport/generators/CbmUnigenGenerator.cxx
index 212d618263..c537325db5 100644
--- a/sim/transport/generators/CbmUnigenGenerator.cxx
+++ b/sim/transport/generators/CbmUnigenGenerator.cxx
@@ -83,7 +83,7 @@ void CbmUnigenGenerator::AddPrimary(FairPrimaryGenerator* primGen, Int_t pdgCode
void CbmUnigenGenerator::CloseInput()
{
if (!fFile) return;
- LOG(INFO) << GetName() << ": Closing input file " << fFileName;
+ LOG(info) << GetName() << ": Closing input file " << fFileName;
fFile->Close();
fFile = nullptr;
}
@@ -108,7 +108,7 @@ Bool_t CbmUnigenGenerator::GetNextEntry()
// Read entry
Int_t result = fTree->GetEntry(fCurrentEntry);
if (result <= 0) {
- LOG(ERROR) << GetName() << ": Error reading entry " << fCurrentEntry << " (returns " << result << ")!";
+ LOG(error) << GetName() << ": Error reading entry " << fCurrentEntry << " (returns " << result << ")!";
return kFALSE;
}
@@ -136,7 +136,7 @@ Bool_t CbmUnigenGenerator::Init()
case kReuseEvents: ss << " re-use events if necessary; random event plane angle"; break;
default: ss << "unkown"; break;
}
- LOG(INFO) << GetName() << ": Mode " << ss.str();
+ LOG(info) << GetName() << ": Mode " << ss.str();
/// Save old global file and folder pointer to avoid messing with FairRoot
TFile* oldFile = gFile;
diff --git a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
index 5ee051e845..0317fca445 100644
--- a/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
+++ b/tutorials/TaskToAlgo/CbmDeviceStsHitProducerIdeal.cxx
@@ -73,7 +73,7 @@ try {
InitContainers();
}
catch (InitTaskError& e) {
- LOG(ERROR) << e.what();
+ LOG(error) << e.what();
// Wrapper defined in CbmMQDefs.h to support different FairMQ versions
cbm::mq::ChangeState(this, cbm::mq::Transition::ErrorFound);
}
@@ -86,7 +86,7 @@ Bool_t CbmDeviceStsHitProducerIdeal::InitContainers()
fvmcworkdir = fConfig->GetValue<string>("vmcworkdir");
fMaxEvents = fConfig->GetValue<uint64_t>("max-events");
- LOG(INFO) << "Init parameter containers for CbmDeviceStsHitProducerIdeal.";
+ LOG(info) << "Init parameter containers for CbmDeviceStsHitProducerIdeal.";
TList* fParCList = fAlgo->GetParList();
@@ -140,7 +140,7 @@ bool CbmDeviceStsHitProducerIdeal::HandleData(FairMQMessagePtr& msg, int /*index
{
fNumMessages++;
- LOG(DEBUG) << "Received message number " << fNumMessages << " with size " << msg->GetSize();
+ LOG(debug) << "Received message number " << fNumMessages << " with size " << msg->GetSize();
// Unpack the message into a vector of CbmStsPoints
@@ -159,7 +159,7 @@ bool CbmDeviceStsHitProducerIdeal::HandleData(FairMQMessagePtr& msg, int /*index
LOG(info) << "Out of " << points.size() << " StsPoints, " << hits.size() << " Hits created.";
- if (fNumMessages % 10000 == 0) LOG(INFO) << "Processed " << fNumMessages << " time slices";
+ if (fNumMessages % 10000 == 0) LOG(info) << "Processed " << fNumMessages << " time slices";
// Send the data to a consumer
SendData();
--
GitLab