Skip to content
Snippets Groups Projects
Commit d88666d3 authored by Tatyana Kharlamova's avatar Tatyana Kharlamova Committed by Graeme Stewart
Browse files

msg svc update (IDC_OverlayBase-00-06-07)

	* IDC_OverlayBase/IDC_OverlayCommon.icc, IDC_OverlayBase/IDC_OverlayBase.icc - endreq to endmsg update. ATLASSIM-3042
	* IDC_OverlayBase-00-06-07


Former-commit-id: c5cf78d2fe0feec6f531fac47fa75b44974985b2
parent 8baa6ef7
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@ namespace Overlay {
first_time = false;
parent->msg(MSG::WARNING)<<"Overlay::mergeChannelData(): Merging of hits on the same channel is not implemented for "
<<typeid(Datum).name()
<<endreq;
<<endmsg;
}
}
......@@ -42,7 +42,7 @@ namespace Overlay {
if(mc_coll->identify() != data_coll->identify()) {
std::ostringstream os;
os<<"mergeCollectionsNew<generic>(): collection Id mismatch";
parent->msg(MSG::FATAL)<<os.str()<<endreq;
parent->msg(MSG::FATAL)<<os.str()<<endmsg;
throw std::runtime_error(os.str());
}
......@@ -56,7 +56,7 @@ namespace Overlay {
parent->msg(MSG::INFO)<<"IDC_OverlayBase::mergeCollectionsNew(): "
<<"generic code is called for "
<<typeid(*mc_coll).name()
<<endreq;
<<endmsg;
}
// ----------------------------------------------------------------
......
......@@ -46,7 +46,7 @@ namespace Overlay {
{
typedef typename IDC_Container::base_value_type Collection;
if(parent->msgLvl(MSG::DEBUG)) { parent->msg(MSG::DEBUG)<<"overlayContainerNew<>() begin"<<endreq; }
if(parent->msgLvl(MSG::DEBUG)) { parent->msg(MSG::DEBUG)<<"overlayContainerNew<>() begin"<<endmsg; }
// The MC signal container should typically be smaller than
// dataContainer, because the latter contains all the noise,
......@@ -101,21 +101,21 @@ namespace Overlay {
if(c_data) {
// Need to merge the collections
if(parent->msgLvl(MSG::VERBOSE)) { parent->msg(MSG::VERBOSE)<<"Merging collections"<<endreq; }
if(parent->msgLvl(MSG::VERBOSE)) { parent->msg(MSG::VERBOSE)<<"Merging collections"<<endmsg; }
//parent->mergeCollections(c_mc, c_data);
mergeCollectionsNew(c_mc, c_data, parent);
}
else {
if(parent->msgLvl(MSG::VERBOSE)) {
parent->msg(MSG::VERBOSE)<<"Transferring to dataContainer complete ovl collection, no merging"<<endreq;
parent->msg(MSG::VERBOSE)<<"Transferring to dataContainer complete ovl collection, no merging"<<endmsg;
}
}
if(dataContainer->addCollection(c_mc, hashId).isFailure()) {
if(parent->msgLvl(MSG::WARNING)) {
parent->msg(MSG::WARNING)<<"overlayContainerNew(): Problem in dataContainer->addCollection(hash) for ovl collection="
<<c_mc<<endreq;
<<c_mc<<endmsg;
}
}
......@@ -131,7 +131,7 @@ namespace Overlay {
{
typedef typename IDC_Container::base_value_type Collection;
if(parent->msgLvl(MSG::DEBUG)) { parent->msg(MSG::DEBUG)<<"overlayContainer<>() begin"<<endreq; }
if(parent->msgLvl(MSG::DEBUG)) { parent->msg(MSG::DEBUG)<<"overlayContainer<>() begin"<<endmsg; }
// The MC signal container should typically be smaller than
// dataContainer, because the latter contains all the noise,
......@@ -186,20 +186,20 @@ namespace Overlay {
if(c_data) {
// Need to merge the collections
if(parent->msgLvl(MSG::VERBOSE)) { parent->msg(MSG::VERBOSE)<<"Merging collections"<<endreq; }
if(parent->msgLvl(MSG::VERBOSE)) { parent->msg(MSG::VERBOSE)<<"Merging collections"<<endmsg; }
parent->mergeCollections(c_mc, c_data);
}
else {
if(parent->msgLvl(MSG::VERBOSE)) {
parent->msg(MSG::VERBOSE)<<"Transferring to dataContainer complete ovl collection, no merging"<<endreq;
parent->msg(MSG::VERBOSE)<<"Transferring to dataContainer complete ovl collection, no merging"<<endmsg;
}
}
if(dataContainer->addCollection(c_mc, hashId).isFailure()) {
if(parent->msgLvl(MSG::WARNING)) {
parent->msg(MSG::WARNING)<<"overlayContainer(): Problem in dataContainer->addCollection(hash) for ovl collection="
<<c_mc<<endreq;
<<c_mc<<endmsg;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment