Commit b4261fdb authored by Denis Oliveira Damazio's avatar Denis Oliveira Damazio Committed by Graeme Stewart
Browse files

fix ESD based monitoring (TrigCaloMonitoring-00-00-43)

	* Tagging TrigCaloMonitoring-00-00-42.
	* endreq -> endmsg.
parent 81dbde52
......@@ -72,7 +72,8 @@ def HLTCaloMonitoringTool():
#list += [ "HLTCaloTool/HLTFullCalo" ];
return list
elif DQMonFlags.monManEnvironment == 'tier0ESD':
#elif DQMonFlags.monManEnvironment == 'tier0ESD':
elif ( ( DQMonFlags.monManEnvironment == 'tier0ESD' ) or ( DQMonFlags.monManEnvironment == 'tier0' ) ) :
from TrigCaloMonitoring.TrigCaloMonitoringConf import HLTCaloToolL2
from TrigCaloMonitoring.TrigCaloMonitoringConf import HLTCaloClusterTool
from TrigCaloMonitoring.TrigCaloMonitoringConf import HLTCaloESD_xAODTrigEMClusters
......
......@@ -35,7 +35,7 @@ HLTCaloClusterTool::~HLTCaloClusterTool() {
}
StatusCode HLTCaloClusterTool::init() {
(*m_log) << MSG::DEBUG << "Initializing" << endreq;
(*m_log) << MSG::DEBUG << "Initializing" << endmsg;
return StatusCode::SUCCESS;
}
......@@ -117,7 +117,7 @@ StatusCode HLTCaloClusterTool::book(bool newEventsBlock, bool newLumiBlock, bool
}else if ( newEventsBlock || newLumiBlock ){
return StatusCode::SUCCESS;
}
msg(MSG::DEBUG)<< "End of book" << endreq;
msg(MSG::DEBUG)<< "End of book" << endmsg;
return StatusCode::SUCCESS;
}
......@@ -135,13 +135,13 @@ StatusCode HLTCaloClusterTool::fill() {
//Offline
const xAOD::PhotonContainer* caloOFF = 0;
if( (evtStore()->retrieve(caloOFF, m_CaloClusterOfflineContainerName)).isFailure() ) {
msg(MSG::DEBUG)<< "No Offline Calo Cluster Container found"<< endreq;
msg(MSG::DEBUG)<< "No Offline Calo Cluster Container found"<< endmsg;
return StatusCode::SUCCESS;
}
xAOD::PhotonContainer::const_iterator OFFbeg;
xAOD::PhotonContainer::const_iterator OFFend;
if(caloOFF->size()!=0) msg(MSG::DEBUG)<< "Got Offline Cluster Container Size: "<<caloOFF->size()<< endreq;
if(caloOFF->size()!=0) msg(MSG::DEBUG)<< "Got Offline Cluster Container Size: "<<caloOFF->size()<< endmsg;
hist("NOffCluster")->Fill(caloOFF->size());
......@@ -160,14 +160,14 @@ StatusCode HLTCaloClusterTool::fill() {
const xAOD::TrigEMClusterContainer* EMColl = 0;
if( (evtStore()->retrieve(EMColl, m_CaloClusterL2ContainerName)).isFailure() ) {
msg(MSG::DEBUG)<< "No TrigT2CaloEgamma Cluster Container found"<< endreq;
msg(MSG::DEBUG)<< "No TrigT2CaloEgamma Cluster Container found"<< endmsg;
return StatusCode::SUCCESS;
}
hist(("NOnCluster"+(*ii)).c_str())->Fill(EMColl->size());
if ( EMColl->size()==0 || caloOFF->size()==0 ){
msg(MSG::DEBUG)<< "Not possible to perform comparison" << endreq;
msg(MSG::DEBUG)<< "Not possible to perform comparison" << endmsg;
continue;
}
......@@ -206,9 +206,9 @@ StatusCode HLTCaloClusterTool::fill() {
if((*OFFbeg)->caloCluster()->et()>m_L2EtCut){
if (deltaPhi((*MatchEM)->phi(),(*OFFbeg)->caloCluster()->phi())>3.1){
if ( msglevel <= MSG::DEBUG ){
msg(MSG::DEBUG)<< "The Online Cluster Et: "<< (*MatchEM)->et() << " eta: " << (*MatchEM)->eta() << " phi: " << (*MatchEM)->phi() << endreq;
msg(MSG::DEBUG)<< "The Offline Cluster Et: "<< (*OFFbeg)->caloCluster()->et() << " eta: " << (*OFFbeg)->caloCluster()->eta() << " phi: " << (*OFFbeg)->caloCluster()->phi() << endreq;
msg(MSG::DEBUG)<< "Offline Cluster Container Size: "<<caloOFF->size()<< "Online Cluster Container Size: "<<EMColl->size()<< endreq;
msg(MSG::DEBUG)<< "The Online Cluster Et: "<< (*MatchEM)->et() << " eta: " << (*MatchEM)->eta() << " phi: " << (*MatchEM)->phi() << endmsg;
msg(MSG::DEBUG)<< "The Offline Cluster Et: "<< (*OFFbeg)->caloCluster()->et() << " eta: " << (*OFFbeg)->caloCluster()->eta() << " phi: " << (*OFFbeg)->caloCluster()->phi() << endmsg;
msg(MSG::DEBUG)<< "Offline Cluster Container Size: "<<caloOFF->size()<< "Online Cluster Container Size: "<<EMColl->size()<< endmsg;
}
}
......@@ -253,10 +253,10 @@ StatusCode HLTCaloClusterTool::fill() {
hist2(("RetaOnOff"+(*ii)).c_str())->Fill(RetaOn,RetaOff);
hist2(("RstripOnOff"+(*ii)).c_str())->Fill(RstripOn,RstripOff);
msg(MSG::DEBUG)<< "RetaOnline: "<<RetaOn<< endreq;
msg(MSG::DEBUG)<< "RstripOnline: "<<RstripOn<< endreq;
msg(MSG::DEBUG)<< "RetaOffline: "<<RetaOff<< endreq;
msg(MSG::DEBUG)<< "RstripOffline: "<<RstripOff<< endreq;
msg(MSG::DEBUG)<< "RetaOnline: "<<RetaOn<< endmsg;
msg(MSG::DEBUG)<< "RstripOnline: "<<RstripOn<< endmsg;
msg(MSG::DEBUG)<< "RetaOffline: "<<RetaOff<< endmsg;
msg(MSG::DEBUG)<< "RstripOffline: "<<RstripOff<< endmsg;
}
if((*MatchEM)->et()/(*OFFbeg)->caloCluster()->et()<0.7||(*MatchEM)->et()/(*OFFbeg)->caloCluster()->et()>1.3) hist2(("etaphiDifferent"+(*ii)).c_str())->Fill((*MatchEM)->eta(),(*MatchEM)->phi());
if (m_ntuple) ((TNtuple*)tree("Details"))->Fill((*MatchEM)->et(),(*MatchEM)->eta(),(*MatchEM)->phi(),(*OFFbeg)->caloCluster()->et(),(*OFFbeg)->caloCluster()->eta(),(*OFFbeg)->caloCluster()->phi() );
......@@ -280,7 +280,7 @@ StatusCode HLTCaloClusterTool::fill() {
if((*ii).compare("EgammaEF")==0){
const xAOD::PhotonContainer* caloON = 0;
if( (evtStore()->retrieve(caloON, m_CaloClusterEFContainerName)).isFailure()) {
msg(MSG::DEBUG)<< "No Online Calo Cluster Container found"<< endreq;
msg(MSG::DEBUG)<< "No Online Calo Cluster Container found"<< endmsg;
return StatusCode::SUCCESS;
}
......@@ -291,7 +291,7 @@ StatusCode HLTCaloClusterTool::fill() {
hist(("NOnCluster"+(*ii)).c_str())->Fill(caloON->size());
if ( caloON->size()==0 || caloOFF->size()==0 ){
msg(MSG::DEBUG)<< "Not possible to perform comparison" << endreq;
msg(MSG::DEBUG)<< "Not possible to perform comparison" << endmsg;
continue;
}
xAOD::PhotonContainer::const_iterator ONbeg = caloON->begin();
......@@ -333,9 +333,9 @@ StatusCode HLTCaloClusterTool::fill() {
if((*OFFbeg)->caloCluster()->et()>m_EFEtCut){
if (deltaPhi((*Match)->caloCluster()->phi(),(*OFFbeg)->caloCluster()->phi())>3.1){
if ( msglevel <= MSG::DEBUG ){
msg(MSG::DEBUG)<< "The Online Cluster Et: "<< (*Match)->caloCluster()->et() << " eta: " << (*Match)->caloCluster()->eta() << " phi: " << (*Match)->caloCluster()->phi() << endreq;
msg(MSG::DEBUG)<< "The Offline Cluster Et: "<< (*OFFbeg)->caloCluster()->et() << " eta: " << (*OFFbeg)->caloCluster()->eta() << " phi: " << (*OFFbeg)->caloCluster()->phi() << endreq;
msg(MSG::DEBUG)<< "Offline Cluster Container Size: "<<caloOFF->size()<< "Online Cluster Container Size: "<<caloON->size()<< endreq;
msg(MSG::DEBUG)<< "The Online Cluster Et: "<< (*Match)->caloCluster()->et() << " eta: " << (*Match)->caloCluster()->eta() << " phi: " << (*Match)->caloCluster()->phi() << endmsg;
msg(MSG::DEBUG)<< "The Offline Cluster Et: "<< (*OFFbeg)->caloCluster()->et() << " eta: " << (*OFFbeg)->caloCluster()->eta() << " phi: " << (*OFFbeg)->caloCluster()->phi() << endmsg;
msg(MSG::DEBUG)<< "Offline Cluster Container Size: "<<caloOFF->size()<< "Online Cluster Container Size: "<<caloON->size()<< endmsg;
}
}
......@@ -410,10 +410,10 @@ StatusCode HLTCaloClusterTool::fill() {
hist2(("RetaOnOff"+(*ii)).c_str())->Fill(RetaOn,RetaOff);
hist2(("RstripOnOff"+(*ii)).c_str())->Fill(RstripOn,RstripOff);
msg(MSG::DEBUG)<< "RetaOnline: "<<RetaOn<< endreq;
msg(MSG::DEBUG)<< "RstripOnline: "<<RstripOn<< endreq;
msg(MSG::DEBUG)<< "RetaOffline: "<<RetaOff<< endreq;
msg(MSG::DEBUG)<< "RstripOffline: "<<RstripOff<< endreq;
msg(MSG::DEBUG)<< "RetaOnline: "<<RetaOn<< endmsg;
msg(MSG::DEBUG)<< "RstripOnline: "<<RstripOn<< endmsg;
msg(MSG::DEBUG)<< "RetaOffline: "<<RetaOff<< endmsg;
msg(MSG::DEBUG)<< "RstripOffline: "<<RstripOff<< endmsg;
}
if((*Match)->caloCluster()->et()/(*OFFbeg)->caloCluster()->et()<0.7||(*Match)->caloCluster()->et()/(*OFFbeg)->caloCluster()->et()>1.3) hist2(("etaphiDifferent"+(*ii)).c_str())->Fill((*Match)->caloCluster()->eta(),(*Match)->caloCluster()->phi());
......
......@@ -36,42 +36,42 @@ HLTCaloTool::~HLTCaloTool() {
}
StatusCode HLTCaloTool::init() {
(*m_log) << MSG::DEBUG << "Initializing" << endreq;
(*m_log) << MSG::DEBUG << "Initializing" << endmsg;
if ( m_tcrAlgTools.retrieve().isFailure() ) {
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_tcrAlgTools << endreq;
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_tcrAlgTools << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::DEBUG << "Retrieved " << m_tcrAlgTools << endreq;
(*m_log) << MSG::DEBUG << "Retrieved " << m_tcrAlgTools << endmsg;
}
if ( m_cablingSvc.retrieve().isFailure() ) {
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_cablingSvc << endreq;
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_cablingSvc << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::INFO << "Retrieved " << m_cablingSvc << endreq;
(*m_log) << MSG::INFO << "Retrieved " << m_cablingSvc << endmsg;
}
ServiceHandle<StoreGateSvc> detStore("DetectorStore",name());
if ( detStore.retrieve().isFailure() ) {
(*m_log) << MSG::ERROR << "Unable to retrieve DetectorStore" << endreq;
(*m_log) << MSG::ERROR << "Unable to retrieve DetectorStore" << endmsg;
return StatusCode::FAILURE;
}
const LArIdManager* larMgr;
if ( (detStore->retrieve(larMgr)).isFailure() ) {
(*m_log) << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endreq;
(*m_log) << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endreq;
(*m_log) << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endmsg;
}
m_onlineHelper = larMgr->getOnlineID();
if (!m_onlineHelper) {
(*m_log) << MSG::ERROR << "Could not access LArOnlineID helper" << endreq;
(*m_log) << MSG::ERROR << "Could not access LArOnlineID helper" << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endreq;
(*m_log) << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endmsg;
}
if ( (detStore->retrieve(m_tileID)).isFailure() ) {
(*m_log) << MSG::ERROR << "Could not access TileID" << endreq;
(*m_log) << MSG::ERROR << "Could not access TileID" << endmsg;
return StatusCode::FAILURE;
}
......@@ -110,7 +110,7 @@ StatusCode HLTCaloTool::book(bool newEventsBlock, bool newLumiBlock, bool newRun
return StatusCode::SUCCESS;
}
*m_log << MSG::DEBUG << "End of book" << endreq;
*m_log << MSG::DEBUG << "End of book" << endmsg;
return StatusCode::SUCCESS;
}
......@@ -119,12 +119,12 @@ StatusCode HLTCaloTool::fill() {
const DataHandle<CaloCellContainer> AllCalo;
if ( m_storeGate->retrieve(AllCalo,"AllCalo").isFailure() ){
(*m_log) << MSG::DEBUG << "No Calo Cell Container found"
<< endreq;
<< endmsg;
return StatusCode::SUCCESS;
}
if ( (*m_log).level() <= MSG::DEBUG ) {
(*m_log) << MSG::DEBUG << "Got container ";
(*m_log) << "Size : " << AllCalo->size() << endreq;
(*m_log) << "Size : " << AllCalo->size() << endmsg;
}
CaloCellContainer* pCaloCellContainer
......@@ -140,7 +140,7 @@ StatusCode HLTCaloTool::fill() {
if ( (*m_log).level() <= MSG::DEBUG ) {
(*m_log) << MSG::DEBUG << "Tool name : "
<< (*itrtcr).name() << endreq;
<< (*itrtcr).name() << endmsg;
}
phimin=-M_PI;
phimax=M_PI;
......@@ -159,7 +159,7 @@ StatusCode HLTCaloTool::fill() {
}
if ( sc.isFailure() ) {
(*m_log) << MSG::ERROR << "Problem with filling the cont"
<< endreq;
<< endmsg;
} else {
// This method does not exist in this place now
uint32_t in_error = (*itrtcr)->report_error();
......@@ -171,14 +171,14 @@ StatusCode HLTCaloTool::fill() {
hist("conversionErrors")->Fill(conversionError);
if ( error ) {
(*m_log) << MSG::DEBUG << "Problems in unpacking : "
<< error << endreq;
<< error << endmsg;
}
if ( (*m_log).level() <=MSG::DEBUG) {
(*m_log) << MSG::DEBUG << "HLT Container size : "
<< pCaloCellContainer->size() << endreq;
<< pCaloCellContainer->size() << endmsg;
(*m_log) << MSG::DEBUG << "Differences in container sizes : "
<< (pCaloCellContainer->size())-(AllCalo->size()) <<endreq;
<< (pCaloCellContainer->size())-(AllCalo->size()) <<endmsg;
}
CaloCellContainer::const_iterator tbeg = pCaloCellContainer->begin();
CaloCellContainer::const_iterator tend = pCaloCellContainer->end();
......@@ -256,7 +256,7 @@ StatusCode HLTCaloTool::fill() {
count_tcellspL++;
}
if ( (*m_log).level() <=MSG::VERBOSE)
(*m_log) << endreq;
(*m_log) << endmsg;
if ( m_ntuple )
((TNtuple*)tree("Details"))->Fill(cell->et(),cell->eta(),cell->phi(),(double)cell->gain(),tcell->et(),tcell->eta(),tcell->phi(),(double)tcell->gain(),lartile );
}
......@@ -281,10 +281,10 @@ StatusCode HLTCaloTool::fill() {
hist("NBadCellsTile")->Fill(count_tcellspT);
hist("NCellsTile")->Fill(count_tcellsT);
if ( (*m_log).level() <= MSG::DEBUG) {
(*m_log) << MSG::DEBUG << "Number of LAr cells found " << count_tcellsL << endreq;
(*m_log) << MSG::DEBUG << "Number of LAr cells w problems " << count_tcellspL << endreq;
(*m_log) << MSG::DEBUG << "Number of Tile cells found " << count_tcellsT << endreq;
(*m_log) << MSG::DEBUG << "Number of Tile cells w problems " << count_tcellspT << endreq;
(*m_log) << MSG::DEBUG << "Number of LAr cells found " << count_tcellsL << endmsg;
(*m_log) << MSG::DEBUG << "Number of LAr cells w problems " << count_tcellspL << endmsg;
(*m_log) << MSG::DEBUG << "Number of Tile cells found " << count_tcellsT << endmsg;
(*m_log) << MSG::DEBUG << "Number of Tile cells w problems " << count_tcellspT << endmsg;
}
delete pCaloCellContainer;
......
......@@ -32,39 +32,39 @@ HLTCaloToolL2::~HLTCaloToolL2() {
}
StatusCode HLTCaloToolL2::init() {
(*m_log) << MSG::DEBUG << "Initializing" << endreq;
(*m_log) << MSG::DEBUG << "Initializing" << endmsg;
for(std::vector<std::string>::const_iterator i =
m_listOfCellsKeys.begin(); i!= m_listOfCellsKeys.end(); ++i){
(*m_log) << MSG::DEBUG << "Will use this key : " << (*i) << endreq;
(*m_log) << MSG::DEBUG << "Will use this key : " << (*i) << endmsg;
}
if ( m_cablingSvc.retrieve().isFailure() ) {
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_cablingSvc << endreq;
(*m_log) << MSG::ERROR << "Failed to retrieve helper tools: " << m_cablingSvc << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::INFO << "Retrieved " << m_cablingSvc << endreq;
(*m_log) << MSG::INFO << "Retrieved " << m_cablingSvc << endmsg;
}
ServiceHandle<StoreGateSvc> detStore("DetectorStore",name());
if ( detStore.retrieve().isFailure() ) {
(*m_log) << MSG::ERROR << "Unable to retrieve DetectorStore" << endreq;
(*m_log) << MSG::ERROR << "Unable to retrieve DetectorStore" << endmsg;
return StatusCode::FAILURE;
}
const LArIdManager* larMgr;
if ( (detStore->retrieve(larMgr)).isFailure() ) {
(*m_log) << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endreq;
(*m_log) << MSG::ERROR << "Unable to retrieve LArIdManager from DetectorStore" << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endreq;
(*m_log) << MSG::DEBUG << "Successfully retrieved LArIdManager from DetectorStore" << endmsg;
}
m_onlineHelper = larMgr->getOnlineID();
if (!m_onlineHelper) {
(*m_log) << MSG::ERROR << "Could not access LArOnlineID helper" << endreq;
(*m_log) << MSG::ERROR << "Could not access LArOnlineID helper" << endmsg;
return StatusCode::FAILURE;
} else {
(*m_log) << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endreq;
(*m_log) << MSG::DEBUG << "Successfully accessed LArOnlineID helper" << endmsg;
}
if ( (detStore->retrieve(m_tileID)).isFailure() ) {
(*m_log) << MSG::ERROR << "Could not access TileID" << endreq;
(*m_log) << MSG::ERROR << "Could not access TileID" << endmsg;
return StatusCode::FAILURE;
}
......@@ -126,7 +126,7 @@ StatusCode HLTCaloToolL2::book(bool newEventsBlock, bool newLumiBlock, bool newR
return StatusCode::SUCCESS;
}
*m_log << MSG::DEBUG << "End of book" << endreq;
*m_log << MSG::DEBUG << "End of book" << endmsg;
return StatusCode::SUCCESS;
}
......@@ -135,12 +135,12 @@ StatusCode HLTCaloToolL2::fill() {
const DataHandle<CaloCellContainer> AllCalo;
if ( m_storeGate->retrieve(AllCalo,"AllCalo").isFailure() ){
(*m_log) << MSG::DEBUG << "No Calo Cell Container found"
<< endreq;
<< endmsg;
return StatusCode::SUCCESS;
}
if ( (*m_log).level() <= MSG::DEBUG) {
(*m_log) << MSG::DEBUG << "Got container ";
(*m_log) << "Size : " << AllCalo->size() << endreq;
(*m_log) << "Size : " << AllCalo->size() << endmsg;
}
int count_tcellsL=0;
int count_tcellspL=0;
......@@ -151,12 +151,12 @@ StatusCode HLTCaloToolL2::fill() {
const DataHandle<CaloCellContainer> pCaloCellContainer;
if ( m_storeGate->retrieve(pCaloCellContainer,*key).isFailure() ){
(*m_log) << MSG::DEBUG << "No HLT Calo Cell Container found"
<< endreq;
<< endmsg;
return StatusCode::SUCCESS;
}
if ( (*m_log).level() <= MSG::DEBUG) {
(*m_log) << MSG::DEBUG << "HLT Container size : "
<< pCaloCellContainer->size() << endreq;
<< pCaloCellContainer->size() << endmsg;
}
// Cache pointers to improve speed
......@@ -258,7 +258,7 @@ StatusCode HLTCaloToolL2::fill() {
count_tcellspL++;
}
if ( (*m_log).level() <=MSG::VERBOSE)
(*m_log) << endreq;
(*m_log) << endmsg;
if ( m_ntuple )
((TNtuple*)tree("Details"))->Fill(cell->et(),cell->eta(),cell->phi(),(double)cell->gain(),tcell->et(),tcell->eta(),tcell->phi(),(double)tcell->gain(),lartile );
}
......@@ -318,10 +318,10 @@ StatusCode HLTCaloToolL2::fill() {
hist("NBadCellsTile")->Fill(count_tcellspT);
hist("NCellsTile")->Fill(count_tcellsT);
if ( (*m_log).level() <= MSG::DEBUG) {
(*m_log) << MSG::DEBUG << "Number of LAr cells found " << count_tcellsL << endreq;
(*m_log) << MSG::DEBUG << "Number of LAr cells w problems " << count_tcellspL << endreq;
(*m_log) << MSG::DEBUG << "Number of Tile cells found " << count_tcellsT << endreq;
(*m_log) << MSG::DEBUG << "Number of Tile cells w problems " << count_tcellspT << endreq;
(*m_log) << MSG::DEBUG << "Number of LAr cells found " << count_tcellsL << endmsg;
(*m_log) << MSG::DEBUG << "Number of LAr cells w problems " << count_tcellspL << endmsg;
(*m_log) << MSG::DEBUG << "Number of Tile cells found " << count_tcellsT << endmsg;
(*m_log) << MSG::DEBUG << "Number of Tile cells w problems " << count_tcellspT << endmsg;
}
return StatusCode::SUCCESS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment