diff --git a/Calorimeter/CaloTriggerTool/CMakeLists.txt b/Calorimeter/CaloTriggerTool/CMakeLists.txt
index 25a3c7edddbb0f40a94f3b8a73c367c74767e53d..1b533e91a9e9d2160a201afcf119b7382a3e3ceb 100644
--- a/Calorimeter/CaloTriggerTool/CMakeLists.txt
+++ b/Calorimeter/CaloTriggerTool/CMakeLists.txt
@@ -26,7 +26,6 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( CaloTriggerToolLib
src/*.cxx
- src/*
PUBLIC_HEADERS CaloTriggerTool
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel SGTools Identifier GaudiKernel TrigT1CaloCalibConditions StoreGateLib SGtests LArToolsLib
diff --git a/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerToolDict.h b/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerToolDict.h
index 6c44242d0e3af6fdc689497bfe2a688f85abe604..24bc2820a693e93d48e8a90ba10dae6fc394b961 100755
--- a/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerToolDict.h
+++ b/Calorimeter/CaloTriggerTool/CaloTriggerTool/CaloTriggerToolDict.h
@@ -26,7 +26,6 @@
#include "CaloTriggerTool/CaloTTPpmRxId.h"
#include "CaloTriggerTool/CaloTTPpmRxIdMap.h"
#include "CaloTriggerTool/CaloTTPpmRxId_P.h"
-#include "CaloTriggerTool/CaloTriggerToolDict.h"
#include "CaloTriggerTool/CaloTriggerTowerService.h"
#endif // CALOTRIGGERTOOL_CALOTRIGGERTOOLDICT_H
diff --git a/Calorimeter/CaloTriggerTool/doc/mainpage.h b/Calorimeter/CaloTriggerTool/doc/mainpage.h
index 3b4867b218b68c9cb6a7ae433f2bd0d0768a2263..1d87d986f9547ca2ffa4bc2d52dc8e821cb36db1 100644
--- a/Calorimeter/CaloTriggerTool/doc/mainpage.h
+++ b/Calorimeter/CaloTriggerTool/doc/mainpage.h
@@ -20,7 +20,7 @@ try {
Identifier ttId = cnvToIdentifier(ttChannel) ;
}
catch(LArID_Exception& except) {
- msglog << MSG::ERROR << "LArID_Exception " << (std::string) except << endreq ;
+ msglog << MSG::ERROR << "LArID_Exception " << (std::string) except << endmsg ;
}
</pre>
@@ -32,7 +32,7 @@ try {
HWIdentifier ttOnlId = createTTChannelID(ttOffId)
}
catch(LArID_Exception& except) {
- msglog << MSG::ERROR << "LArID_Exception " << (std::string) except << endreq ;
+ msglog << MSG::ERROR << "LArID_Exception " << (std::string) except << endmsg ;
}
</pre>
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTTOnAttrIdMap.cxx b/Calorimeter/CaloTriggerTool/src/CaloTTOnAttrIdMap.cxx
index 688e6650522cc5e0136136242013a58d5770251e..eff7e6842fa3cba27c82c7c4474f06b50c3396b2 100755
--- a/Calorimeter/CaloTriggerTool/src/CaloTTOnAttrIdMap.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTTOnAttrIdMap.cxx
@@ -38,18 +38,18 @@ void CaloTTOnAttrIdMap::set( const CaloTTOnAttrId& m ) {
bool dump2=false;
if (log.level()<=MSG::DEBUG) dump2=true;
- log<<MSG::DEBUG<<" CaloTTOnAttrId size = "<<m.size() <<endreq;
+ log<<MSG::DEBUG<<" CaloTTOnAttrId size = "<<m.size() <<endmsg;
StoreGateSvc * detStore;
status = Gaudi::svcLocator()->service("DetectorStore",detStore);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot locate DetectorStore" << endreq;
+ log << MSG::ERROR << "Cannot locate DetectorStore" << endmsg;
}
const TTOnlineID* online_id;
status=detStore->retrieve(online_id);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot retrieve online_id" << endreq;
+ log << MSG::ERROR << "Cannot retrieve online_id" << endmsg;
}
CaloTTOnAttrId::const_iterator it = m.begin();
@@ -70,9 +70,9 @@ void CaloTTOnAttrIdMap::set( const CaloTTOnAttrId& m ) {
<<" em_had="<<t.em_had
<<" pos_neg="<<t.pos_neg
<<" barrel_endcap_fcal"<<t.barrel_endcap_fcal
- << endreq;
+ << endmsg;
- log<<MSG::VERBOSE<< " onl id = " << sid <<endreq;
+ log<<MSG::VERBOSE<< " onl id = " << sid <<endmsg;
}
AttrStruct attrStruct;
@@ -85,8 +85,8 @@ void CaloTTOnAttrIdMap::set( const CaloTTOnAttrId& m ) {
}
if (dump2) log<<MSG::DEBUG<<" CaloTTOnAttrIdMap::set : number of Ids="<<m_on2attrIdMap.size()<<std::endl;
} catch (CaloID_Exception& except) {
- log<<MSG::ERROR<<" Failed in CaloTTOnAttrIdMap::set " << endreq;
- log<<MSG::ERROR<< (std::string) except << endreq ;
+ log<<MSG::ERROR<<" Failed in CaloTTOnAttrIdMap::set " << endmsg;
+ log<<MSG::ERROR<< (std::string) except << endmsg ;
}
return;
}
@@ -106,7 +106,7 @@ unsigned int CaloTTOnAttrIdMap::em_had( HWIdentifier channelId ) const {
}
MsgStream log( msgSvc, "CaloTTOnAttrIdMap");
- log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endreq;
+ log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endmsg;
return 0;
}
unsigned int CaloTTOnAttrIdMap::pos_neg( HWIdentifier channelId ) const {
@@ -124,7 +124,7 @@ unsigned int CaloTTOnAttrIdMap::pos_neg( HWIdentifier channelId ) const {
}
MsgStream log( msgSvc, "CaloTTOnAttrIdMap");
- log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endreq;
+ log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endmsg;
return 0;
}
@@ -143,7 +143,7 @@ unsigned int CaloTTOnAttrIdMap::barrel_endcap_fcal( HWIdentifier channelId ) con
}
MsgStream log( msgSvc, "CaloTTOnAttrIdMap");
- log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endreq;
+ log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endmsg;
return 0;
}
@@ -162,7 +162,7 @@ unsigned int CaloTTOnAttrIdMap::module_type( HWIdentifier channelId ) const {
}
MsgStream log( msgSvc, "CaloTTOnAttrIdMap");
- log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endreq;
+ log<<MSG::ERROR<<" Online ID not found, channelId = " <<channelId.get_compact()<< endmsg;
return 0;
}
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTTOnOffIdMap.cxx b/Calorimeter/CaloTriggerTool/src/CaloTTOnOffIdMap.cxx
index ec4c3f12a9df7ba0982c45bfa1afb5de5f5dee47..74761a0c2b384cbb3a3673f4a14025862bd28868 100755
--- a/Calorimeter/CaloTriggerTool/src/CaloTTOnOffIdMap.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTTOnOffIdMap.cxx
@@ -40,11 +40,11 @@ void CaloTTOnOffIdMap::set( const CaloTTOnOffId& m ) {
if (log.level()<=MSG::DEBUG) dump2=true;
- log<<MSG::DEBUG<<" CaloTTOnOffId size = "<<m.size() <<endreq;
+ log<<MSG::DEBUG<<" CaloTTOnOffId size = "<<m.size() <<endmsg;
StoreGateSvc * detStore;
status = Gaudi::svcLocator()->service("DetectorStore",detStore);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot locate DetectorStore" << endreq;
+ log << MSG::ERROR << "Cannot locate DetectorStore" << endmsg;
}
const TTOnlineID* online_id;
@@ -52,11 +52,11 @@ void CaloTTOnOffIdMap::set( const CaloTTOnOffId& m ) {
status=detStore->retrieve(online_id);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot retrieve online_id" << endreq;
+ log << MSG::ERROR << "Cannot retrieve online_id" << endmsg;
}
status=detStore->retrieve(offline_id);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot retrieve offline_id" << endreq;
+ log << MSG::ERROR << "Cannot retrieve offline_id" << endmsg;
}
CaloTTOnOffId::const_iterator it = m.begin();
@@ -78,9 +78,9 @@ void CaloTTOnOffIdMap::set( const CaloTTOnOffId& m ) {
<<" crate="<<t.crate<<" module="<<t.module
<<" submodule="<<t.submodule
<<" channel="<<t.channel
- << endreq;
+ << endmsg;
- log<<MSG::VERBOSE<< " onl id = " << sid<<" offline id ="<<id<<endreq;
+ log<<MSG::VERBOSE<< " onl id = " << sid<<" offline id ="<<id<<endmsg;
}
m_off2onIdMap[id] = sid;
@@ -88,8 +88,8 @@ void CaloTTOnOffIdMap::set( const CaloTTOnOffId& m ) {
}
if (dump2) log<<MSG::DEBUG<<" CaloTTOnOffIdMap::set : number of Ids="<<m_on2offIdMap.size()<<std::endl;
} catch (CaloID_Exception& except) {
- log<<MSG::ERROR<<" Failed in CaloTTOnOffIdMap::set " << endreq;
- log<<MSG::ERROR<< (std::string) except << endreq ;
+ log<<MSG::ERROR<<" Failed in CaloTTOnOffIdMap::set " << endmsg;
+ log<<MSG::ERROR<< (std::string) except << endmsg ;
}
return;
}
@@ -115,7 +115,7 @@ HWIdentifier CaloTTOnOffIdMap::createSignalChannelID(const Identifier& id, bool
}
MsgStream log( msgSvc, "CaloTTOnOffIdMap");
- log<<MSG::ERROR<<" Offline ID not found "<< id <<endreq;
+ log<<MSG::ERROR<<" Offline ID not found "<< id <<endmsg;
return HWIdentifier(0);
}
@@ -144,7 +144,7 @@ Identifier CaloTTOnOffIdMap::cnvToIdentifier(const HWIdentifier & sid, bool bQui
}
MsgStream log( msgSvc, "CaloTTOnOffIdMap");
- log<<MSG::ERROR<<" Online ID not found, id = " <<sid.get_compact()<< endreq;
+ log<<MSG::ERROR<<" Online ID not found, id = " <<sid.get_compact()<< endmsg;
return Identifier(0) ;
}
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTTPpmRxIdMap.cxx b/Calorimeter/CaloTriggerTool/src/CaloTTPpmRxIdMap.cxx
index e46c520172198aa156ca8d4a5878cf3ce203ee17..708786899ed546831990b78bbe01b4989ed0bd57 100755
--- a/Calorimeter/CaloTriggerTool/src/CaloTTPpmRxIdMap.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTTPpmRxIdMap.cxx
@@ -38,11 +38,11 @@ void CaloTTPpmRxIdMap::set( const CaloTTPpmRxId& m ) {
if (log.level()<=MSG::DEBUG) dump2=true;
- log<<MSG::DEBUG<<" CaloTTPpmRxId size = "<<m.size() <<endreq;
+ log<<MSG::DEBUG<<" CaloTTPpmRxId size = "<<m.size() <<endmsg;
StoreGateSvc * detStore;
status = Gaudi::svcLocator()->service("DetectorStore",detStore);
if(status.isFailure()){
- log << MSG::ERROR << "Cannot locate DetectorStore" << endreq;
+ log << MSG::ERROR << "Cannot locate DetectorStore" << endmsg;
}
CaloTTPpmRxId::const_iterator it = m.begin();
@@ -64,9 +64,9 @@ void CaloTTPpmRxIdMap::set( const CaloTTPpmRxId& m ) {
<<" crate="<<t.crate<<" module="<<t.module
<<" submodule="<<t.submodule
<<" channel="<<t.channel
- << endreq;
+ << endmsg;
*/
- if (dump) log << MSG::VERBOSE << " ppm id = " << ppmChannelId.id() << " rx id =" << rxChannelId.id() <<endreq;
+ if (dump) log << MSG::VERBOSE << " ppm id = " << ppmChannelId.id() << " rx id =" << rxChannelId.id() <<endmsg;
m_mPpmIdToRx[ppmChannelId].push_back(rxChannelId);
m_mRxIdToPpm[rxChannelId] = ppmChannelId;
@@ -74,8 +74,8 @@ void CaloTTPpmRxIdMap::set( const CaloTTPpmRxId& m ) {
}
if (dump2) log<<MSG::DEBUG<<" CaloTTPpmRxIdMap::set : number of Ids="<<m_mPpmIdToRx.size()<<std::endl;
} catch (CaloID_Exception& except) {
- log<<MSG::ERROR<<" Failed in CaloTTPpmRxIdMap::set " << endreq;
- log<<MSG::ERROR<< (std::string) except << endreq ;
+ log<<MSG::ERROR<<" Failed in CaloTTPpmRxIdMap::set " << endmsg;
+ log<<MSG::ERROR<< (std::string) except << endmsg ;
}
return;
}
@@ -96,7 +96,7 @@ std::vector<L1CaloRxCoolChannelId> CaloTTPpmRxIdMap::ppmToRxId(const L1CaloCoolC
}
MsgStream log( msgSvc, "CaloTTPpmRxIdMap");
- log<<MSG::ERROR<<" Ppm channel ID not found, id= "<< ppmChannelId.id()<<" in Ppm to Rx map." <<endreq;
+ log<<MSG::ERROR<<" Ppm channel ID not found, id= "<< ppmChannelId.id()<<" in Ppm to Rx map." <<endmsg;
return std::vector<L1CaloRxCoolChannelId>();
}
@@ -119,7 +119,7 @@ L1CaloCoolChannelId CaloTTPpmRxIdMap::rxToPpmId(const L1CaloRxCoolChannelId& rxC
}
MsgStream log( msgSvc, "CaloTTPpmRxIdMap");
- log<<MSG::ERROR<<" Rx channel ID not found, id = " <<rxChannelId.id()<<" in Rx to Ppm map."<< endreq;
+ log<<MSG::ERROR<<" Rx channel ID not found, id = " <<rxChannelId.id()<<" in Rx to Ppm map."<< endmsg;
return L1CaloCoolChannelId(0) ;
}
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
index 764eb9fb4beef23074dcecf7e09dae484723cb95..618f353ba26690fb282b6b1fb2556bcd81587412 100755
--- a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
@@ -24,11 +24,11 @@ CaloTriggerTowerService::CaloTriggerTowerService( const std::string& type,
const std::string& name,
const IInterface* parent )
: AthAlgTool(type,name,parent),
- m_larcablingSvc(0) ,
- m_onlineHelper(0) ,
- m_emHelper(0) ,
- m_lvl1Helper(0) ,
- m_ttonlineHelper(0)
+ m_larcablingSvc(nullptr) ,
+ m_onlineHelper(nullptr) ,
+ m_emHelper(nullptr) ,
+ m_lvl1Helper(nullptr) ,
+ m_ttonlineHelper(nullptr)
{
// Declare additional interface
@@ -48,7 +48,7 @@ StatusCode CaloTriggerTowerService::initialize ()
msg().setLevel(msgLevel());
- msg()<<MSG::INFO<<" => CaloTriggerTowerService::initialize() "<< endreq;
+ msg()<<MSG::INFO<<" => CaloTriggerTowerService::initialize() "<< endmsg;
ServiceHandle<StoreGateSvc> detStore("DetectorStore",name());
@@ -58,54 +58,54 @@ StatusCode CaloTriggerTowerService::initialize ()
const CaloIdManager* caloMgr;
status = detStore->retrieve(caloMgr);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to retrieve CaloIdManager from DetectorStore" << endreq;
+ msg() << MSG::ERROR << "Unable to retrieve CaloIdManager from DetectorStore" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully retrieved CaloIdManager from DetectorStore" << endreq;
+ msg() << MSG::DEBUG << "Successfully retrieved CaloIdManager from DetectorStore" << endmsg;
}
m_emHelper = caloMgr->getEM_ID();
if (!m_emHelper) {
- msg() << MSG::ERROR << "Could not access LArEM_ID helper" << endreq;
+ msg() << MSG::ERROR << "Could not access LArEM_ID helper" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully accessed LArEM_ID helper" << endreq;
+ msg() << MSG::DEBUG << "Successfully accessed LArEM_ID helper" << endmsg;
}
m_lvl1Helper = caloMgr->getLVL1_ID();
if (!m_lvl1Helper) {
- msg() << MSG::ERROR << "Could not access CaloLVL1_ID helper" << endreq;
+ msg() << MSG::ERROR << "Could not access CaloLVL1_ID helper" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully accessed CaloLVL1_ID helper" << endreq;
+ msg() << MSG::DEBUG << "Successfully accessed CaloLVL1_ID helper" << endmsg;
}
m_ttonlineHelper = caloMgr->getTTOnlineID();
if (!m_ttonlineHelper) {
- msg() << MSG::ERROR << "Could not access TTOnlineID helper" << endreq;
+ msg() << MSG::ERROR << "Could not access TTOnlineID helper" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully accessed CaloLVL1_ID helper" << endreq;
+ msg() << MSG::DEBUG << "Successfully accessed CaloLVL1_ID helper" << endmsg;
}
const LArIdManager* larMgr;
status = detStore->retrieve(larMgr);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endreq;
+ msg() << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endreq;
+ msg() << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endmsg;
}
m_onlineHelper = larMgr->getOnlineID();
if (!m_onlineHelper) {
- msg() << MSG::ERROR << "Could not access LArOnlineID helper" << endreq;
+ msg() << MSG::ERROR << "Could not access LArOnlineID helper" << endmsg;
return StatusCode::FAILURE;
} else {
- msg() << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endreq;
+ msg() << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endmsg;
}
status= detStore->regFcn(&CaloTriggerTowerService::iovCallBack,this,
m_TTCellMap,m_TTCellMapKey);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<<m_TTCellMapKey << endreq;
+ msg() << MSG::ERROR << "Unable to regFcn for "<<m_TTCellMapKey << endmsg;
return StatusCode::FAILURE;
}
@@ -113,7 +113,7 @@ StatusCode CaloTriggerTowerService::initialize ()
status= detStore->regFcn(&CaloTriggerTowerService::iovCallBack,this,
m_caloTTOnOffIdMap,m_caloTTOnOffIdMapKey);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<<m_caloTTOnOffIdMapKey << endreq;
+ msg() << MSG::ERROR << "Unable to regFcn for "<<m_caloTTOnOffIdMapKey << endmsg;
return StatusCode::FAILURE;
}
@@ -121,21 +121,21 @@ StatusCode CaloTriggerTowerService::initialize ()
status= detStore->regFcn(&CaloTriggerTowerService::iovCallBack,this,
m_caloTTOnAttrIdMap,m_caloTTOnAttrIdMapKey);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTOnAttrIdMapKey << endreq;
+ msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTOnAttrIdMapKey << endmsg;
return StatusCode::FAILURE;
}
status= detStore->regFcn(&CaloTriggerTowerService::iovCallBack,this,
m_caloTTPpmRxIdMap,m_caloTTPpmRxIdMapKey);
if (status.isFailure()) {
- msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTPpmRxIdMapKey << endreq;
+ msg() << MSG::ERROR << "Unable to regFcn for "<< m_caloTTPpmRxIdMapKey << endmsg;
return StatusCode::FAILURE;
}
}
else
{
- msg()<<MSG::ERROR<<" => Failed to get DetectorStore "<< endreq;
+ msg()<<MSG::ERROR<<" => Failed to get DetectorStore "<< endmsg;
}
IToolSvc* toolSvc;
@@ -143,15 +143,15 @@ StatusCode CaloTriggerTowerService::initialize ()
if(status.isSuccess()) {
status = toolSvc->retrieveTool("LArCablingService",m_larcablingSvc);
if(status.isFailure()) {
- msg() << MSG::ERROR << "Could not retrieve LArCablingService"<< endreq;
+ msg() << MSG::ERROR << "Could not retrieve LArCablingService"<< endmsg;
return(StatusCode::FAILURE);
}
} else {
- msg() << MSG::ERROR << "Could not get ToolSvc"<< endreq;
+ msg() << MSG::ERROR << "Could not get ToolSvc"<< endmsg;
return(StatusCode::FAILURE);
}
- msg()<<MSG::INFO<<" ====> ...CaloTriggerTowerService::init() OK "<< endreq;
+ msg()<<MSG::INFO<<" ====> ...CaloTriggerTowerService::init() OK "<< endmsg;
return StatusCode::SUCCESS;
}
@@ -160,7 +160,7 @@ StatusCode CaloTriggerTowerService::initialize ()
//===========================================================
StatusCode CaloTriggerTowerService::finalize ()
{
- msg()<<MSG::INFO<<" => CaloTriggerTowerService::finalize() "<< endreq;
+ msg()<<MSG::INFO<<" => CaloTriggerTowerService::finalize() "<< endmsg;
return StatusCode::SUCCESS;
}
@@ -178,9 +178,9 @@ HWIdentifier CaloTriggerTowerService::createTTChannelID(const Identifier & id,
HWIdentifier invalidId (0);
if(!m_caloTTOnOffIdMap ) {// no mapping object
- msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return invalidId;
} else {
@@ -209,9 +209,9 @@ Identifier CaloTriggerTowerService::cnvToIdentifier(const HWIdentifier & id, bo
Identifier invalidId (0);
if(!m_caloTTOnOffIdMap ) {
- msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No CaloTTOnOffIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnOffIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return invalidId;
} else {
@@ -238,9 +238,9 @@ L1CaloCoolChannelId CaloTriggerTowerService::cnvRxIdToCoolChannelId(const L1Calo
L1CaloCoolChannelId invalidId;
if(!m_caloTTPpmRxIdMap ) {
- msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return invalidId;
} else {
@@ -259,9 +259,9 @@ L1CaloCoolChannelId CaloTriggerTowerService::cnvRxIdToCoolChannelId(const L1Calo
std::vector<L1CaloRxCoolChannelId> CaloTriggerTowerService::cnvCoolChannelIdToRxId(const L1CaloCoolChannelId& ppmCoolChannelId) throw(CaloID_Exception) {
if(!m_caloTTPpmRxIdMap ) {
- msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No CaloTTPpmRxIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the CaloTTPpmRxIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return std::vector<L1CaloRxCoolChannelId>();
} else {
@@ -281,9 +281,9 @@ std::vector<L1CaloRxCoolChannelId> CaloTriggerTowerService::cnvCoolChannelIdToRx
unsigned int CaloTriggerTowerService::barrel_endcap_fcal(const HWIdentifier & id) throw(CaloID_Exception) {
if(!m_caloTTOnAttrIdMap) {
- msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
unsigned int barrel_endcap_fcal = m_caloTTOnAttrIdMap->barrel_endcap_fcal(id);
@@ -295,9 +295,9 @@ unsigned int CaloTriggerTowerService::barrel_endcap_fcal(const HWIdentifier & id
unsigned int CaloTriggerTowerService::em_had(const HWIdentifier & id) throw(CaloID_Exception) {
if(!m_caloTTOnAttrIdMap) {
- msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
unsigned int em_had = m_caloTTOnAttrIdMap->em_had(id);
@@ -309,9 +309,9 @@ unsigned int CaloTriggerTowerService::em_had(const HWIdentifier & id) throw(Calo
unsigned int CaloTriggerTowerService::pos_neg(const HWIdentifier & id) throw(CaloID_Exception) {
if(!m_caloTTOnAttrIdMap) {
- msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
unsigned int pos_neg = m_caloTTOnAttrIdMap->pos_neg(id);
@@ -323,9 +323,9 @@ unsigned int CaloTriggerTowerService::module_type(const HWIdentifier & id) throw
if(!m_caloTTOnAttrIdMap) {
- msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No TTOnAttrIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the TTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return (0);
} else {
unsigned int module_type = m_caloTTOnAttrIdMap->module_type(id);
@@ -351,9 +351,9 @@ L1CaloCoolChannelId CaloTriggerTowerService::createL1CoolChannelId( const HWIden
} else {
- msg() << MSG::ERROR << " No CaloTTOnAttrIdMap !" << endreq;
- msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnAttrIdMap been added to IOVDbSvc ? " << endreq;
- msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endreq;
+ msg() << MSG::ERROR << " No CaloTTOnAttrIdMap !" << endmsg;
+ msg() << MSG::ERROR << " Has the DB folder holding the CaloTTOnAttrIdMap been added to IOVDbSvc ? " << endmsg;
+ msg() << MSG::ERROR << " IOVDbSvc.Folders+=[ FolderName + DBConnection + \"<tag>\"+TagSpec+\"</tag>\" ] " << endmsg;
return 0;
}
}
@@ -385,7 +385,7 @@ std::vector<HWIdentifier> CaloTriggerTowerService::createChannelIDvec(const HWId
m_emHelper->dictionaryVersion() == "H8TestBeam") {
if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endreq;
+ msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return channel_id_vec;
}
@@ -425,7 +425,7 @@ HWIdentifier CaloTriggerTowerService::whichTTChannelID(const HWIdentifier & id)
m_emHelper->dictionaryVersion() == "H8TestBeam") {
if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endreq;
+ msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return triggerTower;
}
@@ -456,7 +456,7 @@ CaloTriggerTowerService::createCellIDvecTT(const Identifier& id)
m_emHelper->dictionaryVersion() == "H8TestBeam") {
if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endreq;
+ msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return vec;
}
@@ -490,7 +490,7 @@ CaloTriggerTowerService::createCellIDvecLayer(const Identifier& id)
if(m_emHelper->dictionaryVersion() == "fullAtlas" ||
m_emHelper->dictionaryVersion() == "H8TestBeam") {
if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endreq;
+ msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return vec;
}
vec = m_TTCellMap->createCellIDvec(id);
@@ -509,7 +509,7 @@ Identifier CaloTriggerTowerService::whichTTID(const Identifier & id)
m_emHelper->dictionaryVersion() == "H8TestBeam") {
if(!m_TTCellMap) {
- msg() << MSG::ERROR << " No TTCellMap !" << endreq;
+ msg() << MSG::ERROR << " No TTCellMap !" << endmsg;
return sid;
}
sid = m_TTCellMap->whichTTID( id ) ;
@@ -586,7 +586,7 @@ bool CaloTriggerTowerService::is_in_lvl1(const Identifier & id)
StatusCode CaloTriggerTowerService::iovCallBack(IOVSVC_CALLBACK_ARGS) {
- msg()<<MSG::INFO<<" ====> iovCallBack " << endreq;
+ msg()<<MSG::INFO<<" ====> iovCallBack " << endmsg;
return StatusCode::SUCCESS;
diff --git a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
index c085b2da4dd1573c30c457f283378e71d59484d9..3efc00530d33598e4a78fff8edb88970af5422ec 100755
--- a/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
+++ b/Calorimeter/CaloTriggerTool/src/LArTTCellMap.cxx
@@ -16,7 +16,7 @@
#include <iostream>
-LArTTCellMap::LArTTCellMap( ): m_msg(0)
+LArTTCellMap::LArTTCellMap( ): m_msg(nullptr)
{
IMessageSvc *msgSvc;
@@ -41,12 +41,12 @@ void LArTTCellMap::set( const LArTTCell& m )
convert_to_P(m);
if (m_msg->level() <= MSG::DEBUG) {
- (*m_msg) <<MSG::DEBUG<<" LArTTCell size = "<<m.size() <<endreq;
+ (*m_msg) <<MSG::DEBUG<<" LArTTCell size = "<<m.size() <<endmsg;
}
StoreGateSvc * detStore;
StatusCode status = Gaudi::svcLocator()->service("DetectorStore",detStore);
if(status.isFailure()){
- (*m_msg) << MSG::ERROR << "Cannot locate DetectorStore" << endreq;
+ (*m_msg) << MSG::ERROR << "Cannot locate DetectorStore" << endmsg;
}
const LArEM_ID* em_id;
@@ -56,19 +56,19 @@ void LArTTCellMap::set( const LArTTCell& m )
status=detStore->retrieve(em_id);
if(status.isFailure()){
- (*m_msg) << MSG::ERROR << "Cannot retrieve em_id" << endreq;
+ (*m_msg) << MSG::ERROR << "Cannot retrieve em_id" << endmsg;
}
status=detStore->retrieve(hec_id);
if(status.isFailure()){
- (*m_msg) << MSG::ERROR << "Cannot retrieve hec_id" << endreq;
+ (*m_msg) << MSG::ERROR << "Cannot retrieve hec_id" << endmsg;
}
status=detStore->retrieve(fcal_id);
if(status.isFailure()){
- (*m_msg) << MSG::ERROR << "Cannot retrieve fcal_id" << endreq;
+ (*m_msg) << MSG::ERROR << "Cannot retrieve fcal_id" << endmsg;
}
status=detStore->retrieve(lvl1_id);
if(status.isFailure()){
- (*m_msg) << MSG::ERROR << "Cannot retrieve lvl1_id" << endreq;
+ (*m_msg) << MSG::ERROR << "Cannot retrieve lvl1_id" << endmsg;
}
LArTTCell::const_iterator it = m.begin();
LArTTCell::const_iterator it_e = m.end();
@@ -93,7 +93,7 @@ void LArTTCellMap::set( const LArTTCell& m )
id = fcal_id->channel_id(t.pn,t.region,t.eta,t.phi);
} else {
- (*m_msg) <<MSG::ERROR <<" Wrong input Detector Number " << t.det << endreq;
+ (*m_msg) <<MSG::ERROR <<" Wrong input Detector Number " << t.det << endmsg;
}
Identifier sid = lvl1_id->layer_id(t.tpn,t.tsample,t.tregion,t.teta,t.tphi,t.layer);
@@ -111,9 +111,9 @@ void LArTTCellMap::set( const LArTTCell& m )
<<" trig sample="<<t.tsample
<<" trig eta="<<t.teta<<" trig phi="<<t.tphi
<<" layer="<<t.layer
- << endreq;
+ << endmsg;
- (*m_msg) <<MSG::VERBOSE<< " lvl1 id = " << sid<<" offline id ="<<id<<endreq;
+ (*m_msg) <<MSG::VERBOSE<< " lvl1 id = " << sid<<" offline id ="<<id<<endmsg;
}
if(!(cellIdSet.insert(id)).second) {
@@ -121,7 +121,7 @@ void LArTTCellMap::set( const LArTTCell& m )
<< lvl1_id->show_to_string(id)
<< " in TT= "
<< lvl1_id->show_to_string(sid)
- << endreq;
+ << endmsg;
}
m_cell2ttIdMap[id] = sid;
@@ -167,8 +167,8 @@ void LArTTCellMap::set( const LArTTCell& m )
catch (LArID_Exception& except) {
- (*m_msg) <<MSG::ERROR<<" Failed in LArTTCellMap::set " << endreq;
- (*m_msg) <<MSG::ERROR<< (std::string) except << endreq ;
+ (*m_msg) <<MSG::ERROR<<" Failed in LArTTCellMap::set " << endmsg;
+ (*m_msg) <<MSG::ERROR<< (std::string) except << endmsg ;
}
if (m_msg->level() <= MSG::DEBUG) {
@@ -190,7 +190,7 @@ Identifier LArTTCellMap::whichTTID(const Identifier& id) const
return (*it).second;
}
- (*m_msg) <<MSG::ERROR<<" Offline TT ID not found for cell "<< id <<endreq;
+ (*m_msg) <<MSG::ERROR<<" Offline TT ID not found for cell "<< id <<endmsg;
return Identifier();
@@ -212,7 +212,7 @@ LArTTCellMap::createCellIDvec(const Identifier & sid) const
}
if (m_msg->level() <= MSG::VERBOSE) {
- (*m_msg) <<MSG::VERBOSE<<" vector of offline cell ID not found, TT id = " <<sid.get_compact()<< endreq;
+ (*m_msg) <<MSG::VERBOSE<<" vector of offline cell ID not found, TT id = " <<sid.get_compact()<< endmsg;
}
static std::vector<Identifier> v;