Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • le.koch/cbmroot
  • patrick.pfistner_AT_kit.edu/cbmroot
  • lena.rossel_AT_stud.uni-frankfurt.de/cbmroot
  • i.deppner/cbmroot
  • fweig/cbmroot
  • karpushkin_AT_inr.ru/cbmroot
  • v.akishina/cbmroot
  • rishat.sultanov_AT_cern.ch/cbmroot
  • l_fabe01_AT_uni-muenster.de/cbmroot
  • pwg-c2f/cbmroot
  • j.decuveland/cbmroot
  • a.toia/cbmroot
  • i.vassiliev/cbmroot
  • n.herrmann/cbmroot
  • o.lubynets/cbmroot
  • se.gorbunov/cbmroot
  • cornelius.riesen_AT_physik.uni-giessen.de/cbmroot
  • zhangqn17_AT_mails.tsinghua.edu.cn/cbmroot
  • bartosz.sobol/cbmroot
  • ajit.kumar/cbmroot
  • computing/cbmroot
  • a.agarwal_AT_vecc.gov.in/cbmroot
  • osingh/cbmroot
  • wielanek_AT_if.pw.edu.pl/cbmroot
  • malgorzata.karabowicz.stud_AT_pw.edu.pl/cbmroot
  • m.shiroya/cbmroot
  • s.roy/cbmroot
  • p.-a.loizeau/cbmroot
  • a.weber/cbmroot
  • ma.beyer/cbmroot
  • d.klein/cbmroot
  • d.smith/cbmroot
  • mvdsoft/cbmroot
  • d.spicker/cbmroot
  • y.h.leung/cbmroot
  • aksharma/cbmroot
  • m.deveaux/cbmroot
  • mkunold/cbmroot
  • h.darwish/cbmroot
  • pk.sharma_AT_vecc.gov.in/cbmroot
  • f_fido01_AT_uni-muenster.de/cbmroot
  • g.kozlov/cbmroot
  • d.emschermann/cbmroot
  • evgeny.lavrik/cbmroot
  • v.friese/cbmroot
  • f.uhlig/cbmroot
  • ebechtel_AT_ikf.uni-frankfurt.de/cbmroot
  • a.senger/cbmroot
  • praisig/cbmroot
  • s.lebedev/cbmroot
  • redelbach_AT_compeng.uni-frankfurt.de/cbmroot
  • p.subramani/cbmroot
  • a_meye37_AT_uni-muenster.de/cbmroot
  • om/cbmroot
  • o.golosov/cbmroot
  • l.chlad/cbmroot
  • a.bercuci/cbmroot
  • d.ramirez/cbmroot
  • v.singhal/cbmroot
  • h.schiller/cbmroot
  • apuntke/cbmroot
  • f.zorn/cbmroot
  • rubio_AT_physi.uni-heidelberg.de/cbmroot
  • p.chudoba/cbmroot
  • apuntke/mcbmroot
  • r.karabowicz/cbmroot
66 results
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
Showing
with 258 additions and 144 deletions
CMakeLists.txt
View file @ fd7f90ed
......@@ -233,13 +233,20 @@ if(CBMROOT_MINIMAL)
else(CBMROOT_MINIMAL)
find_package(ROOT 6.00.00 REQUIRED)
if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_GREATER 6.16)
Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
OUTPUT_VARIABLE ROOT_vmc_FOUND
)
String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
If(NOT ROOT_vmc_FOUND)
if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_LESS 6.26)
Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
OUTPUT_VARIABLE ROOT_vmc_FOUND
)
String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
If(NOT ROOT_vmc_FOUND)
set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
find_package2(PUBLIC VMC REQUIRED)
set(VMCLIB VMCLibrary)
endif()
else()
set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
find_package2(PUBLIC VMC REQUIRED)
message("VMC_INCLUDE_DIRS: ${VMC_INCLUDE_DIRS}")
set(VMCLIB VMCLibrary)
endif()
endif()
......
MQ/source/CbmMQTsaMultiSamplerTof.cxx
View file @ fd7f90ed
......@@ -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;
......
MQ/sts/CbmDeviceStsLocalReco.cxx
View file @ fd7f90ed
......@@ -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();
......
MQ/unpacker/CbmDeviceUnpackTofMcbm2018.cxx
View file @ fd7f90ed
......@@ -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;
}
}
......
analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
View file @ fd7f90ed
......@@ -379,6 +379,20 @@ void PairAnalysisCutQa::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
if (idx == static_cast<Int_t>(ETypes::kTrack) || idx == static_cast<Int_t>(ETypes::kTrack2)) {
TProfile2D* detQA = static_cast<TProfile2D*>(histos->FindObject(Form("%sMatchEff", fTypeKeys[idx])));
PairAnalysisTrack* t = static_cast<PairAnalysisTrack*>(obj);
#if (ROOT_VERSION_CODE >= ROOT_VERSION(6, 26, 0))
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))), 1.);
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kSts))), 1.);
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kRich),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kRich))), 1.);
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kTrd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTrd))), 1.);
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kTof),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))), 1.);
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))), 1.);
#else
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))));
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
......@@ -391,6 +405,7 @@ void PairAnalysisCutQa::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))));
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))));
#endif
}
++cutstep;
......@@ -440,6 +455,20 @@ void PairAnalysisCutQa::FillAll(TObject* obj, UInt_t addIdx)
if (idx == static_cast<Int_t>(ETypes::kTrack) || idx == static_cast<Int_t>(ETypes::kTrack2)) {
TProfile2D* detQA = static_cast<TProfile2D*>(histos->FindObject(Form("%sMatchEff", fTypeKeys[idx])));
PairAnalysisTrack* t = static_cast<PairAnalysisTrack*>(obj);
#if (ROOT_VERSION_CODE >= ROOT_VERSION(6, 26, 0))
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))), 1.);
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kSts))), 1.);
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kRich),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kRich))), 1.);
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kTrd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTrd))), 1.);
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kTof),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))), 1.);
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))), 1.);
#else
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))));
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
......@@ -452,6 +481,7 @@ void PairAnalysisCutQa::FillAll(TObject* obj, UInt_t addIdx)
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))));
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))));
#endif
}
}
......
analysis/PWGDIL/dielectron/pi0eta/CbmKresSelectGoodEvents.cxx
View file @ fd7f90ed
......@@ -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);
// }
}
......
analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
View file @ fd7f90ed
......@@ -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;
......
analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
View file @ fd7f90ed
......@@ -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
......
analysis/detectors/tof/CbmTofAnaTestbeam.cxx
View file @ fd7f90ed
......@@ -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();
......
analysis/detectors/tof/CbmTofHitFinderQa.cxx
View file @ fd7f90ed
......@@ -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)
......
core/data/tof/CbmTofTracklet.cxx
View file @ fd7f90ed
......@@ -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;
......
core/detectors/tof/CbmMcbm2018TofPar.cxx
View file @ fd7f90ed
......@@ -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;
}
}
......
core/detectors/tof/CbmTofCreateDigiPar.cxx
View file @ fd7f90ed
......@@ -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
......
core/detectors/tof/CbmTofDigiBdfPar.cxx
View file @ fd7f90ed
......@@ -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() )
......
external/NicaFemto.patch
View file @ fd7f90ed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60ab7e6..b70ab36 100644
index 60ab7e6..9cf7543 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,11 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
If(NOT _HAS_CXX11_FLAG)
Message(FATAL_ERROR "The used C++ compiler (${CMAKE_CXX_COMPILER}) does not support C++11. NicaFemto can only be compiled with compilers supporting C++11. Please install such an compiler.")
EndIf()
@@ -27,11 +27,11 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
set(CMAKE_MODULE_PATH "$ENV{FAIRROOTPATH}/share/fairbase/cmake/modules_old" ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH "$ENV{FAIRROOTPATH}/share/fairbase/cmake/modules" ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
- IF(FAIRROOTPATH)
- Set(CheckSrcDir "${FAIRROOTPATH}/share/fairbase/cmake/checks")
- ELSE(FAIRROOTPATH)
- Set(CheckSrcDir "${CMAKE_SOURCE_DIR}/cmake/checks")
- ENDIF(FAIRROOTPATH)
+# IF(FAIRROOTPATH)
+# Set(CheckSrcDir "${FAIRROOTPATH}/share/fairbase/cmake/checks")
+# ELSE(FAIRROOTPATH)
+# Set(CheckSrcDir "${CMAKE_SOURCE_DIR}/cmake/checks")
+# ENDIF(FAIRROOTPATH)
if(FAIRROOTPATH)
find_package(FairRoot)
@@ -41,7 +41,7 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
EndIf(CMAKE_INSTALL_PREFIX)
endif(FAIRROOTPATH)
- include(CheckCXX11Features)
+# include(CheckCXX11Features)
include(FairMacros)
@@ -49,10 +49,14 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
include(CheckCompiler)
include(WriteConfig)
- If(NOT _HAS_CXX11_FLAG)
- Message(FATAL_ERROR "The used C++ compiler (${CMAKE_CXX_COMPILER}) does not support C++11. NicaFemto can only be compiled with compilers supporting C++11. Please install such an compiler.")
- EndIf()
-
+# If(NOT _HAS_CXX11_FLAG)
+# Message(FATAL_ERROR "The used C++ compiler (${CMAKE_CXX_COMPILER}) does not support C++11. NicaFemto can only be compiled with compilers supporting C++11. Please install such an compiler.")
+# EndIf()
+
+ if(APPLE)
+ SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -single_module -undefined dynamic_lookup")
......@@ -15,7 +47,37 @@ index 60ab7e6..b70ab36 100644
Execute_process(COMMAND $ENV{SIMPATH}/bin/fairsoft-config --cxxflags OUTPUT_VARIABLE _res_fairsoft_config OUTPUT_STRIP_TRAILING_WHITESPACE)
String(FIND ${_res_fairsoft_config} "-std=c++11" POS_C++11)
If(${POS_C++11} EQUAL -1)
@@ -131,7 +135,7 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
@@ -94,16 +98,24 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
find_package(ROOT 6.00.00 REQUIRED)
if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_GREATER 6.16)
- Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
- OUTPUT_VARIABLE ROOT_vmc_FOUND
- )
- String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
- If(NOT ROOT_vmc_FOUND)
+ if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_LESS 6.26)
+ Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
+ OUTPUT_VARIABLE ROOT_vmc_FOUND
+ )
+
+ String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
+ If(NOT ROOT_vmc_FOUND)
+ set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
+ find_package2(PUBLIC VMC REQUIRED)
+ set(VMCLIB VMCLibrary)
+ endif()
+ else()
set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
find_package2(PUBLIC VMC REQUIRED)
set(VMCLIB VMCLibrary)
endif()
endif()
+
Set(SIMPATH $ENV{SIMPATH})
Set(Boost_NO_SYSTEM_PATHS TRUE)
Set(Boost_NO_BOOST_CMAKE TRUE)
@@ -131,7 +143,7 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
if(APPLE)
set(GSL_DIR /usr/local)
else()
......@@ -24,6 +86,8 @@ index 60ab7e6..b70ab36 100644
endif()
find_package(GSL REQUIRED)
endif()
diff --git a/dataformat/NicaDataFormatManager.h b/dataformat/NicaDataFormatManager.h
index 4ecb407..a739199 100644
diff --git a/cuts/CMakeLists.txt b/cuts/CMakeLists.txt
index 1d1c4f0..e5676ba 100755
--- a/cuts/CMakeLists.txt
......@@ -50,6 +114,19 @@ index b8576ab..b3fc335 100644
GENERATE_LIBRARY()
--- a/dataformat/NicaDataFormatManager.h
+++ b/dataformat/NicaDataFormatManager.h
@@ -13,9 +13,9 @@
#include <TObject.h>
#include "NicaStd.h"
+#include "NicaTrack.h"
class NicaEvent;
-class NicaTrack;
/**
* manager of formats
diff --git a/features/NicaHelixBase.cxx b/features/NicaHelixBase.cxx
index e248f54..7317950 100644
--- a/features/NicaHelixBase.cxx
......@@ -60,5 +137,5 @@ index e248f54..7317950 100644
#include <TMath.h>
+#include <TString.h>
#include <iostream>
Double_t NicaHelixBase::fgHelixBz = 0.5;
fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoT0.cxx
View file @ fd7f90ed
......@@ -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),
......
fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
View file @ fd7f90ed
......@@ -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),
......
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich.cxx
View file @ fd7f90ed
......@@ -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;
}
......
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoRich2020.cxx
View file @ fd7f90ed
......@@ -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);
......
fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoTof.cxx
View file @ fd7f90ed
......@@ -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;
......