diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
index cbf15e1a2ebfc810d0fc5520f8da1b3c01d3625d..78dcabd00fe475821c8294e33e72a651a8ab88c8 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
@@ -60,7 +60,7 @@ StatusCode CpByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpByteStreamCnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode CpByteStreamCnv::initialize()
StatusCode CpByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollection* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollection" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to CPBSCollection" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
index 39a3288281c14193f9aa5593d3567fa0cf7b7565..26e0d84203624ed855529bf71f5c3e61e89ec13c 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
@@ -99,19 +99,19 @@ CpByteStreamTool::~CpByteStreamTool()
StatusCode CpByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_cpmMaps.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_cpmMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_cpmMaps << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_cpmMaps << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_cpmMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_towerKey = new LVL1::TriggerTowerKey();
@@ -216,7 +216,7 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
: mod/modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of CPM slices and triggered slice offset
// for this slink
@@ -224,19 +224,19 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
timeslices, trigCpm)) {
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
trigCpmNew = ModifySlices::peak(trigCpm, timeslices, timeslicesNew);
if (debug) {
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigCpm;
if (timeslices != timeslicesNew) {
msg() << " modified to " << timeslicesNew << " " << trigCpmNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setCpm(trigCpmNew);
@@ -246,7 +246,7 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -317,12 +317,12 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
for (pos = m_cpmBlocks.begin(); pos != m_cpmBlocks.end(); ++pos) {
CpmSubBlock* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CPM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CPM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -405,12 +405,12 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
for (; cos != m_cmmHit0Blocks.end(); ++cos) {
CmmCpSubBlock* const subBlock = *cos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Cp sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -418,12 +418,12 @@ StatusCode CpByteStreamTool::convert(const LVL1::CPBSCollection* const cp,
for (; cos != m_cmmHit1Blocks.end(); ++cos) {
CmmCpSubBlock* const subBlock = *cos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Cp sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -486,7 +486,7 @@ StatusCode CpByteStreamTool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -497,7 +497,7 @@ StatusCode CpByteStreamTool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -506,7 +506,7 @@ StatusCode CpByteStreamTool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -519,7 +519,7 @@ StatusCode CpByteStreamTool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -535,20 +535,20 @@ StatusCode CpByteStreamTool::convertBs(
if (debug) {
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -558,7 +558,7 @@ StatusCode CpByteStreamTool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -567,15 +567,15 @@ StatusCode CpByteStreamTool::convertBs(
int trigCmm = userHeader.cpCmm();
if (debug) {
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "CPM triggered slice offset: " << trigCpm << endreq
- << "CMM triggered slice offset: " << trigCmm << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "CPM triggered slice offset: " << trigCpm << endmsg
+ << "CMM triggered slice offset: " << trigCmm << endmsg;
}
if (trigCpm != trigCmm) {
const int newTrig = (trigCpm > trigCmm) ? trigCpm : trigCmm;
trigCpm = newTrig;
trigCmm = newTrig;
- if (debug) msg() << "Changed both offsets to " << newTrig << endreq;
+ if (debug) msg() << "Changed both offsets to " << newTrig << endmsg;
}
// Loop over sub-blocks
@@ -584,7 +584,7 @@ StatusCode CpByteStreamTool::convertBs(
while (payload != payloadEnd) {
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER) {
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -595,19 +595,19 @@ StatusCode CpByteStreamTool::convertBs(
payload = m_cmmCpSubBlock->read(payload, payloadEnd);
if (m_cmmCpSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_CP_HITS) {
decodeCmmCp(m_cmmCpSubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmCp failed" << endreq;
+ if (debug) msg() << "decodeCmmCp failed" << endmsg;
break;
}
}
} else {
- if (debug) msg() << "Invalid CMM type in module field" << endreq;
+ if (debug) msg() << "Invalid CMM type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -618,14 +618,14 @@ StatusCode CpByteStreamTool::convertBs(
payload = m_cpmSubBlock->read(payload, payloadEnd);
if (m_cpmSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CPM_TOWERS || collection == CPM_HITS) {
decodeCpm(m_cpmSubBlock, trigCpm, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCpm failed" << endreq;
+ if (debug) msg() << "decodeCpm failed" << endmsg;
break;
}
}
@@ -657,18 +657,18 @@ void CpByteStreamTool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -676,7 +676,7 @@ void CpByteStreamTool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-CP sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-CP sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -753,14 +753,14 @@ void CpByteStreamTool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec0.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if ((module == CmmSubBlock::RIGHT && (m_hitsVec0[slice] != 0 ||
m_errVec0[slice] != 0)) || (module == CmmSubBlock::LEFT &&
(m_hitsVec1[slice] != 0 || m_errVec1[slice] != 0))) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -797,23 +797,23 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
msg() << "CPM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (module < 1 || module > m_modules) {
- if (debug) msg() << "Unexpected module number: " << module << endreq;
+ if (debug) msg() << "Unexpected module number: " << module << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
return;
}
if (timeslices <= trigCpm) {
if (debug) msg() << "Triggered CPM slice from header "
<< "inconsistent with number of slices: "
- << trigCpm << ", " << timeslices << endreq;
+ << trigCpm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -821,7 +821,7 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CPM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -893,7 +893,7 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -901,7 +901,7 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
if (m_emVec[slice] != 0 || m_hadVec[slice] != 0 ||
m_emErrVec[slice] != 0 || m_hadErrVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -914,12 +914,12 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
}
} else if (verbose && (em || had || emErr || hadErr)) {
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
} else if (verbose) {
msg(MSG::VERBOSE) << "No CPM tower data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
@@ -945,12 +945,12 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
const int nsl = m_hitsVec0.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec0[slice] != 0 || m_hitsVec1[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -961,7 +961,7 @@ void CpByteStreamTool::decodeCpm(CpmSubBlock* subBlock,
} else if (verbose) {
msg(MSG::VERBOSE) << "No CPM hits data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
index 256aacf7a6d53a3d871a231953a9191c0f97b94f..3e03f75e0de7bdd82a87c0456e2ee1d286a26203 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode CpByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpByteStreamV1Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode CpByteStreamV1Cnv::initialize()
StatusCode CpByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollectionV1* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV1" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV1" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
index cc4fbf6285d777964b4a4876ed853106b59a134d..fba80862490c6c1797c9319f08a7f7719f137578 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
@@ -105,19 +105,19 @@ CpByteStreamV1Tool::~CpByteStreamV1Tool()
StatusCode CpByteStreamV1Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_cpmMaps.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_cpmMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_cpmMaps << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_cpmMaps << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_cpmMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_towerKey = new LVL1::TriggerTowerKey();
@@ -222,7 +222,7 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
: mod/modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of CPM slices and triggered slice offset
// for this slink
@@ -230,19 +230,19 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
timeslices, trigCpm)) {
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
trigCpmNew = ModifySlices::peak(trigCpm, timeslices, timeslicesNew);
if (debug) {
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigCpm;
if (timeslices != timeslicesNew) {
msg() << " modified to " << timeslicesNew << " " << trigCpmNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setCpm(trigCpmNew);
@@ -252,7 +252,7 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -323,12 +323,12 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
for (pos = m_cpmBlocks.begin(); pos != m_cpmBlocks.end(); ++pos) {
CpmSubBlockV1* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CPM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CPM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -411,12 +411,12 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
for (; cos != m_cmmHit0Blocks.end(); ++cos) {
CmmCpSubBlock* const subBlock = *cos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Cp sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -424,12 +424,12 @@ StatusCode CpByteStreamV1Tool::convert(const LVL1::CPBSCollectionV1* const cp,
for (; cos != m_cmmHit1Blocks.end(); ++cos) {
CmmCpSubBlock* const subBlock = *cos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Cp sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Cp sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -492,7 +492,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -503,7 +503,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -512,7 +512,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -525,7 +525,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -541,7 +541,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
if (debug) {
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
@@ -549,19 +549,19 @@ StatusCode CpByteStreamV1Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion > m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -570,7 +570,7 @@ StatusCode CpByteStreamV1Tool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -579,15 +579,15 @@ StatusCode CpByteStreamV1Tool::convertBs(
int trigCmm = userHeader.cpCmm();
if (debug) {
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "CPM triggered slice offset: " << trigCpm << endreq
- << "CMM triggered slice offset: " << trigCmm << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "CPM triggered slice offset: " << trigCpm << endmsg
+ << "CMM triggered slice offset: " << trigCmm << endmsg;
}
if (trigCpm != trigCmm) {
const int newTrig = (trigCpm > trigCmm) ? trigCpm : trigCmm;
trigCpm = newTrig;
trigCmm = newTrig;
- if (debug) msg() << "Changed both offsets to " << newTrig << endreq;
+ if (debug) msg() << "Changed both offsets to " << newTrig << endmsg;
}
// Loop over sub-blocks
@@ -596,12 +596,12 @@ StatusCode CpByteStreamV1Tool::convertBs(
while (payload != payloadEnd) {
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER) {
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
if (L1CaloSubBlock::version(*payload) != 1) { // <<== CHECK
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
break;
}
if (CmmSubBlock::cmmBlock(*payload)) {
@@ -611,19 +611,19 @@ StatusCode CpByteStreamV1Tool::convertBs(
payload = m_cmmCpSubBlock->read(payload, payloadEnd);
if (m_cmmCpSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_CP_HITS) {
decodeCmmCp(m_cmmCpSubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmCp failed" << endreq;
+ if (debug) msg() << "decodeCmmCp failed" << endmsg;
break;
}
}
} else {
- if (debug) msg() << "Invalid CMM type in module field" << endreq;
+ if (debug) msg() << "Invalid CMM type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -633,14 +633,14 @@ StatusCode CpByteStreamV1Tool::convertBs(
payload = m_cpmSubBlock->read(payload, payloadEnd);
if (m_cpmSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CPM_TOWERS || collection == CPM_HITS) {
decodeCpm(m_cpmSubBlock, trigCpm, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCpm failed" << endreq;
+ if (debug) msg() << "decodeCpm failed" << endmsg;
break;
}
}
@@ -672,18 +672,18 @@ void CpByteStreamV1Tool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -691,7 +691,7 @@ void CpByteStreamV1Tool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-CP sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-CP sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -768,14 +768,14 @@ void CpByteStreamV1Tool::decodeCmmCp(CmmCpSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec0.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if ((module == CmmSubBlock::RIGHT && (m_hitsVec0[slice] != 0 ||
m_errVec0[slice] != 0)) || (module == CmmSubBlock::LEFT &&
(m_hitsVec1[slice] != 0 || m_errVec1[slice] != 0))) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -812,23 +812,23 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
msg() << "CPM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (module < 1 || module > m_modules) {
- if (debug) msg() << "Unexpected module number: " << module << endreq;
+ if (debug) msg() << "Unexpected module number: " << module << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
return;
}
if (timeslices <= trigCpm) {
if (debug) msg() << "Triggered CPM slice from header "
<< "inconsistent with number of slices: "
- << trigCpm << ", " << timeslices << endreq;
+ << trigCpm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -836,7 +836,7 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CPM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -908,7 +908,7 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -916,7 +916,7 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
if (m_emVec[slice] != 0 || m_hadVec[slice] != 0 ||
m_emErrVec[slice] != 0 || m_hadErrVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -929,12 +929,12 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
}
} else if (verbose && (em || had || emErr || hadErr)) {
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
} else if (verbose) {
msg(MSG::VERBOSE) << "No CPM tower data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
@@ -960,12 +960,12 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
const int nsl = m_hitsVec0.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec0[slice] != 0 || m_hitsVec1[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -976,7 +976,7 @@ void CpByteStreamV1Tool::decodeCpm(CpmSubBlockV1* subBlock,
} else if (verbose) {
msg(MSG::VERBOSE) << "No CPM hits data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
index d648bf2d3b5b44056fb97dcef9fbc19e6187c8cc..d9977ea8fd79b5eb011f9e337e535fa5ccf720d1 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode CpByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpByteStreamV2Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode CpByteStreamV2Cnv::initialize()
StatusCode CpByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::CPBSCollectionV2* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
- m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV2" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to CPBSCollectionV2" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index 2ecf9a1a0ae258441828f45d72848cd6b16f81bb..637202d9ca80ad1b4d0c457975a91b6b2ae68285 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -108,7 +108,7 @@ CpByteStreamV2Tool::~CpByteStreamV2Tool()
StatusCode CpByteStreamV2Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
CHECK(m_cpmMaps.retrieve());
CHECK(m_errorTool.retrieve());
@@ -255,7 +255,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
if (debug)
{
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of CPM slices and triggered slice offset
// for this slink
@@ -264,7 +264,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
{
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
@@ -272,13 +272,13 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
if (debug)
{
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigCpm;
if (timeslices != timeslicesNew)
{
msg() << " modified to " << timeslicesNew << " " << trigCpmNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setCpm(trigCpmNew);
@@ -288,7 +288,7 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -365,13 +365,13 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
CpmSubBlockV2 *const subBlock = *pos;
if ( !subBlock->pack())
{
- msg(MSG::ERROR) << "CPM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug)
{
msg() << "CPM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -474,13 +474,13 @@ StatusCode CpByteStreamV2Tool::convert(const LVL1::CPBSCollectionV2 *const cp,
{
if ( !subBlock->pack())
{
- msg(MSG::ERROR) << "CMX-Cp sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMX-Cp sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug)
{
msg() << "CMX-Cp sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -558,7 +558,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (*robData != 0)
{
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -568,7 +568,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (!dupCheck.insert(robid).second)
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -582,7 +582,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
payload = payloadBeg;
if (payload == payloadEnd)
{
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -600,7 +600,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
{
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
@@ -610,21 +610,21 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (minorVersion <= m_srcIdMap->minorVersionPreLS1())
{
- if (debug) msg() << "Skipping pre-LS1 data" << endreq;
+ if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug)
{
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) )
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -634,7 +634,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -643,8 +643,8 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (debug)
{
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "Triggered slice offset: " << trigCpm << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "Triggered slice offset: " << trigCpm << endmsg;
}
// Loop over sub-blocks
@@ -654,7 +654,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
{
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER)
{
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -662,7 +662,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
// TODO: (sasha) Comment this check since firmware does not ready
// Select right tool by ROD version
// if (L1CaloSubBlock::version(*payload) == 1) {
- // if (debug) msg() << "Skipping pre-LS1 data" << endreq;
+ // if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
// break;
// }
@@ -676,7 +676,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (m_cmxCpSubBlock->crate() != rodCrate)
{
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -686,14 +686,14 @@ StatusCode CpByteStreamV2Tool::convertBs(
decodeCmxCp(m_cmxCpSubBlock, trigCpm, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE)
{
- if (debug) msg() << "decodeCmxCp failed" << endreq;
+ if (debug) msg() << "decodeCmxCp failed" << endmsg;
break;
}
}
}
else
{
- if (debug) msg() << "Invalid CMX type in module field" << endreq;
+ if (debug) msg() << "Invalid CMX type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -706,7 +706,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
if (m_cpmSubBlock->crate() != rodCrate)
{
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -715,7 +715,7 @@ StatusCode CpByteStreamV2Tool::convertBs(
decodeCpm(m_cpmSubBlock, trigCpm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE)
{
- if (debug) msg() << "decodeCpm failed" << endreq;
+ if (debug) msg() << "decodeCpm failed" << endmsg;
break;
}
}
@@ -751,20 +751,20 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
<< " Summing " << summing
<< " Total slices " << timeslices
<< " Slice " << sliceNum
- << endreq;
+ << endmsg;
}
if (timeslices <= trigCpm)
{
if (debug) msg() << "Triggered slice from header "
<< "inconsistent with number of slices: "
- << trigCpm << ", " << timeslices << endreq;
+ << trigCpm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum)
{
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -774,7 +774,7 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
if (debug)
{
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMX-CP sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMX-CP sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -850,14 +850,14 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
if (timeslices != nsl)
{
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_energyVec[slice] != 0 || m_isolVec[slice] != 0 ||
m_errorVec[slice] != 0)
{
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -926,14 +926,14 @@ void CpByteStreamV2Tool::decodeCmxCp(CmxCpSubBlock *subBlock, int trigCpm,
if (timeslices != nsl)
{
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec0[slice] != 0 || m_hitsVec1[slice] != 0 ||
m_errVec0[slice] != 0 || m_errVec1[slice] != 0)
{
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -968,11 +968,11 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
msg() << "CPM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (module < 1 || module > m_modules)
{
- if (debug) msg() << "Unexpected module number: " << module << endreq;
+ if (debug) msg() << "Unexpected module number: " << module << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
return;
}
@@ -980,14 +980,14 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
{
if (debug) msg() << "Triggered slice from header "
<< "inconsistent with number of slices: "
- << trigCpm << ", " << timeslices << endreq;
+ << trigCpm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum)
{
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -997,7 +997,7 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
if (debug)
{
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CPM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1077,7 +1077,7 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
if (debug)
{
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -1086,7 +1086,7 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
m_emErrVec[slice] != 0 || m_hadErrVec[slice] != 0)
{
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1101,14 +1101,14 @@ void CpByteStreamV2Tool::decodeCpm(CpmSubBlockV2 *subBlock, int trigCpm)
else if (verbose && (em || had || emErr || hadErr))
{
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
}
else if (verbose)
{
msg(MSG::VERBOSE) << "No CPM tower data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
index bda64c7c709588abd6430f647ae2f7e08f364d48..12484e5b3fb6c581631771f44c98b3664f5a788c 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
@@ -61,7 +61,7 @@ StatusCode CpReadByteStreamCnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpReadByteStreamCnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode CpReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode CpReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode CpReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
index 77e3e86da6f54e88e8ee662ac58cca4e45dde8b3..aab3536ec4f9309b38feceb14b8afeed3f95965f 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
@@ -61,7 +61,7 @@ StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
index 2491d3848509220388aabacc3f274a41ffc10066..686fe4a5f6663ccdf199baaf7239c5c97ef83a29 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
@@ -64,7 +64,7 @@ StatusCode CpReadByteStreamV1V2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -73,24 +73,24 @@ StatusCode CpReadByteStreamV1V2Cnv::initialize()
// Retrieve Tools
sc = m_tool1.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endmsg;
sc = m_tool2.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -101,18 +101,18 @@ StatusCode CpReadByteStreamV1V2Cnv::initialize()
StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID1(m_tool1->sourceIDs(nm));
@@ -128,7 +128,7 @@ StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
DataVector<LVL1::CPMTower>* const towerCollection = new DataVector<LVL1::CPMTower>;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags1.size()
- << ", " << robFrags2.size() << endreq;
+ << ", " << robFrags2.size() << endmsg;
}
if (robFrags1.size() == 0 && robFrags2.size() == 0) {
pObj = SG::asStorable(towerCollection) ;
@@ -139,7 +139,7 @@ StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
if (robFrags1.size() > 0) {
StatusCode sc = m_tool1->convert(robFrags1, towerCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete towerCollection;
return sc;
}
@@ -148,7 +148,7 @@ StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
if (robFrags2.size() > 0) {
StatusCode sc = m_tool2->convert(robFrags2, towerCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete towerCollection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
index 26bff4683e7900b4395cbabdae19222c6cc54413..bc3b6868a128cf8ea767aba10dfaa97f3db4c9c9 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
@@ -61,7 +61,7 @@ StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
index 1140456502851439804b89b20b58f7407139fdcb..ec671a68ddd53d1e63bcf35bf862d7f5de0832a5 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
@@ -63,7 +63,7 @@ StatusCode CpmRoiByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -73,30 +73,30 @@ StatusCode CpmRoiByteStreamCnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -107,18 +107,18 @@ StatusCode CpmRoiByteStreamCnv::initialize()
StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -131,7 +131,7 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataVector<LVL1::CPMRoI>* const roiCollection = new DataVector<LVL1::CPMRoI>;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(roiCollection) ;
@@ -140,7 +140,7 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, roiCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete roiCollection;
return sc;
}
@@ -155,13 +155,13 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
index 5b3e8a77e7cdb1d61a5c376088497abdee8c8de7..165bbb8c1dfb027f910e1899ff6fbef31f63a65e 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
@@ -82,13 +82,13 @@ CpmRoiByteStreamTool::~CpmRoiByteStreamTool()
StatusCode CpmRoiByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_CLUSTER_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -129,7 +129,7 @@ StatusCode CpmRoiByteStreamTool::convert(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -140,7 +140,7 @@ StatusCode CpmRoiByteStreamTool::convert(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -149,7 +149,7 @@ StatusCode CpmRoiByteStreamTool::convert(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -162,7 +162,7 @@ StatusCode CpmRoiByteStreamTool::convert(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -177,14 +177,14 @@ StatusCode CpmRoiByteStreamTool::convert(
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug) {
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -196,7 +196,7 @@ StatusCode CpmRoiByteStreamTool::convert(
if (headerWords != 1 ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -212,13 +212,13 @@ StatusCode CpmRoiByteStreamTool::convert(
payload = m_subBlock->read(payload, payloadEnd);
if (debug) {
msg() << "CPM RoI sub-block: Crate " << m_subBlock->crate()
- << " Module " << m_subBlock->module() << endreq;
+ << " Module " << m_subBlock->module() << endmsg;
}
// Unpack sub-block
if (m_subBlock->dataWords() && !m_subBlock->unpack()) {
if (debug) {
std::string errMsg(m_subBlock->unpackErrorMsg());
- msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -239,13 +239,13 @@ StatusCode CpmRoiByteStreamTool::convert(
if (roi.setRoiWord(*payload)) {
if (roi.crate() != rodCrate - m_crateOffsetHw) {
if (debug) msg() << "Inconsistent RoI crate number: "
- << roi.crate() << endreq;
+ << roi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (roi.cpm() == 0 || roi.cpm() > m_modules) {
if (debug) msg() << "Invalid CPM number: "
- << roi.cpm() << endreq;
+ << roi.cpm() << endmsg;
rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -256,13 +256,13 @@ StatusCode CpmRoiByteStreamTool::convert(
}
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
} else {
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
@@ -321,9 +321,9 @@ StatusCode CpmRoiByteStreamTool::convert(
: mod/modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdCpm = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -334,7 +334,7 @@ StatusCode CpmRoiByteStreamTool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block (Neutral format only)
@@ -361,12 +361,12 @@ StatusCode CpmRoiByteStreamTool::convert(
if (neutralFormat) {
if ( !m_subBlock->pack()) {
- msg(MSG::ERROR) << "CPMRoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPMRoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CPMRoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
index 840c9e913ffebbebb674a82e8533c4f1127ad887..460d393bdc7b5b2810ee3cdebb3d071947e09616 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
@@ -63,7 +63,7 @@ StatusCode CpmRoiByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -73,30 +73,30 @@ StatusCode CpmRoiByteStreamV1Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -107,18 +107,18 @@ StatusCode CpmRoiByteStreamV1Cnv::initialize()
StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -131,7 +131,7 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataVector<LVL1::CPMRoI>* const roiCollection = new DataVector<LVL1::CPMRoI>;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(roiCollection) ;
@@ -140,7 +140,7 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, roiCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete roiCollection;
return sc;
}
@@ -155,13 +155,13 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to DataVector<CPMRoI>" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
index 3f6d4851491a7fc27f4205c78e7f7c9dcb2cea46..17f8a15f775ddc5d0961aa6728efd10844064915 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
@@ -88,13 +88,13 @@ CpmRoiByteStreamV1Tool::~CpmRoiByteStreamV1Tool()
StatusCode CpmRoiByteStreamV1Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_CLUSTER_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -135,7 +135,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -146,7 +146,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -155,7 +155,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -168,7 +168,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -183,7 +183,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug) {
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
@@ -191,13 +191,13 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion > m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -208,7 +208,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
if (headerWords != 1 ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -224,13 +224,13 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
payload = m_subBlock->read(payload, payloadEnd);
if (debug) {
msg() << "CPM RoI sub-block: Crate " << m_subBlock->crate()
- << " Module " << m_subBlock->module() << endreq;
+ << " Module " << m_subBlock->module() << endmsg;
}
// Unpack sub-block
if (m_subBlock->dataWords() && !m_subBlock->unpack()) {
if (debug) {
std::string errMsg(m_subBlock->unpackErrorMsg());
- msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -251,13 +251,13 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
if (roi.setRoiWord(*payload)) {
if (roi.crate() != rodCrate - m_crateOffsetHw) {
if (debug) msg() << "Inconsistent RoI crate number: "
- << roi.crate() << endreq;
+ << roi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (roi.cpm() == 0 || roi.cpm() > m_modules) {
if (debug) msg() << "Invalid CPM number: "
- << roi.cpm() << endreq;
+ << roi.cpm() << endmsg;
rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -268,13 +268,13 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
}
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
} else {
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
@@ -333,9 +333,9 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
: mod/modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdCpm = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -346,7 +346,7 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block (Neutral format only)
@@ -373,12 +373,12 @@ StatusCode CpmRoiByteStreamV1Tool::convert(
if (neutralFormat) {
if ( !m_subBlock->pack()) {
- msg(MSG::ERROR) << "CPMRoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPMRoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CPMRoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
index 1488112b394b1213625d5d4fd9aeee994ec2f714..0188cfa148f1e7b0e5898dfb50c799d40250840c 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
@@ -63,7 +63,7 @@ StatusCode CpmRoiByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -73,30 +73,30 @@ StatusCode CpmRoiByteStreamV2Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -107,18 +107,18 @@ StatusCode CpmRoiByteStreamV2Cnv::initialize()
StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -131,7 +131,7 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
DataVector<LVL1::CPMTobRoI>* const roiCollection = new DataVector<LVL1::CPMTobRoI>;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(roiCollection) ;
@@ -140,7 +140,7 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, roiCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete roiCollection;
return sc;
}
@@ -155,13 +155,13 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode CpmRoiByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::CPMTobRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<CPMTobRoI>" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to DataVector<CPMTobRoI>" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
index 71891d0d5dfe86a0faa56cc3286a5af28202527c..3acc6eea1936883aa2d0d7fdcc0d27e833fefe40 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
@@ -93,15 +93,15 @@ CpmRoiByteStreamV2Tool::~CpmRoiByteStreamV2Tool()
StatusCode CpmRoiByteStreamV2Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure())
{
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
}
- else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_CLUSTER_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -156,7 +156,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (debug)
{
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -169,7 +169,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (*robData != 0)
{
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -179,7 +179,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (!dupCheck.insert(robid).second)
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -193,7 +193,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
payload = payloadBeg;
if (payload == payloadEnd)
{
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -210,7 +210,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (debug)
{
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
@@ -219,14 +219,14 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion <= m_srcIdMap->minorVersionPreLS1())
{
- if (debug) msg() << "Skipping pre-LS1 data" << endreq;
+ if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug)
{
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -239,7 +239,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -258,7 +258,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (debug)
{
msg() << "CPM RoI sub-block: Crate " << m_subBlock->crate()
- << " Module " << m_subBlock->module() << endreq;
+ << " Module " << m_subBlock->module() << endmsg;
}
// Unpack sub-block
if (m_subBlock->dataWords() && !m_subBlock->unpack())
@@ -266,7 +266,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (debug)
{
std::string errMsg(m_subBlock->unpackErrorMsg());
- msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CPM RoI sub-block unpacking failed: " << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -302,14 +302,14 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (roi.crate() != rodCrate - m_crateOffsetHw)
{
if (debug) msg() << "Inconsistent RoI crate number: "
- << roi.crate() << endreq;
+ << roi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (roi.cpm() == 0 || roi.cpm() > m_modules)
{
if (debug) msg() << "Invalid CPM number: "
- << roi.cpm() << endreq;
+ << roi.cpm() << endmsg;
rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -324,7 +324,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
else
{
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << roiWord << MSG::dec << endreq;
+ << MSG::hex << roiWord << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
@@ -332,7 +332,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
else
{
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << roiWord << MSG::dec << endreq;
+ << MSG::hex << roiWord << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
@@ -344,7 +344,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
}
if (debug)
{
- msg() << "Number of RoIs read = " << roiCollection->size() << endreq;
+ msg() << "Number of RoIs read = " << roiCollection->size() << endmsg;
}
return StatusCode::SUCCESS;
@@ -377,7 +377,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
{
msg() << "Number of RoIs to be written = " << roiCollection->size()
<< " (collection), " << m_roiMap.size() << " (map)"
- << endreq;
+ << endmsg;
}
int count = 0;
CpmRoiMap::const_iterator mapIter = m_roiMap.begin();
@@ -406,9 +406,9 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
if (debug)
{
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdCpm = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -420,7 +420,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdCpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block (Neutral format only)
@@ -453,13 +453,13 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
{
if ( !m_subBlock->pack())
{
- msg(MSG::ERROR) << "CPMTobRoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CPMTobRoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug)
{
msg() << "CPMTobRoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
@@ -467,7 +467,7 @@ StatusCode CpmRoiByteStreamV2Tool::convert(
}
if (debug)
{
- msg() << "Number of RoIs written = " << count << endreq;
+ msg() << "Number of RoIs written = " << count << endmsg;
}
// Fill the raw event
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
index 90cf6a9b2ac1843478d30b69de091fe7b56b1939..aeb8659d0cd78bb4bfc673b7d50fb5e88f0b9cde 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepByteStreamCnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepByteStreamCnv::initialize()
StatusCode JepByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollection* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollection" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPBSCollection" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
index e4683ec4aeec8856814a782df098a87d710a4323..71eb74a82a00b04b7bd010433044afdc47c32639 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
@@ -104,19 +104,19 @@ JepByteStreamTool::~JepByteStreamTool()
StatusCode JepByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_jemMaps.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_elementKey = new LVL1::JetElementKey();
@@ -244,7 +244,7 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
const int slink = module / modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of JEM slices and triggered slice offset
// for this slink
@@ -252,19 +252,19 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
timeslices, trigJem)) {
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
trigJemNew = ModifySlices::peak(trigJem, timeslices, timeslicesNew);
if (debug) {
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigJem;
if (timeslices != timeslicesNew) {
msg() << " modified to " << timeslicesNew << " " << trigJemNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setJem(trigJemNew);
@@ -274,7 +274,7 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -355,12 +355,12 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
for (pos = m_jemBlocks.begin(); pos != m_jemBlocks.end(); ++pos) {
JemSubBlock* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "JEM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -467,12 +467,12 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
for (; pos != m_cmmEnergyBlocks.end(); ++pos) {
CmmEnergySubBlock* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Energy sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -535,12 +535,12 @@ StatusCode JepByteStreamTool::convert(const LVL1::JEPBSCollection* const jep,
for (; jos != m_cmmJetBlocks.end(); ++jos) {
CmmJetSubBlock* const subBlock = *jos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Jet sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -603,7 +603,7 @@ StatusCode JepByteStreamTool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -614,7 +614,7 @@ StatusCode JepByteStreamTool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -623,7 +623,7 @@ StatusCode JepByteStreamTool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -636,7 +636,7 @@ StatusCode JepByteStreamTool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -652,20 +652,20 @@ StatusCode JepByteStreamTool::convertBs(
if (debug) {
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -675,7 +675,7 @@ StatusCode JepByteStreamTool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -684,15 +684,15 @@ StatusCode JepByteStreamTool::convertBs(
int trigCmm = userHeader.jepCmm();
if (debug) {
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "JEM triggered slice offset: " << trigJem << endreq
- << "CMM triggered slice offset: " << trigCmm << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "JEM triggered slice offset: " << trigJem << endmsg
+ << "CMM triggered slice offset: " << trigCmm << endmsg;
}
if (trigJem != trigCmm) {
const int newTrig = (trigJem > trigCmm) ? trigJem : trigCmm;
trigJem = newTrig;
trigCmm = newTrig;
- if (debug) msg() << "Changed both offsets to " << newTrig << endreq;
+ if (debug) msg() << "Changed both offsets to " << newTrig << endmsg;
}
// Loop over sub-blocks
@@ -701,7 +701,7 @@ StatusCode JepByteStreamTool::convertBs(
while (payload != payloadEnd) {
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER) {
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -712,14 +712,14 @@ StatusCode JepByteStreamTool::convertBs(
payload = m_cmmJetSubBlock->read(payload, payloadEnd);
if (m_cmmJetSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_HITS) {
decodeCmmJet(m_cmmJetSubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmJet failed" << endreq;
+ if (debug) msg() << "decodeCmmJet failed" << endmsg;
break;
}
}
@@ -728,19 +728,19 @@ StatusCode JepByteStreamTool::convertBs(
payload = m_cmmEnergySubBlock->read(payload, payloadEnd);
if (m_cmmEnergySubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_SUMS) {
decodeCmmEnergy(m_cmmEnergySubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmEnergy failed" << endreq;
+ if (debug) msg() << "decodeCmmEnergy failed" << endmsg;
break;
}
}
} else {
- if (debug) msg() << "Invalid CMM type in module field" << endreq;
+ if (debug) msg() << "Invalid CMM type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -750,7 +750,7 @@ StatusCode JepByteStreamTool::convertBs(
payload = m_jemSubBlock->read(payload, payloadEnd);
if (m_jemSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -758,7 +758,7 @@ StatusCode JepByteStreamTool::convertBs(
collection == ENERGY_SUMS) {
decodeJem(m_jemSubBlock, trigJem, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeJem failed" << endreq;
+ if (debug) msg() << "decodeJem failed" << endmsg;
break;
}
}
@@ -791,18 +791,18 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -810,7 +810,7 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-Energy sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-Energy sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -912,14 +912,14 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_exVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_exVec[slice] != 0 || m_eyVec[slice] != 0 || m_etVec[slice] != 0 ||
m_exErrVec[slice] != 0 || m_eyErrVec[slice] != 0 ||
m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -960,12 +960,12 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -997,12 +997,12 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1035,13 +1035,13 @@ void JepByteStreamTool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1078,18 +1078,18 @@ void JepByteStreamTool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1097,7 +1097,7 @@ void JepByteStreamTool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-Jet sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-Jet sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1169,12 +1169,12 @@ void JepByteStreamTool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0 || m_errVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1207,12 +1207,12 @@ void JepByteStreamTool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0 || m_errVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1244,18 +1244,18 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
msg() << "JEM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigJem) {
if (debug) msg() << "Triggered JEM slice from header "
<< "inconsistent with number of slices: "
- << trigJem << ", " << timeslices << endreq;
+ << trigJem << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1263,7 +1263,7 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "JEM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "JEM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1310,7 +1310,7 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -1318,7 +1318,7 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
if (emEnergy[slice] != 0 || hadEnergy[slice] != 0 ||
emError[slice] != 0 || hadError[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1336,12 +1336,12 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
}
} else if (verbose && jetEle.data()) {
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
} else if (verbose) {
msg(MSG::VERBOSE) << "No jet element data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
@@ -1364,14 +1364,14 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1381,7 +1381,7 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
} else if (verbose) {
msg(MSG::VERBOSE) << "No jet hits data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
} else if (collection == ENERGY_SUMS) {
@@ -1412,14 +1412,14 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_exVec[slice] != 0 || m_eyVec[slice] != 0 || m_etVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1433,7 +1433,7 @@ void JepByteStreamTool::decodeJem(JemSubBlock* subBlock, int trigJem,
} else if (verbose) {
msg(MSG::VERBOSE) << "No energy sums data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
index 338d7784d7d51a1e739123eb2d04d1506b5ce1f5..5a92f4767aa98723566f1a48730724de510fc8c7 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepByteStreamV1Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepByteStreamV1Cnv::initialize()
StatusCode JepByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollectionV1* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV1" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV1" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
index 989b65a2767e5f557aba1fa9153cceb2b41395fe..80f60a2fd29fab5ddfabe404d18eb15dcc757a1a 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
@@ -110,19 +110,19 @@ JepByteStreamV1Tool::~JepByteStreamV1Tool()
StatusCode JepByteStreamV1Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_jemMaps.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_elementKey = new LVL1::JetElementKey();
@@ -250,7 +250,7 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
const int slink = module / modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of JEM slices and triggered slice offset
// for this slink
@@ -258,19 +258,19 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
timeslices, trigJem)) {
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
trigJemNew = ModifySlices::peak(trigJem, timeslices, timeslicesNew);
if (debug) {
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigJem;
if (timeslices != timeslicesNew) {
msg() << " modified to " << timeslicesNew << " " << trigJemNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setJem(trigJemNew);
@@ -280,7 +280,7 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -361,12 +361,12 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
for (pos = m_jemBlocks.begin(); pos != m_jemBlocks.end(); ++pos) {
JemSubBlockV1* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "JEM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -473,12 +473,12 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
for (; pos != m_cmmEnergyBlocks.end(); ++pos) {
CmmEnergySubBlock* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Energy sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -544,12 +544,12 @@ StatusCode JepByteStreamV1Tool::convert(const LVL1::JEPBSCollectionV1* const jep
for (; jos != m_cmmJetBlocks.end(); ++jos) {
CmmJetSubBlock* const subBlock = *jos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Jet sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -612,7 +612,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -623,7 +623,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -632,7 +632,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -645,7 +645,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -661,7 +661,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
if (debug) {
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
@@ -669,19 +669,19 @@ StatusCode JepByteStreamV1Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion > m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -690,7 +690,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -699,15 +699,15 @@ StatusCode JepByteStreamV1Tool::convertBs(
int trigCmm = userHeader.jepCmm();
if (debug) {
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "JEM triggered slice offset: " << trigJem << endreq
- << "CMM triggered slice offset: " << trigCmm << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "JEM triggered slice offset: " << trigJem << endmsg
+ << "CMM triggered slice offset: " << trigCmm << endmsg;
}
if (trigJem != trigCmm) {
const int newTrig = (trigJem > trigCmm) ? trigJem : trigCmm;
trigJem = newTrig;
trigCmm = newTrig;
- if (debug) msg() << "Changed both offsets to " << newTrig << endreq;
+ if (debug) msg() << "Changed both offsets to " << newTrig << endmsg;
}
// Loop over sub-blocks
@@ -716,7 +716,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
while (payload != payloadEnd) {
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER) {
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -727,14 +727,14 @@ StatusCode JepByteStreamV1Tool::convertBs(
payload = m_cmmJetSubBlock->read(payload, payloadEnd);
if (m_cmmJetSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_HITS) {
decodeCmmJet(m_cmmJetSubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmJet failed" << endreq;
+ if (debug) msg() << "decodeCmmJet failed" << endmsg;
break;
}
}
@@ -743,19 +743,19 @@ StatusCode JepByteStreamV1Tool::convertBs(
payload = m_cmmEnergySubBlock->read(payload, payloadEnd);
if (m_cmmEnergySubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMM_SUMS) {
decodeCmmEnergy(m_cmmEnergySubBlock, trigCmm);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmmEnergy failed" << endreq;
+ if (debug) msg() << "decodeCmmEnergy failed" << endmsg;
break;
}
}
} else {
- if (debug) msg() << "Invalid CMM type in module field" << endreq;
+ if (debug) msg() << "Invalid CMM type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -765,7 +765,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
payload = m_jemSubBlock->read(payload, payloadEnd);
if (m_jemSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -773,7 +773,7 @@ StatusCode JepByteStreamV1Tool::convertBs(
collection == ENERGY_SUMS) {
decodeJem(m_jemSubBlock, trigJem, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeJem failed" << endreq;
+ if (debug) msg() << "decodeJem failed" << endmsg;
break;
}
}
@@ -806,18 +806,18 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -825,7 +825,7 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-Energy sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-Energy sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -921,14 +921,14 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_exVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_exVec[slice] != 0 || m_eyVec[slice] != 0 || m_etVec[slice] != 0 ||
m_exErrVec[slice] != 0 || m_eyErrVec[slice] != 0 ||
m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -969,12 +969,12 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1006,12 +1006,12 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1044,13 +1044,13 @@ void JepByteStreamV1Tool::decodeCmmEnergy(CmmEnergySubBlock* subBlock,
const int nsl = m_etVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_etVec[slice] != 0 || m_etErrVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1087,18 +1087,18 @@ void JepByteStreamV1Tool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigCmm) {
if (debug) msg() << "Triggered CMM slice from header "
<< "inconsistent with number of slices: "
- << trigCmm << ", " << timeslices << endreq;
+ << trigCmm << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1106,7 +1106,7 @@ void JepByteStreamV1Tool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMM-Jet sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMM-Jet sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1181,12 +1181,12 @@ void JepByteStreamV1Tool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0 || m_errVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1219,12 +1219,12 @@ void JepByteStreamV1Tool::decodeCmmJet(CmmJetSubBlock* subBlock, int trigCmm)
const int nsl = m_hitsVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0 || m_errVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1256,18 +1256,18 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
msg() << "JEM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigJem) {
if (debug) msg() << "Triggered JEM slice from header "
<< "inconsistent with number of slices: "
- << trigJem << ", " << timeslices << endreq;
+ << trigJem << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1275,7 +1275,7 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "JEM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "JEM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1322,7 +1322,7 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -1330,7 +1330,7 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
if (emEnergy[slice] != 0 || hadEnergy[slice] != 0 ||
emError[slice] != 0 || hadError[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1348,12 +1348,12 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
}
} else if (verbose && jetEle.data()) {
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
} else if (verbose) {
msg(MSG::VERBOSE) << "No jet element data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
@@ -1376,14 +1376,14 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_hitsVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1393,7 +1393,7 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
} else if (verbose) {
msg(MSG::VERBOSE) << "No jet hits data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
} else if (collection == ENERGY_SUMS) {
@@ -1424,14 +1424,14 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (m_exVec[slice] != 0 || m_eyVec[slice] != 0 || m_etVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1445,7 +1445,7 @@ void JepByteStreamV1Tool::decodeJem(JemSubBlockV1* subBlock, int trigJem,
} else if (verbose) {
msg(MSG::VERBOSE) << "No energy sums data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
index ce5a90a2cac0f0a7fb4013e8db985960510cd8b6..78ad5a286e227e91c767bafdab299c2e5b13fbcf 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepByteStreamV2Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepByteStreamV2Cnv::initialize()
StatusCode JepByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPBSCollectionV2* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV2" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPBSCollectionV2" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
index 0b57a560ba5c021a22a536a2336606857dc2bdb7..32a045b365109f54704efbea075ea75589b754fe 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
@@ -112,19 +112,19 @@ JepByteStreamV2Tool::~JepByteStreamV2Tool()
StatusCode JepByteStreamV2Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_jemMaps.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_jemMaps << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_jemMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_elementKey = new LVL1::JetElementKey();
@@ -309,7 +309,7 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
const int slink = module/modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq;
+ << " slink " << slink << endmsg;
}
// Get number of JEM slices and triggered slice offset
// for this slink
@@ -317,19 +317,19 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
timeslices, trigJem)) {
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << hwCrate << " slink " << slink << endreq;
+ << hwCrate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
timeslicesNew = (m_forceSlices) ? m_forceSlices : timeslices;
trigJemNew = ModifySlices::peak(trigJem, timeslices, timeslicesNew);
if (debug) {
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "Slices/offset: " << timeslices << " " << trigJem;
if (timeslices != timeslicesNew) {
msg() << " modified to " << timeslicesNew << " " << trigJemNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setJem(trigJemNew);
@@ -339,7 +339,7 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Create a sub-block for each slice (except Neutral format)
@@ -423,12 +423,12 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
for (pos = m_jemBlocks.begin(); pos != m_jemBlocks.end(); ++pos) {
JemSubBlockV2* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "JEM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -519,12 +519,12 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
for (; pos != m_cmxEnergyBlocks.end(); ++pos) {
CmxEnergySubBlock* const subBlock = *pos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMX-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMX-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMX-Energy sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -615,12 +615,12 @@ StatusCode JepByteStreamV2Tool::convert(const LVL1::JEPBSCollectionV2* const jep
for (; jos != m_cmxJetBlocks.end(); ++jos) {
CmxJetSubBlock* const subBlock = *jos;
if ( !subBlock->pack()) {
- msg(MSG::ERROR) << "CMX-Jet sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMX-Jet sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMX-Jet sub-block data words: "
- << subBlock->dataWords() << endreq;
+ << subBlock->dataWords() << endmsg;
}
subBlock->write(theROD);
}
@@ -683,7 +683,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -694,7 +694,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -703,7 +703,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -716,7 +716,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -732,7 +732,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
if (debug) {
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
@@ -740,19 +740,19 @@ StatusCode JepByteStreamV2Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion <= m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping pre-LS1 data" << endreq;
+ if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) ) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -761,7 +761,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -769,8 +769,8 @@ StatusCode JepByteStreamV2Tool::convertBs(
int trigJem = userHeader.jem();
if (debug) {
msg() << "Minor format version number: " << MSG::hex
- << minorVersion << MSG::dec << endreq
- << "JEM triggered slice offset: " << trigJem << endreq;
+ << minorVersion << MSG::dec << endmsg
+ << "JEM triggered slice offset: " << trigJem << endmsg;
}
// Loop over sub-blocks
@@ -779,7 +779,7 @@ StatusCode JepByteStreamV2Tool::convertBs(
while (payload != payloadEnd) {
if (L1CaloSubBlock::wordType(*payload) != L1CaloSubBlock::HEADER) {
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -790,14 +790,14 @@ StatusCode JepByteStreamV2Tool::convertBs(
payload = m_cmxJetSubBlock->read(payload, payloadEnd);
if (m_cmxJetSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMX_HITS || collection == CMX_TOBS) {
decodeCmxJet(m_cmxJetSubBlock, trigJem, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmxJet failed" << endreq;
+ if (debug) msg() << "decodeCmxJet failed" << endmsg;
break;
}
}
@@ -806,19 +806,19 @@ StatusCode JepByteStreamV2Tool::convertBs(
payload = m_cmxEnergySubBlock->read(payload, payloadEnd);
if (m_cmxEnergySubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == CMX_SUMS) {
decodeCmxEnergy(m_cmxEnergySubBlock, trigJem);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeCmxEnergy failed" << endreq;
+ if (debug) msg() << "decodeCmxEnergy failed" << endmsg;
break;
}
}
} else {
- if (debug) msg() << "Invalid CMX type in module field" << endreq;
+ if (debug) msg() << "Invalid CMX type in module field" << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -828,14 +828,14 @@ StatusCode JepByteStreamV2Tool::convertBs(
payload = m_jemSubBlock->read(payload, payloadEnd);
if (m_jemSubBlock->crate() != rodCrate) {
if (debug) msg() << "Inconsistent crate number in ROD source ID"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (collection == JET_ELEMENTS || collection == ENERGY_SUMS) {
decodeJem(m_jemSubBlock, trigJem, collection);
if (m_rodErr != L1CaloSubBlock::ERROR_NONE) {
- if (debug) msg() << "decodeJem failed" << endreq;
+ if (debug) msg() << "decodeJem failed" << endmsg;
break;
}
}
@@ -868,18 +868,18 @@ void JepByteStreamV2Tool::decodeCmxEnergy(CmxEnergySubBlock* subBlock,
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigJem) {
if (debug) msg() << "Triggered CMX slice from header "
<< "inconsistent with number of slices: "
- << trigJem << ", " << timeslices << endreq;
+ << trigJem << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -887,7 +887,7 @@ void JepByteStreamV2Tool::decodeCmxEnergy(CmxEnergySubBlock* subBlock,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMX-Energy sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMX-Energy sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -999,14 +999,14 @@ void JepByteStreamV2Tool::decodeCmxEnergy(CmxEnergySubBlock* subBlock,
const int nsl = exVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (exVec[slice] != 0 || eyVec[slice] != 0 || etVec[slice] != 0 ||
exErrVec[slice] != 0 || eyErrVec[slice] != 0 ||
etErrVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1047,18 +1047,18 @@ void JepByteStreamV2Tool::decodeCmxJet(CmxJetSubBlock* subBlock, int trigJem,
<< " Firmware " << firmware
<< " Summing " << summing
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigJem) {
if (debug) msg() << "Triggered CMX slice from header "
<< "inconsistent with number of slices: "
- << trigJem << ", " << timeslices << endreq;
+ << trigJem << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1066,7 +1066,7 @@ void JepByteStreamV2Tool::decodeCmxJet(CmxJetSubBlock* subBlock, int trigJem,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "CMX-Jet sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "CMX-Jet sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1142,13 +1142,13 @@ void JepByteStreamV2Tool::decodeCmxJet(CmxJetSubBlock* subBlock, int trigJem,
const int nsl = energyLgVec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (energyLgVec[slice] != 0 || energySmVec[slice] != 0 ||
errorVec[slice] != 0 || presenceMapVec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1210,13 +1210,13 @@ void JepByteStreamV2Tool::decodeCmxJet(CmxJetSubBlock* subBlock, int trigJem,
const int nsl = hit0Vec.size();
if (timeslices != nsl) {
if (debug) msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (hit0Vec[slice] != 0 || hit1Vec[slice] != 0 ||
err0Vec[slice] != 0 || err1Vec[slice] != 0) {
- if (debug) msg() << "Duplicate data for slice " << slice << endreq;
+ if (debug) msg() << "Duplicate data for slice " << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1251,18 +1251,18 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
msg() << "JEM: Crate " << hwCrate
<< " Module " << module
<< " Total slices " << timeslices
- << " Slice " << sliceNum << endreq;
+ << " Slice " << sliceNum << endmsg;
}
if (timeslices <= trigJem) {
if (debug) msg() << "Triggered JEM slice from header "
<< "inconsistent with number of slices: "
- << trigJem << ", " << timeslices << endreq;
+ << trigJem << ", " << timeslices << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (timeslices <= sliceNum) {
if (debug) msg() << "Total slices inconsistent with slice number: "
- << timeslices << ", " << sliceNum << endreq;
+ << timeslices << ", " << sliceNum << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
@@ -1270,7 +1270,7 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
if (subBlock->dataWords() && !subBlock->unpack()) {
if (debug) {
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "JEM sub-block unpacking failed: " << errMsg << endreq;
+ msg() << "JEM sub-block unpacking failed: " << errMsg << endmsg;
}
m_rodErr = subBlock->unpackErrorCode();
return;
@@ -1320,7 +1320,7 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
@@ -1328,7 +1328,7 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
if (emEnergy[slice] != 0 || hadEnergy[slice] != 0 ||
emError[slice] != 0 || hadError[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1346,12 +1346,12 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
}
} else if (verbose && jetEle.data()) {
msg(MSG::VERBOSE) << "Non-zero data but no channel mapping for channel "
- << chan << endreq;
+ << chan << endmsg;
msg(MSG::DEBUG);
}
} else if (verbose) {
msg(MSG::VERBOSE) << "No jet element data for channel "
- << chan << " slice " << slice << endreq;
+ << chan << " slice " << slice << endmsg;
msg(MSG::DEBUG);
}
}
@@ -1383,14 +1383,14 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
if (timeslices != nsl) {
if (debug) {
msg() << "Inconsistent number of slices in sub-blocks"
- << endreq;
+ << endmsg;
}
m_rodErr = L1CaloSubBlock::ERROR_SLICES;
return;
}
if (exVec[slice] != 0 || eyVec[slice] != 0 || etVec[slice] != 0) {
if (debug) msg() << "Duplicate data for slice "
- << slice << endreq;
+ << slice << endmsg;
m_rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
return;
}
@@ -1404,7 +1404,7 @@ void JepByteStreamV2Tool::decodeJem(JemSubBlockV2* subBlock, int trigJem,
} else if (verbose) {
msg(MSG::VERBOSE) << "No energy sums data for crate/module/slice "
<< hwCrate << "/" << module << "/" << slice
- << endreq;
+ << endmsg;
msg(MSG::DEBUG);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
index 57cc50e057958db59307b50932e29ccb4ccbe7ba..2c6b1498e91a03794214e15ab369e914af66be6f 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
@@ -61,7 +61,7 @@ StatusCode JepReadByteStreamCnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepReadByteStreamCnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode JepReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode JepReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode JepReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
index 51d5adedbd19e2dbf6a0cb6c7cc5be0caada5f27..f95c302c3d42b3d18cfc03ca0b5a4cadcf959963 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
@@ -61,7 +61,7 @@ StatusCode JepReadByteStreamV1Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepReadByteStreamV1Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode JepReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode JepReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode JepReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
index 29f7c2b464f91ae875a154a02e826131f5ed7515..6c77a60df6076ba906d75860f67cd4079e63cfe1 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
@@ -65,7 +65,7 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -74,24 +74,24 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::initialize()
// Retrieve Tools
sc = m_tool1.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool1 << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool1 << endmsg;
sc = m_tool2.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool2 << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool2 << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -103,18 +103,18 @@ template <typename Container>
StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID1(m_tool1->sourceIDs(nm));
@@ -130,7 +130,7 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags1.size()
- << ", " << robFrags2.size() << endreq;
+ << ", " << robFrags2.size() << endmsg;
}
if (robFrags1.size() == 0 && robFrags2.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -141,7 +141,7 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr
if (robFrags1.size() > 0) {
StatusCode sc = m_tool1->convert(robFrags1, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
@@ -150,7 +150,7 @@ StatusCode JepReadByteStreamV1V2Cnv<Container>::createObj( IOpaqueAddress* pAddr
if (robFrags2.size() > 0) {
StatusCode sc = m_tool2->convert(robFrags2, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
index 9aad45c04c12c1cb376acbb929f0b65536b98fe5..c369996bd292bea997c0c5e9b92fc5a983d029a5 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
@@ -61,7 +61,7 @@ StatusCode JepReadByteStreamV2Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepReadByteStreamV2Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -94,18 +94,18 @@ template <typename Container>
StatusCode JepReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -118,7 +118,7 @@ StatusCode JepReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -127,7 +127,7 @@ StatusCode JepReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
index a643f5545dc4b84167d142467691e799c7eac72e..e87657d8be7cf2a7c945b74c1976c6af408fa5e7 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepRoiByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepRoiByteStreamCnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepRoiByteStreamCnv::initialize()
StatusCode JepRoiByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollection* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollection" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollection" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
index 92a12acdac2d2685153de5e6370ee0d86e0bb12a..fb386842986ab2bcbde7465b1abad58d92abd794 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
@@ -90,13 +90,13 @@ JepRoiByteStreamTool::~JepRoiByteStreamTool()
StatusCode JepRoiByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_JET_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -183,9 +183,9 @@ StatusCode JepRoiByteStreamTool::convert(
const int slink = module / modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdJem = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -196,7 +196,7 @@ StatusCode JepRoiByteStreamTool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "JEM Module " << module << endreq;
+ if (debug) msg() << "JEM Module " << module << endmsg;
if (!theROD) break; // for coverity, shouldn't happen
// Create a sub-block (Neutral format only)
@@ -224,12 +224,12 @@ StatusCode JepRoiByteStreamTool::convert(
if (neutralFormat) {
if ( !m_subBlock->pack()) {
- msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM RoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
@@ -298,12 +298,12 @@ StatusCode JepRoiByteStreamTool::convert(
}
}
if ( !enBlock.pack()) {
- msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Energy sub-block data words: "
- << enBlock.dataWords() << endreq;
+ << enBlock.dataWords() << endmsg;
}
enBlock.write(theROD);
@@ -357,12 +357,12 @@ StatusCode JepRoiByteStreamTool::convert(
}
}
if ( !jetBlock.pack()) {
- msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Jet sub-block data words: "
- << jetBlock.dataWords() << endreq;
+ << jetBlock.dataWords() << endmsg;
}
jetBlock.write(theROD);
@@ -455,7 +455,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -466,7 +466,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -475,7 +475,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -488,7 +488,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -503,14 +503,14 @@ StatusCode JepRoiByteStreamTool::convertBs(
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug) {
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -522,7 +522,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -545,7 +545,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "CMM-Jet sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -562,7 +562,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "CMM-Energy sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -591,7 +591,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "JEM RoI sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -614,7 +614,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
if (collection == JEM_ROI) {
if (jroi.crate() != rodCrate - m_crateOffsetHw) {
if (debug) msg() << "Inconsistent RoI crate number: "
- << jroi.crate() << endreq;
+ << jroi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -625,7 +625,7 @@ StatusCode JepRoiByteStreamTool::convertBs(
}
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
@@ -638,14 +638,14 @@ StatusCode JepRoiByteStreamTool::convertBs(
m_cmCollection->setRoiWord(*payload);
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
}
} else {
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
index f0d1facd3e3fc1ee0317ee86eb88ed6d050a63fe..88c9333c46eaf63f92b60d6c59825b047f6f35c3 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepRoiByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepRoiByteStreamV1Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepRoiByteStreamV1Cnv::initialize()
StatusCode JepRoiByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollectionV1* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV1" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV1" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
index 30fbed0c7378c8f61bde2ea504c915ef74b4d73a..5f04d58ed238582141f9fa196fad789f5cde9a38 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
@@ -96,13 +96,13 @@ JepRoiByteStreamV1Tool::~JepRoiByteStreamV1Tool()
StatusCode JepRoiByteStreamV1Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_JET_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -189,9 +189,9 @@ StatusCode JepRoiByteStreamV1Tool::convert(
const int slink = module / modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdJem = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -202,7 +202,7 @@ StatusCode JepRoiByteStreamV1Tool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "JEM Module " << module << endreq;
+ if (debug) msg() << "JEM Module " << module << endmsg;
if (!theROD) break; // for coverity, shouldn't happen
// Create a sub-block (Neutral format only)
@@ -230,12 +230,12 @@ StatusCode JepRoiByteStreamV1Tool::convert(
if (neutralFormat) {
if ( !m_subBlock->pack()) {
- msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM RoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
@@ -301,12 +301,12 @@ StatusCode JepRoiByteStreamV1Tool::convert(
}
}
if ( !enBlock.pack()) {
- msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Energy sub-block data words: "
- << enBlock.dataWords() << endreq;
+ << enBlock.dataWords() << endmsg;
}
enBlock.write(theROD);
@@ -360,12 +360,12 @@ StatusCode JepRoiByteStreamV1Tool::convert(
}
}
if ( !jetBlock.pack()) {
- msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMM-Jet sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMM-Jet sub-block data words: "
- << jetBlock.dataWords() << endreq;
+ << jetBlock.dataWords() << endmsg;
}
jetBlock.write(theROD);
@@ -458,7 +458,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -469,7 +469,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -478,7 +478,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -491,7 +491,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -506,7 +506,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug) {
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
@@ -514,13 +514,13 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion > m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -531,7 +531,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -554,7 +554,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "CMM-Jet sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -571,7 +571,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "CMM-Energy sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -600,7 +600,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "JEM RoI sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -623,7 +623,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
if (collection == JEM_ROI) {
if (jroi.crate() != rodCrate - m_crateOffsetHw) {
if (debug) msg() << "Inconsistent RoI crate number: "
- << jroi.crate() << endreq;
+ << jroi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -634,7 +634,7 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
}
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
@@ -647,14 +647,14 @@ StatusCode JepRoiByteStreamV1Tool::convertBs(
m_cmCollection->setRoiWord(*payload);
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
}
} else {
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
index 51c66370575956c6ff569e3b15245d18b1e4d6c6..5bf834d448dfc8b6973db672126b3d06f193cf90 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
@@ -60,7 +60,7 @@ StatusCode JepRoiByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -70,19 +70,19 @@ StatusCode JepRoiByteStreamV2Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return StatusCode::FAILURE;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -92,13 +92,13 @@ StatusCode JepRoiByteStreamV2Cnv::initialize()
StatusCode JepRoiByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
LVL1::JEPRoIBSCollectionV2* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
- m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV2" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to JEPRoIBSCollectionV2" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
index 8efdee968590e08d41ab45ef7b3f94d6461ec19b..6771a18a4121892673a3b0449e0cad486912240d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
@@ -94,13 +94,13 @@ JepRoiByteStreamV2Tool::~JepRoiByteStreamV2Tool()
StatusCode JepRoiByteStreamV2Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_subDetector = eformat::TDAQ_CALO_JET_PROC_ROI;
m_srcIdMap = new L1CaloSrcIdMap();
@@ -210,9 +210,9 @@ StatusCode JepRoiByteStreamV2Tool::convert(
const int slink = module / modulesPerSlink;
if (debug) {
msg() << "Treating crate " << hwCrate
- << " slink " << slink << endreq
+ << " slink " << slink << endmsg
<< "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq;
+ << " " << m_dataFormat << endmsg;
}
const uint32_t rodIdJem = m_srcIdMap->getRodID(hwCrate, slink, daqOrRoi,
m_subDetector);
@@ -223,7 +223,7 @@ StatusCode JepRoiByteStreamV2Tool::convert(
}
m_rodStatusMap.insert(make_pair(rodIdJem, m_rodStatus));
}
- if (debug) msg() << "JEM Module " << module << endreq;
+ if (debug) msg() << "JEM Module " << module << endmsg;
if (!theROD) break; // for coverity, shouldn't happen
// Create a sub-block (Neutral format only)
@@ -251,12 +251,12 @@ StatusCode JepRoiByteStreamV2Tool::convert(
if (neutralFormat) {
if ( !m_subBlock->pack()) {
- msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "JEM RoI sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "JEM RoI sub-block data words: "
- << m_subBlock->dataWords() << endreq;
+ << m_subBlock->dataWords() << endmsg;
}
m_subBlock->write(theROD);
}
@@ -307,12 +307,12 @@ StatusCode JepRoiByteStreamV2Tool::convert(
}
}
if ( !subBlock.pack()) {
- msg(MSG::ERROR) << "CMX-Energy sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "CMX-Energy sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (debug) {
msg() << "CMX-Energy sub-block data words: "
- << subBlock.dataWords() << endreq;
+ << subBlock.dataWords() << endmsg;
}
subBlock.write(theROD);
@@ -389,7 +389,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -400,7 +400,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -409,7 +409,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -422,7 +422,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
payloadEnd = payloadBeg + (*rob)->rod_ndata();
payload = payloadBeg;
if (payload == payloadEnd) {
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -437,7 +437,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_ROD_ID);
if (debug) {
msg() << "Wrong source identifier in data: "
- << MSG::hex << sourceID << MSG::dec << endreq;
+ << MSG::hex << sourceID << MSG::dec << endmsg;
}
continue;
}
@@ -445,13 +445,13 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
// Check minor version
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion <= m_srcIdMap->minorVersionPreLS1()) {
- if (debug) msg() << "Skipping pre-LS1 data" << endreq;
+ if (debug) msg() << "Skipping pre-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug) {
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word may be User Header
@@ -462,7 +462,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (headerWords != 1) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
if (debug) msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
continue;
}
for (int i = 0; i < headerWords; ++i) ++payload;
@@ -485,7 +485,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "CMX-Energy sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -551,7 +551,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (debug) {
std::string errMsg(subBlock.unpackErrorMsg());
msg() << "JEM RoI sub-block unpacking failed: "
- << errMsg << endreq;
+ << errMsg << endmsg;
}
rodErr = m_subBlock->unpackErrorCode();
break;
@@ -572,7 +572,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
if (collection == JEM_ROI) {
if (jroi.crate() != rodCrate - m_crateOffsetHw) {
if (debug) msg() << "Inconsistent RoI crate number: "
- << jroi.crate() << endreq;
+ << jroi.crate() << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
@@ -583,7 +583,7 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
}
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
@@ -596,14 +596,14 @@ StatusCode JepRoiByteStreamV2Tool::convertBs(
m_cmCollection->setRoiWord(*payload);
} else {
if (debug) msg() << "Duplicate RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
}
} else {
if (debug) msg() << "Invalid RoI word "
- << MSG::hex << *payload << MSG::dec << endreq;
+ << MSG::hex << *payload << MSG::dec << endmsg;
rodErr = L1CaloSubBlock::ERROR_ROI_TYPE;
break;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
index 42f97957dae8e0722ebc2fde09a22991331d780a..d09be689673f9c3bcdecc333367c965d3ac0a385 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
@@ -62,7 +62,7 @@ StatusCode JepRoiReadByteStreamCnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -71,19 +71,19 @@ StatusCode JepRoiReadByteStreamCnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -95,18 +95,18 @@ template <typename Container>
StatusCode JepRoiReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -119,7 +119,7 @@ StatusCode JepRoiReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -128,7 +128,7 @@ StatusCode JepRoiReadByteStreamCnv<Container>::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
index 8cd3e21f28e4fcda3e7250c052b8d71a37cf4731..c6ea7059862255a5f18fe58731244ebd3bb2f02a 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
@@ -62,7 +62,7 @@ StatusCode JepRoiReadByteStreamV1Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -71,19 +71,19 @@ StatusCode JepRoiReadByteStreamV1Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -95,18 +95,18 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -119,7 +119,7 @@ StatusCode JepRoiReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAdd
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -128,7 +128,7 @@ StatusCode JepRoiReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAdd
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
index 28db53b21cc56061409c448a7542c7f91e2f856c..7224f5eefb9e30f7c3ed7ab7b097304e10095598 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
@@ -62,7 +62,7 @@ StatusCode JepRoiReadByteStreamV2Cnv<Container>::initialize()
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << "<"
<< typeid(Container).name() << "> - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -71,19 +71,19 @@ StatusCode JepRoiReadByteStreamV2Cnv<Container>::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -95,18 +95,18 @@ template <typename Container>
StatusCode JepRoiReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -119,7 +119,7 @@ StatusCode JepRoiReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAdd
Container* const collection = new Container;
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(collection) ;
@@ -128,7 +128,7 @@ StatusCode JepRoiReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAdd
StatusCode sc = m_tool->convert(robFrags, collection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete collection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
index 9b4b0b2c06f025535562066ce5066f9fe3fc5341..2084f8e43d9d8691140a08bd246476a1b99f6403 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
@@ -52,7 +52,7 @@ StatusCode L1CaloErrorByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -61,9 +61,9 @@ StatusCode L1CaloErrorByteStreamCnv::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -73,25 +73,25 @@ StatusCode L1CaloErrorByteStreamCnv::initialize()
StatusCode L1CaloErrorByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
std::vector<unsigned int>* const errCollection =
new std::vector<unsigned int>;
StatusCode sc = m_tool->errors(errCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete errCollection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
index 9a2b7b4d8e819cd1c0e041b1e4a2ebd6f18269a0..eb8346502af93d89d4c3a936adbe23b26ac5d1bb 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
@@ -48,7 +48,7 @@ L1CaloErrorByteStreamTool::~L1CaloErrorByteStreamTool()
StatusCode L1CaloErrorByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
return StatusCode::SUCCESS;
}
@@ -65,8 +65,8 @@ StatusCode L1CaloErrorByteStreamTool::finalize()
void L1CaloErrorByteStreamTool::robError(const uint32_t robid,
const unsigned int err)
{
- if (err && robMap.find(robid) == robMap.end()) {
- robMap.insert(std::make_pair(robid, err));
+ if (err && m_robMap.find(robid) == m_robMap.end()) {
+ m_robMap.insert(std::make_pair(robid, err));
}
return;
}
@@ -76,8 +76,8 @@ void L1CaloErrorByteStreamTool::robError(const uint32_t robid,
void L1CaloErrorByteStreamTool::rodError(const uint32_t robid,
const unsigned int err)
{
- if (err && rodMap.find(robid) == rodMap.end()) {
- rodMap.insert(std::make_pair(robid, err));
+ if (err && m_rodMap.find(robid) == m_rodMap.end()) {
+ m_rodMap.insert(std::make_pair(robid, err));
}
return;
}
@@ -87,22 +87,22 @@ void L1CaloErrorByteStreamTool::rodError(const uint32_t robid,
StatusCode L1CaloErrorByteStreamTool::errors(std::vector<unsigned int>*
const errColl)
{
- if (!robMap.empty() || !rodMap.empty()) {
- errColl->push_back(robMap.size());
- ErrorMap::const_iterator iter = robMap.begin();
- ErrorMap::const_iterator iterE = robMap.end();
+ if (!m_robMap.empty() || !m_rodMap.empty()) {
+ errColl->push_back(m_robMap.size());
+ ErrorMap::const_iterator iter = m_robMap.begin();
+ ErrorMap::const_iterator iterE = m_robMap.end();
for (; iter != iterE; ++iter) {
errColl->push_back(iter->first);
errColl->push_back(iter->second);
}
- robMap.clear();
- iter = rodMap.begin();
- iterE = rodMap.end();
+ m_robMap.clear();
+ iter = m_rodMap.begin();
+ iterE = m_rodMap.end();
for (; iter != iterE; ++iter) {
errColl->push_back(iter->first);
errColl->push_back(iter->second);
}
- rodMap.clear();
+ m_rodMap.clear();
}
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
index 9a86c98b57a458768e4a9210a92f5d1445752416..6bbf24809402f715209db43e0932aa8c13633090 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.h
@@ -48,8 +48,8 @@ class L1CaloErrorByteStreamTool : public AthAlgTool {
// Maps of accumulated errors
typedef std::map<uint32_t, unsigned int> ErrorMap;
- ErrorMap robMap;
- ErrorMap rodMap;
+ ErrorMap m_robMap;
+ ErrorMap m_rodMap;
};
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
index 85aa6cca4f4e8432b408ba1466a56d4c3d639a08..8f67bf4875bfd410ba03ce51577fd540d4c610e9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
@@ -63,7 +63,7 @@ StatusCode PpmByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -73,30 +73,30 @@ StatusCode PpmByteStreamV1Cnv::initialize()
sc = m_ByteStreamEventAccess.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::ERROR << "Failed to retrieve service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
return sc;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_ByteStreamEventAccess << endreq;
+ << m_ByteStreamEventAccess << endmsg;
}
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
// Get ROBDataProvider
sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
m_log << MSG::WARNING << "Failed to retrieve service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
} else {
m_log << MSG::DEBUG << "Retrieved service "
- << m_robDataProvider << endreq;
+ << m_robDataProvider << endmsg;
}
return StatusCode::SUCCESS;
@@ -107,18 +107,18 @@ StatusCode PpmByteStreamV1Cnv::initialize()
StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
- if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endreq;
+ if (m_debug) m_log << MSG::DEBUG << " Creating Objects " << nm << endmsg;
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
@@ -132,7 +132,7 @@ StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
new DataVector<LVL1::TriggerTower>(SG::VIEW_ELEMENTS);
if (m_debug) {
m_log << MSG::DEBUG << " Number of ROB fragments is " << robFrags.size()
- << endreq;
+ << endmsg;
}
if (robFrags.size() == 0) {
pObj = SG::asStorable(ttCollection) ;
@@ -141,7 +141,7 @@ StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode sc = m_tool->convert(robFrags, ttCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete ttCollection;
return sc;
}
@@ -156,13 +156,13 @@ StatusCode PpmByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
StatusCode PpmByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
{
- if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
DataVector<LVL1::TriggerTower>* ttCollection = 0;
if( !SG::fromStorable( pObj, ttCollection ) ) {
- m_log << MSG::ERROR << " Cannot cast to DataVector<TriggerTower>" << endreq;
+ m_log << MSG::ERROR << " Cannot cast to DataVector<TriggerTower>" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
index a86371ff9c8af4f87c180998aae6b171f7764d13..fddeb1aad8227e943a6331ae3b0cd7a14d685484 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
@@ -117,31 +117,31 @@ PpmByteStreamV1Tool::~PpmByteStreamV1Tool()
StatusCode PpmByteStreamV1Tool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_ppmMaps.retrieve();
if (sc.isFailure())
{
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_ppmMaps << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_ppmMaps << endmsg;
return sc;
}
- else msg(MSG::INFO) << "Retrieved tool " << m_ppmMaps << endreq;
+ else msg(MSG::INFO) << "Retrieved tool " << m_ppmMaps << endmsg;
sc = m_errorTool.retrieve();
if (sc.isFailure())
{
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
}
- else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
sc = m_sms.retrieve();
if (sc.isFailure())
{
- msg(MSG::ERROR) << "Failed to retrieve service " << m_sms << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve service " << m_sms << endmsg;
return sc;
}
- else msg(MSG::INFO) << "Retrieved service " << m_sms << endreq;
+ else msg(MSG::INFO) << "Retrieved service " << m_sms << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
m_towerKey = new LVL1::TriggerTowerKey();
@@ -317,7 +317,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -330,7 +330,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (*robData != 0)
{
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -340,7 +340,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (!dupCheck.insert(robid).second)
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -354,7 +354,7 @@ StatusCode PpmByteStreamV1Tool::convert(
payload = payloadBeg;
if (payload == payloadEnd)
{
- if (debug) msg() << "ROB fragment empty" << endreq;
+ if (debug) msg() << "ROB fragment empty" << endmsg;
continue;
}
@@ -371,7 +371,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg() << "Wrong source identifier in data: ROD "
<< MSG::hex << sourceID << " ROB " << robid
- << MSG::dec << endreq;
+ << MSG::dec << endmsg;
}
continue;
}
@@ -380,21 +380,21 @@ StatusCode PpmByteStreamV1Tool::convert(
const int minorVersion = (*rob)->rod_version() & 0xffff;
if (minorVersion > m_srcIdMap->minorVersionPreLS1())
{
- if (debug) msg() << "Skipping post-LS1 data" << endreq;
+ if (debug) msg() << "Skipping post-LS1 data" << endmsg;
continue;
}
const int rodCrate = m_srcIdMap->crate(sourceID);
if (debug)
{
msg() << "Treating crate " << rodCrate
- << " slink " << m_srcIdMap->slink(sourceID) << endreq;
+ << " slink " << m_srcIdMap->slink(sourceID) << endmsg;
}
// First word should be User Header
if ( !L1CaloUserHeader::isValid(*payload) )
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_USER_HEADER);
- if (debug) msg() << "Invalid or missing user header" << endreq;
+ if (debug) msg() << "Invalid or missing user header" << endmsg;
continue;
}
L1CaloUserHeader userHeader(*payload);
@@ -406,7 +406,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "Unexpected number of user header words: "
- << headerWords << endreq;
+ << headerWords << endmsg;
}
continue;
}
@@ -419,10 +419,10 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "Minor format version number: "
- << MSG::hex << minorVersion << MSG::dec << endreq
- << "LUT triggered slice offset: " << trigLut << endreq
- << "FADC triggered slice offset: " << trigFadc << endreq
- << "FADC baseline lower bound: " << m_fadcBaseline << endreq;
+ << MSG::hex << minorVersion << MSG::dec << endmsg
+ << "LUT triggered slice offset: " << trigLut << endmsg
+ << "FADC triggered slice offset: " << trigFadc << endmsg
+ << "FADC baseline lower bound: " << m_fadcBaseline << endmsg;
}
const int runNumber = (*rob)->rod_run_no() & 0xffffff;
@@ -438,7 +438,7 @@ StatusCode PpmByteStreamV1Tool::convert(
|| CmmSubBlock::cmmBlock(*payload))
{
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_MISSING_HEADER);
- if (debug) msg() << "Missing Sub-block header" << endreq;
+ if (debug) msg() << "Missing Sub-block header" << endmsg;
continue;
}
firstBlock = true;
@@ -456,15 +456,15 @@ StatusCode PpmByteStreamV1Tool::convert(
m_errorTool->rodError(robid, subBlock->unpackErrorCode());
if (debug) msg() << "Unsupported version/data format: "
<< subBlock->version() << "/"
- << subBlock->format() << endreq;
+ << subBlock->format() << endmsg;
continue;
}
if (debug) msg() << "Channels per sub-block: "
- << chanPerSubBlock << endreq;
+ << chanPerSubBlock << endmsg;
}
else
{
- if (debug) msg() << "ROB fragment contains user header only" << endreq;
+ if (debug) msg() << "ROB fragment contains user header only" << endmsg;
continue;
}
const int numSubBlocks = s_channels / chanPerSubBlock;
@@ -497,7 +497,7 @@ StatusCode PpmByteStreamV1Tool::convert(
|| CmmSubBlock::cmmBlock(word)
|| PpmSubBlockV1::errorBlock(word))
{
- if (debug) msg() << "Unexpected data sequence" << endreq;
+ if (debug) msg() << "Unexpected data sequence" << endmsg;
rodErr = L1CaloSubBlock::ERROR_MISSING_HEADER;
break;
}
@@ -508,7 +508,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg() << "Unexpected channel sequence number: "
<< L1CaloSubBlock::seqno(word) << " expected "
- << block *chanPerSubBlock << endreq;
+ << block *chanPerSubBlock << endmsg;
}
rodErr = L1CaloSubBlock::ERROR_MISSING_SUBBLOCK;
break;
@@ -531,13 +531,13 @@ StatusCode PpmByteStreamV1Tool::convert(
module = subBlock->module();
if (debug)
{
- msg() << "Crate " << crate << " Module " << module << endreq;
+ msg() << "Crate " << crate << " Module " << module << endmsg;
}
if (crate != rodCrate)
{
if (debug)
{
- msg() << "Inconsistent crate number in ROD source ID" << endreq;
+ msg() << "Inconsistent crate number in ROD source ID" << endmsg;
}
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
@@ -548,21 +548,21 @@ StatusCode PpmByteStreamV1Tool::convert(
if (subBlock->crate() != crate)
{
if (debug) msg() << "Inconsistent crate number in sub-blocks"
- << endreq;
+ << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (subBlock->module() != module)
{
if (debug) msg() << "Inconsistent module number in sub-blocks"
- << endreq;
+ << endmsg;
rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
}
if (payload == payloadEnd && block != numSubBlocks - 1)
{
- if (debug) msg() << "Premature end of data" << endreq;
+ if (debug) msg() << "Premature end of data" << endmsg;
rodErr = L1CaloSubBlock::ERROR_MISSING_SUBBLOCK;
break;
}
@@ -578,7 +578,7 @@ StatusCode PpmByteStreamV1Tool::convert(
&& !CmmSubBlock::cmmBlock(*payload)
&& PpmSubBlockV1::errorBlock(*payload))
{
- if (debug) msg() << "Error block found" << endreq;
+ if (debug) msg() << "Error block found" << endmsg;
if (!m_errorBlock) m_errorBlock = new PpmSubBlockV1();
else m_errorBlock->clear();
isErrBlock = true;
@@ -586,14 +586,14 @@ StatusCode PpmByteStreamV1Tool::convert(
if (m_errorBlock->crate() != crate)
{
if (debug) msg() << "Inconsistent crate number in error block"
- << endreq;
+ << endmsg;
rodErr = L1CaloSubBlock::ERROR_CRATE_NUMBER;
break;
}
if (m_errorBlock->module() != module)
{
if (debug) msg() << "Inconsistent module number in error block"
- << endreq;
+ << endmsg;
rodErr = L1CaloSubBlock::ERROR_MODULE_NUMBER;
break;
}
@@ -602,7 +602,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
std::string errMsg(m_errorBlock->unpackErrorMsg());
- msg() << "Unpacking error block failed: " << errMsg << endreq;
+ msg() << "Unpacking error block failed: " << errMsg << endmsg;
}
rodErr = m_errorBlock->unpackErrorCode();
break;
@@ -631,14 +631,14 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg() << "Unpacking sub-block version/format/seqno: "
<< subBlock->version() << "/" << subBlock->format() << "/"
- << subBlock->seqno() << endreq;
+ << subBlock->seqno() << endmsg;
}
if (subBlock->dataWords() && !subBlock->unpack())
{
if (debug)
{
std::string errMsg(subBlock->unpackErrorMsg());
- msg() << "Unpacking PPM sub-block failed: " << errMsg << endreq;
+ msg() << "Unpacking PPM sub-block failed: " << errMsg << endmsg;
}
rodErr = subBlock->unpackErrorCode();
break;
@@ -655,7 +655,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
if (debug) msg() << "Duplicate data for crate/module/channel: "
<< crate << "/" << module << "/" << channel
- << endreq;
+ << endmsg;
rodErr = L1CaloSubBlock::ERROR_DUPLICATE_DATA;
break;
}
@@ -670,7 +670,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg() << "Triggered LUT slice from header "
<< "inconsistent with number of slices: "
- << trigLut << ", " << lut.size() << endreq;
+ << trigLut << ", " << lut.size() << endmsg;
}
rodErr = L1CaloSubBlock::ERROR_SLICES;
break;
@@ -681,7 +681,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg() << "Triggered FADC slice from header "
<< "inconsistent with number of slices: "
- << trigFadc << ", " << fadc.size() << endreq;
+ << trigFadc << ", " << fadc.size() << endmsg;
}
rodErr = L1CaloSubBlock::ERROR_SLICES;
break;
@@ -750,7 +750,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
if (debug)
{
- msg() << "Found " << ttCount << " channels, expected " << colSize << endreq;
+ msg() << "Found " << ttCount << " channels, expected " << colSize << endmsg;
}
std::vector<int> dummy(1);
for (int word = 0; word < chanBitVecSize; ++word)
@@ -832,7 +832,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (chanPerSubBlock == 0)
{
msg(MSG::ERROR) << "Unsupported version/data format: "
- << m_version << "/" << m_dataFormat << endreq;
+ << m_version << "/" << m_dataFormat << endmsg;
return StatusCode::FAILURE;
}
PpmSubBlockV1 errorBlock;
@@ -859,7 +859,7 @@ StatusCode PpmByteStreamV1Tool::convert(
const int slink = module / modulesPerSlink;
if (debug)
{
- msg() << "Treating crate " << crate << " slink " << slink << endreq;
+ msg() << "Treating crate " << crate << " slink " << slink << endmsg;
}
// Get number of slices and triggered slice offsets
// for this slink
@@ -868,7 +868,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
msg(MSG::ERROR) << "Inconsistent number of slices or "
<< "triggered slice offsets in data for crate "
- << crate << " slink " << slink << endreq;
+ << crate << " slink " << slink << endmsg;
return StatusCode::FAILURE;
}
slicesLutNew = (m_forceSlicesLut) ? m_forceSlicesLut : slicesLut;
@@ -878,19 +878,19 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "Data Version/Format: " << m_version
- << " " << m_dataFormat << endreq
+ << " " << m_dataFormat << endmsg
<< "LUT slices/offset: " << slicesLut << " " << trigLut;
if (slicesLut != slicesLutNew)
{
msg() << " modified to " << slicesLutNew << " " << trigLutNew;
}
- msg() << endreq
+ msg() << endmsg
<< "FADC slices/offset: " << slicesFadc << " " << trigFadc;
if (slicesFadc != slicesFadcNew)
{
msg() << " modified to " << slicesFadcNew << " " << trigFadcNew;
}
- msg() << endreq;
+ msg() << endmsg;
}
L1CaloUserHeader userHeader;
userHeader.setPpmLut(trigLutNew);
@@ -902,7 +902,7 @@ StatusCode PpmByteStreamV1Tool::convert(
theROD->push_back(userHeader.header());
m_rodStatusMap.insert(make_pair(rodIdPpm, m_rodStatus));
}
- if (debug) msg() << "Module " << module << endreq;
+ if (debug) msg() << "Module " << module << endmsg;
// Find trigger towers corresponding to each eta/phi pair and fill
// sub-blocks
@@ -984,7 +984,7 @@ StatusCode PpmByteStreamV1Tool::convert(
// output the packed sub-block
if ( !subBlock.pack())
{
- msg(MSG::ERROR) << "PPM sub-block packing failed" << endreq;
+ msg(MSG::ERROR) << "PPM sub-block packing failed" << endmsg;
return StatusCode::FAILURE;
}
if (m_printCompStats) addCompStats(subBlock.compStats());
@@ -996,7 +996,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "PPM sub-block data words: "
- << subBlock.dataWords() << endreq;
+ << subBlock.dataWords() << endmsg;
}
subBlock.write(theROD);
}
@@ -1032,7 +1032,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "PPM sub-block data words: "
- << subBlock.dataWords() << endreq;
+ << subBlock.dataWords() << endmsg;
}
subBlock.write(theROD);
// Only uncompressed format has a separate error block
@@ -1040,7 +1040,7 @@ StatusCode PpmByteStreamV1Tool::convert(
{
if ( ! errorBlock.pack())
{
- msg(MSG::ERROR) << "PPM error block packing failed" << endreq;
+ msg(MSG::ERROR) << "PPM error block packing failed" << endmsg;
return StatusCode::FAILURE;
}
errorBlock.setStatus(0, glinkTimeout, false, upstreamError,
@@ -1049,7 +1049,7 @@ StatusCode PpmByteStreamV1Tool::convert(
if (debug)
{
msg() << "PPM error block data words: "
- << errorBlock.dataWords() << endreq;
+ << errorBlock.dataWords() << endmsg;
}
}
}
@@ -1089,7 +1089,7 @@ void PpmByteStreamV1Tool::printCompStats() const
{
msg() << " " << i << "/" << m_compStats[i];
}
- msg() << endreq;
+ msg() << endmsg;
}
// Find a trigger tower using separate layer maps
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmCompressionV1.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmCompressionV1.cxx
index 821345a0e7511d9df094daaf6339f99bb0874587..cf9001c25fda084d53c3c1aedc723371793d9949 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmCompressionV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmCompressionV1.cxx
@@ -434,7 +434,7 @@ bool PpmCompressionV1::unpackV101(PpmSubBlockV1& subBlock)
int minFadc = 0;
if (subBlock.unpacker(1)) minFadc = subBlock.unpacker(format * 2);
else minFadc = subBlock.unpacker(4) + pedestal - s_lowerRange;
- fadcData.push_back(minFadc);
+ fadcData.push_back(minFadc);
for (int sl = 1; sl < sliceF; ++sl) {
int len = 4;
if (subBlock.unpacker(1)) len = format * 2;
@@ -591,7 +591,7 @@ bool PpmCompressionV1::unpackV104(PpmSubBlockV1& subBlock)
int minFadc = 0;
if (subBlock.unpacker(1)) minFadc = subBlock.unpacker(format * 2);
else minFadc = subBlock.unpacker(4) + fadcBaseline;
- fadcData.push_back(minFadc);
+ fadcData.push_back(minFadc);
for (int sl = 1; sl < sliceF; ++sl) {
int len = 4;
if (subBlock.unpacker(1)) len = format * 2;
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
index 81bb8457f6351d5e004c81b8836b4d7e3a34178a..5bd862c7e36401cdb64658decb9a737d48c9745b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
@@ -60,7 +60,7 @@ StatusCode RodHeaderByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
m_log << MSG::DEBUG << "Initializing " << m_name << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = Converter::initialize();
if ( sc.isFailure() )
@@ -69,9 +69,9 @@ StatusCode RodHeaderByteStreamCnv::initialize()
// Retrieve Tool
sc = m_tool.retrieve();
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endreq;
+ m_log << MSG::ERROR << "Failed to retrieve tool " << m_tool << endmsg;
return sc;
- } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endreq;
+ } else m_log << MSG::DEBUG << "Retrieved tool " << m_tool << endmsg;
return StatusCode::SUCCESS;
}
@@ -81,12 +81,12 @@ StatusCode RodHeaderByteStreamCnv::initialize()
StatusCode RodHeaderByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
{
- if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endreq;
+ if (m_debug) m_log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
- m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endreq;
+ m_log << MSG::ERROR << " Can not cast to ByteStreamAddress " << endmsg;
return StatusCode::FAILURE;
}
@@ -96,7 +96,7 @@ StatusCode RodHeaderByteStreamCnv::createObj( IOpaqueAddress* pAddr,
new DataVector<LVL1::RODHeader>;
StatusCode sc = m_tool->convert(nm, rhCollection);
if ( sc.isFailure() ) {
- m_log << MSG::ERROR << " Failed to create Objects " << nm << endreq;
+ m_log << MSG::ERROR << " Failed to create Objects " << nm << endmsg;
delete rhCollection;
return sc;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
index 50a619bb58a6ffe114564ea7a216ad7a60ba8d70..8ea0ea6579e699fba9dbc0ce497210be0917ae8b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
@@ -89,13 +89,13 @@ RodHeaderByteStreamTool::~RodHeaderByteStreamTool()
StatusCode RodHeaderByteStreamTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = m_errorTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_errorTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_errorTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
return StatusCode::SUCCESS;
@@ -141,7 +141,7 @@ StatusCode RodHeaderByteStreamTool::convert(
if (debug) {
++robCount;
- msg() << "Treating ROB fragment " << robCount << endreq;
+ msg() << "Treating ROB fragment " << robCount << endmsg;
}
// Skip fragments with ROB status errors
@@ -152,7 +152,7 @@ StatusCode RodHeaderByteStreamTool::convert(
(*rob)->status(robData);
if (*robData != 0) {
m_errorTool->robError(robid, *robData);
- if (debug) msg() << "ROB status error - skipping fragment" << endreq;
+ if (debug) msg() << "ROB status error - skipping fragment" << endmsg;
continue;
}
}
@@ -161,7 +161,7 @@ StatusCode RodHeaderByteStreamTool::convert(
if (!dupCheck.insert(robid).second) {
m_errorTool->rodError(robid, L1CaloSubBlock::ERROR_DUPLICATE_ROB);
- if (debug) msg() << "Skipping duplicate ROB fragment" << endreq;
+ if (debug) msg() << "Skipping duplicate ROB fragment" << endmsg;
continue;
}
@@ -200,11 +200,11 @@ StatusCode RodHeaderByteStreamTool::convert(
<< "ROD Header version/sourceId/run/lvl1Id/bcId/trigType/detType/nData: "
<< version << "/" << sourceId << "/" << run << "/" << lvl1Id << "/"
<< bcId << "/" << trigType << "/" << detType << "/" << nData
- << endreq << "ROD Status Words:";
+ << endmsg << "ROD Status Words:";
std::vector<uint32_t>::const_iterator pos = statusWords.begin();
std::vector<uint32_t>::const_iterator pose = statusWords.end();
for (; pos != pose; ++pos) msg() << " " << *pos;
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
index 44f9f7ab8a1ed01b3155d56f9733888a21ef772a..7579532c82415debaea1c7d0added8231b0eab12 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
@@ -56,42 +56,42 @@ TrigT1CaloDataAccess::~TrigT1CaloDataAccess()
StatusCode TrigT1CaloDataAccess::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
// Retrieve data provider service
StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
msg(MSG::ERROR) << "Failed to retrieve service " << m_robDataProvider
- << endreq;
+ << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endreq;
+ } else msg(MSG::INFO) << "Retrieved service " << m_robDataProvider << endmsg;
// Retrieve selection tool
sc = m_selectionTool.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_selectionTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_selectionTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_selectionTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_selectionTool << endmsg;
// Retrieve PPM converter tool
sc = m_ppmBSConverter.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_ppmBSConverter << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_ppmBSConverter << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_ppmBSConverter << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_ppmBSConverter << endmsg;
sc = m_JetConverter.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_JetConverter << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_JetConverter << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_JetConverter << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_JetConverter << endmsg;
IIncidentSvc* p_incSvc;
if ( service("IncidentSvc",p_incSvc, true).isFailure() ) {
- msg(MSG::ERROR) << "Unable to get the IncidentSvc" << endreq;
+ msg(MSG::ERROR) << "Unable to get the IncidentSvc" << endmsg;
}else{
// Will use the new event for caching purposes
p_incSvc->addListener(this, "BeginEvent",100);
@@ -177,7 +177,7 @@ StatusCode TrigT1CaloDataAccess::loadCollection(
if ( full ) sc = m_ppmBSConverter->convert(m_robFrags, m_ttCol, m_chanIds_full);
else sc = m_ppmBSConverter->convert(m_robFrags, m_ttCol, m_chanIds);
if (sc.isFailure() ) {
- msg(MSG::ERROR) << "PPM bytestream conversion failed" << endreq;
+ msg(MSG::ERROR) << "PPM bytestream conversion failed" << endmsg;
m_ttCol->clear();
}
beg = m_ttCol->begin();
@@ -203,7 +203,7 @@ StatusCode TrigT1CaloDataAccess::loadCollection(
m_jetCol->clear();
StatusCode sc = m_JetConverter->convert(m_robFrags, m_jetCol);
if (sc.isFailure() ) {
- msg(MSG::ERROR) << "JET bytestream conversion failed" << endreq;
+ msg(MSG::ERROR) << "JET bytestream conversion failed" << endmsg;
return sc;
}
m_lC_Jet = m_present_event;
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
index 57d0d0b9abd3055a34a1c930572052201efc7b71..c0e1e8e25753dc79846c10533ca203fdaca2e658 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
@@ -68,15 +68,15 @@ TriggerTowerSelectionTool::~TriggerTowerSelectionTool()
StatusCode TriggerTowerSelectionTool::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
// Retrieve mapping tool
StatusCode sc = m_mappingTool.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_mappingTool << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_mappingTool << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_mappingTool << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_mappingTool << endmsg;
m_srcIdMap = new L1CaloSrcIdMap();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
index dc761c697b49e69844c340ae185872b3cce6be63..e6f1fac88cb3fd220ddf85ef9ab0c5c7ec2339f8 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
@@ -107,7 +107,9 @@ StatusCode CmxRoIByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr,
item->initialize(source.ex(), source.ey(), source.et(),
source.exError(), source.eyError(), source.etError(),
- source.sumEtHits(), source.missingEtHits(),
+ //source.sumEtHits(), source.missingEtHits(),
+ // amazurov: values for EtHits and missingEtHits are swaзув in source
+ source.missingEtHits(), source.sumEtHits(),
source.missingEtSigHits(),
source.ex(LVL1::CMXRoI::SumType::MASKED),
source.ey(LVL1::CMXRoI::SumType::MASKED),
@@ -115,8 +117,9 @@ StatusCode CmxRoIByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr,
source.exError(LVL1::CMXRoI::SumType::MASKED),
source.eyError(LVL1::CMXRoI::SumType::MASKED),
source.etError(LVL1::CMXRoI::SumType::MASKED),
- source.sumEtHits(LVL1::CMXRoI::SumType::MASKED),
- source.missingEtHits(LVL1::CMXRoI::SumType::MASKED)
+ // source.sumEtHits(LVL1::CMXRoI::SumType::MASKED), source.missingEtHits(LVL1::CMXRoI::SumType::MASKED)
+ // amazurov: values for EtHits and missingEtHits are swaзув in source
+ source.missingEtHits(LVL1::CMXRoI::SumType::MASKED), source.sumEtHits(LVL1::CMXRoI::SumType::MASKED)
);
// -------------------------------------------------------------------------
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
index 27e183b1648a617346f9dea30844c012c4b447f6..3aa150bfab84ba9e904c8a30e0117c131174f789 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
@@ -209,12 +209,12 @@ StatusCode PpmByteStreamReadV1V2Tool::processRobFragment_(
}
ATH_MSG_DEBUG(
- "Run number: " << MSG::dec << m_rodRunNumber << endreq
+ "Run number: " << MSG::dec << m_rodRunNumber << endmsg
<< "Version code: 0x" << MSG::hex << int(m_verCode) << MSG::dec
- << endreq << "LUT triggered slice offset: "
- << int(m_caloUserHeader.lut()) << endreq
+ << endmsg << "LUT triggered slice offset: "
+ << int(m_caloUserHeader.lut()) << endmsg
<< "FADC triggered slice offset: " << int(m_caloUserHeader.ppFadc())
- << endreq << "FADC baseline lower bound: "
+ << endmsg << "FADC baseline lower bound: "
<< int(m_caloUserHeader.ppLowerBound()));
int indata = 0;
@@ -273,7 +273,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmWord_(uint32_t word,
return processPpmStandardR3V1_(word, indata);
} else {
ATH_MSG_ERROR("Unsupported PPM version:format ("
- << m_verCode << ":" << format
+ << m_verCode << ":" << m_subBlockHeader.format()
<<") combination");
return StatusCode::FAILURE;
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmErrors.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmErrors.cxx
index 9e6f65544d37cffc604dfee4a51047206597a290..2a156c27ad56c950958b1f8a71f05b42ce1278ed 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmErrors.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmErrors.cxx
@@ -87,7 +87,7 @@ CpmErrors::~CpmErrors()
StatusCode CpmErrors::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
// Initialise individual error flags
@@ -137,7 +137,7 @@ StatusCode CpmErrors::execute()
const CpmTowerCollection* cpCollection = 0;
StatusCode sc = evtStore()->retrieve(cpCollection, m_cpmTowerLocation);
if (sc.isFailure() || !cpCollection || cpCollection->empty()) {
- msg() << "No CP Elements found" << endreq;
+ msg() << "No CP Elements found" << endmsg;
cpCollection = 0;
}
@@ -152,7 +152,7 @@ StatusCode CpmErrors::execute()
sc = evtStore()->record(errCollection, m_cpmTowerLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CPMTower container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CPMTower container in TDS " << endmsg;
return sc;
}
}
@@ -164,7 +164,7 @@ StatusCode CpmErrors::execute()
const CmxCpTobCollection* tobCollection = 0;
StatusCode sc = evtStore()->retrieve(tobCollection, m_cmxCpTobLocation);
if (sc.isFailure() || !tobCollection || tobCollection->empty()) {
- msg() << "No CMX TOBs found" << endreq;
+ msg() << "No CMX TOBs found" << endmsg;
tobCollection = 0;
}
@@ -179,7 +179,7 @@ StatusCode CpmErrors::execute()
sc = evtStore()->record(errCollection, m_cmxCpTobLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXCPTob container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXCPTob container in TDS " << endmsg;
return sc;
}
}
@@ -191,7 +191,7 @@ StatusCode CpmErrors::execute()
const CmxCpHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmxCpHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMX Hits found" << endreq;
+ msg() << "No CMX Hits found" << endmsg;
hitCollection = 0;
}
@@ -206,7 +206,7 @@ StatusCode CpmErrors::execute()
sc = evtStore()->record(errCollection, m_cmxCpHitsLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXCPHits container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXCPHits container in TDS " << endmsg;
return sc;
}
}
@@ -218,7 +218,7 @@ StatusCode CpmErrors::execute()
const CpmTobRoiCollection* crCollection = 0;
StatusCode sc = evtStore()->retrieve(crCollection, m_cpmTobRoiLocation);
if (sc.isFailure() || !jcCollection || crCollection->empty()) {
- msg() << "No CPM TOB RoIs found" << endreq;
+ msg() << "No CPM TOB RoIs found" << endmsg;
crCollection = 0;
}
@@ -233,7 +233,7 @@ StatusCode CpmErrors::execute()
sc = evtStore()->record(errCollection, m_cpmTobRoiLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CPMTobRoI container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CPMTobRoI container in TDS " << endmsg;
return sc;
}
}
@@ -471,13 +471,13 @@ void CpmErrors::errorMessage(const std::string& errmsg)
const EventInfo* evInfo = 0;
StatusCode sc = evtStore()->retrieve(evInfo);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "No EventInfo found" << endreq;
+ msg(MSG::ERROR) << "No EventInfo found" << endmsg;
} else {
const EventID* evID = evInfo->event_ID();
if (evID) eventNumber = evID->event_number();
}
msg(MSG::INFO) << "Event " << eventNumber
- << " has error " << errmsg << endreq;
+ << " has error " << errmsg << endmsg;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTester.cxx
index c0f79adda93c626791302dd2bbdbcd6175352bb5..dbc2d8696d1947ff80dc1ef755348d6d04270fae 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTester.cxx
@@ -66,7 +66,7 @@ CpmTester::~CpmTester()
StatusCode CpmTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_towerKey = new LVL1::TriggerTowerKey();
@@ -87,7 +87,7 @@ StatusCode CpmTester::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No core CPM towers found" << endreq;
+ msg() << "No core CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -107,7 +107,7 @@ StatusCode CpmTester::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocationOverlap);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No overlap CPM towers found" << endreq;
+ msg() << "No overlap CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -127,7 +127,7 @@ StatusCode CpmTester::execute()
const CpmHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cpmHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CPM Hits found" << endreq;
+ msg() << "No CPM Hits found" << endmsg;
} else {
// Order by crate, module
@@ -147,7 +147,7 @@ StatusCode CpmTester::execute()
const CmmCpHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmmCpHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMM-CP Hits found" << endreq;
+ msg() << "No CMM-CP Hits found" << endmsg;
} else {
// Order by crate, dataID
@@ -167,7 +167,7 @@ StatusCode CpmTester::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocation);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs found" << endreq;
+ msg() << "No CPM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -187,7 +187,7 @@ StatusCode CpmTester::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocationRoib);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs from RoIB found" << endreq;
+ msg() << "No CPM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -217,7 +217,7 @@ StatusCode CpmTester::finalize()
void CpmTester::printCpmTowers(const std::string& source) const
{
msg() << "Number of " << source << " CPM towers = "
- << m_ttMap.size() << endreq;
+ << m_ttMap.size() << endmsg;
CpmTowerMap::const_iterator mapIter = m_ttMap.begin();
CpmTowerMap::const_iterator mapEnd = m_ttMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -245,7 +245,7 @@ void CpmTester::printCpmTowers(const std::string& source) const
msg() << MSG::hex;
printVec(emError);
printVec(hadError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -253,7 +253,7 @@ void CpmTester::printCpmTowers(const std::string& source) const
void CpmTester::printCpmHits() const
{
- msg() << "Number of CPM Hits = " << m_hitsMap.size() << endreq;
+ msg() << "Number of CPM Hits = " << m_hitsMap.size() << endmsg;
CpmHitsMap::const_iterator mapIter = m_hitsMap.begin();
CpmHitsMap::const_iterator mapEnd = m_hitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -273,7 +273,7 @@ void CpmTester::printCpmHits() const
ModifySlices::data(ch->HitsVec1(), hits1, slices);
printVecH(hits0);
printVecH(hits1);
- msg() << endreq;
+ msg() << endmsg;
}
}
@@ -281,7 +281,7 @@ void CpmTester::printCpmHits() const
void CpmTester::printCmmCpHits() const
{
- msg() << "Number of CMM-CP Hits = " << m_cmmHitsMap.size() << endreq;
+ msg() << "Number of CMM-CP Hits = " << m_cmmHitsMap.size() << endmsg;
CmmCpHitsMap::const_iterator mapIter = m_cmmHitsMap.begin();
CmmCpHitsMap::const_iterator mapEnd = m_cmmHitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -308,7 +308,7 @@ void CpmTester::printCmmCpHits() const
msg() << MSG::hex;
printVec(err0);
printVec(err1);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -317,7 +317,7 @@ void CpmTester::printCmmCpHits() const
void CpmTester::printCpmRois(const std::string& source) const
{
msg() << "Number of CPM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
CpmRoiMap::const_iterator mapIter = m_roiMap.begin();
CpmRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -331,7 +331,7 @@ void CpmTester::printCpmRois(const std::string& source) const
else if (i > 0) msg() << ":";
msg() << ((hits >> i) & 0x1);
}
- msg() << "/" << roi->error() << "/" << endreq;
+ msg() << "/" << roi->error() << "/" << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV1.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV1.cxx
index be1142fe5a370a31b2f178a972e3c66ee735e5cc..2a57d047c4c0eb1657c555861788894c465599e3 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV1.cxx
@@ -66,7 +66,7 @@ CpmTesterV1::~CpmTesterV1()
StatusCode CpmTesterV1::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_towerKey = new LVL1::TriggerTowerKey();
@@ -87,7 +87,7 @@ StatusCode CpmTesterV1::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No core CPM towers found" << endreq;
+ msg() << "No core CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -107,7 +107,7 @@ StatusCode CpmTesterV1::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocationOverlap);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No overlap CPM towers found" << endreq;
+ msg() << "No overlap CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -127,7 +127,7 @@ StatusCode CpmTesterV1::execute()
const CpmHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cpmHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CPM Hits found" << endreq;
+ msg() << "No CPM Hits found" << endmsg;
} else {
// Order by crate, module
@@ -147,7 +147,7 @@ StatusCode CpmTesterV1::execute()
const CmmCpHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmmCpHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMM-CP Hits found" << endreq;
+ msg() << "No CMM-CP Hits found" << endmsg;
} else {
// Order by crate, dataID
@@ -167,7 +167,7 @@ StatusCode CpmTesterV1::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocation);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs found" << endreq;
+ msg() << "No CPM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -187,7 +187,7 @@ StatusCode CpmTesterV1::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocationRoib);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs from RoIB found" << endreq;
+ msg() << "No CPM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -217,7 +217,7 @@ StatusCode CpmTesterV1::finalize()
void CpmTesterV1::printCpmTowers(const std::string& source) const
{
msg() << "Number of " << source << " CPM towers = "
- << m_ttMap.size() << endreq;
+ << m_ttMap.size() << endmsg;
CpmTowerMap::const_iterator mapIter = m_ttMap.begin();
CpmTowerMap::const_iterator mapEnd = m_ttMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -245,7 +245,7 @@ void CpmTesterV1::printCpmTowers(const std::string& source) const
msg() << MSG::hex;
printVec(emError);
printVec(hadError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -253,7 +253,7 @@ void CpmTesterV1::printCpmTowers(const std::string& source) const
void CpmTesterV1::printCpmHits() const
{
- msg() << "Number of CPM Hits = " << m_hitsMap.size() << endreq;
+ msg() << "Number of CPM Hits = " << m_hitsMap.size() << endmsg;
CpmHitsMap::const_iterator mapIter = m_hitsMap.begin();
CpmHitsMap::const_iterator mapEnd = m_hitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -273,7 +273,7 @@ void CpmTesterV1::printCpmHits() const
ModifySlices::data(ch->HitsVec1(), hits1, slices);
printVecH(hits0);
printVecH(hits1);
- msg() << endreq;
+ msg() << endmsg;
}
}
@@ -281,7 +281,7 @@ void CpmTesterV1::printCpmHits() const
void CpmTesterV1::printCmmCpHits() const
{
- msg() << "Number of CMM-CP Hits = " << m_cmmHitsMap.size() << endreq;
+ msg() << "Number of CMM-CP Hits = " << m_cmmHitsMap.size() << endmsg;
CmmCpHitsMap::const_iterator mapIter = m_cmmHitsMap.begin();
CmmCpHitsMap::const_iterator mapEnd = m_cmmHitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -308,7 +308,7 @@ void CpmTesterV1::printCmmCpHits() const
msg() << MSG::hex;
printVec(err0);
printVec(err1);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -317,7 +317,7 @@ void CpmTesterV1::printCmmCpHits() const
void CpmTesterV1::printCpmRois(const std::string& source) const
{
msg() << "Number of CPM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
CpmRoiMap::const_iterator mapIter = m_roiMap.begin();
CpmRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -331,7 +331,7 @@ void CpmTesterV1::printCpmRois(const std::string& source) const
else if (i > 0) msg() << ":";
msg() << ((hits >> i) & 0x1);
}
- msg() << "/" << roi->error() << "/" << endreq;
+ msg() << "/" << roi->error() << "/" << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV2.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV2.cxx
index cc65885467bad8c6115a6ceeb9d87b5c25a7fb3a..525a5f39e618d586c6080cf603dd941bc39faf38 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/CpmTesterV2.cxx
@@ -68,7 +68,7 @@ CpmTesterV2::~CpmTesterV2()
StatusCode CpmTesterV2::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_towerKey = new LVL1::TriggerTowerKey();
@@ -89,7 +89,7 @@ StatusCode CpmTesterV2::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No core CPM towers found" << endreq;
+ msg() << "No core CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -109,7 +109,7 @@ StatusCode CpmTesterV2::execute()
const CpmTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_cpmTowerLocationOverlap);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No overlap CPM towers found" << endreq;
+ msg() << "No overlap CPM towers found" << endmsg;
} else {
// Order by eta, phi
@@ -129,7 +129,7 @@ StatusCode CpmTesterV2::execute()
const CmxCpTobCollection* tobCollection = 0;
StatusCode sc = evtStore()->retrieve(tobCollection, m_cmxCpTobLocation);
if (sc.isFailure() || !tobCollection || tobCollection->empty()) {
- msg() << "No CMX-CP TOBs found" << endreq;
+ msg() << "No CMX-CP TOBs found" << endmsg;
} else {
// Order by crate, cmx, cpm, chip
@@ -149,7 +149,7 @@ StatusCode CpmTesterV2::execute()
const CmxCpHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmxCpHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMX-CP Hits found" << endreq;
+ msg() << "No CMX-CP Hits found" << endmsg;
} else {
// Order by crate, cmx, source
@@ -169,7 +169,7 @@ StatusCode CpmTesterV2::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocation);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs found" << endreq;
+ msg() << "No CPM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -189,7 +189,7 @@ StatusCode CpmTesterV2::execute()
const CpmRoiCollection* roiCollection = 0;
StatusCode sc = evtStore()->retrieve(roiCollection, m_cpmRoiLocationRoib);
if (sc.isFailure() || !roiCollection || roiCollection->empty()) {
- msg() << "No CPM RoIs from RoIB found" << endreq;
+ msg() << "No CPM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -219,7 +219,7 @@ StatusCode CpmTesterV2::finalize()
void CpmTesterV2::printCpmTowers(const std::string& source) const
{
msg() << "Number of " << source << " CPM towers = "
- << m_ttMap.size() << endreq;
+ << m_ttMap.size() << endmsg;
CpmTowerMap::const_iterator mapIter = m_ttMap.begin();
CpmTowerMap::const_iterator mapEnd = m_ttMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -247,7 +247,7 @@ void CpmTesterV2::printCpmTowers(const std::string& source) const
msg() << MSG::hex;
printVec(emError);
printVec(hadError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -255,7 +255,7 @@ void CpmTesterV2::printCpmTowers(const std::string& source) const
void CpmTesterV2::printCmxCpTobs() const
{
- msg() << "Number of CMX-CP TOBs = " << m_tobMap.size() << endreq;
+ msg() << "Number of CMX-CP TOBs = " << m_tobMap.size() << endmsg;
CmxCpTobMap::const_iterator mapIter = m_tobMap.begin();
CmxCpTobMap::const_iterator mapEnd = m_tobMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -289,7 +289,7 @@ void CpmTesterV2::printCmxCpTobs() const
ModifySlices::data(tb->presenceMapVec(), presence, slices);
printVecH(presence, 1, 16);
}
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -297,7 +297,7 @@ void CpmTesterV2::printCmxCpTobs() const
void CpmTesterV2::printCmxCpHits() const
{
- msg() << "Number of CMX-CP Hits = " << m_hitsMap.size() << endreq;
+ msg() << "Number of CMX-CP Hits = " << m_hitsMap.size() << endmsg;
CmxCpHitsMap::const_iterator mapIter = m_hitsMap.begin();
CmxCpHitsMap::const_iterator mapEnd = m_hitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -346,7 +346,7 @@ void CpmTesterV2::printCmxCpHits() const
}
printVec(err0);
printVec(err1);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -355,7 +355,7 @@ void CpmTesterV2::printCmxCpHits() const
void CpmTesterV2::printCpmRois(const std::string& source) const
{
msg() << "Number of CPM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
CpmRoiMap::const_iterator mapIter = m_roiMap.begin();
CpmRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -364,7 +364,7 @@ void CpmTesterV2::printCpmRois(const std::string& source) const
<< roi->crate() << "/" << roi->cpm() << "/" << roi->chip() << "/"
<< roi->location() << "/" << roi->type() << "/"
<< roi->energy() << "/" << MSG::hex << roi->isolation() << MSG::dec
- << endreq;
+ << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/ErrorTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/ErrorTester.cxx
index 7f3119c7bd9db16c84d0e0edd27b76fb57d982a5..fde7efb9a57bb880decb9ebf07e25bc60e6d272c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/ErrorTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/ErrorTester.cxx
@@ -33,7 +33,7 @@ ErrorTester::~ErrorTester()
StatusCode ErrorTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
return StatusCode::SUCCESS;
}
@@ -48,28 +48,28 @@ StatusCode ErrorTester::execute()
const ErrorCollection* errVec = 0;
StatusCode sc = evtStore()->retrieve(errVec, m_errorVectorLocation);
if (sc.isFailure() || !errVec) {
- msg() << "No error vector found for " << m_errorVectorLocation << endreq;
+ msg() << "No error vector found for " << m_errorVectorLocation << endmsg;
} else {
if (errVec->empty()) {
- msg() << "Error vector empty" << endreq;
+ msg() << "Error vector empty" << endmsg;
} else {
ErrorCollection::const_iterator iter = errVec->begin();
ErrorCollection::const_iterator iterE = errVec->end();
unsigned int size1 = *iter;
++iter;
- msg() << "Number of ROB status errors: " << size1 << endreq;
+ msg() << "Number of ROB status errors: " << size1 << endmsg;
while (iter != iterE) {
msg() << "ROB ID: " << MSG::hex << *iter << MSG::dec;
++iter;
if (iter != iterE) {
if (size1 > 0) {
msg() << " status error: " << MSG::hex << *iter << MSG::dec
- << endreq;
+ << endmsg;
size1--;
- } else msg() << " unpacking error: " << *iter << endreq;
+ } else msg() << " unpacking error: " << *iter << endmsg;
++iter;
} else {
- msg() << " vector truncated, no error value" << endreq;
+ msg() << " vector truncated, no error value" << endmsg;
}
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemErrors.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemErrors.cxx
index d9be8df272766248a09270b17d185756a3da534f..a9db9844bce78a55a3a4ea638bb62b31f2ab1616 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemErrors.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemErrors.cxx
@@ -112,7 +112,7 @@ JemErrors::~JemErrors()
StatusCode JemErrors::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
// Initialise individual error flags
@@ -170,7 +170,7 @@ StatusCode JemErrors::execute()
const JetElementCollection* jeCollection = 0;
StatusCode sc = evtStore()->retrieve(jeCollection, m_jetElementLocation);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No Jet Elements found" << endreq;
+ msg() << "No Jet Elements found" << endmsg;
jeCollection = 0;
}
@@ -185,7 +185,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_jetElementLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording JetElement container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording JetElement container in TDS " << endmsg;
return sc;
}
}
@@ -197,7 +197,7 @@ StatusCode JemErrors::execute()
const EnergySumsCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_jemEtSumsLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No Energy Sums found" << endreq;
+ msg() << "No Energy Sums found" << endmsg;
etCollection = 0;
}
@@ -212,7 +212,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_jemEtSumsLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording JEMEtSums container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording JEMEtSums container in TDS " << endmsg;
return sc;
}
}
@@ -224,7 +224,7 @@ StatusCode JemErrors::execute()
const CmxJetTobCollection* tobCollection = 0;
StatusCode sc = evtStore()->retrieve(tobCollection, m_cmxJetTobLocation);
if (sc.isFailure() || !tobCollection || tobCollection->empty()) {
- msg() << "No CMX TOBs found" << endreq;
+ msg() << "No CMX TOBs found" << endmsg;
tobCollection = 0;
}
@@ -239,7 +239,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_cmxJetTobLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXJetTob container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXJetTob container in TDS " << endmsg;
return sc;
}
}
@@ -251,7 +251,7 @@ StatusCode JemErrors::execute()
const CmxJetHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmxJetHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMX Hits found" << endreq;
+ msg() << "No CMX Hits found" << endmsg;
hitCollection = 0;
}
@@ -266,7 +266,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_cmxJetHitsLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXJetHits container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXJetHits container in TDS " << endmsg;
return sc;
}
}
@@ -278,7 +278,7 @@ StatusCode JemErrors::execute()
const CmxEnergyCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_cmxEnergyLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No CMX Energy Sums found" << endreq;
+ msg() << "No CMX Energy Sums found" << endmsg;
etCollection = 0;
}
@@ -293,7 +293,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_cmxEnergyLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXEtSums container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXEtSums container in TDS " << endmsg;
return sc;
}
}
@@ -305,7 +305,7 @@ StatusCode JemErrors::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocation);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs found" << endreq;
+ msg() << "No JEM RoIs found" << endmsg;
jrCollection = 0;
}
@@ -320,7 +320,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_jemRoiLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording JEMTobRoI container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording JEMTobRoI container in TDS " << endmsg;
return sc;
}
}
@@ -337,7 +337,7 @@ StatusCode JemErrors::execute()
!crCollection->roiWord(3) &&
!crCollection->roiWord(4) &&
!crCollection->roiWord(5))) {
- msg() << "No CMX RoIs found" << endreq;
+ msg() << "No CMX RoIs found" << endmsg;
crCollection = 0;
}
@@ -352,7 +352,7 @@ StatusCode JemErrors::execute()
sc = evtStore()->record(errCollection, m_cmxRoiLocationOut);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error recording CMXRoI container in TDS " << endreq;
+ msg(MSG::ERROR) << "Error recording CMXRoI container in TDS " << endmsg;
return sc;
}
}
@@ -637,13 +637,13 @@ void JemErrors::errorMessage(const std::string& errmsg)
const EventInfo* evInfo = 0;
StatusCode sc = evtStore()->retrieve(evInfo);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "No EventInfo found" << endreq;
+ msg(MSG::ERROR) << "No EventInfo found" << endmsg;
} else {
const EventID* evID = evInfo->event_ID();
if (evID) eventNumber = evID->event_number();
}
msg(MSG::INFO) << "Event " << eventNumber
- << " has error " << errmsg << endreq;
+ << " has error " << errmsg << endmsg;
}
} // end namespace
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTester.cxx
index 026aa89a9d4e42921e336c71849d125a671f0a9a..2e05730525e613521e864a99cebb7995fcd63474 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTester.cxx
@@ -82,7 +82,7 @@ JemTester::~JemTester()
StatusCode JemTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_elementKey = new LVL1::JetElementKey();
@@ -103,7 +103,7 @@ StatusCode JemTester::execute()
const JetElementCollection* jeCollection = 0;
StatusCode sc = evtStore()->retrieve(jeCollection, m_jetElementLocation);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No core Jet Elements found" << endreq;
+ msg() << "No core Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -124,7 +124,7 @@ StatusCode JemTester::execute()
StatusCode sc = evtStore()->retrieve(jeCollection,
m_jetElementLocationOverlap);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No overlap Jet Elements found" << endreq;
+ msg() << "No overlap Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -144,7 +144,7 @@ StatusCode JemTester::execute()
const JetHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_jemHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No Jet Hits found" << endreq;
+ msg() << "No Jet Hits found" << endmsg;
} else {
// Order by crate, module
@@ -164,7 +164,7 @@ StatusCode JemTester::execute()
const EnergySumsCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_jemEtSumsLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No Energy Sums found" << endreq;
+ msg() << "No Energy Sums found" << endmsg;
} else {
// Order by crate, module
@@ -184,7 +184,7 @@ StatusCode JemTester::execute()
const CmmJetCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmmJetLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMM Hits found" << endreq;
+ msg() << "No CMM Hits found" << endmsg;
} else {
// Order by crate, dataID
@@ -204,7 +204,7 @@ StatusCode JemTester::execute()
const CmmEnergyCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_cmmEnergyLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No CMM Energy Sums found" << endreq;
+ msg() << "No CMM Energy Sums found" << endmsg;
} else {
// Order by crate, dataID
@@ -224,7 +224,7 @@ StatusCode JemTester::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocation);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs found" << endreq;
+ msg() << "No JEM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -244,7 +244,7 @@ StatusCode JemTester::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocationRoib);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs from RoIB found" << endreq;
+ msg() << "No JEM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -267,7 +267,7 @@ StatusCode JemTester::execute()
!crCollection->energyRoiWord0() &&
!crCollection->energyRoiWord1() &&
!crCollection->energyRoiWord2())) {
- msg() << "No CMM RoIs found" << endreq;
+ msg() << "No CMM RoIs found" << endmsg;
} else {
// Print the CMM RoIs
@@ -286,7 +286,7 @@ StatusCode JemTester::execute()
!crCollection->energyRoiWord0() &&
!crCollection->energyRoiWord1() &&
!crCollection->energyRoiWord2())) {
- msg() << "No CMM RoIs from RoIB found" << endreq;
+ msg() << "No CMM RoIs from RoIB found" << endmsg;
} else {
// Print the CMM RoIs from RoIB
@@ -312,7 +312,7 @@ StatusCode JemTester::finalize()
void JemTester::printJetElements(const std::string& source) const
{
msg() << "Number of " << source << " Jet Elements = "
- << m_jeMap.size() << endreq;
+ << m_jeMap.size() << endmsg;
JetElementMap::const_iterator mapIter = m_jeMap.begin();
JetElementMap::const_iterator mapEnd = m_jeMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -343,7 +343,7 @@ void JemTester::printJetElements(const std::string& source) const
printVec(emError);
printVec(hadError);
printVec(linkError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -351,7 +351,7 @@ void JemTester::printJetElements(const std::string& source) const
void JemTester::printJetHits() const
{
- msg() << "Number of Jet Hits = " << m_hitsMap.size() << endreq;
+ msg() << "Number of Jet Hits = " << m_hitsMap.size() << endmsg;
JetHitsMap::const_iterator mapIter = m_hitsMap.begin();
JetHitsMap::const_iterator mapEnd = m_hitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -386,7 +386,7 @@ void JemTester::printJetHits() const
msg() << thr;
}
}
- msg() << "/" << endreq;
+ msg() << "/" << endmsg;
}
}
@@ -394,7 +394,7 @@ void JemTester::printJetHits() const
void JemTester::printEnergySums() const
{
- msg() << "Number of Energy Sums = " << m_etMap.size() << endreq;
+ msg() << "Number of Energy Sums = " << m_etMap.size() << endmsg;
EnergySumsMap::const_iterator mapIter = m_etMap.begin();
EnergySumsMap::const_iterator mapEnd = m_etMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -416,7 +416,7 @@ void JemTester::printEnergySums() const
printVecU(exVec);
printVecU(eyVec);
printVecU(etVec);
- msg() << endreq;
+ msg() << endmsg;
}
}
@@ -424,7 +424,7 @@ void JemTester::printEnergySums() const
void JemTester::printCmmHits() const
{
- msg() << "Number of CMM Hits = " << m_cmmHitsMap.size() << endreq;
+ msg() << "Number of CMM Hits = " << m_cmmHitsMap.size() << endmsg;
CmmHitsMap::const_iterator mapIter = m_cmmHitsMap.begin();
CmmHitsMap::const_iterator mapEnd = m_cmmHitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -473,7 +473,7 @@ void JemTester::printCmmHits() const
std::vector<int> errorVec;
ModifySlices::data(jh->ErrorVec(), errorVec, slices);
printVec(errorVec);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -481,7 +481,7 @@ void JemTester::printCmmHits() const
void JemTester::printCmmSums() const
{
- msg() << "Number of CMM Energy Sums = " << m_cmmEtMap.size() << endreq;
+ msg() << "Number of CMM Energy Sums = " << m_cmmEtMap.size() << endmsg;
CmmSumsMap::const_iterator mapIter = m_cmmEtMap.begin();
CmmSumsMap::const_iterator mapEnd = m_cmmEtMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -513,7 +513,7 @@ void JemTester::printCmmSums() const
printVec(exError);
printVec(eyError);
printVec(etError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -522,7 +522,7 @@ void JemTester::printCmmSums() const
void JemTester::printJemRois(const std::string& source) const
{
msg() << "Number of JEM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
JemRoiMap::const_iterator mapIter = m_roiMap.begin();
JemRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -536,7 +536,7 @@ void JemTester::printJemRois(const std::string& source) const
if (i > 0) msg() << ":";
msg() << ((hits >> i) & 0x1);
}
- msg() << "/" << roi->error() << "/" << endreq;
+ msg() << "/" << roi->error() << "/" << endmsg;
}
}
@@ -553,7 +553,7 @@ void JemTester::printCmmRois(const std::string& source,
<< roi->missingEtSigHits() << ";" << roi->missingEtSigError() << "/"
<< MSG::dec << roi->ex() << ";" << roi->exError() << "/"
<< roi->ey() << ";" << roi->eyError() << "/"
- << roi->et() << ";" << roi->etError() << "/" << endreq;
+ << roi->et() << ";" << roi->etError() << "/" << endmsg;
}
// Print a vector
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV1.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV1.cxx
index 62a58e175f35b12004659b920ef2fbf070686aea..c870b6cb92ff9eef91c897df8ddf097db672ec33 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV1.cxx
@@ -82,7 +82,7 @@ JemTesterV1::~JemTesterV1()
StatusCode JemTesterV1::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_elementKey = new LVL1::JetElementKey();
@@ -103,7 +103,7 @@ StatusCode JemTesterV1::execute()
const JetElementCollection* jeCollection = 0;
StatusCode sc = evtStore()->retrieve(jeCollection, m_jetElementLocation);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No core Jet Elements found" << endreq;
+ msg() << "No core Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -124,7 +124,7 @@ StatusCode JemTesterV1::execute()
StatusCode sc = evtStore()->retrieve(jeCollection,
m_jetElementLocationOverlap);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No overlap Jet Elements found" << endreq;
+ msg() << "No overlap Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -144,7 +144,7 @@ StatusCode JemTesterV1::execute()
const JetHitsCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_jemHitsLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No Jet Hits found" << endreq;
+ msg() << "No Jet Hits found" << endmsg;
} else {
// Order by crate, module
@@ -164,7 +164,7 @@ StatusCode JemTesterV1::execute()
const EnergySumsCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_jemEtSumsLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No Energy Sums found" << endreq;
+ msg() << "No Energy Sums found" << endmsg;
} else {
// Order by crate, module
@@ -184,7 +184,7 @@ StatusCode JemTesterV1::execute()
const CmmJetCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmmJetLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMM Hits found" << endreq;
+ msg() << "No CMM Hits found" << endmsg;
} else {
// Order by crate, dataID
@@ -204,7 +204,7 @@ StatusCode JemTesterV1::execute()
const CmmEnergyCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_cmmEnergyLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No CMM Energy Sums found" << endreq;
+ msg() << "No CMM Energy Sums found" << endmsg;
} else {
// Order by crate, dataID
@@ -224,7 +224,7 @@ StatusCode JemTesterV1::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocation);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs found" << endreq;
+ msg() << "No JEM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -244,7 +244,7 @@ StatusCode JemTesterV1::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocationRoib);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs from RoIB found" << endreq;
+ msg() << "No JEM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -267,7 +267,7 @@ StatusCode JemTesterV1::execute()
!crCollection->energyRoiWord0() &&
!crCollection->energyRoiWord1() &&
!crCollection->energyRoiWord2())) {
- msg() << "No CMM RoIs found" << endreq;
+ msg() << "No CMM RoIs found" << endmsg;
} else {
// Print the CMM RoIs
@@ -286,7 +286,7 @@ StatusCode JemTesterV1::execute()
!crCollection->energyRoiWord0() &&
!crCollection->energyRoiWord1() &&
!crCollection->energyRoiWord2())) {
- msg() << "No CMM RoIs from RoIB found" << endreq;
+ msg() << "No CMM RoIs from RoIB found" << endmsg;
} else {
// Print the CMM RoIs from RoIB
@@ -312,7 +312,7 @@ StatusCode JemTesterV1::finalize()
void JemTesterV1::printJetElements(const std::string& source) const
{
msg() << "Number of " << source << " Jet Elements = "
- << m_jeMap.size() << endreq;
+ << m_jeMap.size() << endmsg;
JetElementMap::const_iterator mapIter = m_jeMap.begin();
JetElementMap::const_iterator mapEnd = m_jeMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -343,7 +343,7 @@ void JemTesterV1::printJetElements(const std::string& source) const
printVec(emError);
printVec(hadError);
printVec(linkError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -351,7 +351,7 @@ void JemTesterV1::printJetElements(const std::string& source) const
void JemTesterV1::printJetHits() const
{
- msg() << "Number of Jet Hits = " << m_hitsMap.size() << endreq;
+ msg() << "Number of Jet Hits = " << m_hitsMap.size() << endmsg;
JetHitsMap::const_iterator mapIter = m_hitsMap.begin();
JetHitsMap::const_iterator mapEnd = m_hitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -386,7 +386,7 @@ void JemTesterV1::printJetHits() const
msg() << thr;
}
}
- msg() << "/" << endreq;
+ msg() << "/" << endmsg;
}
}
@@ -394,7 +394,7 @@ void JemTesterV1::printJetHits() const
void JemTesterV1::printEnergySums() const
{
- msg() << "Number of Energy Sums = " << m_etMap.size() << endreq;
+ msg() << "Number of Energy Sums = " << m_etMap.size() << endmsg;
EnergySumsMap::const_iterator mapIter = m_etMap.begin();
EnergySumsMap::const_iterator mapEnd = m_etMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -416,7 +416,7 @@ void JemTesterV1::printEnergySums() const
printVecU(exVec);
printVecU(eyVec);
printVecU(etVec);
- msg() << endreq;
+ msg() << endmsg;
}
}
@@ -424,7 +424,7 @@ void JemTesterV1::printEnergySums() const
void JemTesterV1::printCmmHits() const
{
- msg() << "Number of CMM Hits = " << m_cmmHitsMap.size() << endreq;
+ msg() << "Number of CMM Hits = " << m_cmmHitsMap.size() << endmsg;
CmmHitsMap::const_iterator mapIter = m_cmmHitsMap.begin();
CmmHitsMap::const_iterator mapEnd = m_cmmHitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -473,7 +473,7 @@ void JemTesterV1::printCmmHits() const
std::vector<int> errorVec;
ModifySlices::data(jh->ErrorVec(), errorVec, slices);
printVec(errorVec);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -481,7 +481,7 @@ void JemTesterV1::printCmmHits() const
void JemTesterV1::printCmmSums() const
{
- msg() << "Number of CMM Energy Sums = " << m_cmmEtMap.size() << endreq;
+ msg() << "Number of CMM Energy Sums = " << m_cmmEtMap.size() << endmsg;
CmmSumsMap::const_iterator mapIter = m_cmmEtMap.begin();
CmmSumsMap::const_iterator mapEnd = m_cmmEtMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -513,7 +513,7 @@ void JemTesterV1::printCmmSums() const
printVec(exError);
printVec(eyError);
printVec(etError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -522,7 +522,7 @@ void JemTesterV1::printCmmSums() const
void JemTesterV1::printJemRois(const std::string& source) const
{
msg() << "Number of JEM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
JemRoiMap::const_iterator mapIter = m_roiMap.begin();
JemRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -536,7 +536,7 @@ void JemTesterV1::printJemRois(const std::string& source) const
if (i > 0) msg() << ":";
msg() << ((hits >> i) & 0x1);
}
- msg() << "/" << roi->error() << "/" << endreq;
+ msg() << "/" << roi->error() << "/" << endmsg;
}
}
@@ -553,7 +553,7 @@ void JemTesterV1::printCmmRois(const std::string& source,
<< roi->missingEtSigHits() << ";" << roi->missingEtSigError() << "/"
<< MSG::dec << roi->ex() << ";" << roi->exError() << "/"
<< roi->ey() << ";" << roi->eyError() << "/"
- << roi->et() << ";" << roi->etError() << "/" << endreq;
+ << roi->et() << ";" << roi->etError() << "/" << endmsg;
}
// Print a vector
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV2.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV2.cxx
index 8ad28a0e8c0747a6efd66ee3e99ee0133bf99123..d460ab93a742e7435f30976e8d365a0cdc2adb10 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/JemTesterV2.cxx
@@ -84,7 +84,7 @@ JemTesterV2::~JemTesterV2()
StatusCode JemTesterV2::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_elementKey = new LVL1::JetElementKey();
@@ -105,7 +105,7 @@ StatusCode JemTesterV2::execute()
const JetElementCollection* jeCollection = 0;
StatusCode sc = evtStore()->retrieve(jeCollection, m_jetElementLocation);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No core Jet Elements found" << endreq;
+ msg() << "No core Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -126,7 +126,7 @@ StatusCode JemTesterV2::execute()
StatusCode sc = evtStore()->retrieve(jeCollection,
m_jetElementLocationOverlap);
if (sc.isFailure() || !jeCollection || jeCollection->empty()) {
- msg() << "No overlap Jet Elements found" << endreq;
+ msg() << "No overlap Jet Elements found" << endmsg;
} else {
// Order by eta, phi
@@ -146,7 +146,7 @@ StatusCode JemTesterV2::execute()
const EnergySumsCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_jemEtSumsLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No Energy Sums found" << endreq;
+ msg() << "No Energy Sums found" << endmsg;
} else {
// Order by crate, module
@@ -166,7 +166,7 @@ StatusCode JemTesterV2::execute()
const CmxTobCollection* tobCollection = 0;
StatusCode sc = evtStore()->retrieve(tobCollection, m_cmxTobLocation);
if (sc.isFailure() || !tobCollection || tobCollection->empty()) {
- msg() << "No CMX TOBs found" << endreq;
+ msg() << "No CMX TOBs found" << endmsg;
} else {
// Order by crate, jem, frame, loc
@@ -186,7 +186,7 @@ StatusCode JemTesterV2::execute()
const CmxJetCollection* hitCollection = 0;
StatusCode sc = evtStore()->retrieve(hitCollection, m_cmxJetLocation);
if (sc.isFailure() || !hitCollection || hitCollection->empty()) {
- msg() << "No CMX Hits found" << endreq;
+ msg() << "No CMX Hits found" << endmsg;
} else {
// Order by crate, source
@@ -206,7 +206,7 @@ StatusCode JemTesterV2::execute()
const CmxEnergyCollection* etCollection = 0;
StatusCode sc = evtStore()->retrieve(etCollection, m_cmxEnergyLocation);
if (sc.isFailure() || !etCollection || etCollection->empty()) {
- msg() << "No CMX Energy Sums found" << endreq;
+ msg() << "No CMX Energy Sums found" << endmsg;
} else {
// Order by crate, source
@@ -226,7 +226,7 @@ StatusCode JemTesterV2::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocation);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs found" << endreq;
+ msg() << "No JEM RoIs found" << endmsg;
} else {
// Order by RoI word
@@ -246,7 +246,7 @@ StatusCode JemTesterV2::execute()
const JemRoiCollection* jrCollection = 0;
StatusCode sc = evtStore()->retrieve(jrCollection, m_jemRoiLocationRoib);
if (sc.isFailure() || !jrCollection || jrCollection->empty()) {
- msg() << "No JEM RoIs from RoIB found" << endreq;
+ msg() << "No JEM RoIs from RoIB found" << endmsg;
} else {
// Order by RoI word
@@ -271,7 +271,7 @@ StatusCode JemTesterV2::execute()
!crCollection->roiWord(3) &&
!crCollection->roiWord(4) &&
!crCollection->roiWord(5))) {
- msg() << "No CMX RoIs found" << endreq;
+ msg() << "No CMX RoIs found" << endmsg;
} else {
// Print the CMX RoIs
@@ -292,7 +292,7 @@ StatusCode JemTesterV2::execute()
!crCollection->roiWord(3) &&
!crCollection->roiWord(4) &&
!crCollection->roiWord(5))) {
- msg() << "No CMX RoIs from RoIB found" << endreq;
+ msg() << "No CMX RoIs from RoIB found" << endmsg;
} else {
// Print the CMX RoIs from RoIB
@@ -318,7 +318,7 @@ StatusCode JemTesterV2::finalize()
void JemTesterV2::printJetElements(const std::string& source) const
{
msg() << "Number of " << source << " Jet Elements = "
- << m_jeMap.size() << endreq;
+ << m_jeMap.size() << endmsg;
JetElementMap::const_iterator mapIter = m_jeMap.begin();
JetElementMap::const_iterator mapEnd = m_jeMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -348,7 +348,7 @@ void JemTesterV2::printJetElements(const std::string& source) const
printVec(emError);
printVec(hadError);
printVec(linkError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -356,7 +356,7 @@ void JemTesterV2::printJetElements(const std::string& source) const
void JemTesterV2::printEnergySums() const
{
- msg() << "Number of Energy Sums = " << m_etMap.size() << endreq;
+ msg() << "Number of Energy Sums = " << m_etMap.size() << endmsg;
EnergySumsMap::const_iterator mapIter = m_etMap.begin();
EnergySumsMap::const_iterator mapEnd = m_etMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -378,7 +378,7 @@ void JemTesterV2::printEnergySums() const
printVecU(exVec);
printVecU(eyVec);
printVecU(etVec);
- msg() << endreq;
+ msg() << endmsg;
}
}
@@ -386,7 +386,7 @@ void JemTesterV2::printEnergySums() const
void JemTesterV2::printCmxTobs() const
{
- msg() << "Number of CMX-Jet TOBs = " << m_cmxTobMap.size() << endreq;
+ msg() << "Number of CMX-Jet TOBs = " << m_cmxTobMap.size() << endmsg;
CmxTobMap::const_iterator mapIter = m_cmxTobMap.begin();
CmxTobMap::const_iterator mapEnd = m_cmxTobMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -420,7 +420,7 @@ void JemTesterV2::printCmxTobs() const
ModifySlices::data(tb->presenceMapVec(), presence, slices);
printVecH(presence, 1, 16);
}
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -428,7 +428,7 @@ void JemTesterV2::printCmxTobs() const
void JemTesterV2::printCmxHits() const
{
- msg() << "Number of CMX Hits = " << m_cmxHitsMap.size() << endreq;
+ msg() << "Number of CMX Hits = " << m_cmxHitsMap.size() << endmsg;
CmxHitsMap::const_iterator mapIter = m_cmxHitsMap.begin();
CmxHitsMap::const_iterator mapEnd = m_cmxHitsMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -502,7 +502,7 @@ void JemTesterV2::printCmxHits() const
ModifySlices::data(jh->errorVec1(), errorVec1, slices);
printVec(errorVec0);
printVec(errorVec1);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -510,7 +510,7 @@ void JemTesterV2::printCmxHits() const
void JemTesterV2::printCmxSums() const
{
- msg() << "Number of CMX Energy Sums = " << m_cmxEtMap.size() << endreq;
+ msg() << "Number of CMX Energy Sums = " << m_cmxEtMap.size() << endmsg;
CmxSumsMap::const_iterator mapIter = m_cmxEtMap.begin();
CmxSumsMap::const_iterator mapEnd = m_cmxEtMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -542,7 +542,7 @@ void JemTesterV2::printCmxSums() const
printVec(exError);
printVec(eyError);
printVec(etError);
- msg() << MSG::dec << endreq;
+ msg() << MSG::dec << endmsg;
}
}
@@ -551,7 +551,7 @@ void JemTesterV2::printCmxSums() const
void JemTesterV2::printJemRois(const std::string& source) const
{
msg() << "Number of JEM RoIs (" << source << ") = " << m_roiMap.size()
- << endreq;
+ << endmsg;
JemRoiMap::const_iterator mapIter = m_roiMap.begin();
JemRoiMap::const_iterator mapEnd = m_roiMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -559,7 +559,7 @@ void JemTesterV2::printJemRois(const std::string& source) const
msg() << "crate/jem/frame/loc/energyLg/energySm: "
<< roi->crate() << "/" << roi->jem() << "/" << roi->frame() << "/"
<< roi->location() << "/" << roi->energyLarge() << "/"
- << roi->energySmall() << "/" << endreq;
+ << roi->energySmall() << "/" << endmsg;
}
}
@@ -577,7 +577,7 @@ void JemTesterV2::printCmxRois(const std::string& source,
<< MSG::dec
<< roi->ex() << ";" << roi->exError() << "/"
<< roi->ey() << ";" << roi->eyError() << "/"
- << roi->et() << ";" << roi->etError() << "/" << endreq;
+ << roi->et() << ";" << roi->etError() << "/" << endmsg;
msg() << "CMXRoI(" << source
<< "):Masked:sumEtHits/missingEtHits/Ex/Ey/Et;error: "
<< MSG::hex
@@ -589,7 +589,7 @@ void JemTesterV2::printCmxRois(const std::string& source,
<< roi->ey(LVL1::CMXRoI::MASKED) << ";"
<< roi->eyError(LVL1::CMXRoI::MASKED) << "/"
<< roi->et(LVL1::CMXRoI::MASKED) << ";"
- << roi->etError(LVL1::CMXRoI::MASKED) << "/" << endreq;
+ << roi->etError(LVL1::CMXRoI::MASKED) << "/" << endmsg;
}
// Print a vector
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
index 1280c454e68d18824bcf6a07fc815090fcb2b31d..83c0f6a17191b4087aa05fca690ea60425cd0d86 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
@@ -64,21 +64,21 @@ PpmMappingTester::~PpmMappingTester()
StatusCode PpmMappingTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
// Retrieve mapping tools
StatusCode sc = m_tool1.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_tool1 << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_tool1 << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_tool1 << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_tool1 << endmsg;
sc = m_tool2.retrieve();
if ( sc.isFailure() ) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_tool2 << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_tool2 << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_tool2 << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_tool2 << endmsg;
return StatusCode::SUCCESS;
}
@@ -111,12 +111,12 @@ StatusCode PpmMappingTester::execute()
etaPhiToChannel(m_tool2, chanIds2);
unsigned int size1 = chanIds.size();
unsigned int size2 = chanIds2.size();
- msg(MSG::INFO) << "Vector sizes: " << size1 << ", " << size2 << endreq;
+ msg(MSG::INFO) << "Vector sizes: " << size1 << ", " << size2 << endmsg;
if (size1 == size2) {
for (unsigned int i = 0; i < size1; ++i) {
if (chanIds[i] != chanIds2[i]) {
msg(MSG::INFO) << "ChanID mismatch: " << chanIds[i] << ", "
- << chanIds2[i] << endreq;
+ << chanIds2[i] << endmsg;
}
}
}
@@ -127,7 +127,7 @@ StatusCode PpmMappingTester::execute()
channelToEtaPhi(m_tool2, etas2, phis2, layers2);
size1 = etas.size();
size2 = etas2.size();
- msg(MSG::INFO) << "Vector sizes: " << size1 << ", " << size2 << endreq;
+ msg(MSG::INFO) << "Vector sizes: " << size1 << ", " << size2 << endmsg;
if (size1 == size2) {
for (unsigned int i = 0; i < size1; ++i) {
if (notEqual(etas[i], etas2[i]) ||
@@ -137,7 +137,7 @@ StatusCode PpmMappingTester::execute()
<< etas[i] << "/" << phis[i] << "/"
<< layers[i] << "/"
<< etas2[i] << "/" << phis2[i] << "/"
- << layers2[i] << endreq;
+ << layers2[i] << endmsg;
}
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmSubsetTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmSubsetTester.cxx
index 8b921a33f63f482fbaabdfc02b79f7a9b4a73844..bc46af0f55687a3db4ce4ebdfa644fcb58808d42 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmSubsetTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmSubsetTester.cxx
@@ -51,13 +51,13 @@ PpmSubsetTester::~PpmSubsetTester()
StatusCode PpmSubsetTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
StatusCode sc = m_dataAccess.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve tool " << m_dataAccess << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve tool " << m_dataAccess << endmsg;
return sc;
- } else msg(MSG::INFO) << "Retrieved tool " << m_dataAccess << endreq;
+ } else msg(MSG::INFO) << "Retrieved tool " << m_dataAccess << endmsg;
m_towerKey = new LVL1::TriggerTowerKey();
@@ -81,7 +81,7 @@ StatusCode PpmSubsetTester::execute()
const TriggerTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_triggerTowerLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No Trigger Towers found" << endreq;
+ msg() << "No Trigger Towers found" << endmsg;
return StatusCode::SUCCESS;
}
@@ -99,7 +99,7 @@ StatusCode PpmSubsetTester::execute()
TriggerTowerCollection::const_iterator end;
sc = m_dataAccess->loadCollection(beg, end, etaMin, etaMax, phiMin, phiMax, false);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Error accessing data" << endreq;
+ msg(MSG::ERROR) << "Error accessing data" << endmsg;
return sc;
}
@@ -127,7 +127,7 @@ StatusCode PpmSubsetTester::finalize()
void PpmSubsetTester::printTriggerTowers() const
{
- msg() << "Number of Trigger Towers = " << m_ttMap.size() << endreq;
+ msg() << "Number of Trigger Towers = " << m_ttMap.size() << endmsg;
TriggerTowerMap::const_iterator mapIter = m_ttMap.begin();
TriggerTowerMap::const_iterator mapEnd = m_ttMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -169,7 +169,7 @@ void PpmSubsetTester::printTriggerTowers() const
printVec(fadc);
printVec(bcidLut);
printVec(bcidFadc);
- msg() << MSG::hex << tt->emError() << MSG::dec << "/" << endreq
+ msg() << MSG::hex << tt->emError() << MSG::dec << "/" << endmsg
<< "HAD:key/eta/phi/LUTpeak/FADCpeak/LUT/FADC/bcidLUT/bcidFADC/error: "
<< mapIter->first << "/" << tt->eta() << "/" << tt->phi() << "/"
<< hadPeak << "/" << hadADCPeak << "/";
@@ -181,7 +181,7 @@ void PpmSubsetTester::printTriggerTowers() const
printVec(fadc);
printVec(bcidLut);
printVec(bcidFadc);
- msg() << MSG::hex << tt->hadError() << MSG::dec << "/" << endreq;
+ msg() << MSG::hex << tt->hadError() << MSG::dec << "/" << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmTester.cxx
index e062118d45b40f31be15ba9dbe905d46916812a7..9c1765afbc46130f497411fc341fc7e22291744f 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmTester.cxx
@@ -44,7 +44,7 @@ PpmTester::~PpmTester()
StatusCode PpmTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
m_towerKey = new LVL1::TriggerTowerKey();
@@ -63,7 +63,7 @@ StatusCode PpmTester::execute()
const TriggerTowerCollection* ttCollection = 0;
StatusCode sc = evtStore()->retrieve(ttCollection, m_triggerTowerLocation);
if (sc.isFailure() || !ttCollection || ttCollection->empty()) {
- msg() << "No Trigger Towers found" << endreq;
+ msg() << "No Trigger Towers found" << endmsg;
return StatusCode::SUCCESS;
}
@@ -91,7 +91,7 @@ StatusCode PpmTester::finalize()
void PpmTester::printTriggerTowers() const
{
- msg() << "Number of Trigger Towers = " << m_ttMap.size() << endreq;
+ msg() << "Number of Trigger Towers = " << m_ttMap.size() << endmsg;
TriggerTowerMap::const_iterator mapIter = m_ttMap.begin();
TriggerTowerMap::const_iterator mapEnd = m_ttMap.end();
for (; mapIter != mapEnd; ++mapIter) {
@@ -133,7 +133,7 @@ void PpmTester::printTriggerTowers() const
printVec(fadc);
printVec(bcidLut);
printVec(bcidFadc);
- msg() << MSG::hex << tt->emError() << MSG::dec << "/" << endreq;
+ msg() << MSG::hex << tt->emError() << MSG::dec << "/" << endmsg;
msg() << "HAD:key/eta/phi/LUTpeak/FADCpeak/LUT/FADC/bcidLUT/bcidFADC/error: "
<< mapIter->first << "/" << tt->eta() << "/" << tt->phi() << "/"
<< hadPeak << "/" << hadADCPeak << "/";
@@ -145,7 +145,7 @@ void PpmTester::printTriggerTowers() const
printVec(fadc);
printVec(bcidLut);
printVec(bcidFadc);
- msg() << MSG::hex << tt->hadError() << MSG::dec << "/" << endreq;
+ msg() << MSG::hex << tt->hadError() << MSG::dec << "/" << endmsg;
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/RodTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/RodTester.cxx
index dd6a6abb9fd476c748e4ccf8daa2ff3aeacafca9..0ff1ee51310602d3e113636e053126ab8ccb8eac 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/RodTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/RodTester.cxx
@@ -46,7 +46,7 @@ RodTester::~RodTester()
StatusCode RodTester::initialize()
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << /* version() */ PACKAGE_VERSION << endreq;
+ << /* version() */ PACKAGE_VERSION << endmsg;
return StatusCode::SUCCESS;
}
@@ -64,44 +64,44 @@ StatusCode RodTester::execute()
std::vector<std::string>::const_iterator flagEnd = m_flags.end();
for (; flagIter != flagEnd; ++flagIter) {
msg() << "================================================="
- << endreq;
+ << endmsg;
const std::string location(m_rodHeaderLocation + *flagIter);
const RodHeaderCollection* rods = 0;
StatusCode sc = evtStore()->retrieve(rods, location);
if (sc.isFailure() || !rods || rods->empty()) {
- msg() << "No ROD headers found for " << location << endreq;
+ msg() << "No ROD headers found for " << location << endmsg;
} else {
// Print the ROD headers
msg() << "Number of ROD headers in collection "
- << location << " is " << rods->size() << MSG::hex << endreq;
+ << location << " is " << rods->size() << MSG::hex << endmsg;
RodHeaderCollection::const_iterator rodIter = rods->begin();
RodHeaderCollection::const_iterator rodEnd = rods->end();
for (; rodIter != rodEnd; ++rodIter) {
const LVL1::RODHeader* const header = *rodIter;
msg() << "-------------------------------------------------"
- << endreq
+ << endmsg
<< "version/majorVersion/minorVersion: "
<< header->version() << "/" << header->majorVersion() << "/"
- << header->minorVersion() << endreq
+ << header->minorVersion() << endmsg
<< "sourceID/subDetectorID/moduleID/crate/sLink/dataType: "
<< header->sourceID() << "/" << header->subDetectorID() << "/"
<< header->moduleID() << "/" << header->crate() << "/"
- << header->sLink() << "/" << header->dataType() << endreq
+ << header->sLink() << "/" << header->dataType() << endmsg
<< "run/runType/runNumber: "
<< header->run() << "/" << header->runType() << "/"
- << header->runNumber() << endreq
+ << header->runNumber() << endmsg
<< "extendedL1ID/ecrID/l1ID: "
<< header->extendedL1ID() << "/" << header->ecrID() << "/"
- << header->l1ID() << endreq
+ << header->l1ID() << endmsg
<< "bunchCrossing/l1TriggerType: "
<< header->bunchCrossing() << "/" << header->l1TriggerType() << "/"
- << endreq
+ << endmsg
<< "detEventType/orbitCount/stepNumber/stepType: "
<< header->detEventType() << "/" << header->orbitCount() << "/"
- << header->stepNumber() << "/" << header->stepType() << endreq
- << "payloadSize: " << header->payloadSize() << endreq;
+ << header->stepNumber() << "/" << header->stepType() << endmsg
+ << "payloadSize: " << header->payloadSize() << endmsg;
const std::vector<uint32_t>& words(header->statusWords());
msg() << "statusWords(" << words.size() << "): ";
std::vector<uint32_t>::const_iterator wordIter = words.begin();
@@ -109,17 +109,17 @@ StatusCode RodTester::execute()
for (; wordIter != wordEnd; ++wordIter) {
msg() << *wordIter << " ";
}
- msg() << endreq
+ msg() << endmsg
<< "bcnMismatch/gLinkTimeout/dataTransportError/rodFifoOverflow: "
<< header->bcnMismatch() << "/" << header->gLinkTimeout() << "/"
<< header->dataTransportError() << "/" << header->rodFifoOverflow()
- << endreq
+ << endmsg
<< "lvdsLinkError/cmmParityError/gLinkError: "
<< header->lvdsLinkError() << "/" << header->cmmParityError() << "/"
- << header->gLinkError() << endreq
+ << header->gLinkError() << endmsg
<< "limitedRoISet/triggerTypeTimeout: "
<< header->limitedRoISet() << "/" << header->triggerTypeTimeout()
- << endreq;
+ << endmsg;
}
msg() << MSG::dec;
}