From a717d397fa2abcd9bd64ed61d07af72758ef0898 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 10 Aug 2016 17:20:45 +0200
Subject: [PATCH] 'endreq -> endmsg.' (LArIdentifier-01-02-09)
* Tagging LArIdentifier-01-02-09.
* endreq -> endmsg.
---
.../LArIdentifier/src/LArElectrodeID.cxx | 126 +++++++++---------
.../LArIdentifier/src/LArHVLineID.cxx | 106 +++++++--------
.../LArIdentifier/src/LArOnlineID.cxx | 112 ++++++++--------
.../LArIdentifier/src/LArOnlineID_Base.cxx | 116 ++++++++--------
.../src/LArOnline_SuperCellID.cxx | 40 +++---
.../src/LArReadoutModuleService.cxx | 4 +-
6 files changed, 252 insertions(+), 252 deletions(-)
diff --git a/LArCalorimeter/LArIdentifier/src/LArElectrodeID.cxx b/LArCalorimeter/LArIdentifier/src/LArElectrodeID.cxx
index 2bac25a167c7..1adfc46e8d74 100755
--- a/LArCalorimeter/LArIdentifier/src/LArElectrodeID.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArElectrodeID.cxx
@@ -51,7 +51,7 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
MsgStream log(m_msgSvc, "LArElectrodeID" );
std::string strg = " => initialize_from_dictionary()";
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -62,13 +62,13 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
if (!reinitialize(dict_mgr)) {
if(m_msgSvc)log << MSG::DEBUG
<< "Request to reinitialize not satisfied - tags have not changed"
- << endreq;
+ << endmsg;
return (0);
}
else {
- log << MSG::DEBUG << "(Re)initialize" << endreq;
+ log << MSG::DEBUG << "(Re)initialize" << endmsg;
}
- log << MSG::DEBUG << " => Initialization of dict_mgr done ! " << m_dict << endreq;
+ log << MSG::DEBUG << " => Initialization of dict_mgr done ! " << m_dict << endmsg;
// init base object
// ----------------
@@ -78,15 +78,15 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
else{
log << MSG::DEBUG << " => initialize_from_dictionary(dict_mgr) ="
<< AtlasDetectorID::initialize_from_dictionary(dict_mgr)
- << endreq;
+ << endmsg;
}
m_dict = dict_mgr.find_dictionary ("LArElectrode");
log << MSG::DEBUG << " => defined m_dict from find_dictionary(LArElectrode) = "
- << m_dict << endreq;
+ << m_dict << endmsg;
if(!m_dict) {
strg = " initialize_from_dictionary - cannot access LArElectrode dictionary ";
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArElectrodeID::" << strg << std::endl;
@@ -97,12 +97,12 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
// Register version of the dictionary used
// ---------------------------------------
if (register_dict_tag(dict_mgr, "LArElectrode")) return(1);
- log << MSG::DEBUG << "Register_dict_tag of LArElectrode is OK" << endreq;
+ log << MSG::DEBUG << "Register_dict_tag of LArElectrode is OK" << endmsg;
// initialize dictionary version
// -----------------------------
AtlasDetectorID::setDictVersion(dict_mgr, "LArElectrode");
- log << MSG::DEBUG << "setDictVersion of LArElectrode is OK" << endreq;
+ log << MSG::DEBUG << "setDictVersion of LArElectrode is OK" << endmsg;
// Initialize the field indices
@@ -117,14 +117,14 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << atlasDict->m_name;
strg= " Could not get value for label 'LArElectrode' of field 'subdet' in dictionary "+strm.str();
if(m_msgSvc){
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else{
std::cout << "LArElectrodeID:" << strg << std::endl;
}
return (1);
}
- log << MSG::DEBUG << "[init_from_dictionary] > larField value = "<< larField << endreq;
+ log << MSG::DEBUG << "[init_from_dictionary] > larField value = "<< larField << endmsg;
/* Find values for the field Detector */
@@ -134,7 +134,7 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "WARNING : Could not get value for label 'configuration' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else{
std::cout << strg << std::endl;
@@ -142,7 +142,7 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
return (0);
}
log << MSG::DEBUG << "[init_from_dictionary] > configurationValue = "
- << configurationValue << endreq;
+ << configurationValue << endmsg;
// Set up Expanded identifier for electrode range prefix
// =========================================================
@@ -155,7 +155,7 @@ int LArElectrodeID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
m_full_larelectrode_range=m_dict->build_multirange(reg_id, prefix);
m_full_electrode_range = m_dict->build_multirange(reg_id, prefix, "electrode");
log << MSG::DEBUG << "[initialize_from_dictionary] > Electrode range -> "
- << (std::string)m_full_electrode_range << endreq;
+ << (std::string)m_full_electrode_range << endmsg;
// Setup the hash tables
// =========================================================
@@ -195,15 +195,15 @@ int LArElectrodeID::initLevelsFromDict(void)
//=============================================================================
{
MsgStream log(m_msgSvc, "LArElectrodeID" );
- log << MSG::DEBUG << "[initLevelsFromDict] Entering routine... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] Entering routine... " << endmsg;
if(!m_dict) {
log << MSG::INFO << "LArElectrodeID::initLevelsFromDict - dictionary NOT initialized "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] m_dict OK ... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] m_dict OK ... " << endmsg;
// Find out which identifier field corresponds to each level.
// ========================================================================
@@ -216,7 +216,7 @@ int LArElectrodeID::initLevelsFromDict(void)
m_hveta_index = 999;
m_hvgap_index = 999;
m_electrode_index = 999;
- log << MSG::DEBUG << "[initLevelsFromDict] data member initialization OK ... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] data member initialization OK ... " << endmsg;
// Search with region name
IdDictRegion* reg = m_dict->find_region("EM-BARREL-ALL");
@@ -224,10 +224,10 @@ int LArElectrodeID::initLevelsFromDict(void)
m_larElectrodeRegion_index = reg->m_index;}
else {
log << MSG::INFO << "WARNING : [initLevelsFromDict] - unable to find 'EM-BARREL-ALL' region"
- << endreq;
+ << endmsg;
return (0);
}
- log << MSG::DEBUG << "[initLevelsFromDict] region 'EM-BARREL-ALL' found OK ... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] region 'EM-BARREL-ALL' found OK ... " << endmsg;
// Find LArElectrode field
// ========================================================================
@@ -236,11 +236,11 @@ int LArElectrodeID::initLevelsFromDict(void)
m_atlas_index = field->m_index ;}
else {
log << MSG::INFO
- << "LArElectrodeID::initLevelsFromDict - unable to find 'subdet' field " << endreq ;
+ << "LArElectrodeID::initLevelsFromDict - unable to find 'subdet' field " << endmsg ;
return (1);
}
log << MSG::DEBUG
- << "[initLevelsFromDict] field 'LArElectrode' found OK " << endreq;
+ << "[initLevelsFromDict] field 'LArElectrode' found OK " << endmsg;
// Find Configuration field
// ========================================================================
@@ -249,11 +249,11 @@ int LArElectrodeID::initLevelsFromDict(void)
m_configuration_index = field->m_index ;}
else {
log << MSG::INFO
- << "LArHVLineID::initLevelsFromDict - unable to find 'configuration' field " << endreq ;
+ << "LArHVLineID::initLevelsFromDict - unable to find 'configuration' field " << endmsg ;
return (1);
}
log << MSG::DEBUG
- << "[initLevelsFromDict] field config=Atlas found OK " << endreq;
+ << "[initLevelsFromDict] field config=Atlas found OK " << endmsg;
// Find Detector field
// ========================================================================
@@ -262,11 +262,11 @@ int LArElectrodeID::initLevelsFromDict(void)
m_detector_index = field->m_index ;}
else {
log << MSG::INFO
- << "LArElectrodeID::initLevelsFromDict - unable to find 'detector' field " << endreq ;
+ << "LArElectrodeID::initLevelsFromDict - unable to find 'detector' field " << endmsg ;
return (1);
}
log << MSG::DEBUG
- << "[initLevelsFromDict] field 'detector' found OK " << endreq;
+ << "[initLevelsFromDict] field 'detector' found OK " << endmsg;
// Look for Field 'zside'
@@ -276,10 +276,10 @@ int LArElectrodeID::initLevelsFromDict(void)
m_zside_index = field->m_index ;}
else {
log << MSG::INFO << "LArElectrodeID::initLevelsFromDict - unable to find 'zside' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'zside' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'zside' found OK " << endmsg;
// Look for Fields 'module'
@@ -290,10 +290,10 @@ int LArElectrodeID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "LArElectrodeID::initLevelsFromDict - unable to find 'module' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'module' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'module' found OK " << endmsg;
// Look for Fields 'hvphi'
// ========================================================================
@@ -302,10 +302,10 @@ int LArElectrodeID::initLevelsFromDict(void)
m_hvphi_index = field->m_index ;
}
else {
- log << MSG::INFO << "initLevelsFromDict - unable to find 'hvphi' field "<< endreq ;
+ log << MSG::INFO << "initLevelsFromDict - unable to find 'hvphi' field "<< endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'hvphi' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'hvphi' found OK " << endmsg;
// Look for Fields 'hveta'
// ========================================================================
@@ -315,10 +315,10 @@ int LArElectrodeID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "[initLevelsFromDict] - unable to find 'hveta' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'hveta' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'hveta' found OK " << endmsg;
// Look for Fields 'hvgap'
// ========================================================================
@@ -328,10 +328,10 @@ int LArElectrodeID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "[initLevelsFromDict] - unable to find 'hvgap' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'hvgap' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'hvgap' found OK " << endmsg;
// Look for Fields 'electrode'
@@ -342,25 +342,25 @@ int LArElectrodeID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "[initLevelsFromDict] - unable to find 'electrode' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'electrode' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'electrode' found OK " << endmsg;
// Set the field implementation
// ========================================================================
const IdDictRegion& region = *m_dict->m_regions[m_larElectrodeRegion_index];
- log << MSG::DEBUG << "[initLevelsFromDict] Found levels: " << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > Atlas : " << m_atlas_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > Configurat: " << m_configuration_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > detector : " << m_detector_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > zside : " << m_zside_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > hvphi : " << m_hvphi_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > hveta : " << m_hveta_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > hvgap : " << m_hvgap_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > electrode : " << m_electrode_index << endreq ;
+ log << MSG::DEBUG << "[initLevelsFromDict] Found levels: " << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > Atlas : " << m_atlas_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > Configurat: " << m_configuration_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > detector : " << m_detector_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > zside : " << m_zside_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hvphi : " << m_hvphi_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hveta : " << m_hveta_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hvgap : " << m_hvgap_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > electrode : " << m_electrode_index << endmsg ;
m_atlas_impl = region.m_implementation[m_atlas_index];
m_configuration_impl= region.m_implementation[m_configuration_index];
m_detector_impl = region.m_implementation[m_detector_index];
@@ -371,16 +371,16 @@ int LArElectrodeID::initLevelsFromDict(void)
m_hvgap_impl = region.m_implementation[m_hvgap_index];
m_electrode_impl = region.m_implementation[m_electrode_index];
- log << MSG::DEBUG << "[initLevelsFromDict] Decode index and bit fields for each level: " << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > Atlas " << m_atlas_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > larConfig " << m_configuration_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > detector " << m_detector_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > z-side " << m_zside_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > module " << m_module_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > hvphi " << m_hvphi_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > hveta " << m_hveta_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > hvgap " << m_hvgap_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > hv line " << m_electrode_impl.show_to_string() << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] Decode index and bit fields for each level: " << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > Atlas " << m_atlas_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > larConfig " << m_configuration_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > detector " << m_detector_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > z-side " << m_zside_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > module " << m_module_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hvphi " << m_hvphi_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hveta " << m_hveta_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hvgap " << m_hvgap_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hv line " << m_electrode_impl.show_to_string() << endmsg;
return(0) ;
@@ -428,8 +428,8 @@ int LArElectrodeID::init_hashes(void)
strm3 << show_to_string(elec_id);
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc){
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
}
nids++;
@@ -443,9 +443,9 @@ int LArElectrodeID::init_hashes(void)
strg3 = " hash max "+strm2.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -463,7 +463,7 @@ int LArElectrodeID::init_hashes(void)
m_electrode_vec[nids] = (*first) ;
nids++;
}
- log << MSG::DEBUG << "[init_hashes()] > Electrode_size= " << m_electrode_vec.size() << endreq;
+ log << MSG::DEBUG << "[init_hashes()] > Electrode_size= " << m_electrode_vec.size() << endmsg;
return (0);
}
diff --git a/LArCalorimeter/LArIdentifier/src/LArHVLineID.cxx b/LArCalorimeter/LArIdentifier/src/LArHVLineID.cxx
index 7cf0cdd7d887..35b285ac7ecd 100755
--- a/LArCalorimeter/LArIdentifier/src/LArHVLineID.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArHVLineID.cxx
@@ -54,7 +54,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
MsgStream log(m_msgSvc, "LArHVLineID" );
std::string strg = " => initialize_from_dictionary()";
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -65,13 +65,13 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
if (!reinitialize(dict_mgr)) {
if(m_msgSvc)log << MSG::DEBUG
<< "Request to reinitialize not satisfied - tags have not changed"
- << endreq;
+ << endmsg;
return (0);
}
else {
- log << MSG::DEBUG << "(Re)initialize" << endreq;
+ log << MSG::DEBUG << "(Re)initialize" << endmsg;
}
- log << MSG::DEBUG << " => Initialization of dict_mgr done ! " << m_dict << endreq;
+ log << MSG::DEBUG << " => Initialization of dict_mgr done ! " << m_dict << endmsg;
// init base object
// ----------------
@@ -81,7 +81,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
else{
log << MSG::INFO << " => initialize_from_dictionary(dict_mgr) ="
<< AtlasDetectorID::initialize_from_dictionary(dict_mgr)
- << endreq;
+ << endmsg;
}
m_dict = dict_mgr.find_dictionary ("LArHighVoltage");
@@ -89,7 +89,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
{
strg = " initialize_from_dictionary - cannot access LArHighVoltage dictionary ";
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -101,12 +101,12 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
// Register version of the dictionary used
// ---------------------------------------
if (register_dict_tag(dict_mgr, "LArHighVoltage")) return(1);
- log << MSG::INFO << "Register_dict_tag of LArHighVoltage is OK" << endreq;
+ log << MSG::INFO << "Register_dict_tag of LArHighVoltage is OK" << endmsg;
// initialize dictionary version
// -----------------------------
AtlasDetectorID::setDictVersion(dict_mgr, "LArHighVoltage");
- log << MSG::INFO << "setDictVersion of LArHighVoltage is OK" << endreq;
+ log << MSG::INFO << "setDictVersion of LArHighVoltage is OK" << endmsg;
// Initialize the field indices
@@ -121,14 +121,14 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << atlasDict->m_name;
strg= " Could not get value for label 'LArHighVoltage' of field 'subdet' in dictionary "+strm.str();
if(m_msgSvc){
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else{
std::cout << "LArHVLineID:" << strg << std::endl;
}
return (1);
}
- log << MSG::DEBUG << "[init_from_dictionary] > larHV value = "<< larHVValue << endreq;
+ log << MSG::DEBUG << "[init_from_dictionary] > larHV value = "<< larHVValue << endmsg;
/* Find values for the field Configuration */
@@ -138,7 +138,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "WARNING : Could not get value for label 'configuration' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else{
std::cout << strg << std::endl;
@@ -146,7 +146,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
return (0);
}
log << MSG::DEBUG << "[init_from_dictionary] > configurationValue = "
- << configurationValue << endreq;
+ << configurationValue << endmsg;
// Set up Expanded identifier for hvline range prefix
// =========================================================
@@ -160,7 +160,7 @@ int LArHVLineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
m_full_hvline_range = m_dict->build_multirange(reg_id, prefix, "hvline");
m_full_canline_range = m_dict->build_multirange(reg_id, prefix, "canline");
log << MSG::INFO << "[initialize_from_dictionary] > HV line range -> "
- << (std::string)m_full_hvline_range << endreq;
+ << (std::string)m_full_hvline_range << endmsg;
// Setup the hash tables
// =========================================================
@@ -225,15 +225,15 @@ int LArHVLineID::initLevelsFromDict(void)
//=============================================================================
{
MsgStream log(m_msgSvc, "LArHVLineID" );
- log << MSG::DEBUG << "[initLevelsFromDict] Entering routine... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] Entering routine... " << endmsg;
if(!m_dict) {
log << MSG::INFO << "LArHVLineID::initLevelsFromDict - dictionary NOT initialized "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::INFO << "[initLevelsFromDict] m_dict OK ... " << endreq;
+ log << MSG::INFO << "[initLevelsFromDict] m_dict OK ... " << endmsg;
// Find out which identifier field corresponds to each level.
// ========================================================================
@@ -244,7 +244,7 @@ int LArHVLineID::initLevelsFromDict(void)
m_cannode_index = 999;
m_hvline_index = 999;
- log << MSG::DEBUG << "[initLevelsFromDict] data member initialization OK ... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] data member initialization OK ... " << endmsg;
// Search with region name
IdDictRegion* reg = m_dict->find_region("LArHV-HEC-A");
@@ -252,10 +252,10 @@ int LArHVLineID::initLevelsFromDict(void)
m_larhvRegion_index = reg->m_index;}
else {
log << MSG::INFO << "WARNING : LArHVLineID::initLevelsFromDict - unable to find 'barrel-region1' region"
- << endreq;
+ << endmsg;
return (0);
}
- log << MSG::DEBUG << "[initLevelsFromDict] region 'LAr-HV-HEC-A' found OK ... " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] region 'LAr-HV-HEC-A' found OK ... " << endmsg;
// Find ATLAS field
// ========================================================================
@@ -264,11 +264,11 @@ int LArHVLineID::initLevelsFromDict(void)
m_atlas_index = field->m_index ;}
else {
log << MSG::INFO
- << "LArHVLineID::initLevelsFromDict - unable to find 'subdet' field " << endreq ;
+ << "LArHVLineID::initLevelsFromDict - unable to find 'subdet' field " << endmsg ;
return (1);
}
log << MSG::DEBUG
- << "[initLevelsFromDict] field 'LArHighVoltage' found OK " << endreq;
+ << "[initLevelsFromDict] field 'LArHighVoltage' found OK " << endmsg;
// Find Configuration field
// ========================================================================
@@ -277,11 +277,11 @@ int LArHVLineID::initLevelsFromDict(void)
m_configuration_index = field->m_index ;}
else {
log << MSG::INFO
- << "LArHVLineID::initLevelsFromDict - unable to find 'configuration' field " << endreq ;
+ << "LArHVLineID::initLevelsFromDict - unable to find 'configuration' field " << endmsg ;
return (1);
}
log << MSG::DEBUG
- << "[initLevelsFromDict] field config=Atlas found OK " << endreq;
+ << "[initLevelsFromDict] field config=Atlas found OK " << endmsg;
// Look for Field 'partition'
// ========================================================================
@@ -290,10 +290,10 @@ int LArHVLineID::initLevelsFromDict(void)
m_partition_index = field->m_index ;}
else {
log << MSG::INFO << "LArHVLineID::initLevelsFromDict - unable to find 'partition' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'partition' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'partition' found OK " << endmsg;
// Look for Field 'CAN LINE'
@@ -303,10 +303,10 @@ int LArHVLineID::initLevelsFromDict(void)
m_canline_index = field->m_index ;}
else {
log << MSG::INFO << "LArHVLineID::initLevelsFromDict - unable to find 'canline' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'canline' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'canline' found OK " << endmsg;
// Look for Fields 'CAN NODE'
@@ -317,10 +317,10 @@ int LArHVLineID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "LArHVLineID::initLevelsFromDict - unable to find 'cannode' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'cannode' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'cannode' found OK " << endmsg;
// Look for Fields 'HV_line'
@@ -331,27 +331,27 @@ int LArHVLineID::initLevelsFromDict(void)
}
else {
log << MSG::INFO << "LArHVLineID::initLevelsFromDict - unable to find 'hvline' field "
- << endreq ;
+ << endmsg ;
return (1);
}
- log << MSG::DEBUG << "[initLevelsFromDict] field 'hvline' found OK " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] field 'hvline' found OK " << endmsg;
// Set the field implementation
// ========================================================================
const IdDictRegion& region = *m_dict->m_regions[m_larhvRegion_index];
- log << MSG::DEBUG << "[initLevelsFromDict] Found levels: " << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > larHV " << m_atlas_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > larConfiguration " << m_configuration_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > CAN Node " << m_cannode_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > HV line " << m_hvline_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > partition " << m_partition_index << endreq ;
- log << MSG::DEBUG << "[initLevelsFromDict] > CAN line " << m_canline_index << endreq ;
+ log << MSG::DEBUG << "[initLevelsFromDict] Found levels: " << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > larHV " << m_atlas_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > larConfiguration " << m_configuration_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > CAN Node " << m_cannode_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > HV line " << m_hvline_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > partition " << m_partition_index << endmsg ;
+ log << MSG::DEBUG << "[initLevelsFromDict] > CAN line " << m_canline_index << endmsg ;
- log << MSG::DEBUG << "[initLevelsFromDict] > ...fields implementation... " << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > ...implementation: m_larhvcalo_index " << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] > ...fields implementation... " << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > ...implementation: m_larhvcalo_index " << endmsg;
m_atlas_impl = region.m_implementation[m_atlas_index];
m_configuration_impl= region.m_implementation[m_configuration_index];
m_partition_impl = region.m_implementation[m_partition_index];
@@ -359,13 +359,13 @@ int LArHVLineID::initLevelsFromDict(void)
m_cannode_impl = region.m_implementation[m_cannode_index];
m_hvline_impl = region.m_implementation[m_hvline_index];
- log << MSG::DEBUG << "[initLevelsFromDict] Decode index and bit fields for each level: " << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > larHV " << m_atlas_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > larConfig " << m_configuration_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > partition " << m_partition_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > can line " << m_canline_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > can node " << m_cannode_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "[initLevelsFromDict] > hv line " << m_hvline_impl.show_to_string() << endreq;
+ log << MSG::DEBUG << "[initLevelsFromDict] Decode index and bit fields for each level: " << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > larHV " << m_atlas_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > larConfig " << m_configuration_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > partition " << m_partition_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > can line " << m_canline_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > can node " << m_cannode_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "[initLevelsFromDict] > hv line " << m_hvline_impl.show_to_string() << endmsg;
return(0) ;
@@ -410,8 +410,8 @@ int LArHVLineID::init_hashes(void)
strm3 << show_to_string(hv_id);
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc){
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
}
nids++;
@@ -425,9 +425,9 @@ int LArHVLineID::init_hashes(void)
strg3 = " hash max "+strm2.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -445,7 +445,7 @@ int LArHVLineID::init_hashes(void)
m_hvline_vec[nids] = (*first) ;
nids++;
}
- log << MSG::INFO << "[init_hashes()] > Hvline_size= " << m_hvline_vec.size() << endreq;
+ log << MSG::INFO << "[init_hashes()] > Hvline_size= " << m_hvline_vec.size() << endmsg;
return (0);
}
diff --git a/LArCalorimeter/LArIdentifier/src/LArOnlineID.cxx b/LArCalorimeter/LArIdentifier/src/LArOnlineID.cxx
index d46d7172a1b3..85cb00d1282f 100755
--- a/LArCalorimeter/LArIdentifier/src/LArOnlineID.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArOnlineID.cxx
@@ -35,7 +35,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
MsgStream log(m_msgSvc, "LArOnlineID" );
std::string strg = "initialize_from_dictionary";
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -43,11 +43,11 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
// Check whether this helper should be reinitialized
if (!reinitialize(dict_mgr)) {
- if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endreq;
+ if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endmsg;
return (0);
}
else {
- log << MSG::DEBUG << "(Re)initialize" << endreq;
+ log << MSG::DEBUG << "(Re)initialize" << endmsg;
}
// init base object
@@ -57,7 +57,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg = " initialize_from_dictionary - cannot access LArCalorimeter dictionary ";
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnlineID::" << strg << std::endl;
@@ -85,7 +85,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << atlasDict->m_name;
strg= " Could not get value for label 'LArCalorimeter' of field 'subdet' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnlineID:" << strg << std::endl;
@@ -100,7 +100,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnline' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -115,7 +115,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnlineCalib' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -144,10 +144,10 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
std::string strg2= " feedthrough slot range -> " + (std::string)m_full_feb_range;
std::string strg3= " channel range -> " + (std::string)m_full_laronline_range;
if(m_msgSvc) {
- log << MSG::DEBUG << strg0 << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
- log << MSG::DEBUG << strg3 << endreq;
+ log << MSG::DEBUG << strg0 << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
+ log << MSG::DEBUG << strg3 << endmsg;
}
else {
std::cout << strg0 << std::endl;
@@ -164,9 +164,9 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg2= "=> Calib module range -> " + (std::string)m_full_calib_module_range;
strg3= "=> Calib channel range -> " + (std::string)m_full_calib_laronline_range;
if(m_msgSvc) {
- log << MSG::DEBUG << strg0 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
- log << MSG::DEBUG << strg3 << endreq;
+ log << MSG::DEBUG << strg0 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
+ log << MSG::DEBUG << strg3 << endmsg;
}
else {
std::cout << strg0 << std::endl;
@@ -180,7 +180,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << dictionaryVersion();
strg="[initialize_from_dictionary] version= " + strm.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << "LArOnlineID: " << strg << std::endl;
@@ -194,12 +194,12 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
if(init_calib_hashes()) return (1);
}
if( dictionaryVersion() == "H6TestBeam" ) {
- log << MSG::DEBUG << "[initialze_from_dictionary] ...call init_H6hashes.." << endreq;
+ log << MSG::DEBUG << "[initialze_from_dictionary] ...call init_H6hashes.." << endmsg;
if(init_H6Hashes()) return (1);
if(init_calib_hashes()) return (1);
}
- log << MSG::DEBUG << "initialize_from_dictionary -> calibModuleHash= " << m_calibModuleHashMax << endreq;
- log << MSG::DEBUG << "initialize_from_dictionary -> calibChannelHash= " << m_calibChannelHashMax << endreq;
+ log << MSG::DEBUG << "initialize_from_dictionary -> calibModuleHash= " << m_calibModuleHashMax << endmsg;
+ log << MSG::DEBUG << "initialize_from_dictionary -> calibChannelHash= " << m_calibChannelHashMax << endmsg;
// Setup for hash calculation for channels (febs is further below)
@@ -250,9 +250,9 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg1= " "+strm1.str();
strg2= " "+strm2.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
+ log << MSG::DEBUG << strg << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -278,9 +278,9 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg1= " , "+strm1.str();
strg2= " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
+ log << MSG::ERROR << strg << endmsg;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -385,7 +385,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm3 << min_hash;
strg = "Min > " + strm.str() + " " + strm1.str() + " " + strm2.str() + " " + strm3.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -409,7 +409,7 @@ int LArOnlineID::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg = " ***** Error feb ranges, id, hash, i = " +
strm.str() + " , " + strm1.str() + " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -436,7 +436,7 @@ int LArOnlineID::init_H8Hashes(void)
/* Channel hash */
unsigned int nids=0;
std::set<HWIdentifier> ids;
- log << MSG::DEBUG << "[init_H8hashes] > ChannelId : m_full_laronline_range.size() = " << m_full_laronline_range.size() << endreq;
+ log << MSG::DEBUG << "[init_H8hashes] > ChannelId : m_full_laronline_range.size() = " << m_full_laronline_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_laronline_range.size(); ++i)
{
const Range& range = m_full_laronline_range[i];
@@ -458,9 +458,9 @@ int LArOnlineID::init_H8Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -490,7 +490,7 @@ int LArOnlineID::init_H8Hashes(void)
/*==========*/
nids = 0;
ids.clear();
- log << MSG::DEBUG << "[init_H8hashes] > FebId : m_full_feb_range.size() = " << m_full_feb_range.size() << endreq;
+ log << MSG::DEBUG << "[init_H8hashes] > FebId : m_full_feb_range.size() = " << m_full_feb_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_feb_range.size(); ++i)
{
const Range& range = m_full_feb_range[i];
@@ -511,9 +511,9 @@ int LArOnlineID::init_H8Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -542,7 +542,7 @@ int LArOnlineID::init_H8Hashes(void)
/*=================*/
nids = 0;
ids.clear();
- log << MSG::DEBUG << "[init_H8hashes] FeedthroughId: m_feedthrough_range.size() = " << m_full_feedthrough_range.size() << endreq;
+ log << MSG::DEBUG << "[init_H8hashes] FeedthroughId: m_feedthrough_range.size() = " << m_full_feedthrough_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_feedthrough_range.size(); ++i)
{
const Range& range = m_full_feedthrough_range[i];
@@ -558,7 +558,7 @@ int LArOnlineID::init_H8Hashes(void)
int test_pn = pos_neg( feedthroughId);
int test_ft = feedthrough( feedthroughId);
log << MSG::VERBOSE << "[init_H8hashes] in loop : [bec,pn,ft]= [" << test_bec
- << "," << test_pn << "," << test_ft << "]"<< endreq;
+ << "," << test_pn << "," << test_ft << "]"<< endmsg;
if(!(ids.insert(feedthroughId)).second)
{
strm1 << nids;
@@ -567,9 +567,9 @@ int LArOnlineID::init_H8Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -593,7 +593,7 @@ int LArOnlineID::init_H8Hashes(void)
}
}
m_feedthroughHashMax = m_feedthrough_vec.size();
- log << MSG::DEBUG << "[init_H8hashes] final m_feedthroughHashMax = " << m_feedthroughHashMax << endreq;
+ log << MSG::DEBUG << "[init_H8hashes] final m_feedthroughHashMax = " << m_feedthroughHashMax << endmsg;
return (0);
}
@@ -614,7 +614,7 @@ int LArOnlineID::init_H6Hashes(void)
unsigned int nids=0;
std::set<HWIdentifier> ids;
log << MSG::DEBUG << "[init_H6hashes] : ChannelId : m_full_laronline_range.size() = "
- << m_full_laronline_range.size() << endreq;
+ << m_full_laronline_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_laronline_range.size(); ++i)
{
const Range& range = m_full_laronline_range[i];
@@ -636,9 +636,9 @@ int LArOnlineID::init_H6Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -673,7 +673,7 @@ int LArOnlineID::init_H6Hashes(void)
/*==========*/
nids = 0;
ids.clear();
- log << MSG::DEBUG << "[init_H6hashes] > FebId : m_full_feb_range.size() = " << m_full_feb_range.size() << endreq;
+ log << MSG::DEBUG << "[init_H6hashes] > FebId : m_full_feb_range.size() = " << m_full_feb_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_feb_range.size(); ++i)
{
const Range& range = m_full_feb_range[i];
@@ -694,9 +694,9 @@ int LArOnlineID::init_H6Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -727,7 +727,7 @@ int LArOnlineID::init_H6Hashes(void)
nids = 0;
ids.clear();
// AL-->
- log << MSG::DEBUG << "[init_H6hashes] FeedthroughId: m_feedthrough_range.size() = " << m_full_feedthrough_range.size() << endreq;
+ log << MSG::DEBUG << "[init_H6hashes] FeedthroughId: m_feedthrough_range.size() = " << m_full_feedthrough_range.size() << endmsg;
for (unsigned int i = 0; i < m_full_feedthrough_range.size(); ++i)
{
const Range& range = m_full_feedthrough_range[i];
@@ -742,12 +742,12 @@ int LArOnlineID::init_H6Hashes(void)
log << MSG::DEBUG << "[init_H6hashes] m_bec_index= " << m_bec_index
<< "m_side_index= " << m_bec_index
<< "m_feedthrough_index= " << m_bec_index
- << "m_slot_index= " << m_bec_index << endreq;
+ << "m_slot_index= " << m_bec_index << endmsg;
int test_bec = barrel_ec( feedthroughId);
int test_pn = pos_neg( feedthroughId);
int test_ft = feedthrough( feedthroughId);
log << MSG::DEBUG << "[init_H6hashes] in loop : [bec,pn,ft]= [" << test_bec
- << "," << test_pn << "," << test_ft << "]"<< endreq;
+ << "," << test_pn << "," << test_ft << "]"<< endmsg;
if(!(ids.insert(feedthroughId)).second)
{
strm1 << nids;
@@ -756,9 +756,9 @@ int LArOnlineID::init_H6Hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -777,13 +777,13 @@ int LArOnlineID::init_H6Hashes(void)
{
if( is_H6FT( *first ))
{
- log << MSG::DEBUG << "[init_H6hashes] filling m_feedthrough_vec IS-H6 !!"<< endreq;
+ log << MSG::DEBUG << "[init_H6hashes] filling m_feedthrough_vec IS-H6 !!"<< endmsg;
m_feedthrough_vec.push_back(*first);
nidtb++;
}
}
m_feedthroughHashMax = m_feedthrough_vec.size();
- log << MSG::DEBUG << "[init_H6hashes] final m_feedthroughHashMax = " << m_feedthroughHashMax << endreq;
+ log << MSG::DEBUG << "[init_H6hashes] final m_feedthroughHashMax = " << m_feedthroughHashMax << endmsg;
return (0);
}
diff --git a/LArCalorimeter/LArIdentifier/src/LArOnlineID_Base.cxx b/LArCalorimeter/LArIdentifier/src/LArOnlineID_Base.cxx
index 47b0041ae847..885916b7611b 100755
--- a/LArCalorimeter/LArIdentifier/src/LArOnlineID_Base.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArOnlineID_Base.cxx
@@ -316,7 +316,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
MsgStream log(m_msgSvc, "LArOnlineID_Base" );
std::string strg = "initialize_from_dictionary";
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -324,11 +324,11 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
// Check whether this helper should be reinitialized
if (!reinitialize(dict_mgr)) {
- if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endreq;
+ if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endmsg;
return (0);
}
else {
- log << MSG::DEBUG << "(Re)initialize" << endreq;
+ log << MSG::DEBUG << "(Re)initialize" << endmsg;
}
// init base object
@@ -338,7 +338,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg = " initialize_from_dictionary - cannot access LArCalorimeter dictionary ";
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnlineID_Base::" << strg << std::endl;
@@ -367,7 +367,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << atlasDict->m_name;
strg= " Could not get value for label 'LArCalorimeter' of field 'subdet' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnlineID_Base:" << strg << std::endl;
@@ -382,7 +382,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnline' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -397,7 +397,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnlineCalib' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -426,10 +426,10 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
std::string strg2= " feedthrough slot range -> " + (std::string)m_full_feb_range;
std::string strg3= " channel range -> " + (std::string)m_full_laronline_range;
if(m_msgSvc) {
- log << MSG::DEBUG << strg0 << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
- log << MSG::DEBUG << strg3 << endreq;
+ log << MSG::DEBUG << strg0 << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
+ log << MSG::DEBUG << strg3 << endmsg;
}
else {
std::cout << strg0 << std::endl;
@@ -444,7 +444,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm << dictionaryVersion();
strg="[initialize_from_dictionary] version= " + strm.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << "LArOnlineID_Base: " << strg << std::endl;
@@ -501,9 +501,9 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg1= " "+strm1.str();
strg2= " "+strm2.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
+ log << MSG::DEBUG << strg << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -529,9 +529,9 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg1= " , "+strm1.str();
strg2= " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
+ log << MSG::ERROR << strg << endmsg;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -636,7 +636,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strm3 << min_hash;
strg = "Min > " + strm.str() + " " + strm1.str() + " " + strm2.str() + " " + strm3.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -660,7 +660,7 @@ int LArOnlineID_Base::initialize_from_dictionary (const IdDictMgr& dict_mgr)
strg = " ***** Error feb ranges, id, hash, i = " +
strm.str() + " , " + strm1.str() + " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -872,7 +872,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
{
if(m_msgSvc) {
log << MSG::ERROR << "initLevelsFromDict - dictionary NOT initialized "
- << endreq;
+ << endmsg;
}
else {
std::cout << "LArEM_ID::initLevelsFromDict - dictionary NOT initialized "
@@ -904,7 +904,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg = "initLevelsFromDict - unable to find laronline region ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -923,7 +923,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg= "initLevelsFromDict - unable to find 'subdet' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -943,7 +943,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg= "initLevelsFromDict - unable to find 'part' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -963,7 +963,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg= "initLevelsFromDict - unable to find 'barrel-endcap' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -983,7 +983,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg= "initLevelsFromDict - unable to find 'barrel-endcap' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -1008,7 +1008,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg = "initLevelsFromDict - unable to find 'feedthrough' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -1034,7 +1034,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg = "initLevelsFromDict - unable to find 'slot' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -1060,7 +1060,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg = "initLevelsFromDict - unable to find 'channel_in_slot' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -1081,7 +1081,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
strg = "initLevelsFromDict - unable to find 'slar' field ";
if(m_msgSvc)
{
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else
{
@@ -1096,7 +1096,7 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
IdDictGroup* group = m_dict->find_group(group_name);
if ( !group ) {
log << MSG::ERROR << "initLevelsFromDict - cannot find "
- << group_name << endreq;
+ << group_name << endmsg;
} else {
m_laronlineRegion_index = group->regions()[0]->m_index;
}
@@ -1114,16 +1114,16 @@ int LArOnlineID_Base::initLevelsFromDict(const std::string& group_name)
m_slar_impl = region.m_implementation[m_slar_index];
if(m_msgSvc) {
- log << MSG::DEBUG << "decode index and bit fields for each level: " << endreq;
- log << MSG::DEBUG << "lar " << m_lar_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "online " << m_laronline_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "bec " << m_bec_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "side " << m_side_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "ft " << m_feedthrough_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "slot " << m_slot_impl.show_to_string() << endreq;
- log << MSG::DEBUG << "channel " << m_channel_in_slot_impl.show_to_string() << endreq;
+ log << MSG::DEBUG << "decode index and bit fields for each level: " << endmsg;
+ log << MSG::DEBUG << "lar " << m_lar_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "online " << m_laronline_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "bec " << m_bec_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "side " << m_side_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "ft " << m_feedthrough_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "slot " << m_slot_impl.show_to_string() << endmsg;
+ log << MSG::DEBUG << "channel " << m_channel_in_slot_impl.show_to_string() << endmsg;
if ( m_this_is_slar )
- log << MSG::DEBUG << "is-slar " << m_slar_impl.show_to_string() << endreq;
+ log << MSG::DEBUG << "is-slar " << m_slar_impl.show_to_string() << endmsg;
}
else {
std::cout << "decode index and bit fields for each level: " << std::endl;
@@ -1182,9 +1182,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -1205,9 +1205,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " hash max "+strm2.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -1248,9 +1248,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -1271,9 +1271,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " hash max= "+strm2.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -1318,9 +1318,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " expanded Id= "+strm3.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- //log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ //log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
@@ -1341,9 +1341,9 @@ int LArOnlineID_Base::init_hashes(void)
strg3 = " hash max "+strm2.str();
if(m_msgSvc)
{
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
- log << MSG::ERROR << strg3 << endreq;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
+ log << MSG::ERROR << strg3 << endmsg;
}
else
{
diff --git a/LArCalorimeter/LArIdentifier/src/LArOnline_SuperCellID.cxx b/LArCalorimeter/LArIdentifier/src/LArOnline_SuperCellID.cxx
index 23c53285776e..c75cf739d43a 100755
--- a/LArCalorimeter/LArIdentifier/src/LArOnline_SuperCellID.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArOnline_SuperCellID.cxx
@@ -33,7 +33,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
MsgStream log(m_msgSvc, "LArOnline_SuperCellID" );
std::string strg = "initialize_from_dictionary";
if(m_msgSvc) {
- log << MSG::INFO << strg << endreq;
+ log << MSG::INFO << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -41,11 +41,11 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
// Check whether this helper should be reinitialized
if (!reinitialize(dict_mgr)) {
- if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endreq;
+ if(m_msgSvc)log << MSG::DEBUG << "Request to reinitialize not satisfied - tags have not changed" << endmsg;
return (0);
}
else {
- log << MSG::DEBUG << "(Re)initialize" << endreq;
+ log << MSG::DEBUG << "(Re)initialize" << endmsg;
}
// init base object
@@ -55,7 +55,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strg = " initialize_from_dictionary - cannot access LArCalorimeter dictionary ";
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnline_SuperCellID::" << strg << std::endl;
@@ -84,7 +84,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strm << atlasDict->m_name;
strg= " Could not get value for label 'LArCalorimeter' of field 'subdet' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << "LArOnline_SuperCellID:" << strg << std::endl;
@@ -99,7 +99,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnline' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -114,7 +114,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strm << m_dict->m_name;
strg = "Could not get value for label 'LArOnlineCalib' of field 'part' in dictionary "+strm.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -145,10 +145,10 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
std::string strg2= " feedthrough slot range -> " + (std::string)m_full_feb_range;
std::string strg3= " channel range -> " + (std::string)m_full_laronline_range;
if(m_msgSvc) {
- log << MSG::DEBUG << strg0 << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
- log << MSG::DEBUG << strg3 << endreq;
+ log << MSG::DEBUG << strg0 << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
+ log << MSG::DEBUG << strg3 << endmsg;
}
else {
std::cout << strg0 << std::endl;
@@ -162,7 +162,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strm << dictionaryVersion();
strg="[initialize_from_dictionary] version= " + strm.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << "LArOnline_SuperCellID: " << strg << std::endl;
@@ -219,9 +219,9 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strg1= " "+strm1.str();
strg2= " "+strm2.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
- log << MSG::DEBUG << strg1 << endreq;
- log << MSG::DEBUG << strg2 << endreq;
+ log << MSG::DEBUG << strg << endmsg;
+ log << MSG::DEBUG << strg1 << endmsg;
+ log << MSG::DEBUG << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -247,9 +247,9 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strg1= " , "+strm1.str();
strg2= " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
- log << MSG::ERROR << strg1 << endreq;
- log << MSG::ERROR << strg2 << endreq;
+ log << MSG::ERROR << strg << endmsg;
+ log << MSG::ERROR << strg1 << endmsg;
+ log << MSG::ERROR << strg2 << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -370,7 +370,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strm3 << min_hash;
strg = "Min > " + strm.str() + " " + strm1.str() + " " + strm2.str() + " " + strm3.str();
if(m_msgSvc) {
- log << MSG::DEBUG << strg << endreq;
+ log << MSG::DEBUG << strg << endmsg;
}
else {
std::cout << strg << std::endl;
@@ -394,7 +394,7 @@ int LArOnline_SuperCellID::initialize_from_dictionary (const IdDictMgr& dict_mg
strg = " ***** Error feb ranges, id, hash, i = " +
strm.str() + " , " + strm1.str() + " , "+strm2.str();
if(m_msgSvc) {
- log << MSG::ERROR << strg << endreq;
+ log << MSG::ERROR << strg << endmsg;
}
else {
std::cout << strg << std::endl;
diff --git a/LArCalorimeter/LArIdentifier/src/LArReadoutModuleService.cxx b/LArCalorimeter/LArIdentifier/src/LArReadoutModuleService.cxx
index aa5f95bdb0ec..b7c2f3e52591 100644
--- a/LArCalorimeter/LArIdentifier/src/LArReadoutModuleService.cxx
+++ b/LArCalorimeter/LArIdentifier/src/LArReadoutModuleService.cxx
@@ -41,8 +41,8 @@ HWIdentifier LArReadoutModuleService::createReadoutModuleID(int l_atlas_tb, int
MsgStream msg(Athena::getMessageSvc(), " LArReadoutModuleService");
msg << MSG::ERROR << " createReadoutModuleID called with parameters: "
<< l_atlas_tb << ", " << l_barrel_ec << ", " << l_pos_neg << ", " << l_em_hec_fcal
- << ", " << l_rosId << ", " << l_rodFragId << ", " << l_rodCrate << ", " << l_rodSlot << endreq;
- msg << MSG::ERROR << errorReport << endreq;
+ << ", " << l_rosId << ", " << l_rodFragId << ", " << l_rodCrate << ", " << l_rodSlot << endmsg;
+ msg << MSG::ERROR << errorReport << endmsg;
return HWIdentifier(); //Return (invalid) default instance
}
--
GitLab