From 24487f94b7f48f4993d067b6e96160fcbf4b3ce0 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Sun, 22 Jan 2017 04:13:22 +0100
Subject: [PATCH] 'clang warning: Missing override keyword.'
(FastCaloSim-00-01-67)
* Tagging FastCaloSim-00-01-67.
* clang warning: Missing override keyword.
* Tagging FastCaloSim-00-01-66.
* Comply with ATLAS naming conventions.
2017-01-21 scott snyder <snyder@bnl.gov>
* Tagging FastCaloSim-00-01-65.
* endreq -> endmsg.
Former-commit-id: f4797ac22f70c4322fc0a2189339b7d001b51dcc
---
.../FastCaloSim/BasicCellBuilderTool.h | 24 +-
.../FastCaloSim/FastShowerCellBuilderTool.h | 72 +--
.../src/AddNoiseCellBuilderTool.cxx | 20 +-
.../FastCaloSim/src/BasicCellBuilderTool.cxx | 168 +++----
.../FastCaloSim/src/EmptyCellBuilderTool.cxx | 24 +-
.../FastCaloSim/src/FSStoregateClean.cxx | 10 +-
.../src/FastShowerCellBuilderTool.cxx | 450 +++++++++---------
7 files changed, 384 insertions(+), 384 deletions(-)
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
index d3e3dde2208..9ff48db5562 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
@@ -161,7 +161,7 @@ public:
virtual StatusCode initialize() override;
// update theCellContainer
- virtual StatusCode process( CaloCellContainer * theCellContainer) ;
+ virtual StatusCode process( CaloCellContainer * theCellContainer) override;
protected:
void init_all_maps();
@@ -180,18 +180,18 @@ protected:
double m_phi0_em;
double m_phi0_had;
- cellinfo_map celllist_maps[CaloCell_ID_FCS::MaxSample];
- cellinfo_map em_celllist_map;
- cellinfo_map em_map;
- cellinfo_map em_fine_map;
- cellinfo_map had_map;
+ cellinfo_map m_celllist_maps[CaloCell_ID_FCS::MaxSample];
+ cellinfo_map m_em_celllist_map;
+ cellinfo_map m_em_map;
+ cellinfo_map m_em_fine_map;
+ cellinfo_map m_had_map;
- double min_eta_sample[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
- double max_eta_sample[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
- FSmap< double , double > rmid_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
- FSmap< double , double > zmid_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
- FSmap< double , double > rent_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
- FSmap< double , double > zent_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ double m_min_eta_sample[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ double m_max_eta_sample[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ FSmap< double , double > m_rmid_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ FSmap< double , double > m_zmid_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ FSmap< double , double > m_rent_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
+ FSmap< double , double > m_zent_map[2][CaloCell_ID_FCS::MaxSample]; //[side][calosample]
double deta(CaloCell_ID_FCS::CaloSample sample,double eta) const;
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
index e821d636088..d2b683c3580 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
@@ -216,58 +216,58 @@ private:
t_map_PSP_ID m_map_ParticleShapeParametrizationMap;
- std::map< int , double> simul_map_energy;
- std::map< int , double> simul_map_energyEM;
- std::map< int , double> simul_map_energyHAD;
+ std::map< int , double> m_simul_map_energy;
+ std::map< int , double> m_simul_map_energyEM;
+ std::map< int , double> m_simul_map_energyHAD;
- std::map< int , double> simul_sum_energy;
- std::map< int , double> simul_sum_energyEM;
- std::map< int , double> simul_sum_energyHAD;
+ std::map< int , double> m_simul_sum_energy;
+ std::map< int , double> m_simul_sum_energyEM;
+ std::map< int , double> m_simul_sum_energyHAD;
// Variables used during single event generation
private:
- double E_tot_em;
- double E_tot_had;
- double Et_tot_em;
- double Et_tot_had;
+ double m_E_tot_em;
+ double m_E_tot_had;
+ double m_Et_tot_em;
+ double m_Et_tot_had;
- double E_tot_sample[CaloCell_ID_FCS::MaxSample];
- double E_lost_sample[CaloCell_ID_FCS::MaxSample];
- double Et_tot_sample[CaloCell_ID_FCS::MaxSample];
- double Et_lost_sample[CaloCell_ID_FCS::MaxSample];
+ double m_E_tot_sample[CaloCell_ID_FCS::MaxSample];
+ double m_E_lost_sample[CaloCell_ID_FCS::MaxSample];
+ double m_Et_tot_sample[CaloCell_ID_FCS::MaxSample];
+ double m_Et_lost_sample[CaloCell_ID_FCS::MaxSample];
private:
- double ptruth_eta;
- double ptruth_phi;
- double ptruth_e;
+ double m_ptruth_eta;
+ double m_ptruth_phi;
+ double m_ptruth_e;
//double ptruth_et;
- double ptruth_pt;
- double ptruth_p;
+ double m_ptruth_pt;
+ double m_ptruth_p;
//int pdgid;
- int refid;
+ int m_refid;
- double eta_calo_surf;
- double phi_calo_surf;
- double d_calo_surf;
+ double m_eta_calo_surf;
+ double m_phi_calo_surf;
+ double m_d_calo_surf;
- bool layerCaloOK[CaloCell_ID_FCS::MaxSample];
- double letaCalo[CaloCell_ID_FCS::MaxSample];
- double lphiCalo[CaloCell_ID_FCS::MaxSample];
- double dCalo[CaloCell_ID_FCS::MaxSample];
- double distetaCaloBorder[CaloCell_ID_FCS::MaxSample];
+ bool m_layerCaloOK[CaloCell_ID_FCS::MaxSample];
+ double m_letaCalo[CaloCell_ID_FCS::MaxSample];
+ double m_lphiCalo[CaloCell_ID_FCS::MaxSample];
+ double m_dCalo[CaloCell_ID_FCS::MaxSample];
+ double m_distetaCaloBorder[CaloCell_ID_FCS::MaxSample];
- CaloCell_ID_FCS::CaloSample sample_calo_surf;
+ CaloCell_ID_FCS::CaloSample m_sample_calo_surf;
public:
bool get_calo_etaphi(std::vector<Trk::HitInfo>* hitVector,CaloCell_ID_FCS::CaloSample sample);
bool get_calo_surface(std::vector<Trk::HitInfo>* hitVector);
- CaloCell_ID_FCS::CaloSample get_sample_calo_surf() const {return sample_calo_surf;};
- double get_eta_calo_surf() const {return eta_calo_surf;};
- double get_phi_calo_surf() const {return phi_calo_surf;};
- double get_d_calo_surf() const {return d_calo_surf;};
- double get_eta_calo_surf(int layer) const {return letaCalo[layer];};
- double get_phi_calo_surf(int layer) const {return lphiCalo[layer];};
- double get_d_calo_surf(int layer) const {return dCalo[layer];};
+ CaloCell_ID_FCS::CaloSample get_sample_calo_surf() const {return m_sample_calo_surf;};
+ double get_eta_calo_surf() const {return m_eta_calo_surf;};
+ double get_phi_calo_surf() const {return m_phi_calo_surf;};
+ double get_d_calo_surf() const {return m_d_calo_surf;};
+ double get_eta_calo_surf(int layer) const {return m_letaCalo[layer];};
+ double get_phi_calo_surf(int layer) const {return m_lphiCalo[layer];};
+ double get_d_calo_surf(int layer) const {return m_dCalo[layer];};
private:
std::string m_FastShowerInfoContainerKey;
diff --git a/Simulation/FastShower/FastCaloSim/src/AddNoiseCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/AddNoiseCellBuilderTool.cxx
index ad59085233c..d09e05d4c58 100755
--- a/Simulation/FastShower/FastCaloSim/src/AddNoiseCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/AddNoiseCellBuilderTool.cxx
@@ -52,7 +52,7 @@ AddNoiseCellBuilderTool::~AddNoiseCellBuilderTool()
StatusCode AddNoiseCellBuilderTool::initialize()
{
MsgStream log(msgSvc(), name());
- log << MSG::INFO << "Initialisating started" << endreq ;
+ log << MSG::INFO << "Initialisating started" << endmsg ;
StatusCode sc=BasicCellBuilderTool::initialize();
@@ -61,7 +61,7 @@ StatusCode AddNoiseCellBuilderTool::initialize()
if (sc.isFailure()) {
log << MSG::FATAL
<< " Tool Service not found "
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -71,28 +71,28 @@ StatusCode AddNoiseCellBuilderTool::initialize()
if (sc.isFailure()) {
log << MSG::INFO
<< "Unable to find tool for " << m_noiseToolName
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
} else {
log << MSG::INFO << "Noise Tool "
- << m_noiseToolName << " is selected!" << endreq;
+ << m_noiseToolName << " is selected!" << endmsg;
}
m_noiseTool=dynamic_cast<ICaloNoiseTool*>(algtool);
// Random number service
if ( m_rndmSvc.retrieve().isFailure() ) {
- log<<MSG::ERROR<< "Could not retrieve " << m_rndmSvc << endreq;
+ log<<MSG::ERROR<< "Could not retrieve " << m_rndmSvc << endmsg;
return StatusCode::FAILURE;
}
//Get own engine with own seeds:
m_randomEngine = m_rndmSvc->GetEngine(m_randomEngineName);
if (!m_randomEngine) {
- log<<MSG::ERROR << "Could not get random engine '" << m_randomEngineName << "'" << endreq;
+ log<<MSG::ERROR << "Could not get random engine '" << m_randomEngineName << "'" << endmsg;
return StatusCode::FAILURE;
}
- log << MSG::INFO << "Initialisating finished" << endreq ;
+ log << MSG::INFO << "Initialisating finished" << endmsg ;
return sc;
}
@@ -110,7 +110,7 @@ StatusCode AddNoiseCellBuilderTool::process(CaloCellContainer * theCellContainer
log << MSG::INFO << "Executing start calo size=" <<theCellContainer->size()<<" Event="<<m_nEvent;//<<" rseed="<<rseed;
//if(m_rand) log<<" seed(m_rand="<<m_rand->ClassName()<<")="<<m_rand->GetSeed();
- log<< endreq;
+ log<< endmsg;
++m_nEvent;
@@ -147,7 +147,7 @@ StatusCode AddNoiseCellBuilderTool::process(CaloCellContainer * theCellContainer
/*
if(cell->energy()>1000) {
- log<<MSG::DEBUG<<"sample="<<cell->caloDDE()->getSampling()<<" eta="<<cell->eta()<<" phi="<<cell->phi()<<" gain="<<gain<<" e="<<cell->energy()<<" sigma="<<sigma<<" enoise="<<enoise<<endreq;
+ log<<MSG::DEBUG<<"sample="<<cell->caloDDE()->getSampling()<<" eta="<<cell->eta()<<" phi="<<cell->phi()<<" gain="<<gain<<" e="<<cell->energy()<<" sigma="<<sigma<<" enoise="<<enoise<<endmsg;
}
*/
cell->setEnergy(cell->energy()+enoise);
@@ -156,6 +156,6 @@ StatusCode AddNoiseCellBuilderTool::process(CaloCellContainer * theCellContainer
Et_tot+=cell->energy()/cosh(cell->eta());
}
- log << MSG::INFO << "Executing finished calo size=" <<theCellContainer->size()<<" ; e="<<E_tot<<" ; et="<<Et_tot<< endreq;
+ log << MSG::INFO << "Executing finished calo size=" <<theCellContainer->size()<<" ; e="<<E_tot<<" ; et="<<Et_tot<< endmsg;
return StatusCode::SUCCESS;
}
diff --git a/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
index d65cbe0c0fa..b78a009228d 100755
--- a/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
@@ -131,7 +131,7 @@ StatusCode BasicCellBuilderTool::initialize()
// retrive onlineID helper from detStore
StoreGateSvc* detStore;
if (service("DetectorStore", detStore).isFailure()) {
- log << MSG::ERROR << "Unable to access DetectoreStore" << endreq ;
+ log << MSG::ERROR << "Unable to access DetectoreStore" << endmsg ;
return StatusCode::FAILURE;
}
*/
@@ -166,8 +166,8 @@ double BasicCellBuilderTool::deta(CaloCell_ID_FCS::CaloSample sample,double eta)
int side=0;
if(eta>0) side=1;
- double mineta=min_eta_sample[side][sample];
- double maxeta=max_eta_sample[side][sample];
+ double mineta=m_min_eta_sample[side][sample];
+ double maxeta=m_max_eta_sample[side][sample];
if(eta<mineta) {
return fabs(eta-mineta);
@@ -186,8 +186,8 @@ void BasicCellBuilderTool::minmaxeta(CaloCell_ID_FCS::CaloSample sample,double e
int side=0;
if(eta>0) side=1;
- mineta=min_eta_sample[side][sample];
- maxeta=max_eta_sample[side][sample];
+ mineta=m_min_eta_sample[side][sample];
+ maxeta=m_max_eta_sample[side][sample];
}
double BasicCellBuilderTool::rmid(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -195,7 +195,7 @@ double BasicCellBuilderTool::rmid(CaloCell_ID_FCS::CaloSample sample,double eta)
int side=0;
if(eta>0) side=1;
- return rmid_map[side][sample].find_closest(eta)->second;
+ return m_rmid_map[side][sample].find_closest(eta)->second;
}
double BasicCellBuilderTool::zmid(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -203,7 +203,7 @@ double BasicCellBuilderTool::zmid(CaloCell_ID_FCS::CaloSample sample,double eta)
int side=0;
if(eta>0) side=1;
- return zmid_map[side][sample].find_closest(eta)->second;
+ return m_zmid_map[side][sample].find_closest(eta)->second;
}
double BasicCellBuilderTool::rzmid(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -211,8 +211,8 @@ double BasicCellBuilderTool::rzmid(CaloCell_ID_FCS::CaloSample sample,double eta
int side=0;
if(eta>0) side=1;
- if(isCaloBarrel(sample)) return rmid_map[side][sample].find_closest(eta)->second;
- else return zmid_map[side][sample].find_closest(eta)->second;
+ if(isCaloBarrel(sample)) return m_rmid_map[side][sample].find_closest(eta)->second;
+ else return m_zmid_map[side][sample].find_closest(eta)->second;
}
double BasicCellBuilderTool::rent(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -220,7 +220,7 @@ double BasicCellBuilderTool::rent(CaloCell_ID_FCS::CaloSample sample,double eta)
int side=0;
if(eta>0) side=1;
- return rent_map[side][sample].find_closest(eta)->second;
+ return m_rent_map[side][sample].find_closest(eta)->second;
}
double BasicCellBuilderTool::zent(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -228,7 +228,7 @@ double BasicCellBuilderTool::zent(CaloCell_ID_FCS::CaloSample sample,double eta)
int side=0;
if(eta>0) side=1;
- return zent_map[side][sample].find_closest(eta)->second;
+ return m_zent_map[side][sample].find_closest(eta)->second;
}
double BasicCellBuilderTool::rzent(CaloCell_ID_FCS::CaloSample sample,double eta) const
@@ -236,8 +236,8 @@ double BasicCellBuilderTool::rzent(CaloCell_ID_FCS::CaloSample sample,double eta
int side=0;
if(eta>0) side=1;
- if(isCaloBarrel(sample)) return rent_map[side][sample].find_closest(eta)->second;
- else return zent_map[side][sample].find_closest(eta)->second;
+ if(isCaloBarrel(sample)) return m_rent_map[side][sample].find_closest(eta)->second;
+ else return m_zent_map[side][sample].find_closest(eta)->second;
}
@@ -256,25 +256,25 @@ void BasicCellBuilderTool::init_all_maps()
/*
int nokfcal=0;
- log << MSG::INFO << "Loop only fcal" << endreq ;
+ log << MSG::INFO << "Loop only fcal" << endmsg ;
for(CaloDetDescrManager::calo_element_const_iterator calo_iter=m_caloDDM->element_begin(CaloCell_ID::LARFCAL);calo_iter<m_caloDDM->element_end(CaloCell_ID::LARFCAL);++calo_iter) {
const CaloDetDescrElement* theDDE=*calo_iter;
if(theDDE) {
++nokfcal;
- if(fabs(theDDE->eta()+4.95)<0.1) log << MSG::DEBUG << "init cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo()<< endreq ;
+ if(fabs(theDDE->eta()+4.95)<0.1) log << MSG::DEBUG << "init cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo()<< endmsg ;
}
}
- log << MSG::INFO << "Loop only fcal finished nok="<<nokfcal << endreq ;
+ log << MSG::INFO << "Loop only fcal finished nok="<<nokfcal << endmsg ;
*/
int nok=0;
int nvolOK=0;
int naccept=0;
bool doem_celllist_map=false;
bool do_celllist_map=false;
- int emcl_neta=em_celllist_map.leta()-1;
- int emcl_nphi=em_celllist_map.lphi()-1;
- if(em_celllist_map.leta()>1 && em_celllist_map.lphi()>1) doem_celllist_map=true;
- if(celllist_maps[0].leta()>1 && celllist_maps[0].lphi()>1) do_celllist_map=true;
+ int emcl_neta=m_em_celllist_map.leta()-1;
+ int emcl_nphi=m_em_celllist_map.lphi()-1;
+ if(m_em_celllist_map.leta()>1 && m_em_celllist_map.lphi()>1) doem_celllist_map=true;
+ if(m_celllist_maps[0].leta()>1 && m_celllist_maps[0].lphi()>1) do_celllist_map=true;
FSmap< double , double > rz_map_eta [2][CaloCell_ID_FCS::MaxSample];
FSmap< double , double > rz_map_rmid[2][CaloCell_ID_FCS::MaxSample];
@@ -285,8 +285,8 @@ void BasicCellBuilderTool::init_all_maps()
for(int side=0;side<=1;++side) for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
- min_eta_sample[side][sample]=+1000;
- max_eta_sample[side][sample]=-1000;
+ m_min_eta_sample[side][sample]=+1000;
+ m_max_eta_sample[side][sample]=-1000;
}
@@ -299,7 +299,7 @@ void BasicCellBuilderTool::init_all_maps()
if( calo==CaloCell_ID::LARFCAL ) {
log << MSG::DEBUG << "init cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo();
log<<" deta="<<theDDE->deta()<<" dphi="<<theDDE->dphi()<<" dr="<<theDDE->dr()<<" vol="<<theDDE->volume() ;
- log<<" dx="<<theDDE->dx()<<" dy="<<theDDE->dy()<<" dz="<<theDDE->dz()<< endreq ;
+ log<<" dx="<<theDDE->dx()<<" dy="<<theDDE->dy()<<" dz="<<theDDE->dz()<< endmsg ;
}
*/
CaloCell_ID::SUBCALO calo=theDDE->getSubCalo();
@@ -314,8 +314,8 @@ void BasicCellBuilderTool::init_all_maps()
}
double min_eta=theDDE->eta()-theDDE->deta()/2;
double max_eta=theDDE->eta()+theDDE->deta()/2;
- if(min_eta<min_eta_sample[side][sample]) min_eta_sample[side][sample]=min_eta;
- if(max_eta>max_eta_sample[side][sample]) max_eta_sample[side][sample]=max_eta;
+ if(min_eta<m_min_eta_sample[side][sample]) m_min_eta_sample[side][sample]=min_eta;
+ if(max_eta>m_max_eta_sample[side][sample]) m_max_eta_sample[side][sample]=max_eta;
if(rz_map_eta[side][sample].find(eta_raw)==rz_map_eta[side][sample].end()) {
rz_map_eta [side][sample][eta_raw]=0;
@@ -333,28 +333,28 @@ void BasicCellBuilderTool::init_all_maps()
rz_map_n [side][sample][eta_raw]++;
if(do_celllist_map) {
- int cl_neta=celllist_maps[sample].leta()-1;
- int cl_nphi=celllist_maps[sample].lphi()-1;
- double ceta_min=theDDE->eta()-celllist_maps[sample].deta()*cl_neta;
- double ceta_max=theDDE->eta()+celllist_maps[sample].deta()*cl_neta;
- double cphi_min=theDDE->phi()-celllist_maps[sample].dphi()*cl_nphi;
- double cphi_max=theDDE->phi()+celllist_maps[sample].dphi()*cl_nphi;
-
- int iphi1=celllist_maps[sample].phi_to_index_cont(cphi_min);
- int iphi2=celllist_maps[sample].phi_to_index_cont(cphi_max);
- int ieta1=celllist_maps[sample].eta_to_index(ceta_min);
- int ieta2=celllist_maps[sample].eta_to_index(ceta_max);
+ int cl_neta=m_celllist_maps[sample].leta()-1;
+ int cl_nphi=m_celllist_maps[sample].lphi()-1;
+ double ceta_min=theDDE->eta()-m_celllist_maps[sample].deta()*cl_neta;
+ double ceta_max=theDDE->eta()+m_celllist_maps[sample].deta()*cl_neta;
+ double cphi_min=theDDE->phi()-m_celllist_maps[sample].dphi()*cl_nphi;
+ double cphi_max=theDDE->phi()+m_celllist_maps[sample].dphi()*cl_nphi;
+
+ int iphi1=m_celllist_maps[sample].phi_to_index_cont(cphi_min);
+ int iphi2=m_celllist_maps[sample].phi_to_index_cont(cphi_max);
+ int ieta1=m_celllist_maps[sample].eta_to_index(ceta_min);
+ int ieta2=m_celllist_maps[sample].eta_to_index(ceta_max);
for(int ieta=ieta1;ieta<=ieta2;++ieta) {
if(ieta<0) continue;
- if((unsigned int)ieta>=celllist_maps[sample].neta()) continue;
+ if((unsigned int)ieta>=m_celllist_maps[sample].neta()) continue;
for(int s_iphi=iphi1;s_iphi<=iphi2;++s_iphi) {
int iphi=s_iphi;
- if(iphi<0) iphi+=celllist_maps[sample].nphi();
- if((unsigned int)iphi>=celllist_maps[sample].nphi()) iphi-=celllist_maps[sample].nphi();
+ if(iphi<0) iphi+=m_celllist_maps[sample].nphi();
+ if((unsigned int)iphi>=m_celllist_maps[sample].nphi()) iphi-=m_celllist_maps[sample].nphi();
- celllist_maps[sample].vec(ieta,iphi).push_back( cellinfo( theDDE,1),2);
+ m_celllist_maps[sample].vec(ieta,iphi).push_back( cellinfo( theDDE,1),2);
}
}
@@ -373,26 +373,26 @@ void BasicCellBuilderTool::init_all_maps()
++naccept;
if(doem_celllist_map && calo==CaloCell_ID::LAREM) {
- double ceta_min=theDDE->eta()-em_celllist_map.deta()*emcl_neta;
- double ceta_max=theDDE->eta()+em_celllist_map.deta()*emcl_neta;
- double cphi_min=theDDE->phi()-em_celllist_map.dphi()*emcl_nphi;
- double cphi_max=theDDE->phi()+em_celllist_map.dphi()*emcl_nphi;
+ double ceta_min=theDDE->eta()-m_em_celllist_map.deta()*emcl_neta;
+ double ceta_max=theDDE->eta()+m_em_celllist_map.deta()*emcl_neta;
+ double cphi_min=theDDE->phi()-m_em_celllist_map.dphi()*emcl_nphi;
+ double cphi_max=theDDE->phi()+m_em_celllist_map.dphi()*emcl_nphi;
- int iphi1=em_celllist_map.phi_to_index_cont(cphi_min);
- int iphi2=em_celllist_map.phi_to_index_cont(cphi_max);
- int ieta1=em_celllist_map.eta_to_index(ceta_min);
- int ieta2=em_celllist_map.eta_to_index(ceta_max);
+ int iphi1=m_em_celllist_map.phi_to_index_cont(cphi_min);
+ int iphi2=m_em_celllist_map.phi_to_index_cont(cphi_max);
+ int ieta1=m_em_celllist_map.eta_to_index(ceta_min);
+ int ieta2=m_em_celllist_map.eta_to_index(ceta_max);
for(int ieta=ieta1;ieta<=ieta2;++ieta) {
if(ieta<0) continue;
- if((unsigned int)ieta>=em_celllist_map.neta()) continue;
+ if((unsigned int)ieta>=m_em_celllist_map.neta()) continue;
for(int s_iphi=iphi1;s_iphi<=iphi2;++s_iphi) {
int iphi=s_iphi;
- if(iphi<0) iphi+=em_celllist_map.nphi();
- if((unsigned int)iphi>=em_celllist_map.nphi()) iphi-=em_celllist_map.nphi();
+ if(iphi<0) iphi+=m_em_celllist_map.nphi();
+ if((unsigned int)iphi>=m_em_celllist_map.nphi()) iphi-=m_em_celllist_map.nphi();
- em_celllist_map.vec(ieta,iphi).push_back( cellinfo( theDDE,1),2);
+ m_em_celllist_map.vec(ieta,iphi).push_back( cellinfo( theDDE,1),2);
}
}
@@ -401,22 +401,22 @@ void BasicCellBuilderTool::init_all_maps()
curmap=0;
curmap2=0;
if(calo==CaloCell_ID::LAREM) {
- curmap=&em_map;
- if(fabs(theDDE->eta())<2.9 && em_fine_map.neta()>0) curmap2=&em_fine_map;
+ curmap=&m_em_map;
+ if(fabs(theDDE->eta())<2.9 && m_em_fine_map.neta()>0) curmap2=&m_em_fine_map;
/*
if(log.level()<=MSG::DEBUG) {
if(theDDE->phi()>0.0 && theDDE->phi()<0.1 && theDDE->eta()>0) {
log<<"init cell eta="<<theDDE->eta()<<" phi="<<theDDE->phi()<<" r="<<theDDE->r()<<" z="<<theDDE->z()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo();
- log<<endreq;
+ log<<endmsg;
}
}
*/
}
- if(sample==CaloCell_ID_FCS::FCAL0) curmap=&em_map;
+ if(sample==CaloCell_ID_FCS::FCAL0) curmap=&m_em_map;
- if(calo==CaloCell_ID::LARHEC) curmap=&had_map;
- if(calo==CaloCell_ID::TILE) curmap=&had_map;
- if(sample==CaloCell_ID_FCS::FCAL1 || sample==CaloCell_ID_FCS::FCAL2) curmap=&had_map;
+ if(calo==CaloCell_ID::LARHEC) curmap=&m_had_map;
+ if(calo==CaloCell_ID::TILE) curmap=&m_had_map;
+ if(sample==CaloCell_ID_FCS::FCAL1 || sample==CaloCell_ID_FCS::FCAL2) curmap=&m_had_map;
if(curmap2) {
init_cell(*curmap2,theDDE);
@@ -425,10 +425,10 @@ void BasicCellBuilderTool::init_all_maps()
if(sample!=CaloCell_ID_FCS::EMB1 && sample!=CaloCell_ID_FCS::EME1) init_cell(*curmap,theDDE);
}
} else {
-// log << MSG::WARNING << "volume=0 cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo()<< endreq ;
+// log << MSG::WARNING << "volume=0 cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo()<< endmsg ;
}
} else {
-// log << MSG::ERROR << "empty caloDDM element"<< endreq ;
+// log << MSG::ERROR << "empty caloDDM element"<< endmsg ;
}
}
for(int side=0;side<=1;++side) for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
@@ -444,13 +444,13 @@ void BasicCellBuilderTool::init_all_maps()
double rent=rz_map_rent[side][sample][eta_raw]/iter->second;
double zent=rz_map_zent[side][sample][eta_raw]/iter->second;
- rmid_map[side][sample][eta]=rmid;
- zmid_map[side][sample][eta]=zmid;
- rent_map[side][sample][eta]=rent;
- zent_map[side][sample][eta]=zent;
+ m_rmid_map[side][sample][eta]=rmid;
+ m_zmid_map[side][sample][eta]=zmid;
+ m_rent_map[side][sample][eta]=rent;
+ m_zent_map[side][sample][eta]=zent;
}
}
- ATH_MSG_DEBUG("rz-map for side="<<side<<" sample="<<sample<<" #etas="<<rmid_map[side][sample].size());
+ ATH_MSG_DEBUG("rz-map for side="<<side<<" sample="<<sample<<" #etas="<<m_rmid_map[side][sample].size());
} else {
ATH_MSG_WARNING("rz-map for side="<<side<<" sample="<<sample<<" is empty!!!");
}
@@ -485,7 +485,7 @@ void BasicCellBuilderTool::init_volume(cellinfo_map& map)
void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement* theDDE)
{
-// log << MSG::VERBOSE << "init cell "<<map.name()<<" eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() << endreq ;
+// log << MSG::VERBOSE << "init cell "<<map.name()<<" eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() << endmsg ;
double c_phi_min_org=theDDE->phi()-theDDE->dphi()/2;
double c_phi_max_org=theDDE->phi()+theDDE->dphi()/2;
@@ -510,7 +510,7 @@ void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement
if(eta>c_eta_max) c_eta_max=eta;
// log << MSG::DEBUG<<"corner "<<i<<" eta="<<eta<<" phi="<<phi;
-// log<<" ndeta="<<c_eta_max-c_eta_min<<" ndphi="<<c_phi_max_org-c_phi_min_org<< endreq ;
+// log<<" ndeta="<<c_eta_max-c_eta_min<<" ndphi="<<c_phi_max_org-c_phi_min_org<< endmsg ;
}
/*
if( (fabs(c_eta_max)>4.9 || fabs(c_eta_min)>4.9) && fabs(theDDE->phi())<0.5 ) log<<MSG::DEBUG;
@@ -518,7 +518,7 @@ void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement
log<< "init FCAL cell "<<map.name()<<" eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling() <<" calo="<<theDDE->getSubCalo();
log<<" deta="<<theDDE->deta()<<" dphi="<<theDDE->dphi()<<" dr="<<theDDE->dr()<<" vol="<<theDDE->volume() ;
log<<" dx="<<theDDE->dx()<<" dy="<<theDDE->dy()<<" dz="<<theDDE->dz();
- log<<" ndeta="<<c_eta_max-c_eta_min<<" ndphi="<<c_phi_max_org-c_phi_min_org<< endreq ;
+ log<<" ndeta="<<c_eta_max-c_eta_min<<" ndphi="<<c_phi_max_org-c_phi_min_org<< endmsg ;
*/
}
@@ -621,7 +621,7 @@ void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement
}
// log << MSG::VERBOSE << "eta_min=" <<eta_min<<" eta_max=" <<eta_max<<" c_eta_min=" <<c_eta_min<<" c_eta_max=" <<c_eta_max<<std::endl;
-// log << MSG::VERBOSE << "phi_min=" <<phi_min<<" phi_max=" <<phi_max<<" c_phi_min=" <<c_phi_min<<" c_phi_max=" <<c_phi_max<< endreq;
+// log << MSG::VERBOSE << "phi_min=" <<phi_min<<" phi_max=" <<phi_max<<" c_phi_min=" <<c_phi_min<<" c_phi_max=" <<c_phi_max<< endmsg;
// First test if cell is completely in volume, most likely after cellsInZone
if(eta_min<=c_eta_min && eta_max>=c_eta_max && phi_min<=c_phi_min && phi_max>=c_phi_max) {
@@ -682,14 +682,14 @@ void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement
if(overlapvol>0) {
map.vec(ieta,iphi).push_back( cellinfo(theDDE,overlapvol),layernr );
-// log << MSG::VERBOSE << " -> cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling()<<" overlap="<<overlap<<endreq;
+// log << MSG::VERBOSE << " -> cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling()<<" overlap="<<overlap<<endmsg;
continue;
}
}
}
-// log << MSG::VERBOSE << "init cell finished" <<std::endl<< endreq ;
+// log << MSG::VERBOSE << "init cell finished" <<std::endl<< endmsg ;
}
@@ -784,7 +784,7 @@ void BasicCellBuilderTool::findCells(cellinfo_vec & cell_vec, double eta_min, do
// log << MSG::DEBUG << "fill cell boundary eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling()<<std::endl;
// log << MSG::DEBUG << "eta_min=" <<eta_min<<" eta_max=" <<eta_max<<" c_eta_min=" <<c_eta_min<<" c_eta_max=" <<c_eta_max<<std::endl;
- // log << MSG::DEBUG << "phi_min=" <<phi_min<<" phi_max=" <<phi_max<<" c_phi_min=" <<c_phi_min<<" c_phi_max=" <<c_phi_max<< endreq;
+ // log << MSG::DEBUG << "phi_min=" <<phi_min<<" phi_max=" <<phi_max<<" c_phi_min=" <<c_phi_min<<" c_phi_max=" <<c_phi_max<< endmsg;
// First test if cell is completely in volume, most likely after cellsInZone
if(eta_min<=c_eta_min && eta_max>=c_eta_max && phi_min<=c_phi_min && phi_max>=c_phi_max) {
@@ -858,7 +858,7 @@ void BasicCellBuilderTool::findCells(cellinfo_vec & cell_vec, double eta_min, do
ATH_MSG_VERBOSE("caloDDE_list.size()=" <<caloDDE_list.size() << " ; vol_list.size()=" <<vol_list.size() );
-// log << MSG::DEBUG << "REGION : eta_min=" <<eta_min<<" eta_max=" << " phi_min=" <<phi_min<<" phi_max=" <<phi_max<< endreq;
+// log << MSG::DEBUG << "REGION : eta_min=" <<eta_min<<" eta_max=" << " phi_min=" <<phi_min<<" phi_max=" <<phi_max<< endmsg;
for(unsigned int i=0;i<caloDDE_list.size();++i) {
theDDE=caloDDE_list[i];
ATH_MSG_VERBOSE( i <<" : cell eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" sample="<<theDDE->getSampling()<<" deta="<<theDDE->deta()<<" dphi="<<theDDE->dphi()<<" overlap="<<vol_list[i]/theDDE->volume() );
@@ -894,12 +894,12 @@ StatusCode BasicCellBuilderTool::process(CaloCellContainer * theCellContainer)
ATH_MSG_INFO("Executing start size=" <<theCellContainer->size());
++m_nEvent;
-// addCell0101(theCellContainer,48,10,300000,em_map);
-// addCell0101(theCellContainer,52,10,100000,em_map);
-// addCell0101(theCellContainer,52,20,300000,had_map);
+// addCell0101(theCellContainer,48,10,300000,m_em_map);
+// addCell0101(theCellContainer,52,10,100000,m_em_map);
+// addCell0101(theCellContainer,52,20,300000,m_had_map);
-// addCell0101(theCellContainer,54,30,300000,em_map);
-// addCell0101(theCellContainer,54,30,300000,had_map);
+// addCell0101(theCellContainer,54,30,300000,m_em_map);
+// addCell0101(theCellContainer,54,30,300000,m_had_map);
ATH_MSG_INFO("Executing finished : end size=" <<theCellContainer->size());
@@ -910,10 +910,10 @@ StatusCode BasicCellBuilderTool::process(CaloCellContainer * theCellContainer)
void BasicCellBuilderTool::addCell(CaloCellContainer * theCellContainer, int etabin, int phibin, double energy, cellinfo_map& map )
{
-// log << MSG::DEBUG << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endreq;
-// log << MSG::DEBUG << "theCellContainer->isOrderedAndComplete()="<<theCellContainer->isOrderedAndComplete()<< endreq;
-// log << MSG::DEBUG << "theCellContainer->isOrdered()="<<theCellContainer->isOrdered()<< endreq;
-// log << MSG::DEBUG << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endreq;
+// log << MSG::DEBUG << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endmsg;
+// log << MSG::DEBUG << "theCellContainer->isOrderedAndComplete()="<<theCellContainer->isOrderedAndComplete()<< endmsg;
+// log << MSG::DEBUG << "theCellContainer->isOrdered()="<<theCellContainer->isOrdered()<< endmsg;
+// log << MSG::DEBUG << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endmsg;
if(etabin<0 || etabin>=(int)map.neta()) {
ATH_MSG_WARNING("wrong etabin or phibin in BasicCellBuilderTool::addCell etabin="<<etabin<<" phibin="<<phibin<<" neta="<<map.neta()<<" nphi="<<map.nphi());
@@ -949,7 +949,7 @@ void BasicCellBuilderTool::addCell(CaloCellContainer * theCellContainer, int eta
theCaloCell->setEnergy(theCaloCell->energy()+energy*iter->second);
/*
if(fabs(towereta-theCaloCell->caloDDE()->eta())>0.1 || fabs(towerphi-theCaloCell->caloDDE()->phi())>0.1) {
- log<<MSG::WARNING<<" -> teta="<<towereta<<" tphi="<<towerphi <<" ceta="<<theCaloCell->caloDDE()->eta()<<" cphi="<<theCaloCell->caloDDE()->phi()<<endreq;
+ log<<MSG::WARNING<<" -> teta="<<towereta<<" tphi="<<towerphi <<" ceta="<<theCaloCell->caloDDE()->eta()<<" cphi="<<theCaloCell->caloDDE()->phi()<<endmsg;
}
*/
} else {
diff --git a/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
index ca9d8306d4a..04457b3e124 100755
--- a/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
@@ -35,11 +35,11 @@ EmptyCellBuilderTool::~EmptyCellBuilderTool()
StatusCode EmptyCellBuilderTool::initialize()
{
MsgStream log(msgSvc(), name());
- log << MSG::INFO << "Initialisating started" << endreq ;
+ log << MSG::INFO << "Initialisating started" << endmsg ;
StatusCode sc=BasicCellBuilderTool::initialize();
- log << MSG::INFO << "Initialisating finished" << endreq ;
+ log << MSG::INFO << "Initialisating finished" << endmsg ;
return sc;
}
@@ -50,7 +50,7 @@ StatusCode EmptyCellBuilderTool::process(CaloCellContainer * theCellContainer)
create_empty_calo(theCellContainer);
++m_nEvent;
-// log << MSG::INFO << "Executing finished calo size=" <<theCellContainer->size()<< endreq;
+// log << MSG::INFO << "Executing finished calo size=" <<theCellContainer->size()<< endmsg;
return StatusCode::SUCCESS;
}
@@ -74,15 +74,15 @@ void EmptyCellBuilderTool::create_empty_calo(CaloCellContainer * theCellContaine
#else
DataPool<FastSimTileCell> CellsPTile(10000);
DataPool<FastSimCaloCell> CellsPCalo(190000);
- log << MSG::DEBUG << "before: CellsPTile.capacity()="<<CellsPTile.capacity()<<" CellsPTile.allocated()="<<CellsPTile.allocated()<<endreq;
- log << MSG::DEBUG << "before: CellsPCalo.capacity()="<<CellsPCalo.capacity()<<" CellsPCalo.allocated()="<<CellsPCalo.allocated()<<endreq;
+ log << MSG::DEBUG << "before: CellsPTile.capacity()="<<CellsPTile.capacity()<<" CellsPTile.allocated()="<<CellsPTile.allocated()<<endmsg;
+ log << MSG::DEBUG << "before: CellsPCalo.capacity()="<<CellsPCalo.capacity()<<" CellsPCalo.allocated()="<<CellsPCalo.allocated()<<endmsg;
#endif
for(CaloDetDescrManager::calo_element_const_iterator calo_iter=m_caloDDM->element_begin();calo_iter<m_caloDDM->element_end();++calo_iter) {
const CaloDetDescrElement* theDDE=*calo_iter;
if(theDDE) {
// if(n%10000==0) {
-// log << MSG::DEBUG <<" "<<n<<" : det_elm eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" hash="<<theDDE->calo_hash()<< endreq;
+// log << MSG::DEBUG <<" "<<n<<" : det_elm eta=" <<theDDE->eta()<<" phi="<<theDDE->phi()<<" hash="<<theDDE->calo_hash()<< endmsg;
// }
CaloCell* theCaloCell=0;
@@ -123,17 +123,17 @@ void EmptyCellBuilderTool::create_empty_calo(CaloCellContainer * theCellContaine
}
}
- log << MSG::DEBUG << ncreate<<" cells created, "<<nfound<<" cells already found: size="<<theCellContainer->size()<<" e="<<E_tot<<" ; et="<<Et_tot<<". Now initialize and order calo..." << endreq;
+ log << MSG::DEBUG << ncreate<<" cells created, "<<nfound<<" cells already found: size="<<theCellContainer->size()<<" e="<<E_tot<<" ; et="<<Et_tot<<". Now initialize and order calo..." << endmsg;
theCellContainer->order();
#if FastCaloSim_project_release_v1 == 12
#else
- log << MSG::DEBUG << "before: CellsPTile.capacity()="<<CellsPTile.capacity()<<" CellsPTile.allocated()="<<CellsPTile.allocated()<<endreq;
- log << MSG::DEBUG << "before: CellsPCalo.capacity()="<<CellsPCalo.capacity()<<" CellsPCalo.allocated()="<<CellsPCalo.allocated()<<endreq;
+ log << MSG::DEBUG << "before: CellsPTile.capacity()="<<CellsPTile.capacity()<<" CellsPTile.allocated()="<<CellsPTile.allocated()<<endmsg;
+ log << MSG::DEBUG << "before: CellsPCalo.capacity()="<<CellsPCalo.capacity()<<" CellsPCalo.allocated()="<<CellsPCalo.allocated()<<endmsg;
#endif
-// log << MSG::INFO << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endreq;
-// log << MSG::INFO << "theCellContainer->isOrderedAndComplete()="<<theCellContainer->isOrderedAndComplete()<< endreq;
-// log << MSG::INFO << "theCellContainer->isOrdered()="<<theCellContainer->isOrdered()<< endreq;
+// log << MSG::INFO << "theCellContainer->hasTotalSize()="<<theCellContainer->hasTotalSize()<< endmsg;
+// log << MSG::INFO << "theCellContainer->isOrderedAndComplete()="<<theCellContainer->isOrderedAndComplete()<< endmsg;
+// log << MSG::INFO << "theCellContainer->isOrdered()="<<theCellContainer->isOrdered()<< endmsg;
}
diff --git a/Simulation/FastShower/FastCaloSim/src/FSStoregateClean.cxx b/Simulation/FastShower/FastCaloSim/src/FSStoregateClean.cxx
index 2dcf2d87634..5c45655db80 100755
--- a/Simulation/FastShower/FastCaloSim/src/FSStoregateClean.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FSStoregateClean.cxx
@@ -40,23 +40,23 @@ namespace FastCaloSim {
StatusCode sc;
for(unsigned int i=0;i<m_SG_keys.size();++i) {
- msg(MSG::INFO) << "deleting : "<<m_SG_keys[i]<<" ..."<<endreq;
+ msg(MSG::INFO) << "deleting : "<<m_SG_keys[i]<<" ..."<<endmsg;
const INavigable4MomentumCollection* p = 0;
sc = evtStore()->retrieve(p,m_SG_keys[i]);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve pointer to Object "<<m_SG_keys[i]<< endreq;
+ msg(MSG::ERROR) << "Unable to retrieve pointer to Object "<<m_SG_keys[i]<< endmsg;
} else {
- msg(MSG::INFO) <<m_SG_keys[i]<<" at "<<p<<endreq;
+ msg(MSG::INFO) <<m_SG_keys[i]<<" at "<<p<<endmsg;
sc = evtStore()->remove(p);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to delete pointer to Object "<<m_SG_keys[i]<< endreq;
+ msg(MSG::ERROR) << "Unable to delete pointer to Object "<<m_SG_keys[i]<< endmsg;
} else {
p=0;
sc = evtStore()->retrieve(p,m_SG_keys[i]);
sc.ignore();
- msg(MSG::INFO) << "deleting "<<m_SG_keys[i]<<" done, test p*="<<p<<endreq;
+ msg(MSG::INFO) << "deleting "<<m_SG_keys[i]<<" done, test p*="<<p<<endmsg;
}
}
}
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index 2f1c9390a59..e1082ca587a 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -399,7 +399,7 @@ StatusCode FastShowerCellBuilderTool::initialize()
{
log << MSG::ERROR
<< "Unable to get pointer to StoreGateSvc"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
*/
@@ -450,38 +450,38 @@ StatusCode FastShowerCellBuilderTool::initialize()
find_phi0();
ATH_MSG_INFO("========================= Init EM map =============================");
- em_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64);
- em_map.setname("EM");
+ m_em_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64);
+ m_em_map.setname("EM");
ATH_MSG_INFO("========================= Init EM fine map ========================");
- em_fine_map.init(-2.8,+2.8,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,224,256);
- em_fine_map.setname("EM fine");
+ m_em_fine_map.init(-2.8,+2.8,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,224,256);
+ m_em_fine_map.setname("EM fine");
ATH_MSG_INFO("========================= Init HAD map ============================");
- had_map.init(-5,+5,-M_PI+m_phi0_had,+M_PI+m_phi0_had,100,64);
- had_map.setname("HAD");
+ m_had_map.init(-5,+5,-M_PI+m_phi0_had,+M_PI+m_phi0_had,100,64);
+ m_had_map.setname("HAD");
ATH_MSG_INFO("========================= Init EM celllist map =============================");
- em_celllist_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,2,2);
- em_celllist_map.setname("EMlist");
+ m_em_celllist_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,2,2);
+ m_em_celllist_map.setname("EMlist");
ATH_MSG_INFO("========================= Init celllist maps sample 0 ... "<< CaloCell_ID_FCS::LastSample);
for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
- //log << MSG::INFO << "========================= Init celllist map sample "<<sample<<" =============================" <<endreq;
- celllist_maps[sample].init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,3,3);
- celllist_maps[sample].setname("samplecelllist");
-// celllist_maps[sample];
+ //log << MSG::INFO << "========================= Init celllist map sample "<<sample<<" =============================" <<endmsg;
+ m_celllist_maps[sample].init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,3,3);
+ m_celllist_maps[sample].setname("samplecelllist");
+// m_celllist_maps[sample];
}
init_all_maps();
ATH_MSG_INFO("========================= Init volume all maps =========================");
- init_volume(em_map);
- init_volume(em_fine_map);
- init_volume(had_map);
+ init_volume(m_em_map);
+ init_volume(m_em_fine_map);
+ init_volume(m_had_map);
/*
if(m_mcLocation=="") {
- log << MSG::INFO << "========================= Atlfast::GlobalEventData::Instance() =========================" <<endreq;
+ log << MSG::INFO << "========================= Atlfast::GlobalEventData::Instance() =========================" <<endmsg;
Atlfast::GlobalEventData* ged = Atlfast::GlobalEventData::Instance();
m_mcLocation = ged -> mcLocation();
}
@@ -539,7 +539,7 @@ StatusCode FastShowerCellBuilderTool::initialize()
if(m_invisibles[i]==0) msg(MSG::INFO)<<"(pdgid=0 -> Use TruthHelper class IsGenNonInteracting), ";
else msg(MSG::INFO)<<"(pdgid="<<m_invisibles[i]<<"), ";
}
- msg(MSG::INFO)<<endreq;
+ msg(MSG::INFO)<<endmsg;
if(m_simul_ID_only) {
msg(MSG::INFO) <<"Reject ID truth particle vertices outside cylinder(s): ";
@@ -547,7 +547,7 @@ StatusCode FastShowerCellBuilderTool::initialize()
for(int ic=0;ic<nc;++ic) {
msg(MSG::INFO)<<"[r="<<m_ID_cylinder_r[ic]<<",z="<<m_ID_cylinder_z[ic]<<"] ";
}
- msg(MSG::INFO)<<endreq;
+ msg(MSG::INFO)<<endmsg;
}
ATH_MSG_INFO("Initialisating finished");
@@ -622,9 +622,9 @@ StatusCode FastShowerCellBuilderTool::OpenParamSource(std::string insource)
TFile* infile=TFile::Open(ParticleParametrizationFile.c_str(),"READ");
if(infile) {
- //log << MSG::INFO << "infile non zero" <<endreq;
+ //log << MSG::INFO << "infile non zero" <<endmsg;
//infile->ls();
- //log << MSG::INFO << "open="<<infile->IsOpen()<<endreq;
+ //log << MSG::INFO << "open="<<infile->IsOpen()<<endmsg;
if(infile->IsOpen()) {
ATH_MSG_INFO("==== LoadParametrizations from file : "<<ParticleParametrizationFile<<" ====");
TDirectory* dir;
@@ -674,7 +674,7 @@ StatusCode FastShowerCellBuilderTool::callBack( IOVSVC_CALLBACK_ARGS_P( I, keys)
msg(MSG::INFO) << "FastShowerCellBuilderTool callback invoked for I: "<<I<< " folder: ";
for (std::list<std::string>::const_iterator itr=keys.begin();
itr!=keys.end();++itr) msg(MSG::INFO) << *itr << " ";
- msg(MSG::INFO) << endreq;
+ msg(MSG::INFO) << endmsg;
// check all the keys, if we find the histogram folder, update the pointer
MSG::Level level=MSG::INFO;
@@ -953,11 +953,11 @@ void FastShowerCellBuilderTool::CaloLocalPoint (const Trk::TrackParameters* parm
bool FastShowerCellBuilderTool::get_calo_etaphi(std::vector<Trk::HitInfo>* hitVector, CaloCell_ID_FCS::CaloSample sample)
{
- layerCaloOK[sample]=false;
- letaCalo[sample]=eta_calo_surf;
- lphiCalo[sample]=phi_calo_surf;
- double distsamp =deta(sample,eta_calo_surf);
- double rzmiddle =rzmid(sample,eta_calo_surf);
+ m_layerCaloOK[sample]=false;
+ m_letaCalo[sample]=m_eta_calo_surf;
+ m_lphiCalo[sample]=m_phi_calo_surf;
+ double distsamp =deta(sample,m_eta_calo_surf);
+ double rzmiddle =rzmid(sample,m_eta_calo_surf);
double hitdist=0;
bool best_found=false;
double best_target=0;
@@ -1000,10 +1000,10 @@ bool FastShowerCellBuilderTool::get_calo_etaphi(std::vector<Trk::HitInfo>* hitVe
}
double etaCalo = hitPos.eta();
double phiCalo = hitPos.phi();
- letaCalo[sample]=etaCalo;
- lphiCalo[sample]=phiCalo;
+ m_letaCalo[sample]=etaCalo;
+ m_lphiCalo[sample]=phiCalo;
hitdist=hitPos.mag();
- layerCaloOK[sample]=true;
+ m_layerCaloOK[sample]=true;
rzmiddle=rzmid((CaloCell_ID_FCS::CaloSample)sample,etaCalo);
distsamp=deta((CaloCell_ID_FCS::CaloSample)sample,etaCalo);
best_found=true;
@@ -1075,12 +1075,12 @@ bool FastShowerCellBuilderTool::get_calo_etaphi(std::vector<Trk::HitInfo>* hitVe
" rb="<<best_hitPos.perp()<<" zb="<<best_hitPos[Amg::z]
);
if(best_found) {
- letaCalo[sample]=best_hitPos.eta();
- lphiCalo[sample]=best_hitPos.phi();
+ m_letaCalo[sample]=best_hitPos.eta();
+ m_lphiCalo[sample]=best_hitPos.phi();
hitdist=best_hitPos.mag();
- rzmiddle=rzmid((CaloCell_ID_FCS::CaloSample)sample,letaCalo[sample]);
- distsamp=deta((CaloCell_ID_FCS::CaloSample)sample,letaCalo[sample]);
- layerCaloOK[sample]=true;
+ rzmiddle=rzmid((CaloCell_ID_FCS::CaloSample)sample,m_letaCalo[sample]);
+ distsamp=deta((CaloCell_ID_FCS::CaloSample)sample,m_letaCalo[sample]);
+ m_layerCaloOK[sample]=true;
}
}
if(best_found) {
@@ -1091,28 +1091,28 @@ bool FastShowerCellBuilderTool::get_calo_etaphi(std::vector<Trk::HitInfo>* hitVe
}
}
- if(isCaloBarrel((CaloCell_ID_FCS::CaloSample)sample)) rzmiddle*=cosh(letaCalo[sample]);
- else rzmiddle= fabs(rzmiddle/tanh(letaCalo[sample]));
+ if(isCaloBarrel((CaloCell_ID_FCS::CaloSample)sample)) rzmiddle*=cosh(m_letaCalo[sample]);
+ else rzmiddle= fabs(rzmiddle/tanh(m_letaCalo[sample]));
- dCalo[sample]=rzmiddle;
- distetaCaloBorder[sample]=distsamp;
+ m_dCalo[sample]=rzmiddle;
+ m_distetaCaloBorder[sample]=distsamp;
if(msgLvl(MSG::DEBUG)) {
msg(MSG::DEBUG)<<" Final par TTC sample "<<(int)sample;
- if(layerCaloOK[sample]) msg()<<" (good)";
+ if(m_layerCaloOK[sample]) msg()<<" (good)";
else msg()<<" (bad)";
- msg()<<" eta=" << letaCalo[sample] << " phi=" << lphiCalo[sample] <<" dCalo="<<dCalo[sample]<<" dist(hit)="<<hitdist<< endreq;
+ msg()<<" eta=" << m_letaCalo[sample] << " phi=" << m_lphiCalo[sample] <<" m_dCalo="<<m_dCalo[sample]<<" dist(hit)="<<hitdist<< endmsg;
}
- return layerCaloOK[sample];
+ return m_layerCaloOK[sample];
}
bool FastShowerCellBuilderTool::get_calo_surface(std::vector<Trk::HitInfo>* hitVector)
{
- sample_calo_surf=CaloCell_ID_FCS::noSample;
- eta_calo_surf=-999;
- phi_calo_surf=-999;
- d_calo_surf=0;
+ m_sample_calo_surf=CaloCell_ID_FCS::noSample;
+ m_eta_calo_surf=-999;
+ m_phi_calo_surf=-999;
+ m_d_calo_surf=0;
double min_calo_surf_dist=1000;
for(int i=0;i<m_n_surfacelist;++i) {
@@ -1133,27 +1133,27 @@ bool FastShowerCellBuilderTool::get_calo_surface(std::vector<Trk::HitInfo>* hitV
msg(MSG::DEBUG)<<" phi="<<phiCalo<<" dist="<<distsamp;
if(distsamp<min_calo_surf_dist) {
- eta_calo_surf=etaCalo;
- phi_calo_surf=phiCalo;
+ m_eta_calo_surf=etaCalo;
+ m_phi_calo_surf=phiCalo;
min_calo_surf_dist=distsamp;
- sample_calo_surf=sample;
- d_calo_surf=rzent(sample,etaCalo);
- msg(MSG::DEBUG)<<" r/z="<<d_calo_surf;
- if(isCaloBarrel(sample)) d_calo_surf*=cosh(etaCalo);
- else d_calo_surf= fabs(d_calo_surf/tanh(etaCalo));
- msg(MSG::DEBUG)<<" d="<<d_calo_surf;
+ m_sample_calo_surf=sample;
+ m_d_calo_surf=rzent(sample,etaCalo);
+ msg(MSG::DEBUG)<<" r/z="<<m_d_calo_surf;
+ if(isCaloBarrel(sample)) m_d_calo_surf*=cosh(etaCalo);
+ else m_d_calo_surf= fabs(m_d_calo_surf/tanh(etaCalo));
+ msg(MSG::DEBUG)<<" d="<<m_d_calo_surf;
if(distsamp<0) {
- msg(MSG::DEBUG)<<endreq;
+ msg(MSG::DEBUG)<<endmsg;
break;
}
}
- msg(MSG::DEBUG)<<endreq;
+ msg(MSG::DEBUG)<<endmsg;
} else {
- msg(MSG::DEBUG)<<": eta > 900, not using this"<<endreq;
+ msg(MSG::DEBUG)<<": eta > 900, not using this"<<endmsg;
}
}
- if(sample_calo_surf==CaloCell_ID_FCS::noSample) {
+ if(m_sample_calo_surf==CaloCell_ID_FCS::noSample) {
// first intersection with sensitive calo layer
std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
while ( it < hitVector->end() && (*it).detID != 3 ) { it++;} // to be updated
@@ -1161,18 +1161,18 @@ bool FastShowerCellBuilderTool::get_calo_surface(std::vector<Trk::HitInfo>* hitV
return false;
}
Amg::Vector3D surface_hitPos = (*it).trackParms->position();
- eta_calo_surf=surface_hitPos.eta();
- phi_calo_surf=surface_hitPos.phi();
- d_calo_surf=surface_hitPos.mag();
+ m_eta_calo_surf=surface_hitPos.eta();
+ m_phi_calo_surf=surface_hitPos.phi();
+ m_d_calo_surf=surface_hitPos.mag();
double pT=(*it).trackParms->momentum().perp();
- if(TMath::Abs(eta_calo_surf)>4.9 || pT<500 || (TMath::Abs(eta_calo_surf)>4 && pT<1000) ) {
- ATH_MSG_DEBUG("only entrance to calo entrance layer found, no surface : eta="<<eta_calo_surf<<" phi="<<phi_calo_surf<<" d="<<d_calo_surf<<" pT="<<pT);
+ if(TMath::Abs(m_eta_calo_surf)>4.9 || pT<500 || (TMath::Abs(m_eta_calo_surf)>4 && pT<1000) ) {
+ ATH_MSG_DEBUG("only entrance to calo entrance layer found, no surface : eta="<<m_eta_calo_surf<<" phi="<<m_phi_calo_surf<<" d="<<m_d_calo_surf<<" pT="<<pT);
} else {
- ATH_MSG_WARNING("only entrance to calo entrance layer found, no surface : eta="<<eta_calo_surf<<" phi="<<phi_calo_surf<<" d="<<d_calo_surf<<" pT="<<pT);
+ ATH_MSG_WARNING("only entrance to calo entrance layer found, no surface : eta="<<m_eta_calo_surf<<" phi="<<m_phi_calo_surf<<" d="<<m_d_calo_surf<<" pT="<<pT);
}
} else {
- ATH_MSG_DEBUG("entrance to calo surface : sample="<<sample_calo_surf<<" eta="<<eta_calo_surf<<" phi="<<phi_calo_surf<<" deta="<<min_calo_surf_dist<<" dsurf="<<d_calo_surf);
+ ATH_MSG_DEBUG("entrance to calo surface : sample="<<m_sample_calo_surf<<" eta="<<m_eta_calo_surf<<" phi="<<m_phi_calo_surf<<" deta="<<min_calo_surf_dist<<" dsurf="<<m_d_calo_surf);
}
return true;
@@ -1200,51 +1200,51 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
///////////////////////////
// Ugly code, ptruth_XYZ are member variables
- ptruth_eta=initMom.eta();
- if( fabs(ptruth_eta)>6.0 ) {
+ m_ptruth_eta=initMom.eta();
+ if( fabs(m_ptruth_eta)>6.0 ) {
if(m_storeFastShowerInfo) delete fastshowerinfo;
return StatusCode::SUCCESS;
}
- ptruth_phi=initMom.phi();
- ptruth_e = sqrt(initMom.mag2()+mass*mass);
+ m_ptruth_phi=initMom.phi();
+ m_ptruth_e = sqrt(initMom.mag2()+mass*mass);
TVector3 truth_direction; // added (25.5.2009)
- truth_direction.SetPtEtaPhi(1.,ptruth_eta,ptruth_phi);
+ truth_direction.SetPtEtaPhi(1.,m_ptruth_eta,m_ptruth_phi);
TVector3 z_direction;// added (25.5.2009)
z_direction.SetXYZ(0,0,1);// added (25.5.2009) // added (25.5.2009)
double ang_beta = z_direction.Angle(truth_direction);// added (25.5.2009)
// Definition of et2 and et according to CLHEP::HepLorentzVector
//double pt2 = part->momentum().perp2();
- //double et2 = pt2 == 0 ? 0 : ptruth_e*ptruth_e * pt2/(pt2+part->momentum().z()*part->momentum().z());
- //ptruth_et = ptruth_e < 0.0 ? 0.0 : sqrt(et2);
- ptruth_pt=initMom.perp();
- ptruth_p=initMom.mag();
+ //double et2 = pt2 == 0 ? 0 : m_ptruth_e*m_ptruth_e * pt2/(pt2+part->momentum().z()*part->momentum().z());
+ //ptruth_et = m_ptruth_e < 0.0 ? 0.0 : sqrt(et2);
+ m_ptruth_pt=initMom.perp();
+ m_ptruth_p=initMom.mag();
// By default assume its a charged hadron==pion
- refid=211;
+ m_refid=211;
double refmass=139.57018; //PDG charged pion mass
double partmass=mass;
t_map_PEP_ID::iterator iter_id=m_map_ParticleEnergyParametrizationMap.find(11); // Test if a dedicated electron parametrization exists
if(iter_id!=m_map_ParticleEnergyParametrizationMap.end()) { // electron parametrization exists
if(pdgid==22 || pdgid==111) {
- refid=22;
+ m_refid=22;
refmass=0;
}
if( pdgid==11 || pdgid==-11 ) {
- refid=11;
+ m_refid=11;
refmass=0.511;
- //log<<MSG::VERBOSE<<" electron parametrization found " << endreq;
+ //log<<MSG::VERBOSE<<" electron parametrization found " << endmsg;
}
} else { // electron parametrization does not exist
if(pdgid==22 || pdgid==11 || pdgid==-11 || pdgid==111) {
- refid=22;
+ m_refid=22;
refmass=0;
- //if(pdgid==11 || pdgid==-11) log<<MSG::VERBOSE<<" no electron parametrization found: USE PHOTON " << endreq;
+ //if(pdgid==11 || pdgid==-11) log<<MSG::VERBOSE<<" no electron parametrization found: USE PHOTON " << endmsg;
}
}
if(pdgid==13 || pdgid==-13) {
- refid=13;
+ m_refid=13;
refmass=105.658367; //PDG mass
}
if(pdgid==111) {
@@ -1254,12 +1254,12 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
}
// Default use the total particle energy as base quantity to deposit into the calo
- double Ein=ptruth_e;
+ double Ein=m_ptruth_e;
if(m_use_Ekin_for_depositions) { // alternatively use only the kinetic energy
double Ekin=Ein - partmass; // kinetic energy of incoming particle
Ein=Ekin+refmass; //the parametrization is done in bins of E, so go back from Ekin to the E used in the input reference
}
- double EinT=Ein * ptruth_pt/ptruth_p; // only needed to trigger debug output
+ double EinT=Ein * m_ptruth_pt/m_ptruth_p; // only needed to trigger debug output
if(Ein<10) {
// don't simulate particles below 10MeV
@@ -1268,20 +1268,20 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
}
for(int i=CaloCell_ID_FCS::FirstSample;i<CaloCell_ID_FCS::MaxSample;++i) {
- layerCaloOK[i]=false;
- distetaCaloBorder[i]=1000;
- dCalo[i]=0;
- letaCalo[i]=lphiCalo[i]=-999;
+ m_layerCaloOK[i]=false;
+ m_distetaCaloBorder[i]=1000;
+ m_dCalo[i]=0;
+ m_letaCalo[i]=m_lphiCalo[i]=-999;
}
if( m_storeFastShowerInfo ) {
// storing the particle information inside the FastShowerInfo object
- fastshowerinfo->SetPtEtaPhiE( ptruth_pt, ptruth_eta, ptruth_phi, ptruth_e );
+ fastshowerinfo->SetPtEtaPhiE( m_ptruth_pt, m_ptruth_eta, m_ptruth_phi, m_ptruth_e );
fastshowerinfo->SetBarcodeAndPDGId( barcode, pdgid );
}
std::stringstream particle_info_str;
- particle_info_str<<"id="<<pdgid<<" rid="<<refid<<" e="<<ptruth_e<<" Ein="<<Ein<<" EinT="<<EinT<<" pt="<<ptruth_pt<<" p="<<ptruth_p<<" m="<<mass<<" eta="<<ptruth_eta<<" phi="<<ptruth_phi;
+ particle_info_str<<"id="<<pdgid<<" rid="<<m_refid<<" e="<<m_ptruth_e<<" Ein="<<Ein<<" EinT="<<EinT<<" pt="<<m_ptruth_pt<<" p="<<m_ptruth_p<<" m="<<mass<<" eta="<<m_ptruth_eta<<" phi="<<m_ptruth_phi;
if(msgLvl(MSG::DEBUG)) {
ATH_MSG_DEBUG("====================================================");
@@ -1305,7 +1305,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
}
if(!get_calo_surface(hitVector)) {
- if(TMath::Abs(ptruth_eta)>5 || EinT<500) {
+ if(TMath::Abs(m_ptruth_eta)>5 || EinT<500) {
ATH_MSG_DEBUG("Calo hit vector does not contain calo layer entry: aborting processing particle "<<particle_info_str.str());
} else {
ATH_MSG_WARNING("Calo hit vector does not contain calo layer entry: aborting processing particle "<<particle_info_str.str());
@@ -1315,13 +1315,13 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
}
TVector3 surface;
- surface.SetPtEtaPhi(1,eta_calo_surf,phi_calo_surf);
- surface.SetMag(d_calo_surf);
+ surface.SetPtEtaPhi(1,m_eta_calo_surf,m_phi_calo_surf);
+ surface.SetMag(m_d_calo_surf);
- if(m_storeFastShowerInfo) fastshowerinfo->SetCaloSurface(eta_calo_surf, phi_calo_surf, d_calo_surf);
+ if(m_storeFastShowerInfo) fastshowerinfo->SetCaloSurface(m_eta_calo_surf, m_phi_calo_surf, m_d_calo_surf);
// only continue if inside the calo
- if( fabs(eta_calo_surf)> 6 ) {
+ if( fabs(m_eta_calo_surf)> 6 ) {
if(m_storeFastShowerInfo) delete fastshowerinfo;
return StatusCode::SUCCESS;
}
@@ -1340,9 +1340,9 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
for(int i=CaloCell_ID_FCS::FirstSample;i<CaloCell_ID_FCS::MaxSample;++i) {
p.E_layer[i]=0;
p.fcal_layer[i]=0;
- letaCalo[i]=-999;
- lphiCalo[i]=-999;
- dCalo[i]=0;
+ m_letaCalo[i]=-999;
+ m_lphiCalo[i]=-999;
+ m_dCalo[i]=0;
}
// loop over intersection
std::vector<Trk::HitInfo>::iterator it = hitVector->begin();
@@ -1363,12 +1363,12 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
double E = edeposit/Ein;
p.E_layer[sample]=E;
p.E+=p.E_layer[sample];
- letaCalo[sample]=hitPos.eta();
- lphiCalo[sample]=hitPos.phi();
- dCalo[sample]=0.5*(dCurr+hitPos.mag());
- p.dist000+=p.E_layer[sample]*dCalo[sample];
+ m_letaCalo[sample]=hitPos.eta();
+ m_lphiCalo[sample]=hitPos.phi();
+ m_dCalo[sample]=0.5*(dCurr+hitPos.mag());
+ p.dist000+=p.E_layer[sample]*m_dCalo[sample];
- ATH_MSG_DEBUG("muon deposit: sampe="<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << letaCalo[sample] <<" dCalo="<<dCalo[sample]);
+ ATH_MSG_DEBUG("muon deposit: sampe="<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << m_letaCalo[sample] <<" m_dCalo="<<m_dCalo[sample]);
}
sample = (CaloCell_ID_FCS::CaloSample)((*it).detID-3000); // to be updated
dCurr = hitPos.mag();
@@ -1383,8 +1383,8 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
//////////////////////////////
// Process all non muon particles
//////////////////////////////
- ParticleEnergyParametrization* Elower=findElower(refid , Ein , eta_calo_surf);
- ParticleEnergyParametrization* Eupper=findEupper(refid , Ein , eta_calo_surf);
+ ParticleEnergyParametrization* Elower=findElower(m_refid , Ein , m_eta_calo_surf);
+ ParticleEnergyParametrization* Eupper=findEupper(m_refid , Ein , m_eta_calo_surf);
ParticleEnergyParametrization* Epara=0;
if(Elower) {
ATH_MSG_DEBUG("lower : "<< Elower->GetTitle()<< " lower E: " << Elower->E());
@@ -1457,10 +1457,10 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
if (sample>0) { // save layer deposit as relative fraction of the momentum ?
if(p.E_layer[sample]<0) p.E_layer[sample]=0;
if(p.E_layer[sample]>0) {
- dCalo[sample] = 0.5*( dCurr + hitPos.mag() );
+ m_dCalo[sample] = 0.5*( dCurr + hitPos.mag() );
p.dist000+=p.E_layer[sample]*hitPos.mag();
- if(dCalo[sample]<0.01 && p.E_layer[sample]>0) {
- ATH_MSG_WARNING("Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << hitPos.eta() <<" dCalo="<<dCalo[sample]);
+ if(m_dCalo[sample]<0.01 && p.E_layer[sample]>0) {
+ ATH_MSG_WARNING("Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << hitPos.eta() <<" m_dCalo="<<m_dCalo[sample]);
}
}
}
@@ -1481,11 +1481,11 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
if(p.E_layer[sample]<0) p.E_layer[sample]=0;
if(p.E_layer[sample]>0) {
- ATH_MSG_DEBUG("============= Getting Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << ptruth_eta);
+ ATH_MSG_DEBUG("============= Getting Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << m_ptruth_eta);
if( get_calo_etaphi(hitVector,(CaloCell_ID_FCS::CaloSample)sample) ) {
- p.dist000+=p.E_layer[sample]*dCalo[sample];
- if(dCalo[sample]<0.01 && p.E_layer[sample]>0) {
- ATH_MSG_WARNING("Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << ptruth_eta <<" dCalo="<<dCalo[sample]);
+ p.dist000+=p.E_layer[sample]*m_dCalo[sample];
+ if(m_dCalo[sample]<0.01 && p.E_layer[sample]>0) {
+ ATH_MSG_WARNING("Calo position for sample "<<sample<<" E/Etot="<<p.E_layer[sample]<<" ; in : eta= " << m_ptruth_eta <<" m_dCalo="<<m_dCalo[sample]);
}
}
}
@@ -1519,13 +1519,13 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
ATH_MSG_DEBUG("============= E"<<sample<<"="<<p.E_layer[sample]<<" =============");
double E_orig=p.E_layer[sample];
- double Et_orig=E_orig/cosh(eta_calo_surf);
+ double Et_orig=E_orig/cosh(m_eta_calo_surf);
// Add energy to lost energy couner, if all deposit goes OK, subtract it again...
- E_lost_sample[sample]+=E_orig;
- Et_lost_sample[sample]+=Et_orig;
+ m_E_lost_sample[sample]+=E_orig;
+ m_Et_lost_sample[sample]+=Et_orig;
- if(p.E_layer[sample]>0 && (!isnan(p.E_layer[sample])) && fabs(letaCalo[sample])<5.0) {
- ATH_MSG_DEBUG("E"<<sample<<"="<<p.E_layer[sample]<<" d="<<dCalo[sample]);
+ if(p.E_layer[sample]>0 && (!isnan(p.E_layer[sample])) && fabs(m_letaCalo[sample])<5.0) {
+ ATH_MSG_DEBUG("E"<<sample<<"="<<p.E_layer[sample]<<" d="<<m_dCalo[sample]);
// Calculate estimates for cell energy fluctuations. Should be updated with better numbers
double smaple_err=0.1;
@@ -1536,9 +1536,9 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
// Find parametrization for the lateral shape distribution in the sample
TShape_Result* shape;
if(m_jo_interpolate) {
- shape=findShape( refid , sample , Epara_E , letaCalo[sample] , p.dist_in , distrange);
+ shape=findShape( m_refid , sample , Epara_E , m_letaCalo[sample] , p.dist_in , distrange);
} else {
- shape=findShape( refid , sample , Ein , letaCalo[sample] , p.dist_in , distrange);
+ shape=findShape( m_refid , sample , Ein , m_letaCalo[sample] , p.dist_in , distrange);
}
if(shape) {
if(msgLvl(MSG::DEBUG)) {
@@ -1547,12 +1547,12 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
if(icorr>0) msg()<<";";
msg()<<shape->m_correction[icorr]->GetName();
}
- msg()<<"]"<<endreq;
+ msg()<<"]"<<endmsg;
}
} else {
if( !(sample>=CaloCell_ID_FCS::FCAL0 && sample<=CaloCell_ID_FCS::FCAL2) ) {
MSG::Level level=MSG::WARNING;
- if(refid==13) level=MSG::DEBUG;
+ if(m_refid==13) level=MSG::DEBUG;
if(msgLvl(level)) {
ATH_MSG_LVL(level,"no shape found calosample="<<sample<<" Elayer="<<E_orig);
ATH_MSG_LVL(level," - "<<particle_info_str.str());
@@ -1562,15 +1562,15 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
}
}
- ATH_MSG_DEBUG(" letaCalo="<<letaCalo[sample]<<" lphiCalo="<<lphiCalo[sample]);
- double fcx=letaCalo[sample];
- double fcy=lphiCalo[sample];
+ ATH_MSG_DEBUG(" m_letaCalo="<<m_letaCalo[sample]<<" m_lphiCalo="<<m_lphiCalo[sample]);
+ double fcx=m_letaCalo[sample];
+ double fcy=m_lphiCalo[sample];
double direction_factor=0.0;
double distfactor = 0.0;
//double distsign = 1.;
TVector3 truth; // added (25.5.2009)
- truth.SetPtEtaPhi(1.,letaCalo[sample],lphiCalo[sample]);// added (25.5.2009)
+ truth.SetPtEtaPhi(1.,m_letaCalo[sample],m_lphiCalo[sample]);// added (25.5.2009)
double ang_alpha = truth.Angle(truth_direction); // added (25.5.2009)
double ang_gamma = z_direction.Angle(truth);// added (25.5.2009)
int sign =1;// added (25.5.2009)
@@ -1590,91 +1590,91 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
if(distfactor < -1.) distfactor =-1.;
//if(distfactor < 0.) distsign = -1.;
// calculate position of shower in calo
- fcx=shape->eta_center(letaCalo[sample]/*,distsign*distfactor*/,direction_factor*sign);
- fcy=shape->phi_center(lphiCalo[sample]);
+ fcx=shape->eta_center(m_letaCalo[sample]/*,distsign*distfactor*/,direction_factor*sign);
+ fcy=shape->phi_center(m_lphiCalo[sample]);
lookup_letaCalo=fcx;
lookup_lphiCalo=fcy;
- distetaCaloBorder[sample]=deta((CaloCell_ID_FCS::CaloSample)sample,fcx);
+ m_distetaCaloBorder[sample]=deta((CaloCell_ID_FCS::CaloSample)sample,fcx);
double mineta,maxeta;
minmaxeta((CaloCell_ID_FCS::CaloSample)sample,fcx,mineta,maxeta);
// correct shower position in calo, if it is outside the calo layer boundaries
// TODO: Apply relocation of shape to overlap with active calo also if no shape function is found
- if(distetaCaloBorder[sample]>0) {
+ if(m_distetaCaloBorder[sample]>0) {
double bordereta=maxeta;
if(fcx<mineta) bordereta=mineta;
lookup_letaCalo=bordereta;
double eta_jakobi=shape->eta_jakobi_factor(bordereta);
- //TODO: dCalo[sample] should not be taken, better dcalo at mineta/maxeta
- double cutoff_eta=shape->cutoff_eta()/(eta_jakobi*dCalo[sample]);
+ //TODO: m_dCalo[sample] should not be taken, better dcalo at mineta/maxeta
+ double cutoff_eta=shape->cutoff_eta()/(eta_jakobi*m_dCalo[sample]);
double newetaCaloBorder=cutoff_eta/2;
if(msgLvl(MSG::DEBUG)) {
msg(MSG::DEBUG)<<" fcx="<<fcx<<" fcy="<<fcy<<" mineta="<<mineta<<" maxeta="<<maxeta<<" deta_border="
- <<distetaCaloBorder[sample]<<" bordereta="<<bordereta<<" eta_jakobi="<<eta_jakobi
- <<" cutoff_eta [mm]="<<shape->cutoff_eta()<<" dcalo="<<dCalo[sample]
+ <<m_distetaCaloBorder[sample]<<" bordereta="<<bordereta<<" eta_jakobi="<<eta_jakobi
+ <<" cutoff_eta [mm]="<<shape->cutoff_eta()<<" dcalo="<<m_dCalo[sample]
<<" shapesize="<<cutoff_eta<<" aim deta_border="<<newetaCaloBorder;
}
- if(distetaCaloBorder[sample]>newetaCaloBorder) {
- double olddeta=distetaCaloBorder[sample];
- double oldletaCalo=letaCalo[sample];
+ if(m_distetaCaloBorder[sample]>newetaCaloBorder) {
+ double olddeta=m_distetaCaloBorder[sample];
+ double oldletaCalo=m_letaCalo[sample];
double oldfcx=fcx;
- double delta=distetaCaloBorder[sample]-newetaCaloBorder;
+ double delta=m_distetaCaloBorder[sample]-newetaCaloBorder;
if(fcx<mineta) {
fcx+=delta;
} else if(fcx>maxeta) {
fcx-=delta;
}
- letaCalo[sample]=fcx;
+ m_letaCalo[sample]=fcx;
/* Causing to big steps!!!
- if(fcx<mineta) {
- while(fcx<mineta){
- letaCalo[sample]+=delta;
- fcx=shape->eta_center(letaCalo[sample],direction_factor*sign);
- }
- } else if(fcx>maxeta) {
- while(fcx>maxeta){
- letaCalo[sample]-=delta;
- fcx=shape->eta_center(letaCalo[sample],direction_factor*sign);
- }
- }
-
- fcx=shape->eta_center(letaCalo[sample],direction_factor*sign);
+ if(fcx<mineta) {
+ while(fcx<mineta){
+ m_letaCalo[sample]+=delta;
+ fcx=shape->eta_center(m_letaCalo[sample],direction_factor*sign);
+ }
+ } else if(fcx>maxeta) {
+ while(fcx>maxeta){
+ m_letaCalo[sample]-=delta;
+ fcx=shape->eta_center(m_letaCalo[sample],direction_factor*sign);
+ }
+ }
+
+ fcx=shape->eta_center(m_letaCalo[sample],direction_factor*sign);
*/
- distetaCaloBorder[sample]=deta((CaloCell_ID_FCS::CaloSample)sample,fcx);
+ m_distetaCaloBorder[sample]=deta((CaloCell_ID_FCS::CaloSample)sample,fcx);
if(msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG)<<" new deta="<<distetaCaloBorder[sample]<<endreq;
+ msg(MSG::DEBUG)<<" new deta="<<m_distetaCaloBorder[sample]<<endmsg;
}
- if(distetaCaloBorder[sample]>olddeta) {
+ if(m_distetaCaloBorder[sample]>olddeta) {
ATH_MSG_WARNING("repositioned cell impact, but deta increased!!!! stay with the old...");
- distetaCaloBorder[sample]=olddeta;
- letaCalo[sample]=oldletaCalo;
+ m_distetaCaloBorder[sample]=olddeta;
+ m_letaCalo[sample]=oldletaCalo;
fcx=oldfcx;
}
} else {
- msg(MSG::DEBUG)<<endreq;
+ msg(MSG::DEBUG)<<endmsg;
}
} else {
- ATH_MSG_DEBUG(" fcx="<<fcx<<" fcy="<<fcy<<" mineta="<<mineta<<" maxeta="<<maxeta<<" deta="<<distetaCaloBorder[sample]);
+ ATH_MSG_DEBUG(" fcx="<<fcx<<" fcy="<<fcy<<" mineta="<<mineta<<" maxeta="<<maxeta<<" deta="<<m_distetaCaloBorder[sample]);
}
if(m_storeFastShowerInfo) shape->SetDebugInfo(sample, fastshowerinfo); // old version: fastshowerinfo->SetTShapeResult( sample, *shape );
}
- if(m_storeFastShowerInfo) fastshowerinfo->SetCaloInfo(sample, fcx, fcy, letaCalo[sample], lphiCalo[sample]);
+ if(m_storeFastShowerInfo) fastshowerinfo->SetCaloInfo(sample, fcx, fcy, m_letaCalo[sample], m_lphiCalo[sample]);
if(fabs(lookup_letaCalo)>5.0) {
lookup_letaCalo*=4.99/fabs(lookup_letaCalo);
}
// Ugly code: does a fast lookup which cells should be considered to be filled with energy
- int iphi=celllist_maps[sample].phi_to_index(lookup_lphiCalo);
- int ieta=celllist_maps[sample].eta_to_index(lookup_letaCalo);
- cellinfo_map::cellinfo_vec& vec=celllist_maps[sample].vec(ieta,iphi);
+ int iphi=m_celllist_maps[sample].phi_to_index(lookup_lphiCalo);
+ int ieta=m_celllist_maps[sample].eta_to_index(lookup_letaCalo);
+ cellinfo_map::cellinfo_vec& vec=m_celllist_maps[sample].vec(ieta,iphi);
int n_cells=vec.size();
ATH_MSG_DEBUG(" n_cells=" <<n_cells);
@@ -1695,7 +1695,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
double bestdist=100000000000.0;
CLHEP::Hep3Vector truthimpact;
truthimpact.setREtaPhi(1,fcx,fcy);
- truthimpact.setMag(dCalo[sample]);
+ truthimpact.setMag(m_dCalo[sample]);
if(shape==0) {
// If no shape is found, find the hit cell and deposit all energy in the hit cell
@@ -1722,12 +1722,12 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
elayertot+=subetot;
const CaloDetDescrElement* cell=theDDE[ibestcell];
- if( !(sample>=CaloCell_ID_FCS::FCAL0 && sample<=CaloCell_ID_FCS::FCAL2) && refid!=13) {
- ATH_MSG_WARNING("best cell found for calosample "<<sample<<" eta="<<letaCalo[sample]<<" phi="<<lphiCalo[sample]
+ if( !(sample>=CaloCell_ID_FCS::FCAL0 && sample<=CaloCell_ID_FCS::FCAL2) && m_refid!=13) {
+ ATH_MSG_WARNING("best cell found for calosample "<<sample<<" eta="<<m_letaCalo[sample]<<" phi="<<m_lphiCalo[sample]
<<" ceta="<<cell->eta()<<" cphi="<<cell->phi()
<<" cdeta="<<cell->deta()<<" cdphi="<<cell->dphi()<<" bd="<<bestdist);
} else {
- ATH_MSG_DEBUG ("best cell found for calosample "<<sample<<" eta="<<letaCalo[sample]<<" phi="<<lphiCalo[sample]
+ ATH_MSG_DEBUG ("best cell found for calosample "<<sample<<" eta="<<m_letaCalo[sample]<<" phi="<<m_lphiCalo[sample]
<<" ceta="<<cell->eta()<<" cphi="<<cell->phi()
<<" cdeta="<<cell->deta()<<" cdphi="<<cell->dphi()<<" bd="<<bestdist);
}
@@ -1750,7 +1750,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
if(ibestcell < 0 ) {
ATH_MSG_WARNING("NO BEST CELL FOUND ");
ATH_MSG_WARNING(" - calosample="<<sample<<" Elayer="<<E_orig);
- ATH_MSG_WARNING(" - id="<<pdgid<<" eta="<<letaCalo[sample]<<" phi="<<lphiCalo[sample]);
+ ATH_MSG_WARNING(" - id="<<pdgid<<" eta="<<m_letaCalo[sample]<<" phi="<<m_lphiCalo[sample]);
ATH_MSG_WARNING(" - Ein="<<Ein<<" Ecal/Ein="<<p.Ecal<<" E/Ein="<<p.E<<" E="<<p.E*Ein
<<" din="<<p.dist_in<<" dist000="<<p.dist000<<" drec="<<p.dist_rec);
ATH_MSG_WARNING(" - fcx="<<fcx<<" fcy="<<fcy);
@@ -1773,9 +1773,9 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
const CaloDetDescrElement* cell=theDDE[icell];
double Einwide;
- double Ecell=shape->CellIntegralEtaPhi(*cell,letaCalo[sample],lphiCalo[sample],Einwide,fcx_fine_corr,fcy,direction_factor*sign);
+ double Ecell=shape->CellIntegralEtaPhi(*cell,m_letaCalo[sample],m_lphiCalo[sample],Einwide,fcx_fine_corr,fcy,direction_factor*sign);
- // if(icell<20) log << MSG::DEBUG <<" ("<<icell<<") ceta="<<cell->eta()<<" cphi="<<cell->phi()<<" E="<<Ecell<<" Einwide="<<Einwide<<endreq;
+ // if(icell<20) log << MSG::DEBUG <<" ("<<icell<<") ceta="<<cell->eta()<<" cphi="<<cell->phi()<<" E="<<Ecell<<" Einwide="<<Einwide<<endmsg;
if(Einwide<=0) {
E_theDDE[icell]=0;
continue;
@@ -1786,7 +1786,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
float distphi=TVector2::Phi_mpi_pi( cell->phi() - cell_hit->phi() )/cell_hit->dphi();
long int idisteta=lroundf(disteta);
long int idistphi=lroundf(distphi);
- //log << MSG::DEBUG <<" ("<<icell<<") ceta="<<cell->eta()<<" cphi="<<cell->phi()<<" E="<<Ecell<<" Einwide="<<Einwide<<" deta="<<disteta<<"="<<idisteta<<" dphi="<<distphi<<"="<<idistphi<<endreq;
+ //log << MSG::DEBUG <<" ("<<icell<<") ceta="<<cell->eta()<<" cphi="<<cell->phi()<<" E="<<Ecell<<" Einwide="<<Einwide<<" deta="<<disteta<<"="<<idisteta<<" dphi="<<distphi<<"="<<idistphi<<endmsg;
for(unsigned int icorr=0;icorr<shape->m_correction.size();++icorr) {
if(shape->m_correction[icorr]->HasCellFactor()) {
@@ -1813,7 +1813,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
double dist000=TMath::Sqrt(cell->r()*cell->r()+cell->z()*cell->z());
double celldx=cell->deta()*eta_jakobi*dist000;
double celldy=cell->dphi()*phi_dist2r*cell->r();
- ATH_MSG_DEBUG("center cell found for calosample "<<sample<<" eta="<<letaCalo[sample]<<" phi="<<lphiCalo[sample]
+ ATH_MSG_DEBUG("center cell found for calosample "<<sample<<" eta="<<m_letaCalo[sample]<<" phi="<<m_lphiCalo[sample]
<<" ceta="<<cell->eta()<<" cphi="<<cell->phi()<<" bd="<<bestdist
<<" cdeta="<<cell->deta()<<" cdphi="<<cell->dphi()<<" cdx="<<celldx<<" cdy="<<celldy<<" r="<<cell->r()<<" d="<<dist000);
}
@@ -1823,11 +1823,11 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
MSG::Level level=MSG::DEBUG;
if(Et_orig>500) level=MSG::WARNING;
if(msgLvl(level)) {
- msg(level)<< "calosample "<<sample<<" : no energy dep around truth impact ("<<letaCalo[sample]<<"/"<<fcx<<"/"<<lookup_letaCalo<<";"<<lphiCalo[sample]<<"/"<<fcy<<"/"<<lookup_lphiCalo<<"), E("<<sample<<")="<<E_orig<<", Et("<<sample<<")="<<Et_orig<<endreq;
- msg(level)<< " - "<<particle_info_str.str()<<endreq;
+ msg(level)<< "calosample "<<sample<<" : no energy dep around truth impact ("<<m_letaCalo[sample]<<"/"<<fcx<<"/"<<lookup_letaCalo<<";"<<m_lphiCalo[sample]<<"/"<<fcy<<"/"<<lookup_lphiCalo<<"), E("<<sample<<")="<<E_orig<<", Et("<<sample<<")="<<Et_orig<<endmsg;
+ msg(level)<< " - "<<particle_info_str.str()<<endmsg;
msg(level)<< " - ";
if(shape) msg() << level << "parametrization : "<< shape->GetTitle()<<", ";
- msg() << level << "skip sample..."<<endreq;
+ msg() << level << "skip sample..."<<endmsg;
}
continue;
}
@@ -1854,7 +1854,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
const CaloDetDescrElement* bestcell=theDDE[ibestcell];
log <<" dhit :deta="<<cell->eta()-bestcell->eta()<<" dphi="<<TVector2::Phi_mpi_pi( cell->phi() - bestcell->phi() );
}
- log <<endreq;
+ log <<endmsg;
}
*/
@@ -1862,7 +1862,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
while(rndfactor<=0) rndfactor=CLHEP::RandGaussZiggurat::shoot(m_randomEngine,1.0,smaple_err/sqrt(ecell/1000));
ecell*=rndfactor;
// if(ecell<0) ecell=0;
- // log<<" Esmear="<<ecell<<endreq;
+ // log<<" Esmear="<<ecell<<endmsg;
elayertot2+=ecell;
E_theDDE[icell]=ecell;
@@ -1879,7 +1879,7 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
// is there a other way to get a non const pointer?
CaloCell* theCaloCell=(CaloCell*)(theCellContainer->findCell(cell->calo_hash()));
if(theCaloCell) {
- // log << MSG::VERBOSE << "found calo cell : eta=" <<theCaloCell->caloDDE()->eta()<<" phi="<<theCaloCell->caloDDE()->phi()<<" overlap="<<iter->second<<"old e=" <<theCaloCell->energy()<< " ; new e=" <<theCaloCell->energy()+energy*iter->second<< endreq;
+ // log << MSG::VERBOSE << "found calo cell : eta=" <<theCaloCell->caloDDE()->eta()<<" phi="<<theCaloCell->caloDDE()->phi()<<" overlap="<<iter->second<<"old e=" <<theCaloCell->energy()<< " ; new e=" <<theCaloCell->energy()+energy*iter->second<< endmsg;
theCaloCell->setEnergy(theCaloCell->energy()+ecell);
if(m_storeFastShowerInfo) fastshowerinfo->AddCellEFinal(sample, ecell );
@@ -1899,24 +1899,24 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
if(shape) ATH_MSG_ERROR("parametrization : "<< shape->GetTitle());
}
- double et_elayertot3=elayertot3/cosh(eta_calo_surf);
+ double et_elayertot3=elayertot3/cosh(m_eta_calo_surf);
if(sample>=CaloCell_ID_FCS::PreSamplerB && sample<=CaloCell_ID_FCS::EME3) {
- E_tot_em+=elayertot3;
- Et_tot_em+=et_elayertot3;
+ m_E_tot_em+=elayertot3;
+ m_Et_tot_em+=et_elayertot3;
// simul_map_energy[part->barcode()]+=elayertot3;
// simul_map_energyEM[part->barcode()]+=elayertot3;
} else {
- E_tot_had+=elayertot3;
- Et_tot_had+=et_elayertot3;
+ m_E_tot_had+=elayertot3;
+ m_Et_tot_had+=et_elayertot3;
// simul_map_energy[part->barcode()]+=elayertot3;
// simul_map_energyHAD[part->barcode()]+=elayertot3;
}
- E_tot_sample[sample]+=elayertot3;
- Et_tot_sample[sample]+=et_elayertot3;
+ m_E_tot_sample[sample]+=elayertot3;
+ m_Et_tot_sample[sample]+=et_elayertot3;
- E_lost_sample[sample]-=elayertot3;
- Et_lost_sample[sample]-=et_elayertot3;
+ m_E_lost_sample[sample]-=elayertot3;
+ m_Et_lost_sample[sample]-=et_elayertot3;
ATH_MSG_DEBUG("sample "<<sample<<" etot="<<p.E_layer[sample]<<" e1="<<elayertot<<" e2="<<elayertot2<<" e3="<<elayertot3);
@@ -1930,11 +1930,11 @@ StatusCode FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCel
} else {
MSG::Level level=MSG::DEBUG;
bool is_debug=false;
- if(fabs(letaCalo[sample])>5 && fabs(letaCalo[sample])<10) is_debug=true;
- if(fabs(ptruth_eta)>4.9) is_debug=true;
+ if(fabs(m_letaCalo[sample])>5 && fabs(m_letaCalo[sample])<10) is_debug=true;
+ if(fabs(m_ptruth_eta)>4.9) is_debug=true;
if(Et_orig>100 && (!is_debug) ) level=MSG::WARNING;
if(Et_orig>1) {
- ATH_MSG_LVL(level,"calosample "<<sample<<" : no eta on calo found for truth impact ("<<letaCalo[sample]<<","<<lphiCalo[sample]<<"), E("<<sample<<")="<<E_orig<<", Et("<<sample<<")="<<Et_orig);
+ ATH_MSG_LVL(level,"calosample "<<sample<<" : no eta on calo found for truth impact ("<<m_letaCalo[sample]<<","<<m_lphiCalo[sample]<<"), E("<<sample<<")="<<E_orig<<", Et("<<sample<<")="<<Et_orig);
ATH_MSG_LVL(level," - "<<particle_info_str.str());
ATH_MSG_LVL(level," - skip sample...");
}
@@ -1960,7 +1960,7 @@ void FastShowerCellBuilderTool::print_par(const HepMC::GenParticle* par,MsgStrea
log<<MSG::INFO<<"";
log<<"-> id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode();
log<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<" e="<<par->momentum().e();
- log<<" E="<<simul_sum_energy[par->barcode()]<<" E(EM)="<<simul_sum_energyEM[par->barcode()]<<" E(HAD)="<<simul_sum_energyHAD[par->barcode()]<<endreq;
+ log<<" E="<<simul_sum_energy[par->barcode()]<<" E(EM)="<<simul_sum_energyEM[par->barcode()]<<" E(HAD)="<<simul_sum_energyHAD[par->barcode()]<<endmsg;
HepMC::GenVertex* outver=par->end_vertex();
if(outver) {
for(HepMC::GenVertex::particles_out_const_iterator pout=outver->particles_out_const_begin();pout!=outver->particles_out_const_end();++pout) {
@@ -2110,7 +2110,7 @@ void MC_recursive_remove_in_particles(MCdo_simul_state& do_simul_state,HepMC::Ge
{
if(ver) {
if(do_simul_state[ver->barcode()]==simul_state) {
- //log << MSG::DEBUG<<"ver: bc="<<ver->barcode()<<" : loop in MC_recursive_remove_in_particles, returning"<<endreq;
+ //log << MSG::DEBUG<<"ver: bc="<<ver->barcode()<<" : loop in MC_recursive_remove_in_particles, returning"<<endmsg;
return;
}
do_simul_state[ver->barcode()]=simul_state;
@@ -2126,7 +2126,7 @@ void MC_recursive_remove_in_particles(MCdo_simul_state& do_simul_state,HepMC::Ge
/*
void print_MC_info(MCdo_simul_state& do_simul_state,const MCparticleCollection& particles,MsgStream& log)
{
- log << MSG::VERBOSE <<"print_MC_info: begin"<< endreq;
+ log << MSG::VERBOSE <<"print_MC_info: begin"<< endmsg;
MCparticleCollectionCIter ip;
for(ip=particles.begin();ip<particles.end();++ip){
const HepMC::GenParticle* par=*ip;
@@ -2182,11 +2182,11 @@ void print_MC_info(MCdo_simul_state& do_simul_state,const MCparticleCollection&
}
}
}
- log<<endreq;
+ log<<endmsg;
}
}
- log << MSG::VERBOSE <<"print_MC_info: end"<< endreq;
+ log << MSG::VERBOSE <<"print_MC_info: end"<< endmsg;
}
*/
@@ -2370,7 +2370,7 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
//sc = m_gentesIO->getMC(particles, &ifs, m_mcLocation );
//if ( sc.isFailure() ) {
- // log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endreq;
+ // log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endmsg;
// return StatusCode::FAILURE;
//}
@@ -2404,13 +2404,13 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
for(unsigned int i=0;i<m_invisibles.size();++i) {
if(abs(par->pdg_id())==m_invisibles[i]) {
do_simul_state[par->barcode()]=invisibleArray;
- //log << MSG::DEBUG <<"INVISIBLE by ARRAY: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endreq;
+ //log << MSG::DEBUG <<"INVISIBLE by ARRAY: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endmsg;
break;
}
if(m_invisibles[i]==0) {
if(MC::isNonInteracting(par)) {
do_simul_state[par->barcode()]=invisibleTruthHelper;
- //log << MSG::DEBUG <<"INVISIBLE by TruthHelper: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endreq;
+ //log << MSG::DEBUG <<"INVISIBLE by TruthHelper: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endmsg;
break;
}
}
@@ -2431,7 +2431,7 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
<<" : layer="<<i->second.sample<<" eta="<<i->second.position.eta()<<" phi="<<i->second.position.phi()
<<" d="<<i->second.position.mag();
if(i->second.materialEffects) if(i->second.materialEffects->energyLoss()) msg()<<" de="<<i->second.materialEffects->energyLoss()->deltaE();
- msg()<< endreq;
+ msg()<< endmsg;
}
}
}
@@ -2484,7 +2484,7 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
}
}
}
- msg()<<endreq;
+ msg()<<endmsg;
}
if(do_simul_state[par->barcode()]<=0) {
@@ -2495,9 +2495,9 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
// if(DoParticleSimul(par,log)) {
{
-// log<<MSG::DEBUG<<"-> OK for simul"<<endreq;
+// log<<MSG::DEBUG<<"-> OK for simul"<<endmsg;
Simulparticles.push_back(par);
-// if(Is_Particle_from_pdgid(par,log,15,1)) log<<MSG::INFO<<""<<endreq;
+// if(Is_Particle_from_pdgid(par,log,15,1)) log<<MSG::INFO<<""<<endmsg;
// deflectParticle(particlesAtCal,par);
}
@@ -2509,7 +2509,7 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
ATH_MSG_DEBUG("Creating and registering the FastShowerInfoContainer with key " << m_FastShowerInfoContainerKey);
m_FastShowerInfoContainer = new FastShowerInfoContainer();
evtStore()->record( m_FastShowerInfoContainer, m_FastShowerInfoContainerKey);
-// log << MSG::DEBUG << m_storeGate->dump() << endreq;
+// log << MSG::DEBUG << m_storeGate->dump() << endmsg;
}
MCparticleCollectionCIter fpart = Simulparticles.begin();
@@ -2544,15 +2544,15 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
//std::cout <<"ZH Processed: "<<stat_npar<<"(ok: "<<stat_npar_nOK<<")"<<std::endl;
/*
MCparticleCollection all_particles;
- log <<MSG::DEBUG<<"Start getting all particles"<<endreq;
+ log <<MSG::DEBUG<<"Start getting all particles"<<endmsg;
sc = m_gentesIO->getMC(all_particles, m_mcLocation );
if ( sc.isFailure() ) {
- log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endreq;
+ log << MSG::ERROR << "getMC from "<<m_mcLocation<<" failed "<< endmsg;
return StatusCode::FAILURE;
}
- log <<MSG::INFO<<"Got all particles n="<<all_particles.size()<<endreq;
+ log <<MSG::INFO<<"Got all particles n="<<all_particles.size()<<endmsg;
for(ip=all_particles.begin(); ip<all_particles.end(); ++ip){
const HepMC::GenParticle* par=*ip;
if(abs(par->pdg_id())!=15) continue;
@@ -2585,40 +2585,40 @@ StatusCode FastShowerCellBuilderTool::setupEvent()
//if(gRandom) log<<" seed(gRandom="<<gRandom->ClassName()<<")="<<gRandom->GetSeed();
//if(m_rndm) log<<" seed(m_rndm="<<m_rndm->ClassName()<<")="<<m_rndm->GetSeed();
- //log<< endreq;
+ //log<< endmsg;
++m_nEvent;
- E_tot_em=0;
- E_tot_had=0;
- Et_tot_em=0;
- Et_tot_had=0;
+ m_E_tot_em=0;
+ m_E_tot_had=0;
+ m_Et_tot_em=0;
+ m_Et_tot_had=0;
for(int i=CaloCell_ID_FCS::FirstSample;i<CaloCell_ID_FCS::MaxSample;++i) {
- E_tot_sample[i]=0;
- E_lost_sample[i]=0;
- Et_tot_sample[i]=0;
- Et_lost_sample[i]=0;
+ m_E_tot_sample[i]=0;
+ m_E_lost_sample[i]=0;
+ m_Et_tot_sample[i]=0;
+ m_Et_lost_sample[i]=0;
}
- simul_map_energy.clear();
- simul_map_energyEM.clear();
- simul_map_energyHAD.clear();
+ m_simul_map_energy.clear();
+ m_simul_map_energyEM.clear();
+ m_simul_map_energyHAD.clear();
return StatusCode::SUCCESS;
}
StatusCode FastShowerCellBuilderTool::releaseEvent()
{
- ATH_MSG_DEBUG("Event summary e="<<E_tot_em+E_tot_had<<" e(EM)="<<E_tot_em<<" e(HAD)="<<E_tot_had
- <<" ; et="<<Et_tot_em+Et_tot_had<<" et(EM)="<<Et_tot_em<<" et(HAD)="<<Et_tot_had);
+ ATH_MSG_DEBUG("Event summary e="<<m_E_tot_em+m_E_tot_had<<" e(EM)="<<m_E_tot_em<<" e(HAD)="<<m_E_tot_had
+ <<" ; et="<<m_Et_tot_em+m_Et_tot_had<<" et(EM)="<<m_Et_tot_em<<" et(HAD)="<<m_Et_tot_had);
for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
- if(fabs(Et_lost_sample[sample])<1E-6) Et_lost_sample[sample]=0;
- if(fabs(E_lost_sample[sample])<1E-6) E_lost_sample[sample]=0;
- if(Et_lost_sample[sample]>5000) {
- ATH_MSG_WARNING(" Event summary sample "<<sample<<" : etlost="<<Et_lost_sample[sample]<<" elost="<<E_lost_sample[sample]);
+ if(fabs(m_Et_lost_sample[sample])<1E-6) m_Et_lost_sample[sample]=0;
+ if(fabs(m_E_lost_sample[sample])<1E-6) m_E_lost_sample[sample]=0;
+ if(m_Et_lost_sample[sample]>5000) {
+ ATH_MSG_WARNING(" Event summary sample "<<sample<<" : etlost="<<m_Et_lost_sample[sample]<<" elost="<<m_E_lost_sample[sample]);
} else {
- ATH_MSG_DEBUG(" Event summary sample "<<sample<<" : etlost="<<Et_lost_sample[sample]<<" elost="<<E_lost_sample[sample]);
+ ATH_MSG_DEBUG(" Event summary sample "<<sample<<" : etlost="<<m_Et_lost_sample[sample]<<" elost="<<m_E_lost_sample[sample]);
}
}
@@ -2630,7 +2630,7 @@ StatusCode FastShowerCellBuilderTool::releaseEvent()
void FastShowerCellBuilderTool::deflectParticles(ITransportedParticleCollection &itpc)
{
MsgStream log( msgSvc(), name() );
- log << MSG::DEBUG << "FastShowerCellBuilderTool deflectParticles()" << endreq;
+ log << MSG::DEBUG << "FastShowerCellBuilderTool deflectParticles()" << endmsg;
// read MC particles from TES
typedef std::vector<const HepMC::GenParticle*> MCparticleCollection ;
@@ -2640,7 +2640,7 @@ void FastShowerCellBuilderTool::deflectParticles(ITransportedParticleCollection
TesIoStat stat = m_tesIO->getMC( p, m_mcSelector ) ;
std::string mess;
mess = stat? "Retrieved MC from TES ":"Failed MC retrieve from TES ";
- log << MSG::DEBUG << mess << p.size()<<endreq;
+ log << MSG::DEBUG << mess << p.size()<<endmsg;
MCparticleCollectionCIter ip= p.begin();
for(; ip<p.end(); ++ip){
--
GitLab