diff --git a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
index f9f007b5fac816d5e63ec67a1b9e5881d7e68549..6856fbf6891246b086b21f2ba7d2c75c7dc2a173 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileMuonReceiverDecision.cxx
@@ -159,7 +159,7 @@ StatusCode TileMuonReceiverDecision::execute() {
int drawer = (frag_id&0xFF);
memset(energy_HLX,0,sizeof(energy_HLX));
memset(time_HLX,0,sizeof(time_HLX));
- msg(MSG::VERBOSE) << "(E.0.0) Frag_id: 0x"<< MSG::hex << frag_id << MSG::dec <<" ros: "<< ros <<" drawer: "<< drawer << endreq;
+ ATH_MSG_VERBOSE( "(E.0.0) Frag_id: 0x"<< MSG::hex << frag_id << MSG::dec <<" ros: "<< ros <<" drawer: "<< drawer );
}
float energy_d6 = 0.0;
@@ -179,7 +179,7 @@ StatusCode TileMuonReceiverDecision::execute() {
// TMDB channel is used in COOL and goes from 0..n with n=5 for EB and n=8 in LB
int TMDBchan = m_tileHWID->channel(adc_id) ;
if ( TMDBchan >= upperLim ) {
- msg(MSG::WARNING) << "(E.1."<< ich <<") hwid: "<< m_tileHWID->to_string(adc_id,-1) <<" ch: "<< TMDBchan <<" --> Tile ch: UNKNOWN" << endreq ;
+ ATH_MSG_WARNING( "(E.1."<< ich <<") hwid: "<< m_tileHWID->to_string(adc_id,-1) <<" ch: "<< TMDBchan <<" --> Tile ch: UNKNOWN" );
continue;
}
// TILE channel is the Tile HW channel
@@ -193,10 +193,8 @@ StatusCode TileMuonReceiverDecision::execute() {
float energy = (*chanItr)->amplitude()*ADC2MeV_factor;
float time = (*chanItr)->time();
- if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "(E.1."<< ich <<") hwid: "<< m_tileHWID->to_string(adc_id,-1) <<" ch: "<< TMDBchan <<" --> Tile ch: "<< TILEchan << endreq ;
- msg(MSG::DEBUG) << " E[ADC]: "<<(*chanItr)->amplitude()<<" E[MeV]: "<<energy<<" t[ns]: "<<time<<" QF: "<<(*chanItr)->quality() << endreq;
- }
+ ATH_MSG_DEBUG( "(E.1."<< ich <<") hwid: "<< m_tileHWID->to_string(adc_id,-1) <<" ch: "<< TMDBchan <<" --> Tile ch: "<< TILEchan );
+ ATH_MSG_DEBUG( " E[ADC]: "<<(*chanItr)->amplitude()<<" E[MeV]: "<<energy<<" t[ns]: "<<time<<" QF: "<<(*chanItr)->quality() );
if ( eb_ros ) {
if ( TMDBchan<4 ) {
@@ -223,13 +221,13 @@ StatusCode TileMuonReceiverDecision::execute() {
}
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "(X.0.0) Summary of the exteded results for HL-LHC: " << endreq;
+ ATH_MSG_VERBOSE( "(X.0.0) Summary of the exteded results for HL-LHC: " );
if ( eb_ros ) {
- msg(MSG::VERBOSE) << "(X.1.0) Energy D-5 "<<energy_HLX[0]<<" D-6 "<<energy_HLX[1]<<" D-4 "<<energy_HLX[2]<< endreq;
- msg(MSG::VERBOSE) << "(X.2.0) Time D-5 "<<time_HLX[0]/2.<<" D-6 "<<time_HLX[1]/2.<<" D-4 "<<time_HLX[2]/2.<< endreq;
+ ATH_MSG_VERBOSE( "(X.1.0) Energy D-5 "<<energy_HLX[0]<<" D-6 "<<energy_HLX[1]<<" D-4 "<<energy_HLX[2] );
+ ATH_MSG_VERBOSE( "(X.2.0) Time D-5 "<<time_HLX[0]/2.<<" D-6 "<<time_HLX[1]/2.<<" D-4 "<<time_HLX[2]/2. );
} else {
- msg(MSG::VERBOSE) << "(X.1.0) Energy D-0 "<<energy_HLX[0]<<" D-1 "<<energy_HLX[1]<<" D-2 "<<energy_HLX[2]<<" D-3 "<<energy_HLX[3]<<" BC-8 "<<energy_HLX[4]<< endreq;
- msg(MSG::VERBOSE) << "(X.2.0) Time D-0 "<<time_HLX[0]<<" D-1 "<<time_HLX[1]/2.<<" D-2 "<<time_HLX[2]/2.<<" D-3 "<<time_HLX[3]/2.<<" BC-8 "<<time_HLX[4]/2.<< endreq;
+ ATH_MSG_VERBOSE( "(X.1.0) Energy D-0 "<<energy_HLX[0]<<" D-1 "<<energy_HLX[1]<<" D-2 "<<energy_HLX[2]<<" D-3 "<<energy_HLX[3]<<" BC-8 "<<energy_HLX[4] );
+ ATH_MSG_VERBOSE( "(X.2.0) Time D-0 "<<time_HLX[0]<<" D-1 "<<time_HLX[1]/2.<<" D-2 "<<time_HLX[2]/2.<<" D-3 "<<time_HLX[3]/2.<<" BC-8 "<<time_HLX[4]/2. );
}
}
@@ -263,10 +261,10 @@ StatusCode TileMuonReceiverDecision::execute() {
tile2SL[3] = (!pass_d6_hi && pass_d6_lo);
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "(E.2.0) Summary: e(d5+d6)= " << energy_d5d6 << " e(d6)= " << energy_d6 << endreq;
- msg(MSG::VERBOSE) << "(E.3.0) Thresholds: " << m_threshold_d5d6_lo << " " << m_threshold_d5d6_hi << " " << m_threshold_d6_lo << " " << m_threshold_d6_hi << endreq;
- msg(MSG::VERBOSE) << "(E.4.0) Checking which tresholds have been passed: d56 high " << pass_d5d6_hi << " d56 low " << pass_d5d6_lo << " d6 high " << pass_d6_hi << " d6 low " << pass_d6_lo << endreq;
- msg(MSG::VERBOSE) << "(E.5.0) Output to SL: " << tile2SL[0] << tile2SL[1] << tile2SL[2] << tile2SL[3] << endreq;
+ ATH_MSG_VERBOSE( "(E.2.0) Summary: e(d5+d6)= " << energy_d5d6 << " e(d6)= " << energy_d6 );
+ ATH_MSG_VERBOSE( "(E.3.0) Thresholds: " << m_threshold_d5d6_lo << " " << m_threshold_d5d6_hi << " " << m_threshold_d6_lo << " " << m_threshold_d6_hi );
+ ATH_MSG_VERBOSE( "(E.4.0) Checking which tresholds have been passed: d56 high " << pass_d5d6_hi << " d56 low " << pass_d5d6_lo << " d6 high " << pass_d6_hi << " d6 low " << pass_d6_lo );
+ ATH_MSG_VERBOSE( "(E.5.0) Output to SL: " << tile2SL[0] << tile2SL[1] << tile2SL[2] << tile2SL[3] );
}
if (tile2SL[0] || tile2SL[1] || tile2SL[2] || tile2SL[3]) {
@@ -285,7 +283,7 @@ StatusCode TileMuonReceiverDecision::execute() {
}
if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "== Print TileD decision container output to SL" << endreq ;
+ ATH_MSG_DEBUG( "== Print TileD decision container output to SL" );
decisionContainer->print();
}
CHECK(evtStore()->record( decisionContainer, m_TileMuRcvContainer, false));
diff --git a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
index 858b7b5c627d77b4d5bf5e192d0e7c9c6878269b..9f16d05fb54d9e9ee52898e851df94f3b9466adc 100644
--- a/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TilePulseForTileMuonReceiver.cxx
@@ -350,12 +350,12 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
if (msgLvl(MSG::VERBOSE)){
HWIdentifier adc_id = m_tileHWID->adc_id(drawer_id, TMDBchan, TileID::LOWGAIN);
- msg(MSG::VERBOSE) << "(B.01) Correct pmt being transported in XXchan[]: "<<TMDBchan<<" "<<TILEchan<< "=?"
- << m_tileHWID->channel(m_cablingService->s2h_channel_id(pmt_id))
- << " For reference get TMDB adc_id: " << m_tileHWID->to_string(adc_id) << endreq;
- msg(MSG::VERBOSE) << "(B.02) New hit in ROS/DRAWER/PMT "<<ros<<"/"<<drawer<<"/"<<TMDBchan<<" ("<<TILEchan<<")"
- << " pmt_id "<< m_tileID->to_string(pmt_id,-1)
- << " adc_id "<< m_tileHWID->to_string(adc_id) << endreq;
+ ATH_MSG_VERBOSE( "(B.01) Correct pmt being transported in XXchan[]: "<<TMDBchan<<" "<<TILEchan<< "=?"
+ << m_tileHWID->channel(m_cablingService->s2h_channel_id(pmt_id))
+ << " For reference get TMDB adc_id: " << m_tileHWID->to_string(adc_id) );
+ ATH_MSG_VERBOSE( "(B.02) New hit in ROS/DRAWER/PMT "<<ros<<"/"<<drawer<<"/"<<TMDBchan<<" ("<<TILEchan<<")"
+ << " pmt_id "<< m_tileID->to_string(pmt_id,-1)
+ << " adc_id "<< m_tileHWID->to_string(adc_id) );
}
// Scintillator Energy -> Cell Energy (uses sampling fraction)
@@ -587,18 +587,18 @@ StatusCode TilePulseForTileMuonReceiver::execute() {
TileRawChannel* MuRcvRawChannel = m_MuRcvBuildTool->rawChannel(MuonReceiverDigits);
MuonReceiverRawChannelContainer->push_back(MuRcvRawChannel);
if (msgLvl(MSG::DEBUG)){
- msg(MSG::DEBUG) << " Channel " << m_tileHWID->to_string(adc_id,-1)
- << " Digitized pulse [ADC] "<< digitsBuffer[0]
- << "/" << digitsBuffer[1]
- << "/" << digitsBuffer[2]
- << "/" << digitsBuffer[3]
- << "/" << digitsBuffer[4]
- << "/" << digitsBuffer[5]
- << "/" << digitsBuffer[6] << endreq;
- msg(MSG::DEBUG) << " Raw channel reconstruction Ch: "<< m_tileHWID->to_string(adc_id,-1)
- <<" E [ADC]: "<< MuRcvRawChannel->amplitude()
- <<" Time [ns]: "<< MuRcvRawChannel->time()
- <<" Qf: "<< MuRcvRawChannel->quality() << endreq;
+ ATH_MSG_DEBUG( " Channel " << m_tileHWID->to_string(adc_id,-1)
+ << " Digitized pulse [ADC] "<< digitsBuffer[0]
+ << "/" << digitsBuffer[1]
+ << "/" << digitsBuffer[2]
+ << "/" << digitsBuffer[3]
+ << "/" << digitsBuffer[4]
+ << "/" << digitsBuffer[5]
+ << "/" << digitsBuffer[6] );
+ ATH_MSG_DEBUG( " Raw channel reconstruction Ch: "<< m_tileHWID->to_string(adc_id,-1)
+ <<" E [ADC]: "<< MuRcvRawChannel->amplitude()
+ <<" Time [ns]: "<< MuRcvRawChannel->time()
+ <<" Qf: "<< MuRcvRawChannel->quality() );
}
}
} // END loop over all HIT collections in container