diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/TrigConfigSvc/LVL1ConfigSvc.h b/Trigger/TrigConfiguration/TrigConfigSvc/TrigConfigSvc/LVL1ConfigSvc.h
index 30100ebe207ee6bfae0e17bedf950522bc9ac5f9..24b11fb2e5bc3885b422581d8e37983bf383b6c1 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/TrigConfigSvc/LVL1ConfigSvc.h
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/TrigConfigSvc/LVL1ConfigSvc.h
@@ -51,7 +51,7 @@ namespace TrigConf {
Muctpi* m_muctpi;
// Properties:
- int m_masterID;
+ //int m_masterID;
int m_prescaleSetID;
int m_bunchgroupSetID;
BooleanProperty m_dumpTTVmap;
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
index 25f4d19bc71d29fddd7941e7e04311aabefc1bcf..50ded42a6a0795b4cead71719965feba770deed7 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
@@ -31,10 +31,10 @@ class TmpThr(threading.Thread):
line = line.lower()
if ' warning ' in line:
maxlevel = max(1,maxlevel)
- if ' error ' in line and not 'connection refused' in line:
- maxlevel = max(2,maxlevel)
- elif ' fatal ' in line.lower() or 'exception ' in line.lower():
- maxlevel = max(3,maxlevel)
+ if ' error ' in line and not 'connection refused' in line:
+ maxlevel = max(2,maxlevel)
+ elif ' fatal ' in line.lower() or 'exception ' in line.lower():
+ maxlevel = max(3,maxlevel)
output = ''.join(output)
if maxlevel==1:
msg.warning(output)
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTJobOptionsSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTJobOptionsSvc.cxx
index efca58b280f453e64b97760b174851939a9225ae..f4615656a6c51187f8f1a1095ddbe09c7157d65b 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTJobOptionsSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTJobOptionsSvc.cxx
@@ -51,22 +51,13 @@ TrigConf::HLTJobOptionsSvc::readEnv()
StatusCode
TrigConf::HLTJobOptionsSvc::sysInitialize() {
- // problem is that AthService::sysInitialize forbids the setting of the outputLevel in ::initialize
- // (which is problematic for modifying the HLTJobOptionsSvc)
- StatusCode sc = base_class::sysInitialize();
+ //We specifically do not call the base class sysInitialize here (ATR-15094)
+ //StatusCode sc = base_class::sysInitialize();
+
+ ATH_CHECK(initialize());
+ ATH_CHECK(setMyProperties(name(), this));
- if(sc.isSuccess())
- {
- // set the message level from the DB
- vector<const Property*>* ownProperties;
- m_catalogue.optionsOf( name(), ownProperties);
- for(const Property * p : *ownProperties) {
- if(p->name() != "OutputLevel") continue;
- this->setProperty( "OutputLevel", *p );
- break;
- }
- }
- return sc;
+ return StatusCode::SUCCESS;
}
//----------------------------------------------------------------------------
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/JobOptionsCatalogue.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/JobOptionsCatalogue.cxx
index ee72e8d05243956ddad7b2777d614eaa15374474..01384e48546552023969aaf3e337dafff825552f 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/JobOptionsCatalogue.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/JobOptionsCatalogue.cxx
@@ -113,7 +113,7 @@ TrigConf::JobOptionsCatalogue::printUnresolvedOptions(MsgStream& msgStream) {
if ( s.length() > 0 && s[0] == '@' ) {
msgStream << MSG::FATAL << "Found problematic option:"
<< (*iter)->algorithmName() << "." << p->name()
- << " Value[" << i << "] = " << s << endreq;
+ << " Value[" << i << "] = " << s << endmsg;
}
}
}
@@ -124,7 +124,7 @@ TrigConf::JobOptionsCatalogue::printUnresolvedOptions(MsgStream& msgStream) {
if ( s.length() > 0 && s[0] == '@' )
msgStream << MSG::FATAL << "Found problematic option:"
<< (*iter)->algorithmName() << "." << p->name()
- << " Value = " << s << endreq;
+ << " Value = " << s << endmsg;
}
}
}
@@ -181,10 +181,10 @@ TrigConf::JobOptionsCatalogue::resolveOptions(MsgStream& log) {
}
}
else {
- log << endreq
+ log << endmsg
<< MSG::FATAL << "Self references to options are not allowed!"
<< (*iter)->algorithmName() << "." << p->name()
- << " Value = " << s << endreq;
+ << " Value = " << s << endmsg;
return StatusCode::FAILURE;
}
}
@@ -223,7 +223,7 @@ TrigConf::JobOptionsCatalogue::resolveOptions(MsgStream& log) {
if ( loops <= 0 || missing_syms > 0 ) {
log << MSG::FATAL
<< "Job option symbols cannot be resolved. Bad symbols found."
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfDataIOVChanger.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfDataIOVChanger.cxx
index af855e58aa2246d8df5f3a666f5e5c91861a634b..7b9a168118688a4d622bd9c2c3bd7b1582226b81 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfDataIOVChanger.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfDataIOVChanger.cxx
@@ -99,8 +99,7 @@ TrigConf::TrigConfDataIOVChanger::execute() {
return StatusCode::FAILURE;
}
- EventID* myEventID = eventInfo->event_ID();
- unsigned int runNumber = myEventID->run_number();
+ unsigned int runNumber = eventInfo->event_ID()->run_number();
if(m_LastRun == runNumber) // already executed in this run?
return StatusCode::SUCCESS;
@@ -225,7 +224,7 @@ TrigConf::TrigConfDataIOVChanger::execute() {
}
}
- if( outputLevel()<=MSG::VERBOSE) {
+ if( msgLevel()<=MSG::VERBOSE) {
itAttList = payload->begin();
for (; itAttList != itAttListEnd; ++itAttList)
printOut((*itAttList));
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvc.cxx
index 8cecc83aa83aa70119a090e27c7f8d35ebc30c0f..3f1ab96c81977b3662dcfcd8c26e0971fe819cfe 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfigSvc.cxx
@@ -144,7 +144,7 @@ TrigConfigSvc::menu() const {
if(m_l1toposervice)
return m_l1toposervice->menu();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -153,7 +153,7 @@ TrigConfigSvc::muctpiConfig() const {
if(m_l1service)
return m_l1service->muctpiConfig();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -163,7 +163,7 @@ TrigConfigSvc::ctpConfig() const {
if(m_l1service)
return m_l1service->ctpConfig();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -173,7 +173,7 @@ TrigConfigSvc::thresholdConfig() const {
if(m_l1service)
return m_l1service->thresholdConfig();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -183,7 +183,7 @@ TrigConfigSvc::bunchGroupSet() const {
if(m_l1service)
return m_l1service->bunchGroupSet();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -193,7 +193,7 @@ TrigConfigSvc::lvl1PrescaleKey() const {
if(m_l1service)
return m_l1service->lvl1PrescaleKey();
- REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No LVL1 trigger configuration available" << endmsg;
return 0;
}
@@ -203,7 +203,7 @@ TrigConfigSvc::chains() const {
if(m_hltservice)
return m_hltservice->chains();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return m_NullFrame.chains();
}
@@ -213,7 +213,7 @@ TrigConfigSvc::chainList() const {
if(m_hltservice)
return m_hltservice->chainList();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return 0;
}
@@ -223,7 +223,7 @@ TrigConfigSvc::sequences() const {
if(m_hltservice)
return m_hltservice->sequences();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return m_NullFrame.sequences();
}
@@ -233,7 +233,7 @@ TrigConfigSvc::sequenceList() const {
if(m_hltservice)
return m_hltservice->sequenceList();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return 0;
}
@@ -243,7 +243,7 @@ TrigConfigSvc::masterKey() const {
if(m_hltservice)
return m_hltservice->masterKey();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return 0;
}
@@ -253,7 +253,7 @@ TrigConfigSvc::hltPrescaleKey() const {
if(m_hltservice)
return m_hltservice->hltPrescaleKey();
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return 0;
}
@@ -263,7 +263,7 @@ TrigConfigSvc::assignPrescalesToChains(uint lumiblock ) {
if(m_hltservice)
return m_hltservice->assignPrescalesToChains(lumiblock);
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return StatusCode::RECOVERABLE;
}
@@ -273,7 +273,7 @@ TrigConfigSvc::updatePrescaleSets(uint requestcount) {
if(m_hltservice)
return m_hltservice->updatePrescaleSets(requestcount);
- REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endreq;
+ REPORT_MESSAGE(MSG::WARNING) << "No HLT trigger configuration available" << endmsg;
return StatusCode::RECOVERABLE;
}
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/Verifyer.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/Verifyer.cxx
index 0fc6e764a30d8f43bd5129dec16d8f8617033424..bf736d0f0610e28dc07dd6ed6ba8d8d6a37fb983 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/Verifyer.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/Verifyer.cxx
@@ -33,19 +33,19 @@ namespace TrigConf {
bool Verifyer::verify( const Menu& menu, MsgStream& log ) {
log << MSG::DEBUG << "---> Verifying the validity of the trigger menu..."
- << endreq;
+ << endmsg;
if( verifyThCount( menu, log ) ) {
- log << MSG::ERROR << "Verifyer::verifyThCount() failed" << endreq;
+ log << MSG::ERROR << "Verifyer::verifyThCount() failed" << endmsg;
return true;
}
//if( verifyThLayout( menu, log ) ) {
- // log << MSG::ERROR << "Verifyer::verifyThLayout() failed" << endreq;
+ // log << MSG::ERROR << "Verifyer::verifyThLayout() failed" << endmsg;
// return true;
//}
- log << MSG::DEBUG << "---> Trigger menu found to be valid" << endreq;
+ log << MSG::DEBUG << "---> Trigger menu found to be valid" << endmsg;
return false;
}
@@ -54,7 +54,7 @@ namespace TrigConf {
L1DataDef def;
- log << MSG::VERBOSE << " ---> Checking trigger threshold counts" << endreq;
+ log << MSG::VERBOSE << " ---> Checking trigger threshold counts" << endmsg;
//
// Count all the thresholds in the configuration:
@@ -148,138 +148,138 @@ namespace TrigConf {
//
if( muon_th_count > def.max_MUON_Threshold_Number() ) {
- log << MSG::ERROR << "Too many MUON thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many MUON thresholds defined in the configuration" << endmsg;
return true;
} else if( muon_th_count != def.max_MUON_Threshold_Number() ) {
- log << MSG::WARNING << " ---> Less than 6 MUON thresholds defined, TGC simulation will override!" << endreq;
+ log << MSG::WARNING << " ---> Less than 6 MUON thresholds defined, TGC simulation will override!" << endmsg;
} else {
- log << MSG::VERBOSE << " ---> MUON threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> MUON threshold count passed the check" << endmsg;
}
if( em_th_count > def.max_EM_Threshold_Number() ) {
- log << MSG::ERROR << "Too many EM thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many EM thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> EM threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> EM threshold count passed the check" << endmsg;
}
if( tau_th_count > def.max_TAU_Threshold_Number() ) {
- log << MSG::ERROR << "Too many TAU thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many TAU thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> TAU threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> TAU threshold count passed the check" << endmsg;
}
if( jet_th_count > def.max_JET_Threshold_Number() ) {
- log << MSG::ERROR << "Too many JET thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many JET thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> JET threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> JET threshold count passed the check" << endmsg;
}
if( jetenergy_th_count > def.max_JE_Threshold_Number() ) {
- log << MSG::ERROR << "Too many JE thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many JE thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> JE threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> JE threshold count passed the check" << endmsg;
}
if( jb_th_count > def.max_JB_Threshold_Number() ) {
- log << MSG::ERROR << "Too many JB thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many JB thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> JB threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> JB threshold count passed the check" << endmsg;
}
if( jf_th_count > def.max_JF_Threshold_Number() ) {
- log << MSG::ERROR << "Too many JF thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many JF thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> JF threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> JF threshold count passed the check" << endmsg;
}
if( energy_th_count > def.max_TE_Threshold_Number() ) {
- log << MSG::ERROR << "Too many TE thresholds defined in the configuration" << endreq;
+ log << MSG::ERROR << "Too many TE thresholds defined in the configuration" << endmsg;
return true;
} else {
- log << MSG::VERBOSE << " ---> TE threshold count passed the check" << endreq;
+ log << MSG::VERBOSE << " ---> TE threshold count passed the check" << endmsg;
}
if( missen_th_count > def.max_XE_Threshold_Number() ) {
log << MSG::ERROR <<
- "Too many XE thresholds defined in the configuration" << endreq;
+ "Too many XE thresholds defined in the configuration" << endmsg;
return true;
} else {
log << MSG::VERBOSE <<
- " ---> XE threshold count passed the check" << endreq;
+ " ---> XE threshold count passed the check" << endmsg;
}
if(rndm_th_count > def.max_RNDM_Threshold_Number()) {
log << MSG::ERROR <<
- "Too many RNDM thresholds defined in the configuration" << endreq;
+ "Too many RNDM thresholds defined in the configuration" << endmsg;
return true;
} else {
log << MSG::VERBOSE <<
- " ---> RNDM threshold count passed the check" << endreq;
+ " ---> RNDM threshold count passed the check" << endmsg;
}
if(pclk_th_count > def.max_PCLK_Threshold_Number()) {
log << MSG::ERROR <<
- "Too many PCLK thresholds defined in the configuration" << endreq;
+ "Too many PCLK thresholds defined in the configuration" << endmsg;
return true;
} else {
log << MSG::VERBOSE <<
- " ---> PCLK threshold count passed the check" << endreq;
+ " ---> PCLK threshold count passed the check" << endmsg;
}
if(bgrp_th_count > def.max_BGRP_Threshold_Number()) {
log << MSG::ERROR <<
- "Too many BGRP thresholds defined in the configuration" << endreq;
+ "Too many BGRP thresholds defined in the configuration" << endmsg;
return true;
} else {
log << MSG::VERBOSE <<
- " ---> BGRP threshold count passed the check" << endreq;
+ " ---> BGRP threshold count passed the check" << endmsg;
}
if( count[L1DataDef::TOPO] > L1DataDef::typeConfig( L1DataDef::TOPO ).max ) {
log << MSG::ERROR <<
- "Too many TOPO thresholds defined in the configuration" << endreq;
+ "Too many TOPO thresholds defined in the configuration" << endmsg;
return true;
} else {
log << MSG::VERBOSE <<
- "TOPO threshold count passed the check" << endreq;
+ "TOPO threshold count passed the check" << endmsg;
}
@@ -293,21 +293,21 @@ namespace TrigConf {
// if (rndm_th_count != def.max_RNDM_Threshold_Number()) {
// log << MSG::WARNING <<
// "Only " << rndm_th_count << " RNDM thresholds are defined! " <<
- // " maximum allowed is " << def.max_RNDM_Threshold_Number() << endreq;
+ // " maximum allowed is " << def.max_RNDM_Threshold_Number() << endmsg;
// }
// if (pclk_th_count != def.max_PCLK_Threshold_Number()) {
// log << MSG::WARNING <<
// "Only " << pclk_th_count << " PCLK thresholds are defined! " <<
- // " maximum allowed is " << def.max_PCLK_Threshold_Number() << endreq;
+ // " maximum allowed is " << def.max_PCLK_Threshold_Number() << endmsg;
// }
// if (bgrp_th_count != def.max_BGRP_Threshold_Number()) {
// log << MSG::WARNING <<
// "Only " << bgrp_th_count << " BGRP thresholds are defined! " <<
- // " maximum allowed is " << def.max_BGRP_Threshold_Number() << endreq;
+ // " maximum allowed is " << def.max_BGRP_Threshold_Number() << endmsg;
// }
//===========================================================================
- log << MSG::VERBOSE << " ---> Trigger threshold counts passed the tests" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold counts passed the tests" << endmsg;
return false;
}
@@ -318,7 +318,7 @@ namespace TrigConf {
//
// Now check that the layout of the thresholds on the cables is possible or not:
//
- log << MSG::VERBOSE << " ---> Checking layout of trigger thresholds onto cables" << endreq;
+ log << MSG::VERBOSE << " ---> Checking layout of trigger thresholds onto cables" << endmsg;
unsigned int muon_cable = !MUON_CABLE_MASK;
unsigned int cp1_cable = !CP1_CABLE_MASK;
@@ -339,96 +339,96 @@ namespace TrigConf {
if( ( *it )->cableName() == "MU" ) {
if( ( *it )->type() != def.muonType() ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the MU cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the MU cable!" << endmsg;
return true;
}
if( muon_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable MU "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
muon_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable MU verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable MU verifyed" << endmsg;
} else if( ( *it )->cableName() == "CP1" ) {
if( ( *it )->type() != def.emType() ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the CP1 cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the CP1 cable!" << endmsg;
return true;
}
if( cp1_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable CP1 "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
cp1_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable CP1 verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable CP1 verifyed" << endmsg;
} else if( ( *it )->cableName() == "CP2" ) {
if( ! ( ( ( *it )->type() == def.emType() ) || ( ( *it )->type() == def.tauType() ) ) ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the CP2 cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the CP2 cable!" << endmsg;
return true;
}
if( cp2_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable CP2 "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
cp2_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable CP2 verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable CP2 verifyed" << endmsg;
} else if( ( *it )->cableName() == "JEP1" ) {
if( ! ( ( ( *it )->type() == def.jetType() ) || ( ( *it )->type() == def.jeType() ) ) ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP1 cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP1 cable!" << endmsg;
return true;
}
if( jep1_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable JEP1 "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
jep1_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP1 verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP1 verifyed" << endmsg;
} else if( ( *it )->cableName() == "JEP2" ) {
if( ! ( ( *it )->type()==def.jbType() || (*it)->type()==def.jfType()) ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP2 cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP2 cable!" << endmsg;
return true;
}
if( jep2_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable JEP2 "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
jep2_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP2 verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP2 verifyed" << endmsg;
} else if( ( *it )->cableName() == "JEP3" ) {
if( ! ( ( ( *it )->type() == def.teType() ) || ( ( *it )->type() == def.xeType() ) ) ) {
- log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP3 cable!" << endreq;
+ log << MSG::ERROR << " ---> A(n) " << ( *it )->type() << " threshold can't be put on the JEP3 cable!" << endmsg;
return true;
}
if( jep3_cable & createMask( ( *it )->cableStart(), ( *it )->cableEnd() ) ) {
log << MSG::ERROR << " ---> The bits from " << ( *it )->cableStart() << " to " << ( *it )->cableEnd() << " on cable JEP3 "
- << "are already partly or totally taken" << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ << "are already partly or totally taken" << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
jep3_cable |= createMask( ( *it )->cableStart(), ( *it )->cableEnd() );
- log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP3 verifyed" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger threshold " << ( *it )->name() << " on cable JEP3 verifyed" << endmsg;
} else if( ( *it )->cableName() == "NIM" ) {
@@ -441,24 +441,24 @@ namespace TrigConf {
(*it)->type()==def.bcmcmbType() ||
(*it)->type()==def.lucidType())) {
log << MSG::ERROR << " ---> A(n) " << (*it)->type()
- << " threshold can't be put on the NIM cable!" << endreq; // This check seems tied to an outdated cabling...
+ << " threshold can't be put on the NIM cable!" << endmsg; // This check seems tied to an outdated cabling...
return true;
}
log << MSG::VERBOSE << " ---> Trigger threshold "
- << ( *it )->name() << " on cable NIM verifyed" << endreq;
+ << ( *it )->name() << " on cable NIM verifyed" << endmsg;
} else if( ( *it )->cableName() == "MBTS" ) {
} else {
- log << MSG::ERROR << " ---> There is no cable named: " << ( *it )->cableName() << endreq;
- log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endreq;
+ log << MSG::ERROR << " ---> There is no cable named: " << ( *it )->cableName() << endmsg;
+ log << MSG::ERROR << " Threshold " << ( *it )->name() << " can't be placed" << endmsg;
return true;
}
}
- log << MSG::VERBOSE << " ---> Trigger thresholds layout passed the tests" << endreq;
+ log << MSG::VERBOSE << " ---> Trigger thresholds layout passed the tests" << endmsg;
return false;
}