diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
index 65d12c8735bc8bffdc4593c04baa925ea67524b1..e1896bb6eee65b93660eb2e76db21473d4723d30 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileHid2RESrcID.cxx
@@ -131,26 +131,26 @@ void TileHid2RESrcID::setROD2ROBmap(const std::vector<std::string> & ROD2ROB,
uint32_t rob = strtol(ROD2ROB[i].data(),NULL,0) & 0xFFFFFF;
if ( frag < 0x1000 ) {
if ( rob < 0x500000 ) {
- log << MSG::ERROR << "You are using obsolete mapping" << endreq;
- log << MSG::ERROR << "Please, upgrade it to event format V3" << endreq;
+ log << MSG::ERROR << "You are using obsolete mapping" << endmsg;
+ log << MSG::ERROR << "Please, upgrade it to event format V3" << endmsg;
assert(0);
log << MSG::ERROR << "TileHid2RESrcID:: mapping frag 0x"<< MSG::hex
- << frag << " to ROB 0x" << rob << MSG::dec << endreq;
+ << frag << " to ROB 0x" << rob << MSG::dec << endmsg;
}
// this is actually remapping for fragments inside ROB, bypassing ROD ID
m_frag2ROD[frag] = rob;
log << MSG::INFO << "TileHid2RESrcID:: mapping frag 0x"<< MSG::hex
- << frag << " to ROB 0x" << rob << MSG::dec << endreq;
+ << frag << " to ROB 0x" << rob << MSG::dec << endmsg;
++fragCount;
} else {
- log << MSG::ERROR << "You are using obsolete ROD to ROB mapping" << endreq;
- log << MSG::ERROR << "Please, replace it by frag -> ROB mapping" << endreq;
+ log << MSG::ERROR << "You are using obsolete ROD to ROB mapping" << endmsg;
+ log << MSG::ERROR << "Please, replace it by frag -> ROB mapping" << endmsg;
assert(0);
}
}
if (fragCount > 0)
log << MSG::INFO << "TileHid2RESrcID:: " << fragCount
- << " frag to ROD remappings set via jobOptions" << endreq;
+ << " frag to ROD remappings set via jobOptions" << endmsg;
}
void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint32_t*> * event,
@@ -256,9 +256,9 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if (!cisparFound) {
if (lascisROB) {
m_frag2ROD[0xff] = lascisROB;
- log << MSG::INFO << "TileHid2RESrcID: Attention! Taking CISpar from lastROD 0x" << MSG::hex << lascisROB << MSG::dec << endreq;
+ log << MSG::INFO << "TileHid2RESrcID: Attention! Taking CISpar from lastROD 0x" << MSG::hex << lascisROB << MSG::dec << endmsg;
} else {
- log << MSG::INFO << "TileHid2RESrcID: no CISpar in the data" << endreq;
+ log << MSG::INFO << "TileHid2RESrcID: no CISpar in the data" << endmsg;
}
}
log << MSG::INFO << "TileHid2RESrcID: " << nBeamFrag << " beam sub-frags (";
@@ -275,7 +275,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if (itr->first < 10) nDataFrag[itr->first]+=itr->second; // id=0 - all digits, id=1 - digits above threshold
// id=2,3,4,5 - reco frags
}
- log << " ) was found in the data" << endreq;
+ log << " ) was found in the data" << endmsg;
if ((nDataFrag[0]+nDataFrag[1]==0 || (nDataFrag[2]+nDataFrag[3]+nDataFrag[4]==0)) && nDataFrag[5] > 0 ) {
// only frag5 in the data - make sure that TileROD_Decoder is configured properly
@@ -285,7 +285,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
IToolSvc* toolSvc;
sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
if(sc.isFailure()){
- log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endreq;
+ log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endmsg;
return;
}
@@ -293,7 +293,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
TileROD_Decoder* rodDecoder=0;
sc = toolSvc->retrieveTool("TileROD_Decoder",rodDecoder);
if (sc.isFailure()) {
- log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileROD_Decoder" << endreq;
+ log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileROD_Decoder" << endmsg;
return;
}
@@ -303,12 +303,12 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
rodDecoder->setUseFrag0 (false);
rodDecoder->setUseFrag1 (false);
rodDecoder->setUseFrag5Raw (true);
- log << MSG::INFO << "Setting TileROD_Decoder->useFrag5Raw to true, unit is " << unit << endreq;
+ log << MSG::INFO << "Setting TileROD_Decoder->useFrag5Raw to true, unit is " << unit << endmsg;
std::vector<int>::const_iterator itr=fragIDs.begin();
std::vector<int>::const_iterator end=fragIDs.end();
for ( ; itr!=end; ++itr) {
if (debug)
- log << MSG::DEBUG << "Init OFC for frag 0x" << MSG::hex << (*itr) << MSG::dec << endreq;
+ log << MSG::DEBUG << "Init OFC for frag 0x" << MSG::hex << (*itr) << MSG::dec << endmsg;
rodDecoder->getOFW((*itr),unit);
}
}
@@ -316,10 +316,10 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if (nDataFrag[2]+nDataFrag[3]+nDataFrag[4]==0) {
rodDecoder->setUseFrag4 (false);
rodDecoder->setUseFrag5Reco (true);
- log << MSG::INFO << "Setting TileROD_Decoder->useFrag5Reco to true, unit is " << unit << endreq;
+ log << MSG::INFO << "Setting TileROD_Decoder->useFrag5Reco to true, unit is " << unit << endmsg;
}
if (toolSvc->releaseTool(rodDecoder).isFailure())
- log << MSG::WARNING << "Unable to release algtool TileROD_Decoder" << endreq;
+ log << MSG::WARNING << "Unable to release algtool TileROD_Decoder" << endmsg;
}
bool of2=true; // default for RUN1 data
@@ -330,7 +330,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if ((flags5 & 0x3000) < 0x3000) // real data
of2 = ((flags5 & 0x400) != 0);
}
- log << MSG::DEBUG << "OF2 flag in data is " << ((of2)?"True":"False") << endreq;
+ log << MSG::DEBUG << "OF2 flag in data is " << ((of2)?"True":"False") << endmsg;
bool do_merge = ( (nDataFrag[0]+nDataFrag[1]+nDataFrag[2]+nDataFrag[3]+nDataFrag[4]+nDataFrag[5] == 0) ||
nDataFrag[1] > 0 || nDataFrag[4] > 0);
@@ -342,7 +342,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
IToolSvc* toolSvc;
sc = svcLoc->service( "ToolSvc"+threadGaudi->getThreadID(),toolSvc);
if(sc.isFailure()){
- log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endreq;
+ log << MSG::WARNING << "TileHid2RESrcID: Can not retrieve ToolSvc" << endmsg;
return;
}
@@ -350,48 +350,47 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
TileCellBuilder* cellBuilder=0;
sc = toolSvc->retrieveTool("TileCellBuilder",cellBuilder);
if (sc.isFailure()) {
- log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileCellBuilder " << endreq;
+ log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileCellBuilder " << endmsg;
return;
}
const Property& rawChannelCnt_prop = cellBuilder->getProperty ("TileRawChannelContainer");
const Property& dspRawChannelContainer_prop = cellBuilder->getProperty ("TileDSPRawChannelContainer");
- const PropertyWithValue<bool>& mergeChannels_prop =
- dynamic_cast<const PropertyWithValue<bool>&> (cellBuilder->getProperty ("mergeChannels"));
+ const BooleanPropertyRef& mergeChannels_prop =
+ dynamic_cast<const BooleanPropertyRef&> (cellBuilder->getProperty ("mergeChannels"));
// Get any RawChannel Builder
if (debug)
log << MSG::DEBUG << " looking for TileRawChannelBuilder tool which provides container with name "
- << rawChannelCnt_prop.toString() << endreq;
+ << rawChannelCnt_prop.toString() << endmsg;
TileRawChannelBuilder* channelBuilder=0;
+ static const
std::string toolType[6] = { "TileRawChannelBuilderOpt2Filter", "TileRawChannelBuilderOptFilter",
"TileRawChannelBuilderFitFilter", "TileRawChannelBuilderFitFilterCool",
"TileRawChannelBuilderManyAmps", "TileRawChannelBuilderFlatFilter" };
- for (int i=0; i<6; ++i) {
- std::vector<std::string> toolName = toolSvc->getInstances(toolType[i]);
- if (debug)
- log << MSG::DEBUG << toolName.size() << " tools of type " << toolType[i] << " found " << endreq;
- if (toolName.size()!=0) {
- for (size_t j=0; j<toolName.size(); ++j) {
- size_t found = toolName[j].find('.');
- std::string name=(found!=std::string::npos) ? toolName[j].substr(found+1) : toolName[j];
- if (debug)
- log << MSG::DEBUG << " full name " << toolName[j] << " - using " << name << endreq;
- if (toolSvc->retrieveTool(name,channelBuilder).isSuccess()) {
- if (debug)
- log << MSG::DEBUG << " it provides " << channelBuilder->getTileRawChannelContainerID() << endreq;
- if (rawChannelCnt_prop.toString() == channelBuilder->getTileRawChannelContainerID()) {
- break;
- } else {
- if (toolSvc->releaseTool(channelBuilder).isFailure())
- log << MSG::WARNING << "Unable to release algtool " << channelBuilder << endreq;
- channelBuilder=0;
- }
+ static const int nTypes = sizeof(toolType)/sizeof(toolType[0]);
+
+ // FIXME: This backdoor peeking at tools is likely to cause issues
+ // with Hive, as well as generally making things incomprehensible.
+ // Figure out what's really going on here, and reimplement
+ // in a sensible manner!
+ for (IAlgTool* tool : toolSvc->getTools()) {
+ const std::string* foundType = std::find (toolType, toolType+nTypes,
+ tool->type());
+ if (foundType != toolType+nTypes) {
+ channelBuilder = dynamic_cast<TileRawChannelBuilder*> (tool);
+ if (channelBuilder) {
+ if (rawChannelCnt_prop.toString() == channelBuilder->getTileRawChannelContainerID()) {
+ break;
+ }
+ else {
+ channelBuilder=0;
}
}
- if (channelBuilder) break;
}
}
+ if (channelBuilder)
+ channelBuilder->addRef();
if (do_merge) { // frag1 in the data - should merge offline and dsp reco
if (rawChannelCnt_prop.toString() != dspRawChannelContainer_prop.toString() &&
@@ -400,23 +399,23 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
log << MSG::INFO << "TileHid2RESrcID: only frag1 digi found, changing properties for TileCellBuilder";
else
log << MSG::INFO << "TileHid2RESrcID: no TileCal digits found, but still changing properties for TileCellBuilder";
- log << " mergeChannels=True" << endreq;
+ log << " mergeChannels=True" << endmsg;
sc=cellBuilder->setProperty ("mergeChannels", true);
if (sc.isFailure()) {
- log << MSG::ERROR << "Failed to set mergeChannels property in TileCellBuilder" << endreq;
+ log << MSG::ERROR << "Failed to set mergeChannels property in TileCellBuilder" << endmsg;
}
if (channelBuilder && cellBuilder->m_noiseFilterTools.size() != channelBuilder->m_noiseFilterTools.size()) {
log << MSG::INFO << " and number of NoiseFilterTools from "
<< cellBuilder->m_noiseFilterTools.size() << " to " << channelBuilder->m_noiseFilterTools.size()
<< " i.e. from " << cellBuilder->m_noiseFilterTools << " to " << channelBuilder->m_noiseFilterTools
- << endreq;
+ << endmsg;
cellBuilder->m_noiseFilterTools = channelBuilder->m_noiseFilterTools;
sc=cellBuilder->m_noiseFilterTools.retrieve();
if (sc.isFailure()) {
- log << MSG::WARNING << "Failed to retrieve " << cellBuilder->m_noiseFilterTools << endreq;
+ log << MSG::WARNING << "Failed to retrieve " << cellBuilder->m_noiseFilterTools << endmsg;
} else {
if (debug)
- log << MSG::DEBUG << "Successfully retrieved " << cellBuilder->m_noiseFilterTools << endreq;
+ log << MSG::DEBUG << "Successfully retrieved " << cellBuilder->m_noiseFilterTools << endmsg;
}
}
}
@@ -428,7 +427,7 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
<< "' instead of '" << rawChannelCnt_prop.toString() << "'";
sc=cellBuilder->setProperty ("TileRawChannelContainer",dspRawChannelContainer_prop.toString());
if (sc.isFailure()) {
- log << MSG::ERROR << "Failed to set TileRawChannelContainer property in TileCellBuilder" << endreq;
+ log << MSG::ERROR << "Failed to set TileRawChannelContainer property in TileCellBuilder" << endmsg;
}
flags = (flags>>8) & 0x3; // this is number of iterations
if (flags == 0) { // no iterations - assume best phase was used, just need amplitude correction
@@ -442,20 +441,20 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
}
log << " and of2=" << ((of2)?"True":"False");
cellBuilder->m_of2 = of2;
- log << endreq;
+ log << endmsg;
if (channelBuilder && cellBuilder->m_noiseFilterTools.size() != channelBuilder->m_noiseFilterTools.size()) {
log << MSG::INFO << " and number of NoiseFilterTools from "
<< cellBuilder->m_noiseFilterTools.size() << " to " << channelBuilder->m_noiseFilterTools.size()
<< " i.e. from " << cellBuilder->m_noiseFilterTools << " to " << channelBuilder->m_noiseFilterTools
- << endreq;
+ << endmsg;
cellBuilder->m_noiseFilterTools = channelBuilder->m_noiseFilterTools;
sc=cellBuilder->m_noiseFilterTools.retrieve();
if (sc.isFailure()) {
- log << MSG::WARNING << "Failed to retrieve " << cellBuilder->m_noiseFilterTools << endreq;
+ log << MSG::WARNING << "Failed to retrieve " << cellBuilder->m_noiseFilterTools << endmsg;
}
else {
if (debug)
- log << MSG::DEBUG << "Successfully retrieved " << cellBuilder->m_noiseFilterTools << endreq;
+ log << MSG::DEBUG << "Successfully retrieved " << cellBuilder->m_noiseFilterTools << endmsg;
}
}
}
@@ -464,17 +463,17 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
if (channelBuilder) {
if (fabs(cellBuilder->m_ampMinThresh - channelBuilder->m_ampMinThresh) > 1.e-3) {
log << MSG::INFO << "Setting AmpMinForAmpCorrection in TileCellBuilder to " << channelBuilder->m_ampMinThresh
- << " instead of " << cellBuilder->m_ampMinThresh << endreq;
+ << " instead of " << cellBuilder->m_ampMinThresh << endmsg;
cellBuilder->m_ampMinThresh = channelBuilder->m_ampMinThresh;
}
if (fabs(cellBuilder->m_timeMinThresh - channelBuilder->m_timeMinThresh) > 1.e-3) {
log << MSG::INFO << "Setting TimeMinForAmpCorrection in TileCellBuilder to " << channelBuilder->m_timeMinThresh
- << " instead of " << cellBuilder->m_timeMinThresh << endreq;
+ << " instead of " << cellBuilder->m_timeMinThresh << endmsg;
cellBuilder->m_timeMinThresh = channelBuilder->m_timeMinThresh;
}
if (fabs(cellBuilder->m_timeMaxThresh - channelBuilder->m_timeMaxThresh) > 1.e-3) {
log << MSG::INFO << "Setting TimeMaxForAmpCorrection in TileCellBuilder to " << channelBuilder->m_timeMaxThresh
- << " instead of " << cellBuilder->m_timeMaxThresh << endreq;
+ << " instead of " << cellBuilder->m_timeMaxThresh << endmsg;
cellBuilder->m_timeMaxThresh = channelBuilder->m_timeMaxThresh;
}
}
@@ -483,35 +482,35 @@ void TileHid2RESrcID::setROD2ROBmap (const eformat::FullEventFragment<const uint
TileROD_Decoder* rodDecoder=0;
sc = toolSvc->retrieveTool("TileROD_Decoder",rodDecoder);
if (sc.isFailure()) {
- log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileROD_Decoder" << endreq;
+ log << MSG::WARNING << "TileHid2RESrcID: Unable to retrieve algtool TileROD_Decoder" << endmsg;
} else {
if (fabs(cellBuilder->m_ampMinThresh - rodDecoder->m_ampMinThresh) > 1.e-3) {
log << MSG::INFO << "Setting AmpMinForAmpCorrection in TileROD_Decoder to " << cellBuilder->m_ampMinThresh
- << " instead of " << rodDecoder->m_ampMinThresh << endreq;
+ << " instead of " << rodDecoder->m_ampMinThresh << endmsg;
rodDecoder->updateAmpThreshold(cellBuilder->m_ampMinThresh);
}
if (fabs(cellBuilder->m_timeMinThresh - rodDecoder->m_timeMinThresh) > 1.e-3) {
log << MSG::INFO << "Setting TimeMinForAmpCorrection in TileROD_Decoder to " << cellBuilder->m_timeMinThresh
- << " instead of " << rodDecoder->m_timeMinThresh << endreq;
+ << " instead of " << rodDecoder->m_timeMinThresh << endmsg;
rodDecoder->m_timeMinThresh = cellBuilder->m_timeMinThresh;
}
if (fabs(cellBuilder->m_timeMaxThresh - rodDecoder->m_timeMaxThresh) > 1.e-3) {
log << MSG::INFO << "Setting TimeMaxForAmpCorrection in TileROD_Decoder to " << cellBuilder->m_timeMaxThresh
- << " instead of " << rodDecoder->m_timeMaxThresh << endreq;
+ << " instead of " << rodDecoder->m_timeMaxThresh << endmsg;
rodDecoder->m_timeMaxThresh = cellBuilder->m_timeMaxThresh;
}
if (of2 != rodDecoder->m_of2) {
log << MSG::INFO << "Setting OF2 flag in in TileROD_Decoder to " << ((of2)?"True":"False")
- << " instead of " << ((rodDecoder->m_of2)?"True":"False") << endreq;
+ << " instead of " << ((rodDecoder->m_of2)?"True":"False") << endmsg;
rodDecoder->m_of2 = of2;
}
}
if (toolSvc->releaseTool(cellBuilder).isFailure())
- log << MSG::WARNING << "Unable to release algtool TileCellBuilder" << endreq;
+ log << MSG::WARNING << "Unable to release algtool TileCellBuilder" << endmsg;
if (channelBuilder)
if (toolSvc->releaseTool(channelBuilder).isFailure())
- log << MSG::WARNING << "Unable to release algtool TileRawChannelBuilder" << endreq;
+ log << MSG::WARNING << "Unable to release algtool TileRawChannelBuilder" << endmsg;
}
}
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
index 19f74710cdf8bd9c361d71a1238f58f51821ee26..f719b79e17708413789fe7e811e2e7e415976265 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileMuRcvContByteStreamCnv.cxx
@@ -54,19 +54,19 @@ StatusCode TileMuRcvContByteStreamCnv::initialize()
MsgStream log(msgSvc(), "TileMuRcvContByteStreamCnv");
- log << MSG::DEBUG << " initialize() " << endreq;
+ log << MSG::DEBUG << " initialize() " << endmsg;
// Get ByteStreamInputSvc
//
IService* svc;
if(StatusCode::SUCCESS != serviceLocator()->getService("ROBDataProviderSvc",svc)){
- log << MSG::WARNING << " Can't get ByteStreamInputSvc interface Reading of ByteStream Data not possible. " << endreq;
+ log << MSG::WARNING << " Can't get ByteStreamInputSvc interface Reading of ByteStream Data not possible. " << endmsg;
m_rdpSvc=0;
}
else {
m_rdpSvc=dynamic_cast<IROBDataProviderSvc*>(svc);
if(m_rdpSvc == 0 ) {
- log<<MSG::ERROR<< " Can't cast to ByteStreamInputSvc " <<endreq;
+ log<<MSG::ERROR<< " Can't cast to ByteStreamInputSvc " <<endmsg;
return StatusCode::FAILURE;
}
}
@@ -74,13 +74,13 @@ StatusCode TileMuRcvContByteStreamCnv::initialize()
// Get ByteStreamCnvSvc [svc]
//
if(StatusCode::SUCCESS != serviceLocator()->getService("ByteStreamCnvSvc",svc)){
- log << MSG::ERROR << " Can't get ByteStreamEventAccess interface " << endreq;
+ log << MSG::ERROR << " Can't get ByteStreamEventAccess interface " << endmsg;
return StatusCode::FAILURE;
}
m_ByteStreamEventAccess=dynamic_cast<ByteStreamCnvSvc*>(svc);
if (m_ByteStreamEventAccess==NULL)
{
- log << MSG::ERROR << " TileMuRcvContByteStreamCnv: Can't cast to ByteStreamCnvSvc " << endreq;
+ log << MSG::ERROR << " TileMuRcvContByteStreamCnv: Can't cast to ByteStreamCnvSvc " << endmsg;
return StatusCode::FAILURE ;
}
@@ -89,17 +89,17 @@ StatusCode TileMuRcvContByteStreamCnv::initialize()
IToolSvc* toolSvc;
if(StatusCode::SUCCESS != service("ToolSvc",toolSvc)){
- log << MSG::ERROR << " Can't get ToolSvc " << endreq;
+ log << MSG::ERROR << " Can't get ToolSvc " << endmsg;
return StatusCode::FAILURE;
}
if(StatusCode::SUCCESS != toolSvc->retrieveTool("TileMuRcvContByteStreamTool",m_tool)) {
- log << MSG::ERROR << " Can't get ByteStreamTool " << endreq;
+ log << MSG::ERROR << " Can't get ByteStreamTool " << endmsg;
return StatusCode::FAILURE;
}
if(StatusCode::SUCCESS != toolSvc->retrieveTool("TileROD_Decoder",m_decoder)) {
- log << MSG::ERROR << "Can't get TileROD_Decoder" << endreq;
+ log << MSG::ERROR << "Can't get TileROD_Decoder" << endmsg;
return StatusCode::FAILURE;
}
@@ -119,13 +119,13 @@ StatusCode TileMuRcvContByteStreamCnv::initialize()
//
ServiceHandle<IIncidentSvc> incSvc( "IncidentSvc", "TileMuRcvContByteStreamCnv");
if ( !incSvc.retrieve().isSuccess() ) {
- log << MSG::WARNING << "Unable to retrieve the IncidentSvc" << endreq;
+ log << MSG::WARNING << "Unable to retrieve the IncidentSvc" << endmsg;
}
else {
incSvc->addListener(this,"StoreCleared");
}
- log << MSG::DEBUG << " End of initialize() " << endreq;
+ log << MSG::DEBUG << " End of initialize() " << endmsg;
return service("StoreGateSvc",m_storeGate) ;
}
@@ -136,29 +136,29 @@ StatusCode TileMuRcvContByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObje
MsgStream log(msgSvc(), "TileMuRcvContByteStreamCnv");
- log << MSG::DEBUG << " Executing createObj method" << endreq;
+ log << MSG::DEBUG << " Executing createObj method" << endmsg;
if (!m_rdpSvc) {
- log << MSG::ERROR << " ROBDataProviderSvc not loaded. Can't read ByteStream." << endreq;
+ log << MSG::ERROR << " ROBDataProviderSvc not loaded. Can't read ByteStream." << endmsg;
return StatusCode::FAILURE;
}
ByteStreamAddress *pRE_Addr;
pRE_Addr = dynamic_cast<ByteStreamAddress*>(pAddr);
if(!pRE_Addr) {
- log << MSG::ERROR << " Can't cast to ByteStreamAddress " << endreq ;
+ log << MSG::ERROR << " Can't cast to ByteStreamAddress " << endmsg ;
return StatusCode::FAILURE;
}
const RawEvent* re = m_rdpSvc->getEvent();
if (!re) {
- log << MSG::ERROR << "Could not get raw event from ByteStreamInputSvc" << endreq;
+ log << MSG::ERROR << "Could not get raw event from ByteStreamInputSvc" << endmsg;
return StatusCode::FAILURE;
}
StatusCode sc=m_decoder->convertTMDBDecision(re,m_container);
if (sc!=StatusCode::SUCCESS) {
- log << MSG::WARNING << "Conversion tool returned an error. TileMuonReceiverContainer might be empty." << endreq;
+ log << MSG::WARNING << "Conversion tool returned an error. TileMuonReceiverContainer might be empty." << endmsg;
}
// new container will not own elements, i.e. TileMuonReceiverContainer will not be deleted
@@ -173,7 +173,7 @@ StatusCode TileMuRcvContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddres
// convert TileMuonsReceiverObj's in the container into ByteStream
//
MsgStream log(msgSvc(), "TileMuRcvContByteStreamCnv");
- log << MSG::DEBUG << " Executing createRep method " << endreq;
+ log << MSG::DEBUG << " Executing createRep method " << endmsg;
StatusCode sc;
@@ -184,7 +184,7 @@ StatusCode TileMuRcvContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddres
sc=m_ByteStreamEventAccess->getFullEventAssembler(fea,key);
if (sc.isFailure()) {
- log << MSG::ERROR << "Can't get full event assember with key \"Tile\" from ByteStreamEventAccess." << endreq;
+ log << MSG::ERROR << "Can't get full event assember with key \"Tile\" from ByteStreamEventAccess." << endmsg;
return sc;
}
@@ -194,7 +194,7 @@ StatusCode TileMuRcvContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddres
StoreGateSvc::fromStorable(pObj, muRcvCont );
if(!muRcvCont){
- log << MSG::ERROR << " Can't cast to TileMuonReceiverContainer " << endreq;
+ log << MSG::ERROR << " Can't cast to TileMuonReceiverContainer " << endmsg;
return StatusCode::FAILURE;
}
@@ -215,7 +215,7 @@ StatusCode TileMuRcvContByteStreamCnv::createRep(DataObject* pObj, IOpaqueAddres
StatusCode TileMuRcvContByteStreamCnv::finalize()
{
MsgStream log(msgSvc(), "TileMuRcvContByteStreamCnv");
- log << MSG::DEBUG << " Clearing TileMuonReceiverContainer " << endreq;
+ log << MSG::DEBUG << " Clearing TileMuonReceiverContainer " << endmsg;
m_container->clear();
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx
index 9f27495e2d18de79c423954831ab4e041141f868..3f1010cd92a90d2b115d7801b3330b1311b044d6 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileROD_Encoder.cxx
@@ -561,7 +561,7 @@ void TileROD_Encoder::fillRODTileMuRcvDigi(std::vector<uint32_t>& v) {
<<"\tSample "<<7-i<<" bits |" << std::setfill('0') << std::setw(2)
<< shift << "-" << std::setw(2) << shift+7 << std::setfill('0')
<< "| of 32-bit word "<<3 + nwc*i + wc<<" "<<digits[i]
- <<" "<<MSG::hex<<word[i]<<MSG::dec << endreq;
+ <<" "<<MSG::hex<<word[i]<<MSG::dec << endmsg;
}
}
@@ -605,9 +605,9 @@ void TileROD_Encoder::fillRODTileMuRcvDigi(std::vector<uint32_t>& v) {
// dump fragment
//
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x40)... " << v.size() << endreq;
+ msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x40)... " << v.size() << endmsg;
for (size_t i=0; i<v.size(); ++i)
- msg(MSG::VERBOSE) << i << "\t" << v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endreq;
+ msg(MSG::VERBOSE) << i << "\t" << v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endmsg;
}
return;
@@ -710,7 +710,7 @@ void TileROD_Encoder::fillRODTileMuRcvRawChannel(std::vector<uint32_t>& v) {
msg(MSG::DEBUG) << ros << "/" << drawer << "/" << channel << strchannel[j]
<<"\tAmp " << f_amp << " " << i_amp << " "
<<" ch cnt " << chc << " word cnt " << wc
- << " word 0x" <<MSG::hex<< word <<MSG::dec<<endreq;
+ << " word 0x" <<MSG::hex<< word <<MSG::dec<<endmsg;
}
++chc;
@@ -729,9 +729,9 @@ void TileROD_Encoder::fillRODTileMuRcvRawChannel(std::vector<uint32_t>& v) {
ATH_MSG_DEBUG("Check version and counters: "<<MSG::hex<< verfrag <<MSG::dec<<" "<< chc <<" "<< wc <<" save in position: "<< savepos );
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x41)... "<< m_vTileRC.size() <<" "<< v.size() << endreq;
+ msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x41)... "<< m_vTileRC.size() <<" "<< v.size() << endmsg;
for (size_t i=0; i<v.size(); ++i) {
- msg(MSG::VERBOSE) << i <<"\t"<< v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endreq;
+ msg(MSG::VERBOSE) << i <<"\t"<< v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endmsg;
}
}
return;
@@ -801,7 +801,7 @@ void TileROD_Encoder::fillRODTileMuRcvObj(std::vector<uint32_t>& v) {
for (const auto & val : slin) {
ss<<std::setw(2)<<val;
}
- msg(MSG::DEBUG) << "Result for module: "<<modid<<" in TMDB board "<<modid%8<<MSG::hex<<": 0x"<<word4b<<MSG::dec<<" from "<<ss.str() << endreq;
+ msg(MSG::DEBUG) << "Result for module: "<<modid<<" in TMDB board "<<modid%8<<MSG::hex<<": 0x"<<word4b<<MSG::dec<<" from "<<ss.str() << endmsg;
}
switch (modid%8) {
@@ -826,9 +826,9 @@ void TileROD_Encoder::fillRODTileMuRcvObj(std::vector<uint32_t>& v) {
ATH_MSG_DEBUG( "Check version and counters: "<<MSG::hex<< verfrag <<MSG::dec<<" "<< chc <<" "<< wc <<" save in position: "<< savepos );
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x42)... " << v.size() << endreq;
+ msg(MSG::VERBOSE) << "Check content of ROD fragment after including sub-fragment (0x42)... " << v.size() << endmsg;
for (size_t i=0; i<v.size(); ++i) {
- msg(MSG::VERBOSE) << i << "\t" << v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endreq;
+ msg(MSG::VERBOSE) << i << "\t" << v.at(i) << MSG::hex << " 0x" << v.at(i) << MSG::dec << endmsg;
}
}
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes5.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes5.cxx
index faba0f33382bfd753f7e487e5d747a516148f3f7..c5f8ace32276de3101790d2e2d1530e200126fd9 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes5.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannel2Bytes5.cxx
@@ -289,7 +289,8 @@ void print_ampcorr_lookup() {
printf("unsigned short ampcorr_lookup[64] = {");
for (time = -32; time < 32; time++) {
UINT16 ampcorr_coeff = get_ampcorr_coeff(time);
- if (k % 8 == 0) printf("\n "); k++;
+ if (k % 8 == 0) printf("\n ");
+ k++;
printf(" 0x%04X,", ampcorr_coeff);
}
printf("}\n");