diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h
index 18a646ee95a74490446348984fc507fbde24d41c..71f4587d3a78d8a52f79124316fb1666edae3c5a 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h
@@ -30,14 +30,14 @@ namespace InDet {
public:
SiSpacePointForSeed();
- SiSpacePointForSeed(Trk::SpacePoint*const&,const float*);
- SiSpacePointForSeed(Trk::SpacePoint*const&,const float*,const float*);
+ SiSpacePointForSeed(const Trk::SpacePoint*const&,const float*);
+ SiSpacePointForSeed(const Trk::SpacePoint*const&,const float*,const float*);
SiSpacePointForSeed(const SiSpacePointForSeed&);
virtual ~SiSpacePointForSeed() ;
SiSpacePointForSeed& operator = (const SiSpacePointForSeed&);
- void set(Trk::SpacePoint*const&,const float*) ;
- void set(Trk::SpacePoint*const&,const float*,const float*);
+ void set(const Trk::SpacePoint*const&,const float*) ;
+ void set(const Trk::SpacePoint*const&,const float*,const float*);
void setQuality(float);
void setParam(const float&);
@@ -107,13 +107,13 @@ namespace InDet {
}
inline SiSpacePointForSeed::SiSpacePointForSeed
- (Trk::SpacePoint*const& sp,const float* r)
+ (const Trk::SpacePoint*const& sp,const float* r)
{
set(sp,r); m_param = 0.;
}
inline SiSpacePointForSeed::SiSpacePointForSeed
- (Trk::SpacePoint*const& sp,const float* r,const float* sc)
+ (const Trk::SpacePoint*const& sp,const float* r,const float* sc)
{
set(sp,r,sc); m_param = 0.;
}
@@ -140,7 +140,7 @@ namespace InDet {
/////////////////////////////////////////////////////////////////////////////////
inline void SiSpacePointForSeed::set
- (Trk::SpacePoint*const& sp,const float* r)
+ (const Trk::SpacePoint*const& sp,const float* r)
{
spacepoint = sp ;
m_x = r[0];
@@ -182,7 +182,7 @@ namespace InDet {
/////////////////////////////////////////////////////////////////////////////////
inline void SiSpacePointForSeed::set
- (Trk::SpacePoint*const& sp,const float* r,const float* sc)
+ (const Trk::SpacePoint*const& sp,const float* r,const float* sc)
{
spacepoint = sp ;
m_x = r[0];
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h
index f03950830b741aa4f1cf8d4d1178f6eb83c353ad..50db98e4f57b977c948818f7d6344625c2326843 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h
@@ -30,14 +30,14 @@ namespace InDet {
public:
SiSpacePointForSeedITK();
- SiSpacePointForSeedITK(Trk::SpacePoint*const&,const float*);
- SiSpacePointForSeedITK(Trk::SpacePoint*const&,const float*,const float*);
+ SiSpacePointForSeedITK(const Trk::SpacePoint*const&,const float*);
+ SiSpacePointForSeedITK(const Trk::SpacePoint*const&,const float*,const float*);
SiSpacePointForSeedITK(const SiSpacePointForSeedITK&);
virtual ~SiSpacePointForSeedITK() ;
SiSpacePointForSeedITK& operator = (const SiSpacePointForSeedITK&);
- void set(Trk::SpacePoint*const&,const float*) ;
- void set(Trk::SpacePoint*const&,const float*,const float*);
+ void set(const Trk::SpacePoint*const&,const float*) ;
+ void set(const Trk::SpacePoint*const&,const float*,const float*);
void setQuality(float);
void setParam(const float&);
@@ -120,13 +120,13 @@ namespace InDet {
}
inline SiSpacePointForSeedITK::SiSpacePointForSeedITK
- (Trk::SpacePoint*const& sp,const float* r)
+ (const Trk::SpacePoint*const& sp,const float* r)
{
set(sp,r); m_param = 0.;
}
inline SiSpacePointForSeedITK::SiSpacePointForSeedITK
- (Trk::SpacePoint*const& sp,const float* r,const float* sc)
+ (const Trk::SpacePoint*const& sp,const float* r,const float* sc)
{
set(sp,r,sc); m_param = 0.;
}
@@ -153,7 +153,7 @@ namespace InDet {
/////////////////////////////////////////////////////////////////////////////////
inline void SiSpacePointForSeedITK::set
- (Trk::SpacePoint*const& sp,const float* r)
+ (const Trk::SpacePoint*const& sp,const float* r)
{
spacepoint = sp ;
m_x = r[0];
@@ -198,7 +198,7 @@ namespace InDet {
/////////////////////////////////////////////////////////////////////////////////
inline void SiSpacePointForSeedITK::set
- (Trk::SpacePoint*const& sp,const float* r,const float* sc)
+ (const Trk::SpacePoint*const& sp,const float* r,const float* sc)
{
spacepoint = sp ;
m_x = r[0];
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
index 408977219aa47b0ea47a9d8a743a67621b6ad93c..f603d96b4ed292e01cc9af0247f9caa88236898d 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
@@ -160,8 +160,8 @@ namespace InDet {
float m_zmaxB ;
float m_ftrig ;
float m_ftrigW ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -178,26 +178,26 @@ namespace InDet {
float m_ipt2C ;
float m_COFK ;
float m_umax ;
- int r_size ;
- int r_first ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[ 300] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_r_first ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfzv_Sorted[ 300] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax,m_fvNmax ;
int m_fNmin,m_fvNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int m_nrfzv , rfzv_index [300], rfzv_map [300] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][9],rfz_it[583][9] ;
- int rfzv_n[300],rfzv_i[300][6] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_nrfzv , m_rfzv_index [300], m_rfzv_map [300] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][9],m_rfz_it[583][9] ;
+ int m_rfzv_n[300],m_rfzv_i[300][6] ;
float m_sF ;
float m_sFv ;
@@ -216,9 +216,9 @@ namespace InDet {
InDet::SiSpacePointsSeed* m_seedOutput ;
- std::list<InDet::SiSpacePointsProSeed*> l_seeds ;
- std::list<InDet::SiSpacePointsProSeed*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsProSeed*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsProSeed*> m_l_seeds ;
+ std::list<InDet::SiSpacePointsProSeed*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsProSeed*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsProSeed*> m_seeds ;
std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator m_seed ;
@@ -228,7 +228,7 @@ namespace InDet {
int m_maxOneSize ;
int m_nOneSeeds ;
int m_fillOneSeeds;
- std::set<float> l_vertex ;
+ std::set<float> m_l_vertex ;
std::vector<std::pair<float,InDet::SiSpacePointForSeed*>> m_CmSp;
///////////////////////////////////////////////////////////////////
@@ -264,7 +264,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(SiSpacePointForSeed*&,SiSpacePointForSeed*&,float) ;
@@ -296,7 +296,7 @@ namespace InDet {
bool newVertices(const std::list<Trk::Vertex>&) ;
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*);
};
@@ -311,14 +311,14 @@ namespace InDet {
{
if(m_nspoint==3) {
do {
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;} ++i_seed;
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;} ++m_i_seed;
}
while(!(*m_seed++).second->set3(*m_seedOutput));
return(m_seedOutput);
}
else {
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;}
- (*i_seed++)->set2(*m_seedOutput); return(m_seedOutput);
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;}
+ (*m_i_seed++)->set2(*m_seedOutput); return(m_seedOutput);
}
return 0;
}
@@ -330,7 +330,7 @@ namespace InDet {
if(Zv < m_zminU || Zv > m_zmaxU) return false;
if(!m_isvertex) return true;
- std::set<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::set<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
float dZmin = fabs((*v)-Zv);
for(++v; v!=ve; ++v) {
@@ -344,7 +344,7 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_ATLxk::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
@@ -358,12 +358,12 @@ namespace InDet {
if((z*z )<(x*x+y*y)) return 0;
}
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -378,13 +378,13 @@ namespace InDet {
{
SiSpacePointForSeed* p3 = 0;
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsProSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsProSeed* s = (*m_i_seede++);
s->set(p1,p2,p3,z);
}
else {
- l_seeds.push_back(new SiSpacePointsProSeed(p1,p2,p3,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsProSeed(p1,p2,p3,z));
+ m_i_seede = m_l_seeds.end();
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
index bd19ac5080629ed71dabfbfa290a52e86fedf3cd..104141d8a10a847c030ff6e99999907e4e3cde99 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
@@ -147,8 +147,8 @@ namespace InDet {
float m_dzdrmax ;
float m_zmin ;
float m_zmax ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -160,24 +160,24 @@ namespace InDet {
float m_COF ;
float m_K ;
- int r_size ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rf_Sorted [ 53] ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rf_Sorted [ 53] ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz ;
int m_fNmax ;
int m_fNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrf , rf_index [ 53], rf_map [ 53] ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][12],rfz_it[583][12] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrf , m_rf_index [ 53], m_rf_map [ 53] ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][12],m_rfz_it[583][12] ;
float m_sF ;
///////////////////////////////////////////////////////////////////
@@ -193,9 +193,9 @@ namespace InDet {
float * m_V ;
float * m_Zo ;
- std::list<InDet::SiSpacePointsSeed*> l_seeds ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsSeed*> m_l_seeds ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsSeed*> m_mapOneSeeds;
InDet::SiSpacePointsSeed* m_OneSeeds ;
@@ -233,7 +233,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const float&) ;
@@ -259,7 +259,7 @@ namespace InDet {
void findNext() ;
bool isZCompatible (float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*) ;
};
@@ -272,10 +272,10 @@ namespace InDet {
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_BeamGas::next()
{
- if(i_seed==i_seede) {
- findNext(); if(i_seed==i_seede) return 0;
+ if(m_i_seed==m_i_seede) {
+ findNext(); if(m_i_seed==m_i_seede) return 0;
}
- return(*i_seed++);
+ return(*m_i_seed++);
}
inline bool SiSpacePointsSeedMaker_BeamGas::isZCompatible
@@ -289,18 +289,18 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_BeamGas::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
float r[3]; convertToBeamFrameWork(sp,r);
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -314,16 +314,16 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -335,8 +335,8 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const Trk::SpacePoint*& p3,const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
@@ -344,8 +344,8 @@ namespace InDet {
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -361,13 +361,13 @@ namespace InDet {
for(; l!=le; ++l) {
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
*s = *(*l).second;
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
+ m_i_seede = m_l_seeds.end();
}
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
index 0981dc4a313dcd37894f9da5edcd65476a66ff15..d4427f2e4c4e45295d224efe73dadb89d7b53618 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
@@ -142,31 +142,31 @@ namespace InDet {
float m_dzdrmax ;
float m_zmin ;
float m_zmax ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_diver ;
float m_dazmax ;
float m_diverpps ;
float m_diversss ;
float m_etamin, m_etamax ;
- int r_size ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rf_Sorted [ 53] ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rf_Sorted [ 53] ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz ;
int m_fNmax ;
int m_fNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrf , rf_index [ 53], rf_map [ 53] ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][12],rfz_it[583][12] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrf , m_rf_index [ 53], m_rf_map [ 53] ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][12],m_rfz_it[583][12] ;
float m_sF ;
///////////////////////////////////////////////////////////////////
@@ -181,9 +181,9 @@ namespace InDet {
float * m_U ;
float * m_V ;
- std::multimap<float,InDet::SiSpacePointsSeed*> l_seeds;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seed ;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seede;
+ std::multimap<float,InDet::SiSpacePointsSeed*> m_l_seeds;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator m_i_seed ;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator m_i_seede;
InDet::SiSpacePointsSeed* m_seeds;
///////////////////////////////////////////////////////////////////
@@ -207,9 +207,9 @@ namespace InDet {
void buildFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&,const float*) ;
+ (const Trk::SpacePoint*const&,const float*) ;
void newSeed
(const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const float&) ;
@@ -249,8 +249,8 @@ namespace InDet {
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_Cosmic::next()
{
- if(i_seed==i_seede) return 0;
- SiSpacePointsSeed* sp = (*i_seed).second; ++i_seed;
+ if(m_i_seed==m_i_seede) return 0;
+ SiSpacePointsSeed* sp = (*m_i_seed).second; ++m_i_seed;
return(sp);
}
@@ -259,7 +259,7 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_Cosmic::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
@@ -267,12 +267,12 @@ namespace InDet {
float(sp->globalPosition().y()),
float(sp->globalPosition().z())};
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -283,18 +283,18 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_Cosmic::newSpacePoint
- (Trk::SpacePoint*const& sp,const float* sc)
+ (const Trk::SpacePoint*const& sp,const float* sc)
{
SiSpacePointForSeed* sps;
float r[3]; r[0]=sp->globalPosition().x(); r[1]=sp->globalPosition().y(); r[2]=sp->globalPosition().z();
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r,sc);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r,sc);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r,sc)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r,sc)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -315,21 +315,21 @@ namespace InDet {
m_seeds[m_nseeds].add (p1);
m_seeds[m_nseeds].add (p2);
m_seeds[m_nseeds].setZVertex(0.);
- l_seeds.insert(std::make_pair(z,m_seeds+m_nseeds));
+ m_l_seeds.insert(std::make_pair(z,m_seeds+m_nseeds));
++m_nseeds;
}
else {
- std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = l_seeds.rbegin();
+ std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = m_l_seeds.rbegin();
if((*l).first <= z) return;
InDet::SiSpacePointsSeed* s = (*l).second;
- l_seeds.erase((*l).first);
+ m_l_seeds.erase((*l).first);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(0.);
- l_seeds.insert(std::make_pair(z,s));
+ m_l_seeds.insert(std::make_pair(z,s));
}
}
@@ -348,22 +348,22 @@ namespace InDet {
m_seeds[m_nseeds].add (p2);
m_seeds[m_nseeds].add (p3);
m_seeds[m_nseeds].setZVertex(0.);
- l_seeds.insert(std::make_pair(z,m_seeds+m_nseeds));
+ m_l_seeds.insert(std::make_pair(z,m_seeds+m_nseeds));
++m_nseeds;
}
else {
- std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = l_seeds.rbegin();
+ std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = m_l_seeds.rbegin();
if((*l).first <= z) return;
InDet::SiSpacePointsSeed* s = (*l).second;
- l_seeds.erase((*l).first);
+ m_l_seeds.erase((*l).first);
s->erase ( );
s->add (p1);
s->add (p2);
s->add (p3);
s->setZVertex(0.);
- l_seeds.insert(std::make_pair(z,s));
+ m_l_seeds.insert(std::make_pair(z,s));
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
index d547f5d42d01fd5667285d52ff754eedc53e0f58..07874b53764a259d238aa91e3311c8927783bb25 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
@@ -149,8 +149,8 @@ namespace InDet {
float m_zmaxU ;
float m_ftrig ;
float m_ftrigW ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -162,25 +162,25 @@ namespace InDet {
float m_ipt2 ;
float m_COF ;
float m_K ;
- int r_size ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[ 300] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfzv_Sorted[ 300] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax,m_fvNmax ;
int m_fNmin,m_fvNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int m_nrfzv , rfzv_index [300], rfzv_map [300] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][9],rfz_it[583][9] ;
- int rfzv_n[300],rfzv_i[300][6] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_nrfzv , m_rfzv_index [300], m_rfzv_map [300] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][9],m_rfz_it[583][9] ;
+ int m_rfzv_n[300],m_rfzv_i[300][6] ;
float m_sF ;
float m_sFv ;
@@ -197,15 +197,15 @@ namespace InDet {
float * m_V ;
float * m_Er ;
- std::list<InDet::SiSpacePointsSeed*> l_seeds ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsSeed*> m_l_seeds ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsSeed*> m_mapOneSeeds;
InDet::SiSpacePointsSeed* m_OneSeeds ;
int m_maxOneSize ;
int m_nOneSeeds ;
- std::list<float> l_vertex ;
+ std::list<float> m_l_vertex ;
///////////////////////////////////////////////////////////////////
// Beam geometry
@@ -238,7 +238,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const float&) ;
@@ -278,7 +278,7 @@ namespace InDet {
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
float dZVertexMin(float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_HeavyIon&);
@@ -290,8 +290,8 @@ namespace InDet {
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_HeavyIon::next()
{
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;}
- return(*i_seed++);
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;}
+ return(*m_i_seed++);
}
inline bool SiSpacePointsSeedMaker_HeavyIon::isZCompatible
@@ -300,7 +300,7 @@ namespace InDet {
if(Zv < m_zmin || Zv > m_zmax) return false;
if(!m_izvertex ) return true ;
- std::list<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
float dZmin = fabs((*v)-Zv); ++v;
@@ -313,7 +313,7 @@ namespace InDet {
inline float SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(float& Z)
{
float dZm = 1.E10;
- std::list<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
for(; v!=ve; ++v) {float dZ = fabs((*v)-Z); if(dZ<dZm) dZm = dZ;}
return dZm;
@@ -324,18 +324,18 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_HeavyIon::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
float r[3]; convertToBeamFrameWork(sp,r);
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -349,16 +349,16 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -370,8 +370,8 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const Trk::SpacePoint*& p3,const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
@@ -379,8 +379,8 @@ namespace InDet {
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -396,13 +396,13 @@ namespace InDet {
for(; l!=le; ++l) {
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
*s = *(*l).second;
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
+ m_i_seede = m_l_seeds.end();
}
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
index b58b079f6c80f4926610c3d598fc41836a37e49d..8a469ff1eefb3047217a7af50949736f99c8a613 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
@@ -156,9 +156,9 @@ namespace InDet {
float m_zmaxB ;
float m_ftrig ;
float m_ftrigW ;
- float r_rmax ;
- float r_rmin ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rmin ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -176,26 +176,26 @@ namespace InDet {
float m_COFK ;
float m_umax ;
float m_dzmaxPPP ;
- int r_size ;
- int r_first ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeedITK*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeedITK*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeedITK*> rfzv_Sorted[ 300] ;
- std::list<InDet::SiSpacePointForSeedITK*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeedITK*>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeedITK*>::iterator m_rMin ;
+ int m_r_size ;
+ int m_r_first ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeedITK*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeedITK*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeedITK*> m_rfzv_Sorted[ 300] ;
+ std::list<InDet::SiSpacePointForSeedITK*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeedITK*>::iterator m_i_spforseed;
+ std::list<InDet::SiSpacePointForSeedITK*>::iterator m_rMin ;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax,m_fvNmax ;
int m_fNmin,m_fvNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int m_nrfzv , rfzv_index [300], rfzv_map [300] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][9],rfz_it[583][9] ;
- int rfzv_n[300],rfzv_i[300][6] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_nrfzv , m_rfzv_index [300], m_rfzv_map [300] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][9],m_rfz_it[583][9] ;
+ int m_rfzv_n[300],m_rfzv_i[300][6] ;
float m_sF ;
float m_sFv ;
@@ -216,9 +216,9 @@ namespace InDet {
InDet::SiSpacePointsSeed* m_seedOutput ;
- std::list<InDet::SiSpacePointsProSeedITK*> l_seeds;
- std::list<InDet::SiSpacePointsProSeedITK*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsProSeedITK*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsProSeedITK*> m_l_seeds;
+ std::list<InDet::SiSpacePointsProSeedITK*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsProSeedITK*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsProSeedITK*> m_seeds ;
std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator m_seed ;
@@ -228,7 +228,7 @@ namespace InDet {
int m_maxOneSize ;
int m_nOneSeeds ;
int m_fillOneSeeds;
- std::set<float> l_vertex ;
+ std::set<float> m_l_vertex ;
std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>> m_CmSp;
///////////////////////////////////////////////////////////////////
@@ -264,7 +264,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeedITK* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) ;
@@ -302,7 +302,7 @@ namespace InDet {
bool newVertices(const std::list<Trk::Vertex>&) ;
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*);
};
@@ -318,14 +318,14 @@ namespace InDet {
{
if(m_nspoint==3) {
do {
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;} ++i_seed;
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;} ++m_i_seed;
}
while(!(*m_seed++).second->set3(*m_seedOutput));
return(m_seedOutput);
}
else {
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;}
- (*i_seed++)->set2(*m_seedOutput); return(m_seedOutput);
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;}
+ (*m_i_seed++)->set2(*m_seedOutput); return(m_seedOutput);
}
return 0;
}
@@ -337,7 +337,7 @@ namespace InDet {
if(Zv < m_zminU || Zv > m_zmaxU) return false;
if(!m_isvertex) return true;
- std::set<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::set<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
float dZmin = fabs((*v)-Zv);
for(++v; v!=ve; ++v) {
@@ -351,7 +351,7 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeedITK* SiSpacePointsSeedMaker_ITK::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeedITK* sps;
@@ -365,12 +365,12 @@ namespace InDet {
if((z*z )<(x*x+y*y)) return 0;
}
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeedITK(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeedITK(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -385,13 +385,13 @@ namespace InDet {
{
SiSpacePointForSeedITK* p3 = 0;
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsProSeedITK* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsProSeedITK* s = (*m_i_seede++);
s->set(p1,p2,p3,z);
}
else {
- l_seeds.push_back(new SiSpacePointsProSeedITK(p1,p2,p3,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsProSeedITK(p1,p2,p3,z));
+ m_i_seede = m_l_seeds.end();
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
index 992639bb11ff106082420ef4105b7a0d3deefa7b..7e9f1512c02cf0221408699849ead107e7456eae 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
@@ -150,8 +150,8 @@ namespace InDet {
float m_zmax ;
float m_zminU ;
float m_zmaxU ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -162,22 +162,22 @@ namespace InDet {
float m_iptmin ;
float m_iptmax ;
- int r_size ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 220] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 220] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz ;
int m_fNmax ;
int m_fNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrfz , rfz_index [220], rfz_map [220] ;
- int rfz_b[220],rfz_t[220],rfz_ib[220][9],rfz_it[220][9] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrfz , m_rfz_index [220], m_rfz_map [220] ;
+ int m_rfz_b[220],m_rfz_t[220],m_rfz_ib[220][9],m_rfz_it[220][9] ;
float m_sF ;
///////////////////////////////////////////////////////////////////
@@ -193,15 +193,15 @@ namespace InDet {
float * m_V ;
float * m_Zo ;
- std::list<InDet::SiSpacePointsSeed*> l_seeds ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsSeed*> m_l_seeds ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsSeed*> m_mapOneSeeds;
InDet::SiSpacePointsSeed* m_OneSeeds ;
int m_maxOneSize;
int m_nOneSeeds ;
- std::list<float> l_vertex ;
+ std::list<float> m_l_vertex ;
///////////////////////////////////////////////////////////////////
// Beam geometry
@@ -236,7 +236,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const float&) ;
@@ -263,7 +263,7 @@ namespace InDet {
bool newVertices(const std::list<Trk::Vertex>&) ;
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*);
};
@@ -276,11 +276,11 @@ namespace InDet {
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_LowMomentum::next()
{
- if(i_seed==i_seede) {
+ if(m_i_seed==m_i_seede) {
findNext();
- if(i_seed==i_seede) return 0;
+ if(m_i_seed==m_i_seede) return 0;
}
- return(*i_seed++);
+ return(*m_i_seed++);
}
inline bool SiSpacePointsSeedMaker_LowMomentum::isZCompatible
@@ -288,7 +288,7 @@ namespace InDet {
{
if(Zv < m_zmin || Zv > m_zmax) return false;
- std::list<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
if(v==ve) return true;
float dZmin = fabs((*v)-Zv); ++v;
@@ -304,18 +304,18 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_LowMomentum::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
float r[3]; convertToBeamFrameWork(sp,r);
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -329,16 +329,16 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -350,8 +350,8 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const Trk::SpacePoint*& p3,const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
@@ -359,8 +359,8 @@ namespace InDet {
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,p3,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -376,13 +376,13 @@ namespace InDet {
for(; l!=le; ++l) {
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
*s = *(*l).second;
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(*(*l).second));
+ m_i_seede = m_l_seeds.end();
}
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
index 9711a00f7fb1c04029debeb2f24a52d8171d0975..e5dd983dbd51a8edcd57104c74510637a4921f72 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
@@ -148,8 +148,8 @@ namespace InDet {
float m_zmaxB ;
float m_ftrig ;
float m_ftrigW ;
- float r_rmax ;
- float r_rstep ;
+ float m_r_rmax ;
+ float m_r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
@@ -161,25 +161,25 @@ namespace InDet {
float m_ipt2 ;
float m_COF ;
float m_K ;
- int r_size ;
- int rf_size ;
- int rfz_size ;
- std::list<InDet::SiSpacePointForSeed*>* r_Sorted ;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted [ 583] ;
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[ 300] ;
- std::list<InDet::SiSpacePointForSeed*> l_spforseed ;
- std::list<InDet::SiSpacePointForSeed*>::iterator i_spforseed;
+ int m_r_size ;
+ int m_rf_size ;
+ int m_rfz_size ;
+ std::list<InDet::SiSpacePointForSeed*>* m_r_Sorted ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted [ 583] ;
+ std::list<InDet::SiSpacePointForSeed*> m_rfzv_Sorted[ 300] ;
+ std::list<InDet::SiSpacePointForSeed*> m_l_spforseed ;
+ std::list<InDet::SiSpacePointForSeed*>::iterator m_i_spforseed;
std::list<InDet::SiSpacePointForSeed*>::iterator m_rMin ;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax,m_fvNmax ;
int m_fNmin,m_fvNmin ;
int m_zMin ;
- int m_nr ; int* r_index ; int* r_map ;
- int m_nrfz , rfz_index [583], rfz_map [583] ;
- int m_nrfzv , rfzv_index [300], rfzv_map [300] ;
- int rfz_b[583],rfz_t[593],rfz_ib[583][9],rfz_it[583][9] ;
- int rfzv_n[300],rfzv_i[300][6] ;
+ int m_nr ; int* m_r_index ; int* m_r_map ;
+ int m_nrfz , m_rfz_index [583], m_rfz_map [583] ;
+ int m_nrfzv , m_rfzv_index [300], m_rfzv_map [300] ;
+ int m_rfz_b[583],m_rfz_t[593],m_rfz_ib[583][9],m_rfz_it[583][9] ;
+ int m_rfzv_n[300],m_rfzv_i[300][6] ;
float m_sF ;
float m_sFv ;
@@ -196,9 +196,9 @@ namespace InDet {
float * m_V ;
float * m_Er ;
- std::list<InDet::SiSpacePointsSeed*> l_seeds ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seed ;
- std::list<InDet::SiSpacePointsSeed*>::iterator i_seede ;
+ std::list<InDet::SiSpacePointsSeed*> m_l_seeds ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seed ;
+ std::list<InDet::SiSpacePointsSeed*>::iterator m_i_seede ;
std::multimap<float,InDet::SiSpacePointsSeed*> m_mapOneSeeds;
std::multimap<float,InDet::SiSpacePointsSeed*> m_mapSeeds ;
@@ -208,7 +208,7 @@ namespace InDet {
InDet::SiSpacePointsSeed* m_OneSeeds ;
int m_maxOneSize ;
int m_nOneSeeds ;
- std::list<float> l_vertex ;
+ std::list<float> m_l_vertex ;
///////////////////////////////////////////////////////////////////
// Beam geometry
@@ -241,7 +241,7 @@ namespace InDet {
void buildBeamFrameWork() ;
SiSpacePointForSeed* newSpacePoint
- (Trk::SpacePoint*const&) ;
+ (const Trk::SpacePoint*const&) ;
void newSeed
(const Trk::SpacePoint*&,const Trk::SpacePoint*&,
const float&) ;
@@ -271,7 +271,7 @@ namespace InDet {
bool newVertices(const std::list<Trk::Vertex>&) ;
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
- void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
+ void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*) ;
float dZVertexMin(float&) ;
};
@@ -284,9 +284,9 @@ namespace InDet {
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_Trigger::next()
{
- if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;}
- if(m_mode==0 || m_mode==1) return(*i_seed++);
- ++i_seed;
+ if(m_i_seed==m_i_seede) {findNext(); if(m_i_seed==m_i_seede) return 0;}
+ if(m_mode==0 || m_mode==1) return(*m_i_seed++);
+ ++m_i_seed;
return (*m_seed++).second;
}
@@ -295,7 +295,7 @@ namespace InDet {
{
if(Zv < m_zmin || Zv > m_zmax) return false;
- std::list<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
if(v==ve) return true;
float dZmin = fabs((*v)-Zv); ++v;
@@ -308,7 +308,7 @@ namespace InDet {
inline float SiSpacePointsSeedMaker_Trigger::dZVertexMin(float& Z)
{
- std::list<float>::iterator v=l_vertex.begin(),ve=l_vertex.end();
+ std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
if(v==ve) return 0.;
float dZm = 1.E10;
@@ -321,18 +321,18 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
inline SiSpacePointForSeed* SiSpacePointsSeedMaker_Trigger::newSpacePoint
- (Trk::SpacePoint*const& sp)
+ (const Trk::SpacePoint*const& sp)
{
SiSpacePointForSeed* sps;
float r[3]; convertToBeamFrameWork(sp,r);
- if(i_spforseed!=l_spforseed.end()) {
- sps = (*i_spforseed++); sps->set(sp,r);
+ if(m_i_spforseed!=m_l_spforseed.end()) {
+ sps = (*m_i_spforseed++); sps->set(sp,r);
}
else {
- l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
- i_spforseed = l_spforseed.end();
+ m_l_spforseed.push_back((sps=new SiSpacePointForSeed(sp,r)));
+ m_i_spforseed = m_l_spforseed.end();
}
return sps;
@@ -346,16 +346,16 @@ namespace InDet {
(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
const float& z)
{
- if(i_seede!=l_seeds.end()) {
- SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ SiSpacePointsSeed* s = (*m_i_seede++);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(double(z));
}
else {
- l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(new SiSpacePointsSeed(p1,p2,z));
+ m_i_seede = m_l_seeds.end();
}
}
@@ -378,16 +378,16 @@ namespace InDet {
(*s0->spacePoints().begin())->clusterList().second ? q+=1000. : q+=10000.;
}
- if(i_seede!=l_seeds.end()) {
- InDet::SiSpacePointsSeed* s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ InDet::SiSpacePointsSeed* s = (*m_i_seede++);
*s = *s0;
m_mapSeeds.insert(std::make_pair(q,s));
}
else {
InDet::SiSpacePointsSeed* s = new InDet::SiSpacePointsSeed(*s0);
- l_seeds.push_back(s);
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(s);
+ m_i_seede = m_l_seeds.end();
m_mapSeeds.insert(std::make_pair(q,s));
}
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index aae52604c17b193a40e3ab5c009b2cb74b2be8de..48ffea8083af313b4e771b19eab61c76479fa3af 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -67,11 +67,11 @@ InDet::SiSpacePointsSeedMaker_ATLxk::SiSpacePointsSeedMaker_ATLxk
m_diversss = 50 ;
m_divermax = 20. ;
m_dazmax = .02 ;
- r_rmax = 600. ;
- r_rstep = 2. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 600. ;
+ m_r_rstep = 2. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 5000 ;
m_maxOneSize= 5 ;
m_SP = 0 ;
@@ -107,8 +107,8 @@ InDet::SiSpacePointsSeedMaker_ATLxk::SiSpacePointsSeedMaker_ATLxk
declareProperty("etaMin" ,m_etamin );
declareProperty("etaMax" ,m_etamax );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -150,20 +150,20 @@ InDet::SiSpacePointsSeedMaker_ATLxk::SiSpacePointsSeedMaker_ATLxk
InDet::SiSpacePointsSeedMaker_ATLxk::~SiSpacePointsSeedMaker_ATLxk()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_seedOutput) delete m_seedOutput;
@@ -261,22 +261,22 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
m_ipt2K = m_ipt2/(m_K*m_K);
m_ipt2C = m_ipt2*m_COF ;
m_COFK = m_COF*(m_K*m_K) ;
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
}
else {
- r_first = 0; fillLists(); return;
+ m_r_first = 0; fillLists(); return;
}
m_dbm ? m_checketa = false : m_checketa = m_dzdrmin > 1.;
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
- for(int i=0; i!=m_nr; ++i) {int n = r_index[i]; r_map[n] = 0; r_Sorted[n].clear();}
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
+ for(int i=0; i!=m_nr; ++i) {int n = m_r_index[i]; m_r_map[n] = 0; m_r_Sorted[n].clear();}
m_ns = m_nr = 0;
// Get pixels space points containers from store gate
//
- r_first = 0;
+ m_r_first = 0;
if(!m_dbm && m_pixel) {
// m_spacepointsPixel = 0;
@@ -294,7 +294,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
for(; sp != spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax) continue;
// Remove DBM space points
//
@@ -305,14 +305,14 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
- if(ir > r_first) r_first = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
+ if(ir > m_r_first) m_r_first = ir;
++m_ns;
}
}
}
- ++r_first;
+ ++m_r_first;
}
// Get sct space points containers from store gate
@@ -334,13 +334,13 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
for(; sp != spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -359,13 +359,13 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
for (; sp!=spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -395,21 +395,21 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration)
//
const InDetDD::SiDetectorElement* de=
static_cast<const InDetDD::SiDetectorElement*>((*sp)->clusterList().first->detectorElement());
- if(!de || !de->isDBM() || (*sp)->r() > r_rmax) continue;
+ if(!de || !de->isDBM() || (*sp)->r() > m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
- if(ir > r_first) r_first = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
+ if(ir > m_r_first) m_r_first = ir;
++m_ns;
}
}
}
- ++r_first;
+ ++m_r_first;
}
- if(iteration < 0) r_first = 0;
+ if(iteration < 0) m_r_first = 0;
fillLists();
}
@@ -442,15 +442,15 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
m_ipt2C = m_ipt2*m_COF ;
m_COFK = m_COF*(m_K*m_K) ;
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
- r_first = 0 ;
+ m_r_first = 0 ;
m_checketa = false ;
- for(int i=0; i!=m_nr; ++i) {int n = r_index[i]; r_map[n] = 0; r_Sorted[n].clear();}
+ for(int i=0; i!=m_nr; ++i) {int n = m_r_index[i]; m_r_map[n] = 0; m_r_Sorted[n].clear();}
m_ns = m_nr = 0;
// Get pixels space points containers from store gate
@@ -476,11 +476,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r > r_rmax) continue;
+ float r = (*sp)->r(); if(r > m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -510,11 +510,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r > r_rmax) continue;
+ float r = (*sp)->r(); if(r > m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -562,7 +562,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>&
if(newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -573,7 +573,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>&
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -594,7 +594,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
bool newv = newVertices(lv);
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -605,7 +605,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -627,7 +627,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
bool newv = newVertices(lv);
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -638,7 +638,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -662,7 +662,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp (const std::list<Trk::Vertex>&
if(newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -673,7 +673,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp (const std::list<Trk::Vertex>&
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -687,7 +687,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp (const std::list<Trk::Vertex>&
MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -735,10 +736,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpConditions( MsgStream& out )
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -847,7 +848,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpEvent( MsgStream& out ) cons
<<std::setw(12)<<m_nsazv
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -922,13 +923,13 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) production3Sp ();
else if(m_mode==5 || m_mode==6) production3Sp ();
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
++m_nlist;
}
@@ -939,21 +940,21 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findNext ()
bool InDet::SiSpacePointsSeedMaker_ATLxk::newVertices(const std::list<Trk::Vertex>& lV)
{
- unsigned int s1 = l_vertex.size();
+ unsigned int s1 = m_l_vertex.size();
unsigned int s2 = lV .size();
m_isvertex = false;
if(s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- l_vertex.clear();
+ m_l_vertex.clear();
if(s2 == 0) return false;
m_isvertex = true;
- for(v=lV.begin(); v!=lV.end(); ++v) {l_vertex.insert(float((*v).position().z()));}
+ for(v=lV.begin(); v!=lV.end(); ++v) {m_l_vertex.insert(float((*v).position().z()));}
- m_zminU = (*l_vertex. begin())-20.; if( m_zminU < m_zmin) m_zminU = m_zmin;
- m_zmaxU = (*l_vertex.rbegin())+20.; if( m_zmaxU > m_zmax) m_zmaxU = m_zmax;
+ m_zminU = (*m_l_vertex. begin())-20.; if( m_zminU < m_zmin) m_zminU = m_zmin;
+ m_zmaxU = (*m_l_vertex.rbegin())+20.; if( m_zmaxU > m_zmax) m_zmaxU = m_zmax;
return false;
}
@@ -968,7 +969,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
// For DBM reconstruction we use new parameters
//
- if ( m_dbm ) {r_rmax = 150.; r_rstep = .5; m_drmin = 2.; m_ptmin = 10.; m_diver = 150.;}
+ if ( m_dbm ) {m_r_rmax = 150.; m_r_rstep = .5; m_drmin = 2.; m_ptmin = 10.; m_diver = 150.;}
else if(m_ptmin < 100.) m_ptmin = 100.;
if(m_diversss < m_diver ) m_diversss = m_diver ;
@@ -978,7 +979,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
m_dzdrmax0 = 1./tan(2.*atan(exp(-m_etamax)));
m_dzdrmin0 = 1./tan(2.*atan(exp(-m_etamin)));
- m_r3max = r_rmax ;
+ m_r3max = m_r_rmax ;
m_COF = 134*.05*9. ;
m_ipt = 1./fabs(.9*m_ptmin) ;
m_ipt2 = m_ipt*m_ipt ;
@@ -988,27 +989,27 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 100./60. ;
+ const float sFmin = 100./60. ;
float ptm = 400.; if(!m_dbm && m_ptmin < ptm) ptm = m_ptmin;
- m_sF = ptm /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = ptm /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build radius-azimuthal-Z sorted containers for Z-vertices
//
@@ -1016,7 +1017,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
const float sFvmax = float(NFtmax)/pi2;
m_sFv = m_ptmin/120. ; if(m_sFv >sFvmax) m_sFv = sFvmax;
m_fvNmax = int(pi2*m_sFv); if(m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
- m_nrfzv = 0; for(int i=0; i!=300; ++i) {rfzv_index[i]=0; rfzv_map[i]=0;}
+ m_nrfzv = 0; for(int i=0; i!=300; ++i) {m_rfzv_index[i]=0; m_rfzv_map[i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -1032,62 +1033,62 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
- rfz_it[a][6] = a-1;
- rfz_it[a][7] = b-1;
- rfz_it[a][8] = c-1;
+ m_rfz_t [a] = 9 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
+ m_rfz_it[a][6] = a-1;
+ m_rfz_it[a][7] = b-1;
+ m_rfz_it[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a-1;
- rfz_ib[a][4] = b-1;
- rfz_ib[a][5] = c-1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
}
}
else {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a+1;
- rfz_ib[a][4] = b+1;
- rfz_ib[a][5] = c+1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a-1;
- rfz_it[a][4] = b-1;
- rfz_it[a][5] = c-1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a-1;
+ m_rfz_it[a][4] = b-1;
+ m_rfz_it[a][5] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a+2;
- rfz_ib[a][7] = b+2;
- rfz_ib[a][8] = c+2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a+2;
+ m_rfz_ib[a][7] = b+2;
+ m_rfz_ib[a][8] = c+2;
}
else if(z==7) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a-2;
- rfz_ib[a][7] = b-2;
- rfz_ib[a][8] = c-2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a-2;
+ m_rfz_ib[a][7] = b-2;
+ m_rfz_ib[a][8] = c-2;
}
}
}
@@ -1106,21 +1107,21 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
int a = f *3+z;
int b = fb*3+z;
int c = ft*3+z;
- rfzv_n[a] = 3;
- rfzv_i[a][0] = a;
- rfzv_i[a][1] = b;
- rfzv_i[a][2] = c;
+ m_rfzv_n[a] = 3;
+ m_rfzv_i[a][0] = a;
+ m_rfzv_i[a][1] = b;
+ m_rfzv_i[a][2] = c;
if (z>1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a-1;
- rfzv_i[a][4] = b-1;
- rfzv_i[a][5] = c-1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a-1;
+ m_rfzv_i[a][4] = b-1;
+ m_rfzv_i[a][5] = c-1;
}
else if(z<1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a+1;
- rfzv_i[a][4] = b+1;
- rfzv_i[a][5] = c+1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a+1;
+ m_rfzv_i[a][4] = b+1;
+ m_rfzv_i[a][5] = c+1;
}
}
}
@@ -1136,8 +1137,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildFrameWork()
if(!m_seedOutput) m_seedOutput = new InDet::SiSpacePointsSeed();
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
@@ -1180,7 +1181,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ATLxk::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
r[0] = float(sp->globalPosition().x())-m_xbeam[0];
@@ -1200,9 +1201,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
int ir0 = 0;
bool ibl = false;
- for(int i=r_first; i!=r_size; ++i) {
+ for(int i=m_r_first; i!=m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin(); re = r_Sorted[i].end();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
+
if(!ir0) ir0 = i;
if( m_iteration) {
@@ -1218,7 +1221,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1232,20 +1239,25 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
if(!m_iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
+
n = f*3+z; ++m_nsazv;
- rfzv_Sorted[n].push_back(*r); if(!rfzv_map[n]++) rfzv_index[m_nrfzv++] = n;
+ m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
}
}
- if(!m_sct && ir0 && float(ir0)*r_rstep < 43.) m_umax = -200.;
+ if(!m_sct && ir0 && float(ir0)*m_r_rstep < 43.) m_umax = -200.;
m_state = 0;
}
@@ -1256,13 +1268,13 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillLists()
void InDet::SiSpacePointsSeedMaker_ATLxk::erase()
{
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].clear();
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].clear();
}
for(int i=0; i!=m_nrfzv; ++i) {
- int n = rfzv_index[i]; rfzv_map[n] = 0;
- rfzv_Sorted[n].clear();
+ int n = m_rfzv_index[i]; m_rfzv_map[n] = 0;
+ m_rfzv_Sorted[n].clear();
}
m_state = 0;
m_nsaz = 0;
@@ -1307,9 +1319,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
int z = 0; if(!m_endlist) z = m_zMin;
for(; z!=3; ++z) {
- int a = f*3+z; if(!rfzv_map[a]) continue;
- r0 = rfzv_Sorted[a].begin();
- r0e = rfzv_Sorted[a].end ();
+ int a = f*3+z; if(!m_rfzv_map[a]) continue;
+ r0 = m_rfzv_Sorted[a].begin();
+ r0e = m_rfzv_Sorted[a].end ();
if(!m_endlist) {r0 = m_rMin; m_endlist = true;}
@@ -1320,28 +1332,31 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
// Bottom links production
//
- int NB = rfzv_n[a];
+ int NB = m_rfzv_n[a];
for(int i=0; i!=NB; ++i) {
- int an = rfzv_i[a][i];
- if(!rfzv_map[an]) continue;
+ int an = m_rfzv_i[a][i];
+ if(!m_rfzv_map[an]) continue;
- r = rfzv_Sorted[an].begin();
- re = rfzv_Sorted[an].end ();
+ r = m_rfzv_Sorted[an].begin();
+ re = m_rfzv_Sorted[an].end ();
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1363,7 +1378,8 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r),(*r0),Zo);
}
}
@@ -1399,19 +1415,19 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
if(!m_trigger) production3Sp (rb,rbe,rt,rte,NB,NT,nseed);
else production3SpTrigger(rb,rbe,rt,rte,NB,NT,nseed);
@@ -1871,14 +1887,14 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillSeeds ()
if(l!=lf && s->spacepoint0()->radius() < 43. && w > -200.) continue;
if(!s->setQuality(w)) continue;
- if(i_seede!=l_seeds.end()) {
- s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ s = (*m_i_seede++);
*s = *(*l).second;
}
else {
s = new SiSpacePointsProSeed(*(*l).second);
- l_seeds.push_back(s);
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(s);
+ m_i_seede = m_l_seeds.end();
}
if (s->spacepoint0()->spacepoint->clusterList().second) w-=3000.;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index 6ddfd00d8005481ed8b08d050fb76354bbcbe297..eba5f33b85a3eba15b6b483d3b2c4175fc0d92c5 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -59,11 +59,11 @@ InDet::SiSpacePointsSeedMaker_BeamGas::SiSpacePointsSeedMaker_BeamGas
m_diver = 10. ;
m_diverpps = 1.7 ;
m_dazmax = .02 ;
- r_rmax = 600. ;
- r_rstep = 2. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 600. ;
+ m_r_rstep = 2. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 1500 ;
m_maxOneSize= 5 ;
m_SP = 0 ;
@@ -91,8 +91,8 @@ InDet::SiSpacePointsSeedMaker_BeamGas::SiSpacePointsSeedMaker_BeamGas
declareProperty("usePixel" ,m_pixel );
declareProperty("useSCT" ,m_sct );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -126,20 +126,20 @@ InDet::SiSpacePointsSeedMaker_BeamGas::SiSpacePointsSeedMaker_BeamGas
InDet::SiSpacePointsSeedMaker_BeamGas::~SiSpacePointsSeedMaker_BeamGas()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_SP) delete [] m_SP;
@@ -216,7 +216,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::finalize()
void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
{
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -226,9 +227,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
+ float irstep = 1./m_r_rstep;
// Get pixels space points containers from store gate
//
@@ -249,13 +250,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
int ir = int(r*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -280,13 +281,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
int ir = int(r*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -305,13 +306,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent (int)
for (; sp!=spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
int ir = int(r*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -328,7 +329,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -338,9 +340,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
+ float irstep = 1./m_r_rstep;
// Get pixels space points containers from store gate
//
@@ -365,13 +367,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
int ir = int(r*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -401,13 +403,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
int ir = int(r*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -438,7 +440,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex>
if(!m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -448,7 +450,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex>
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -466,7 +468,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>
if(!m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -476,7 +478,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -499,7 +501,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp (const std::list<Trk::Vertex
if(!m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -509,7 +511,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp (const std::list<Trk::Vertex
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -522,7 +524,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp (const std::list<Trk::Vertex
MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -570,10 +573,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpConditions( MsgStream& out
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -664,7 +667,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpEvent( MsgStream& out ) co
<<std::setw(12)<<m_nsaz
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -739,12 +742,12 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) production3Sp ();
else if(m_mode==5 || m_mode==6) production3Sp ();
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
++m_nlist;
}
@@ -767,27 +770,27 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 100./60. ;
+ const float sFmin = 100./60. ;
- m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
- m_nrf = 0; for(int i=0; i!= 53; ++i) {rf_index [i]=0; rf_map [i]=0;}
+ m_nrf = 0; for(int i=0; i!= 53; ++i) {m_rf_index [i]=0; m_rf_map [i]=0;}
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -803,48 +806,48 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][3] = a+1; rfz_ib[a][3] = a+1;
- rfz_it[a][4] = b+1; rfz_ib[a][4] = b+1;
- rfz_it[a][5] = c+1; rfz_ib[a][5] = c+1;
- rfz_it[a][6] = a-1; rfz_ib[a][6] = a-1;
- rfz_it[a][7] = b-1; rfz_ib[a][7] = b-1;
- rfz_it[a][8] = c-1; rfz_ib[a][8] = c-1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][3] = a+1; m_rfz_ib[a][3] = a+1;
+ m_rfz_it[a][4] = b+1; m_rfz_ib[a][4] = b+1;
+ m_rfz_it[a][5] = c+1; m_rfz_ib[a][5] = c+1;
+ m_rfz_it[a][6] = a-1; m_rfz_ib[a][6] = a-1;
+ m_rfz_it[a][7] = b-1; m_rfz_ib[a][7] = b-1;
+ m_rfz_it[a][8] = c-1; m_rfz_ib[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ; rfz_t [a] = 6 ;
- rfz_ib[a][3] = a-1; rfz_it[a][3] = a-1;
- rfz_ib[a][4] = b-1; rfz_it[a][4] = b-1;
- rfz_ib[a][5] = c-1; rfz_it[a][5] = c-1;
+ m_rfz_b [a] = 6 ; m_rfz_t [a] = 6 ;
+ m_rfz_ib[a][3] = a-1; m_rfz_it[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1; m_rfz_it[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1; m_rfz_it[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][6] = a+1; rfz_ib[a][6] = a+1;
- rfz_it[a][7] = b+1; rfz_ib[a][7] = b+1;
- rfz_it[a][8] = c+1; rfz_ib[a][8] = c+1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][6] = a+1; m_rfz_ib[a][6] = a+1;
+ m_rfz_it[a][7] = b+1; m_rfz_ib[a][7] = b+1;
+ m_rfz_it[a][8] = c+1; m_rfz_ib[a][8] = c+1;
}
}
else {
- rfz_b [a] = 6 ; rfz_t [a] = 6 ;
- rfz_ib[a][3] = a+1; rfz_it[a][3] = a+1;
- rfz_ib[a][4] = b+1; rfz_it[a][4] = b+1;
- rfz_ib[a][5] = c+1; rfz_it[a][5] = c+1;
+ m_rfz_b [a] = 6 ; m_rfz_t [a] = 6 ;
+ m_rfz_ib[a][3] = a+1; m_rfz_it[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1; m_rfz_it[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1; m_rfz_it[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][6] = a-1; rfz_ib[a][6] = a-1;
- rfz_it[a][7] = b-1; rfz_ib[a][7] = b-1;
- rfz_it[a][8] = c-1; rfz_ib[a][8] = c-1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][6] = a-1; m_rfz_ib[a][6] = a-1;
+ m_rfz_it[a][7] = b-1; m_rfz_ib[a][7] = b-1;
+ m_rfz_it[a][8] = c-1; m_rfz_ib[a][8] = c-1;
}
}
}
@@ -859,8 +862,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::buildFrameWork()
if(!m_Zo) m_Zo = new float[m_maxsizeSP];
if(!m_OneSeeds) m_OneSeeds = new InDet::SiSpacePointsSeed [m_maxOneSize];
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
@@ -903,7 +906,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_BeamGas::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
float x = float(sp->globalPosition().x())-m_xbeam[0];
@@ -923,18 +926,24 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists()
const float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
- for(int i=0; i!= r_size; ++i) {
+ for(int i=0; i!= m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
- while(r!=r_Sorted[i].end()) {
+ while(r!=m_r_Sorted[i].end()) {
// Azimuthal angle sort
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
- rf_Sorted[f].push_back(*r); if(!rf_map[f]++) rf_index[m_nrf++] = f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
+
+ m_rf_Sorted[f].push_back(*r); if(!m_rf_map[f]++) m_rf_index[m_nrf++] = f;
int z; float Z = (*r)->z();
@@ -947,10 +956,10 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists()
Z>-250.?z=5:Z>-450.?z=4:Z>-925.?z=3:Z>-1400.?z=2:Z>-2500.?z=1:z= 0;
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
- r_Sorted[i].erase(r++);
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
+ m_r_Sorted[i].erase(r++);
}
- r_map[i] = 0;
+ m_r_map[i] = 0;
}
m_nr = 0;
m_state = 0;
@@ -963,18 +972,18 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillLists()
void InDet::SiSpacePointsSeedMaker_BeamGas::erase()
{
for(int i=0; i!=m_nr; ++i) {
- int n = r_index[i]; r_map[n] = 0;
- r_Sorted[n].erase(r_Sorted[n].begin(),r_Sorted[n].end());
+ int n = m_r_index[i]; m_r_map[n] = 0;
+ m_r_Sorted[n].erase(m_r_Sorted[n].begin(),m_r_Sorted[n].end());
}
for(int i=0; i!=m_nrf; ++i) {
- int n = rf_index[i]; rf_map[n] = 0;
- rf_Sorted[n].erase(rf_Sorted[n].begin(),rf_Sorted[n].end());
+ int n = m_rf_index[i]; m_rf_map[n] = 0;
+ m_rf_Sorted[n].erase(m_rf_Sorted[n].begin(),m_rf_Sorted[n].end());
}
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].erase(rfz_Sorted[n].begin(),rfz_Sorted[n].end());
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].erase(m_rfz_Sorted[n].begin(),m_rfz_Sorted[n].end());
}
m_state = 0;
@@ -1016,19 +1025,19 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
production3Sp(rb,rbe,rt,rte,NB,NT,nseed);
if(!m_endlist) {m_fNmin=f; m_zMin = z; return;}
@@ -1098,7 +1107,8 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::production3Sp
}
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index fbf6800ab1cafb1c93e00451f6199d0f75b87a43..c4675942f2db39ff9d8d494d1806d9a2c157d95c 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -49,11 +49,11 @@ InDet::SiSpacePointsSeedMaker_Cosmic::SiSpacePointsSeedMaker_Cosmic
m_zmin = -10000. ;
m_zmax = +10000. ;
m_diver = 10. ;
- r_rmax = 600. ;
- r_rstep = 5. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 600. ;
+ m_r_rstep = 5. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 1500 ;
m_SP = 0 ;
m_R = 0 ;
@@ -74,8 +74,8 @@ InDet::SiSpacePointsSeedMaker_Cosmic::SiSpacePointsSeedMaker_Cosmic
declareProperty("usePixel" ,m_pixel );
declareProperty("useSCT" ,m_sct );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -103,15 +103,15 @@ InDet::SiSpacePointsSeedMaker_Cosmic::SiSpacePointsSeedMaker_Cosmic
InDet::SiSpacePointsSeedMaker_Cosmic::~SiSpacePointsSeedMaker_Cosmic()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_SP) delete [] m_SP;
@@ -181,10 +181,11 @@ StatusCode InDet::SiSpacePointsSeedMaker_Cosmic::finalize()
void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent (int)
{
- if(!m_pixel && !m_sct) return; erase();
- i_spforseed = l_spforseed.begin();
+ if(!m_pixel && !m_sct) return;
+ erase();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
+ float irstep = 1./m_r_rstep;
float errorsc[4] = {16.,16.,100.,16.};
// Get pixels space points containers from store gate
@@ -206,14 +207,14 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
- int ir = int(((*sp)->globalPosition().y()+r_rmax)*irstep);
+ int ir = int(((*sp)->globalPosition().y()+m_r_rmax)*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp),errorsc);
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -238,14 +239,14 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
- int ir = int(((*sp)->globalPosition().y()+r_rmax)*irstep);
+ int ir = int(((*sp)->globalPosition().y()+m_r_rmax)*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp),errorsc);
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -264,14 +265,14 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent (int)
for (; sp!=spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
- int ir = int(((*sp)->globalPosition().y()+r_rmax)*irstep);
+ int ir = int(((*sp)->globalPosition().y()+m_r_rmax)*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp),errorsc);
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -288,10 +289,11 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
- if(!m_pixel && !m_sct) return; erase();
- i_spforseed = l_spforseed.begin();
+ if(!m_pixel && !m_sct) return;
+ erase();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
+ float irstep = 1./m_r_rstep;
float errorsc[4] = {16.,16.,100.,16.};
// Get pixels space points containers from store gate
@@ -317,13 +319,13 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
- int ir = int(((*sp)->globalPosition().y()+r_rmax)*irstep);
+ int ir = int(((*sp)->globalPosition().y()+m_r_rmax)*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp),errorsc);
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -353,13 +355,13 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
- int ir = int(((*sp)->globalPosition().y()+r_rmax)*irstep);
+ int ir = int(((*sp)->globalPosition().y()+m_r_rmax)*irstep);
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp),errorsc);
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -387,7 +389,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>&
{
int mode; lv.begin()!=lv.end() ? mode = 1 : mode = 0;
- m_nseeds = 0; l_seeds.erase(l_seeds.begin(),l_seeds.end());
+ m_nseeds = 0; m_l_seeds.erase(m_l_seeds.begin(),m_l_seeds.end());
if( !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
@@ -401,8 +403,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>&
production2Sp ();
}
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -418,7 +420,7 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>&
{
int mode; lv.begin()!=lv.end() ? mode = 3 : mode = 2;
- m_nseeds = 0; l_seeds.erase(l_seeds.begin(),l_seeds.end());
+ m_nseeds = 0; m_l_seeds.erase(m_l_seeds.begin(),m_l_seeds.end());
if(!m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
@@ -432,8 +434,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>&
production3Sp();
}
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -467,8 +469,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp (const std::list<Trk::Vertex>
production3Sp();
}
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -481,7 +483,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp (const std::list<Trk::Vertex>
MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -525,10 +528,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpConditions( MsgStream& out
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -566,7 +569,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpEvent( MsgStream& out ) con
<<std::setw(12)<<m_nsaz
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -647,27 +650,27 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep)*2;
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep)*2;
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 50./60. ;
+ const float sFmin = 50./60. ;
- m_sF = 50./60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = 50./60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
- m_nrf = 0; for(int i=0; i!= 53; ++i) {rf_index [i]=0; rf_map [i]=0;}
+ m_nrf = 0; for(int i=0; i!= 53; ++i) {m_rf_index [i]=0; m_rf_map [i]=0;}
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -683,62 +686,62 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][3] = a+1; rfz_ib[a][3] = a+1;
- rfz_it[a][4] = b+1; rfz_ib[a][4] = b+1;
- rfz_it[a][5] = c+1; rfz_ib[a][5] = c+1;
- rfz_it[a][6] = a-1; rfz_ib[a][6] = a-1;
- rfz_it[a][7] = b-1; rfz_ib[a][7] = b-1;
- rfz_it[a][8] = c-1; rfz_ib[a][8] = c-1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][3] = a+1; m_rfz_ib[a][3] = a+1;
+ m_rfz_it[a][4] = b+1; m_rfz_ib[a][4] = b+1;
+ m_rfz_it[a][5] = c+1; m_rfz_ib[a][5] = c+1;
+ m_rfz_it[a][6] = a-1; m_rfz_ib[a][6] = a-1;
+ m_rfz_it[a][7] = b-1; m_rfz_ib[a][7] = b-1;
+ m_rfz_it[a][8] = c-1; m_rfz_ib[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ; rfz_t [a] = 6 ;
- rfz_ib[a][3] = a-1; rfz_it[a][3] = a-1;
- rfz_ib[a][4] = b-1; rfz_it[a][4] = b-1;
- rfz_ib[a][5] = c-1; rfz_it[a][5] = c-1;
+ m_rfz_b [a] = 6 ; m_rfz_t [a] = 6 ;
+ m_rfz_ib[a][3] = a-1; m_rfz_it[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1; m_rfz_it[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1; m_rfz_it[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][6] = a+1; rfz_ib[a][6] = a+1;
- rfz_it[a][7] = b+1; rfz_ib[a][7] = b+1;
- rfz_it[a][8] = c+1; rfz_ib[a][8] = c+1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][6] = a+1; m_rfz_ib[a][6] = a+1;
+ m_rfz_it[a][7] = b+1; m_rfz_ib[a][7] = b+1;
+ m_rfz_it[a][8] = c+1; m_rfz_ib[a][8] = c+1;
}
}
else {
- rfz_b [a] = 6 ; rfz_t [a] = 6 ;
- rfz_ib[a][3] = a+1; rfz_it[a][3] = a+1;
- rfz_ib[a][4] = b+1; rfz_it[a][4] = b+1;
- rfz_ib[a][5] = c+1; rfz_it[a][5] = c+1;
+ m_rfz_b [a] = 6 ; m_rfz_t [a] = 6 ;
+ m_rfz_ib[a][3] = a+1; m_rfz_it[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1; m_rfz_it[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1; m_rfz_it[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 9 ; rfz_b [a] = 9 ;
- rfz_it[a][6] = a-1; rfz_ib[a][6] = a-1;
- rfz_it[a][7] = b-1; rfz_ib[a][7] = b-1;
- rfz_it[a][8] = c-1; rfz_ib[a][8] = c-1;
+ m_rfz_t [a] = 9 ; m_rfz_b [a] = 9 ;
+ m_rfz_it[a][6] = a-1; m_rfz_ib[a][6] = a-1;
+ m_rfz_it[a][7] = b-1; m_rfz_ib[a][7] = b-1;
+ m_rfz_it[a][8] = c-1; m_rfz_ib[a][8] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 12; rfz_t [a] = 12;
- rfz_ib[a][ 9] = a+2; rfz_it[a][ 9] = a+2;
- rfz_ib[a][10] = b+2; rfz_it[a][10] = b+2;
- rfz_ib[a][11] = c+2; rfz_it[a][11] = c+2;
+ m_rfz_b[a] = 12; m_rfz_t [a] = 12;
+ m_rfz_ib[a][ 9] = a+2; m_rfz_it[a][ 9] = a+2;
+ m_rfz_ib[a][10] = b+2; m_rfz_it[a][10] = b+2;
+ m_rfz_ib[a][11] = c+2; m_rfz_it[a][11] = c+2;
}
else if(z==7) {
- rfz_b[a] = 12; rfz_t [a] = 12;
- rfz_ib[a][ 9] = a-2; rfz_it[a][ 9] = a-2;
- rfz_ib[a][10] = b-2; rfz_it[a][10] = b-2;
- rfz_ib[a][11] = c-2; rfz_it[a][11] = c-2;
+ m_rfz_b[a] = 12; m_rfz_t [a] = 12;
+ m_rfz_ib[a][ 9] = a-2; m_rfz_it[a][ 9] = a-2;
+ m_rfz_ib[a][10] = b-2; m_rfz_it[a][10] = b-2;
+ m_rfz_ib[a][11] = c-2; m_rfz_it[a][11] = c-2;
}
}
}
@@ -761,19 +764,20 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists()
const float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
- for(int i=0; i!= r_size; ++i) {
+ for(int i=0; i!= m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
- while(r!=r_Sorted[i].end()) {
+ while(r!=m_r_Sorted[i].end()) {
// Azimuthal angle sort
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
- f = 1;
- rf_Sorted[f].push_back(*r); if(!rf_map[f]++) rf_index[m_nrf++] = f;
+ //int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = 1;
+ m_rf_Sorted[f].push_back(*r); if(!m_rf_map[f]++) m_rf_index[m_nrf++] = f;
int z; float Z = (*r)->z();
@@ -786,10 +790,10 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists()
Z>-250.?z=5:Z>-450.?z=4:Z>-925.?z=3:Z>-1400.?z=2:Z>-2500.?z=1:z= 0;
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
- r_Sorted[i].erase(r++);
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
+ m_r_Sorted[i].erase(r++);
}
- r_map[i] = 0;
+ m_r_map[i] = 0;
}
m_nr = 0;
m_state = 0;
@@ -802,18 +806,18 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::fillLists()
void InDet::SiSpacePointsSeedMaker_Cosmic::erase()
{
for(int i=0; i!=m_nr; ++i) {
- int n = r_index[i]; r_map[n] = 0;
- r_Sorted[n].erase(r_Sorted[n].begin(),r_Sorted[n].end());
+ int n = m_r_index[i]; m_r_map[n] = 0;
+ m_r_Sorted[n].erase(m_r_Sorted[n].begin(),m_r_Sorted[n].end());
}
for(int i=0; i!=m_nrf; ++i) {
- int n = rf_index[i]; rf_map[n] = 0;
- rf_Sorted[n].erase(rf_Sorted[n].begin(),rf_Sorted[n].end());
+ int n = m_rf_index[i]; m_rf_map[n] = 0;
+ m_rf_Sorted[n].erase(m_rf_Sorted[n].begin(),m_rf_Sorted[n].end());
}
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].erase(rfz_Sorted[n].begin(),rfz_Sorted[n].end());
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].erase(m_rfz_Sorted[n].begin(),m_rfz_Sorted[n].end());
}
m_state = 0;
@@ -865,19 +869,19 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
production3Sp(rb,rbe,rt,rte,NB,NT,K,ipt);
if(!m_endlist) {m_fNmin=f; m_zMin = z; return;}
@@ -907,19 +911,19 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3SpWithoutField()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
production3SpWithoutField(rb,rbe,rt,rte,NB,NT,ipt);
if(!m_endlist) {m_fNmin=f; m_zMin = z; return;}
@@ -996,7 +1000,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3Sp
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
@@ -1127,7 +1132,8 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::production3SpWithoutField
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index 739deda7e6d5f09d17479202d24d12933b05c9d4..850df7ef91a1ee2569c321015af120f582d4bcc1 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -59,11 +59,11 @@ InDet::SiSpacePointsSeedMaker_HeavyIon::SiSpacePointsSeedMaker_HeavyIon
m_diverpps = 1.7 ;
m_diversss = 1000 ;
m_dazmax = .02 ;
- r_rmax = 600. ;
- r_rstep = 2. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 600. ;
+ m_r_rstep = 2. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 4000 ;
m_maxOneSize= 6 ;
m_SP = 0 ;
@@ -91,8 +91,8 @@ InDet::SiSpacePointsSeedMaker_HeavyIon::SiSpacePointsSeedMaker_HeavyIon
declareProperty("usePixel" ,m_pixel );
declareProperty("useSCT" ,m_sct );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -131,20 +131,20 @@ InDet::SiSpacePointsSeedMaker_HeavyIon::SiSpacePointsSeedMaker_HeavyIon
InDet::SiSpacePointsSeedMaker_HeavyIon::~SiSpacePointsSeedMaker_HeavyIon()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_SP) delete [] m_SP;
@@ -210,7 +210,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::finalize()
void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -220,10 +221,10 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
// Get pixels space points containers from store gate
//
@@ -244,12 +245,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r < 43. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r < 43. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -274,12 +275,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -296,7 +297,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
@@ -307,10 +309,10 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
// Get pixels space points containers from store gate
//
@@ -335,12 +337,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -370,12 +372,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -408,7 +410,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex
if(newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -419,7 +421,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -440,7 +442,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -451,7 +453,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -477,7 +479,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Verte
if(newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -488,7 +490,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Verte
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -501,7 +503,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Verte
MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -549,10 +552,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions( MsgStream& ou
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -661,7 +664,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent( MsgStream& out ) c
<<std::setw(12)<<m_nsazv
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -736,12 +739,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) production3Sp ();
else if(m_mode==5 || m_mode==6) production3Sp ();
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
++m_nlist;
}
@@ -751,17 +754,17 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findNext ()
bool InDet::SiSpacePointsSeedMaker_HeavyIon::newVertices(const std::list<Trk::Vertex>& lV)
{
- unsigned int s1 = l_vertex.size();
+ unsigned int s1 = m_l_vertex.size();
unsigned int s2 = lV .size();
if(s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- l_vertex.erase(l_vertex.begin(),l_vertex.end());
+ m_l_vertex.erase(m_l_vertex.begin(),m_l_vertex.end());
for(v=lV.begin(); v!=lV.end(); ++v) {
- l_vertex.push_back(float((*v).position().z()));
- if(l_vertex.size() >= m_maxNumberVertices) break;
+ m_l_vertex.push_back(float((*v).position().z()));
+ if(m_l_vertex.size() >= m_maxNumberVertices) break;
}
return false;
}
@@ -776,7 +779,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
m_rapcut = fabs(m_rapcut) ;
m_dzdrmax = 1./tan(2.*atan(exp(-m_rapcut)));
m_dzdrmin =-m_dzdrmax ;
- m_r3max = r_rmax ;
+ m_r3max = m_r_rmax ;
m_COF = 134*.05*9. ;
m_ipt = 1./fabs(.9*m_ptmin) ;
m_ipt2 = m_ipt*m_ipt ;
@@ -786,25 +789,25 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 100./60. ;
+ const float sFmin = 100./60. ;
- m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build radius-azimuthal-Z sorted containers for Z-vertices
//
@@ -812,7 +815,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
const float sFvmax = float(NFtmax)/pi2;
m_sFv = m_ptmin/120. ; if(m_sFv >sFvmax) m_sFv = sFvmax;
m_fvNmax = int(pi2*m_sFv); if(m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
- m_nrfzv = 0; for(int i=0; i!=300; ++i) {rfzv_index[i]=0; rfzv_map[i]=0;}
+ m_nrfzv = 0; for(int i=0; i!=300; ++i) {m_rfzv_index[i]=0; m_rfzv_map[i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -828,62 +831,62 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
- rfz_it[a][6] = a-1;
- rfz_it[a][7] = b-1;
- rfz_it[a][8] = c-1;
+ m_rfz_t [a] = 9 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
+ m_rfz_it[a][6] = a-1;
+ m_rfz_it[a][7] = b-1;
+ m_rfz_it[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a-1;
- rfz_ib[a][4] = b-1;
- rfz_ib[a][5] = c-1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
}
}
else {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a+1;
- rfz_ib[a][4] = b+1;
- rfz_ib[a][5] = c+1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a-1;
- rfz_it[a][4] = b-1;
- rfz_it[a][5] = c-1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a-1;
+ m_rfz_it[a][4] = b-1;
+ m_rfz_it[a][5] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a+2;
- rfz_ib[a][7] = b+2;
- rfz_ib[a][8] = c+2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a+2;
+ m_rfz_ib[a][7] = b+2;
+ m_rfz_ib[a][8] = c+2;
}
else if(z==7) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a-2;
- rfz_ib[a][7] = b-2;
- rfz_ib[a][8] = c-2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a-2;
+ m_rfz_ib[a][7] = b-2;
+ m_rfz_ib[a][8] = c-2;
}
}
}
@@ -902,21 +905,21 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
int a = f *3+z;
int b = fb*3+z;
int c = ft*3+z;
- rfzv_n[a] = 3;
- rfzv_i[a][0] = a;
- rfzv_i[a][1] = b;
- rfzv_i[a][2] = c;
+ m_rfzv_n[a] = 3;
+ m_rfzv_i[a][0] = a;
+ m_rfzv_i[a][1] = b;
+ m_rfzv_i[a][2] = c;
if (z>1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a-1;
- rfzv_i[a][4] = b-1;
- rfzv_i[a][5] = c-1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a-1;
+ m_rfzv_i[a][4] = b-1;
+ m_rfzv_i[a][5] = c-1;
}
else if(z<1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a+1;
- rfzv_i[a][4] = b+1;
- rfzv_i[a][5] = c+1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a+1;
+ m_rfzv_i[a][4] = b+1;
+ m_rfzv_i[a][5] = c+1;
}
}
}
@@ -930,8 +933,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
if(!m_Zo) m_Zo = new float[m_maxsizeSP];
if(!m_OneSeeds) m_OneSeeds = new InDet::SiSpacePointsSeed [m_maxOneSize];
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
@@ -974,7 +977,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
r[0] = float(sp->globalPosition().x())-m_xbeam[0];
r[1] = float(sp->globalPosition().y())-m_ybeam[0];
@@ -990,17 +993,22 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
const float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
- for(int i=0; i!= r_size; ++i) {
+ for(int i=0; i!= m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
- while(r!=r_Sorted[i].end()) {
+ while(r!=m_r_Sorted[i].end()) {
// Azimuthal angle sort
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1013,20 +1021,24 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
Z>-250.?z=5:Z>-450.?z=4:Z>-925.?z=3:Z>-1400.?z=2:Z>-2500.?z=1:z= 0;
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
if((*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
n = f*3+z; ++m_nsazv;
- rfzv_Sorted[n].push_back(*r); if(!rfzv_map[n]++) rfzv_index[m_nrfzv++] = n;
+ m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
- r_Sorted[i].erase(r++);
+ m_r_Sorted[i].erase(r++);
}
- r_map[i] = 0;
+ m_r_map[i] = 0;
}
m_nr = 0;
m_state = 0;
@@ -1039,18 +1051,18 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
void InDet::SiSpacePointsSeedMaker_HeavyIon::erase()
{
for(int i=0; i!=m_nr; ++i) {
- int n = r_index[i]; r_map[n] = 0;
- r_Sorted[n].clear();
+ int n = m_r_index[i]; m_r_map[n] = 0;
+ m_r_Sorted[n].clear();
}
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].clear();
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].clear();
}
for(int i=0; i!=m_nrfzv; ++i) {
- int n = rfzv_index[i]; rfzv_map[n] = 0;
- rfzv_Sorted[n].clear();
+ int n = m_rfzv_index[i]; m_rfzv_map[n] = 0;
+ m_rfzv_Sorted[n].clear();
}
m_state = 0;
m_ns = 0;
@@ -1081,9 +1093,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
int z = 0; if(!m_endlist) z = m_zMin;
for(; z!=3; ++z) {
- int a = f*3+z; if(!rfzv_map[a]) continue;
- r0 = rfzv_Sorted[a].begin();
- r0e = rfzv_Sorted[a].end ();
+ int a = f*3+z; if(!m_rfzv_map[a]) continue;
+ r0 = m_rfzv_Sorted[a].begin();
+ r0e = m_rfzv_Sorted[a].end ();
if(!m_endlist) {r0 = m_rMin; m_endlist = true;}
@@ -1094,28 +1106,31 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
// Bottom links production
//
- int NB = rfzv_n[a];
+ int NB = m_rfzv_n[a];
for(int i=0; i!=NB; ++i) {
- int an = rfzv_i[a][i];
- if(!rfzv_map[an]) continue;
+ int an = m_rfzv_i[a][i];
+ if(!m_rfzv_map[an]) continue;
- r = rfzv_Sorted[an].begin();
- re = rfzv_Sorted[an].end ();
+ r = m_rfzv_Sorted[an].begin();
+ re = m_rfzv_Sorted[an].end ();
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1137,7 +1152,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r)->spacepoint,(*r0)->spacepoint,Zo);
}
}
@@ -1172,19 +1188,19 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
if(m_izvertex) {
if(!m_trigger) production3Sp (rb,rbe,rt,rte,NB,NT,nseed);
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index 358fe7bceff3d89ccc2afed9129b9a8b8ce1667a..e6c2306e0388911ebe0bb26824f81183957e2a52 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -67,14 +67,14 @@ InDet::SiSpacePointsSeedMaker_ITK::SiSpacePointsSeedMaker_ITK
m_diversss = 20 ;
m_divermax = 20. ;
m_dazmax = .02 ;
- r_rmax = 1100. ;
- r_rmin = 0. ;
+ m_r_rmax = 1100. ;
+ m_r_rmin = 0. ;
m_umax = 0. ;
- r_rstep = 2. ;
+ m_r_rstep = 2. ;
m_dzmaxPPP = 600. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 5000 ;
m_maxOneSize= 5 ;
m_SP = 0 ;
@@ -112,9 +112,9 @@ InDet::SiSpacePointsSeedMaker_ITK::SiSpacePointsSeedMaker_ITK
declareProperty("etaMin" ,m_etamin );
declareProperty("etaMax" ,m_etamax );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radMin" ,r_rmin );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radMin" ,m_r_rmin );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -157,20 +157,20 @@ InDet::SiSpacePointsSeedMaker_ITK::SiSpacePointsSeedMaker_ITK
InDet::SiSpacePointsSeedMaker_ITK::~SiSpacePointsSeedMaker_ITK()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_seedOutput) delete m_seedOutput;
@@ -221,7 +221,7 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::initialize()
}
}
- if(r_rmax < 1100.) r_rmax = 1100.;
+ if(m_r_rmax < 1100.) m_r_rmax = 1100.;
// Build framework
//
@@ -274,22 +274,22 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration)
m_ipt2K = m_ipt2/(m_K*m_K);
m_ipt2C = m_ipt2*m_COF ;
m_COFK = m_COF*(m_K*m_K) ;
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
}
else {
- r_first = 0; fillLists(); return;
+ m_r_first = 0; fillLists(); return;
}
m_checketa = m_dzdrmin > 1.;
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
- for(int i=0; i!=m_nr; ++i) {int n = r_index[i]; r_map[n] = 0; r_Sorted[n].clear();}
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
+ for(int i=0; i!=m_nr; ++i) {int n = m_r_index[i]; m_r_map[n] = 0; m_r_Sorted[n].clear();}
m_ns = m_nr = 0;
// Get pixels space points containers from store gate
//
- r_first = 0;
+ m_r_first = 0;
if(m_pixel) {
// m_spacepointsPixel = 0;
@@ -307,19 +307,19 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration)
for(; sp != spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax || (*sp)->r() < r_rmin ) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax || (*sp)->r() < m_r_rmin ) continue;
InDet::SiSpacePointForSeedITK* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
- if(ir > r_first) r_first = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
+ if(ir > m_r_first) m_r_first = ir;
++m_ns;
}
}
}
- ++r_first;
+ ++m_r_first;
}
// Get sct space points containers from store gate
@@ -340,13 +340,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration)
for(; sp != spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax || (*sp)->r() < r_rmin ) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax || (*sp)->r() < m_r_rmin ) continue;
InDet::SiSpacePointForSeedITK* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -365,20 +365,20 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration)
for (; sp!=spe; ++sp) {
- if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > r_rmax || (*sp)->r() < r_rmin) continue;
+ if ((m_useassoTool && isUsed(*sp)) || (*sp)->r() > m_r_rmax || (*sp)->r() < m_r_rmin) continue;
InDet::SiSpacePointForSeedITK* sps = newSpacePoint((*sp)); if(!sps) continue;
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
}
}
- if(iteration < 0) r_first = 0;
+ if(iteration < 0) m_r_first = 0;
fillLists();
}
@@ -410,15 +410,15 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
m_ipt2C = m_ipt2*m_COF ;
m_COFK = m_COF*(m_K*m_K) ;
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
- r_first = 0 ;
+ m_r_first = 0 ;
m_checketa = false ;
- for(int i=0; i!=m_nr; ++i) {int n = r_index[i]; r_map[n] = 0; r_Sorted[n].clear();}
+ for(int i=0; i!=m_nr; ++i) {int n = m_r_index[i]; m_r_map[n] = 0; m_r_Sorted[n].clear();}
m_ns = m_nr = 0;
// Get pixels space points containers from store gate
@@ -444,11 +444,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r > r_rmax || r < r_rmin) continue;
+ float r = (*sp)->r(); if(r > m_r_rmax || r < m_r_rmin) continue;
InDet::SiSpacePointForSeedITK* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -478,11 +478,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r > r_rmax || r < r_rmin) continue;
+ float r = (*sp)->r(); if(r > m_r_rmax || r < m_r_rmin) continue;
InDet::SiSpacePointForSeedITK* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -530,7 +530,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv
if(newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -541,7 +541,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -562,7 +562,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
bool newv = newVertices(lv);
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -573,7 +573,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -595,7 +595,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
bool newv = newVertices(lv);
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -606,7 +606,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -630,7 +630,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp (const std::list<Trk::Vertex>& l
if(newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -641,7 +641,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp (const std::list<Trk::Vertex>& l
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
if(m_outputlevel<=0) {
@@ -655,7 +655,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp (const std::list<Trk::Vertex>& l
MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -703,13 +704,13 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpConditions( MsgStream& out ) c
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| min radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmin
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmin
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -818,7 +819,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpEvent( MsgStream& out ) const
<<std::setw(12)<<m_nsazv
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -893,13 +894,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) production3Sp ();
else if(m_mode==5 || m_mode==6) production3Sp ();
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_seeds.begin();
++m_nlist;
}
@@ -910,21 +911,21 @@ void InDet::SiSpacePointsSeedMaker_ITK::findNext ()
bool InDet::SiSpacePointsSeedMaker_ITK::newVertices(const std::list<Trk::Vertex>& lV)
{
- unsigned int s1 = l_vertex.size();
+ unsigned int s1 = m_l_vertex.size();
unsigned int s2 = lV .size();
m_isvertex = false;
if(s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- l_vertex.clear();
+ m_l_vertex.clear();
if(s2 == 0) return false;
m_isvertex = true;
- for(v=lV.begin(); v!=lV.end(); ++v) {l_vertex.insert(float((*v).position().z()));}
+ for(v=lV.begin(); v!=lV.end(); ++v) {m_l_vertex.insert(float((*v).position().z()));}
- m_zminU = (*l_vertex. begin())-20.; if( m_zminU < m_zmin) m_zminU = m_zmin;
- m_zmaxU = (*l_vertex.rbegin())+20.; if( m_zmaxU > m_zmax) m_zmaxU = m_zmax;
+ m_zminU = (*m_l_vertex. begin())-20.; if( m_zminU < m_zmin) m_zminU = m_zmin;
+ m_zmaxU = (*m_l_vertex.rbegin())+20.; if( m_zmaxU > m_zmax) m_zmaxU = m_zmax;
return false;
}
@@ -955,28 +956,28 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeedITK*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeedITK*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 100./60. ;
+ const float sFmin = 100./60. ;
float ptm = 400.; if(m_ptmin < ptm) ptm = m_ptmin;
- m_sF = ptm /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = ptm /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build radius-azimuthal-Z sorted containers for Z-vertices
//
@@ -984,7 +985,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
const float sFvmax = float(NFtmax)/pi2;
m_sFv = m_ptmin/120. ; if(m_sFv >sFvmax) m_sFv = sFvmax;
m_fvNmax = int(pi2*m_sFv); if(m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
- m_nrfzv = 0; for(int i=0; i!=300; ++i) {rfzv_index[i]=0; rfzv_map[i]=0;}
+ m_nrfzv = 0; for(int i=0; i!=300; ++i) {m_rfzv_index[i]=0; m_rfzv_map[i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -1000,62 +1001,62 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
- rfz_it[a][6] = a-1;
- rfz_it[a][7] = b-1;
- rfz_it[a][8] = c-1;
+ m_rfz_t [a] = 9 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
+ m_rfz_it[a][6] = a-1;
+ m_rfz_it[a][7] = b-1;
+ m_rfz_it[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a-1;
- rfz_ib[a][4] = b-1;
- rfz_ib[a][5] = c-1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
}
}
else {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a+1;
- rfz_ib[a][4] = b+1;
- rfz_ib[a][5] = c+1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a-1;
- rfz_it[a][4] = b-1;
- rfz_it[a][5] = c-1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a-1;
+ m_rfz_it[a][4] = b-1;
+ m_rfz_it[a][5] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a+2;
- rfz_ib[a][7] = b+2;
- rfz_ib[a][8] = c+2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a+2;
+ m_rfz_ib[a][7] = b+2;
+ m_rfz_ib[a][8] = c+2;
}
else if(z==7) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a-2;
- rfz_ib[a][7] = b-2;
- rfz_ib[a][8] = c-2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a-2;
+ m_rfz_ib[a][7] = b-2;
+ m_rfz_ib[a][8] = c-2;
}
}
}
@@ -1074,21 +1075,21 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
int a = f *3+z;
int b = fb*3+z;
int c = ft*3+z;
- rfzv_n[a] = 3;
- rfzv_i[a][0] = a;
- rfzv_i[a][1] = b;
- rfzv_i[a][2] = c;
+ m_rfzv_n[a] = 3;
+ m_rfzv_i[a][0] = a;
+ m_rfzv_i[a][1] = b;
+ m_rfzv_i[a][2] = c;
if (z>1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a-1;
- rfzv_i[a][4] = b-1;
- rfzv_i[a][5] = c-1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a-1;
+ m_rfzv_i[a][4] = b-1;
+ m_rfzv_i[a][5] = c-1;
}
else if(z<1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a+1;
- rfzv_i[a][4] = b+1;
- rfzv_i[a][5] = c+1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a+1;
+ m_rfzv_i[a][4] = b+1;
+ m_rfzv_i[a][5] = c+1;
}
}
}
@@ -1106,8 +1107,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildFrameWork()
if(!m_seedOutput) m_seedOutput = new InDet::SiSpacePointsSeed();
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
@@ -1149,7 +1150,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::buildBeamFrameWork()
// Initiate beam frame work for seed generator
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ITK::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
r[0] = float(sp->globalPosition().x())-m_xbeam[0];
@@ -1207,9 +1208,10 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
int ir0 =0;
- for(int i=r_first; i!=r_size; ++i) {
+ for(int i=m_r_first; i!=m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin(); re = r_Sorted[i].end();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin(); re = m_r_Sorted[i].end();
if(!ir0) ir0 = i;
if(m_iteration && (*r)->spacepoint->clusterList().second) break;
@@ -1220,7 +1222,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1234,16 +1240,21 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
if(!m_iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
- n = f*3+z; ++m_nsazv;
- rfzv_Sorted[n].push_back(*r); if(!rfzv_map[n]++) rfzv_index[m_nrfzv++] = n;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f += m_fvNmax;
+ else if (f> m_fvNmax)
+ f -= m_fvNmax;
+
+ n = f*3+z; ++m_nsazv;
+ m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
}
}
@@ -1257,13 +1268,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists()
void InDet::SiSpacePointsSeedMaker_ITK::erase()
{
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].clear();
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].clear();
}
for(int i=0; i!=m_nrfzv; ++i) {
- int n = rfzv_index[i]; rfzv_map[n] = 0;
- rfzv_Sorted[n].clear();
+ int n = m_rfzv_index[i]; m_rfzv_map[n] = 0;
+ m_rfzv_Sorted[n].clear();
}
m_state = 0;
m_nsaz = 0;
@@ -1307,9 +1318,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
int z = 0; if(!m_endlist) z = m_zMin;
for(; z!=3; ++z) {
- int a = f*3+z; if(!rfzv_map[a]) continue;
- r0 = rfzv_Sorted[a].begin();
- r0e = rfzv_Sorted[a].end ();
+ int a = f*3+z; if(!m_rfzv_map[a]) continue;
+ r0 = m_rfzv_Sorted[a].begin();
+ r0e = m_rfzv_Sorted[a].end ();
if(!m_endlist) {r0 = m_rMin; m_endlist = true;}
@@ -1320,28 +1331,31 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
// Bottom links production
//
- int NB = rfzv_n[a];
+ int NB = m_rfzv_n[a];
for(int i=0; i!=NB; ++i) {
- int an = rfzv_i[a][i];
- if(!rfzv_map[an]) continue;
+ int an = m_rfzv_i[a][i];
+ if(!m_rfzv_map[an]) continue;
- r = rfzv_Sorted[an].begin();
- re = rfzv_Sorted[an].end ();
+ r = m_rfzv_Sorted[an].begin();
+ re = m_rfzv_Sorted[an].end ();
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1363,7 +1377,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r),(*r0),Zo);
}
}
@@ -1399,19 +1414,19 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
if(m_iteration == 0 && m_iteration0 ==0) production3SpSSS(rb,rbe,rt,rte,NB,NT,nseed);
@@ -2080,14 +2095,14 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds ()
if(l!=lf && s->spacepoint0()->radius() < 43. && w > -200.) continue;
if(!s->setQuality(w)) continue;
- if(i_seede!=l_seeds.end()) {
- s = (*i_seede++);
+ if(m_i_seede!=m_l_seeds.end()) {
+ s = (*m_i_seede++);
*s = *(*l).second;
}
else {
s = new SiSpacePointsProSeedITK(*(*l).second);
- l_seeds.push_back(s);
- i_seede = l_seeds.end();
+ m_l_seeds.push_back(s);
+ m_i_seede = m_l_seeds.end();
}
if (s->spacepoint0()->spacepoint->clusterList().second) w-=3000.;
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index ce7b60342fc1e8a126da9d1910117852b935dc4d..5b44873edab97dfb8c5664e2d7e94e3d9d400a94 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -60,11 +60,11 @@ InDet::SiSpacePointsSeedMaker_LowMomentum::SiSpacePointsSeedMaker_LowMomentum
m_diverpps = 1.2 ;
m_dazmax = .02 ;
m_iptmax = 1./400. ;
- r_rmax = 200. ;
- r_rstep = 2. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 200. ;
+ m_r_rstep = 2. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 1500 ;
m_maxOneSize = 5 ;
m_SP = 0 ;
@@ -95,8 +95,8 @@ InDet::SiSpacePointsSeedMaker_LowMomentum::SiSpacePointsSeedMaker_LowMomentum
declareProperty("useSCT" ,m_sct );
declareProperty("pTmin" ,m_ptmin );
declareProperty("pTmax" ,m_ptmax );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -130,20 +130,20 @@ InDet::SiSpacePointsSeedMaker_LowMomentum::SiSpacePointsSeedMaker_LowMomentum
InDet::SiSpacePointsSeedMaker_LowMomentum::~SiSpacePointsSeedMaker_LowMomentum()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_SP) delete [] m_SP;
@@ -220,12 +220,13 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::finalize()
void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
- i_spforseed = l_spforseed.begin();
+ if(!m_pixel && !m_sct) return;
+ erase();
+ m_i_spforseed = m_l_spforseed.begin();
buildBeamFrameWork();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
// Get pixels space points containers from store gate
//
@@ -246,14 +247,14 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -278,14 +279,14 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -302,12 +303,13 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
- i_spforseed = l_spforseed.begin();
+ if(!m_pixel && !m_sct) return;
+ erase();
+ m_i_spforseed = m_l_spforseed.begin();
buildBeamFrameWork();
- int irmax = r_size-1 ;
- float irstep = 1./r_rstep;
+ int irmax = m_r_size-1 ;
+ float irstep = 1./m_r_rstep;
// Get pixels space points containers from store gate
//
@@ -332,14 +334,14 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -369,14 +371,14 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
if(m_useassoTool && isUsed(*sp) ) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -407,7 +409,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Ver
if(newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -417,7 +419,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Ver
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -436,7 +438,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Ver
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -446,7 +448,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Ver
m_zMin = 0 ;
production3Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -471,7 +473,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp (const std::list<Trk::Ve
if(newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -481,7 +483,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp (const std::list<Trk::Ve
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -494,7 +496,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp (const std::list<Trk::Ve
MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -547,10 +550,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpConditions( MsgStream&
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -641,7 +644,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpEvent( MsgStream& out
<<std::setw(12)<<m_nsaz
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -716,7 +719,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) {
@@ -729,7 +732,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findNext ()
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
++m_nlist;
}
@@ -739,16 +742,16 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findNext ()
bool InDet::SiSpacePointsSeedMaker_LowMomentum::newVertices(const std::list<Trk::Vertex>& lV)
{
- unsigned int s1 = l_vertex.size();
+ unsigned int s1 = m_l_vertex.size();
unsigned int s2 = lV .size();
if(s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- l_vertex.erase(l_vertex.begin(),l_vertex.end());
+ m_l_vertex.erase(m_l_vertex.begin(),m_l_vertex.end());
for(v=lV.begin(); v!=lV.end(); ++v) {
- l_vertex.push_back(float((*v).position().z()));
+ m_l_vertex.push_back(float((*v).position().z()));
}
return false;
}
@@ -765,17 +768,17 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildFrameWork()
m_rapcut = fabs(m_rapcut) ;
m_dzdrmax = 1./tan(2.*atan(exp(-m_rapcut)));
m_dzdrmin =-m_dzdrmax ;
- m_r3max = r_rmax ;
+ m_r3max = m_r_rmax ;
m_ns = m_nsaz = m_nr = m_nrfz = 0;
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
@@ -790,7 +793,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildFrameWork()
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=220; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=220; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
@@ -807,62 +810,62 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
- rfz_it[a][6] = a-1;
- rfz_it[a][7] = b-1;
- rfz_it[a][8] = c-1;
+ m_rfz_t [a] = 9 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
+ m_rfz_it[a][6] = a-1;
+ m_rfz_it[a][7] = b-1;
+ m_rfz_it[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a-1;
- rfz_ib[a][4] = b-1;
- rfz_ib[a][5] = c-1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
}
}
else {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a+1;
- rfz_ib[a][4] = b+1;
- rfz_ib[a][5] = c+1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a-1;
- rfz_it[a][4] = b-1;
- rfz_it[a][5] = c-1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a-1;
+ m_rfz_it[a][4] = b-1;
+ m_rfz_it[a][5] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a+2;
- rfz_ib[a][7] = b+2;
- rfz_ib[a][8] = c+2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a+2;
+ m_rfz_ib[a][7] = b+2;
+ m_rfz_ib[a][8] = c+2;
}
else if(z==7) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a-2;
- rfz_ib[a][7] = b-2;
- rfz_ib[a][8] = c-2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a-2;
+ m_rfz_ib[a][7] = b-2;
+ m_rfz_ib[a][8] = c-2;
}
}
}
@@ -876,8 +879,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildFrameWork()
if(!m_Zo) m_Zo = new float[m_maxsizeSP];
if(!m_OneSeeds) m_OneSeeds = new InDet::SiSpacePointsSeed [m_maxOneSize];
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
@@ -920,7 +923,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_LowMomentum::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
r[0] = float(sp->globalPosition().x())-m_xbeam[0];
@@ -937,17 +940,22 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists()
const float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
- for(int i=0; i!= r_size; ++i) {
+ for(int i=0; i!= m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
- while(r!=r_Sorted[i].end()) {
+ while(r!=m_r_Sorted[i].end()) {
// Azimuthal angle sort
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -960,10 +968,10 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists()
Z>-250.?z=5:Z>-450.?z=4:Z>-925.?z=3:Z>-1400.?z=2:Z>-2500.?z=1:z= 0;
}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
- r_Sorted[i].erase(r++);
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
+ m_r_Sorted[i].erase(r++);
}
- r_map[i] = 0;
+ m_r_map[i] = 0;
}
m_nr = 0;
m_state = 0;
@@ -976,13 +984,13 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillLists()
void InDet::SiSpacePointsSeedMaker_LowMomentum::erase()
{
for(int i=0; i!=m_nr; ++i) {
- int n = r_index[i]; r_map[n] = 0;
- r_Sorted[n].clear();
+ int n = m_r_index[i]; m_r_map[n] = 0;
+ m_r_Sorted[n].clear();
}
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].clear();
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].clear();
}
m_state = 0;
@@ -1032,19 +1040,20 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z];
+ if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
production3Sp(rb,rbe,rt,rte,NB,NT,nseed,K);
if(!m_endlist) {m_fNmin=f; m_zMin = z; return;}
@@ -1116,7 +1125,8 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::production3Sp
}
}
breakb:
- if(!Nb || Nb==m_maxsizeSP) continue; int Nt = Nb;
+ if(!Nb || Nb==m_maxsizeSP) continue;
+ int Nt = Nb;
// Top links production
//
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index 68fc6c02892782a7023ebde395e02029544a6c6d..de47c9b2513ec31343ed69936356cf906b83e4e6 100755
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -59,11 +59,11 @@ InDet::SiSpacePointsSeedMaker_Trigger::SiSpacePointsSeedMaker_Trigger
m_diverpps = 1.7 ;
m_diversss = 1000. ;
m_dazmax = .02 ;
- r_rmax = 600. ;
- r_rstep = 2. ;
- r_Sorted = 0 ;
- r_index = 0 ;
- r_map = 0 ;
+ m_r_rmax = 600. ;
+ m_r_rstep = 2. ;
+ m_r_Sorted = 0 ;
+ m_r_index = 0 ;
+ m_r_map = 0 ;
m_maxsizeSP = 1500 ;
m_maxOneSize= 3 ;
m_SP = 0 ;
@@ -93,8 +93,8 @@ InDet::SiSpacePointsSeedMaker_Trigger::SiSpacePointsSeedMaker_Trigger
declareProperty("usePixel" ,m_pixel );
declareProperty("useSCT" ,m_sct );
declareProperty("pTmin" ,m_ptmin );
- declareProperty("radMax" ,r_rmax );
- declareProperty("radStep" ,r_rstep );
+ declareProperty("radMax" ,m_r_rmax );
+ declareProperty("radStep" ,m_r_rstep );
declareProperty("maxSize" ,m_maxsize );
declareProperty("maxSizeSP" ,m_maxsizeSP );
declareProperty("minZ" ,m_zmin );
@@ -133,20 +133,20 @@ InDet::SiSpacePointsSeedMaker_Trigger::SiSpacePointsSeedMaker_Trigger
InDet::SiSpacePointsSeedMaker_Trigger::~SiSpacePointsSeedMaker_Trigger()
{
- if(r_index ) delete [] r_index ;
- if(r_map ) delete [] r_map ;
- if(r_Sorted) delete [] r_Sorted;
+ if(m_r_index ) delete [] m_r_index ;
+ if(m_r_map ) delete [] m_r_map ;
+ if(m_r_Sorted) delete [] m_r_Sorted;
// Delete seeds
//
- for(i_seed=l_seeds.begin(); i_seed!=l_seeds.end (); ++i_seed) {
- delete *i_seed;
+ for(m_i_seed=m_l_seeds.begin(); m_i_seed!=m_l_seeds.end (); ++m_i_seed) {
+ delete *m_i_seed;
}
// Delete space points for reconstruction
//
- i_spforseed=l_spforseed.begin();
- for(; i_spforseed!=l_spforseed.end(); ++i_spforseed) {
- delete *i_spforseed;
+ m_i_spforseed=m_l_spforseed.begin();
+ for(; m_i_spforseed!=m_l_spforseed.end(); ++m_i_spforseed) {
+ delete *m_i_spforseed;
}
if(m_SP) delete [] m_SP;
@@ -212,7 +212,8 @@ StatusCode InDet::SiSpacePointsSeedMaker_Trigger::finalize()
void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
double f[3], gP[3] ={10.,10.,0.};
@@ -222,10 +223,10 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
// Get pixels space points containers from store gate
//
@@ -246,13 +247,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -278,13 +279,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -304,13 +305,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newEvent (int)
for (; sp!=spe; ++sp) {
float r = (*sp)->r();
- if(r<0. || r>=r_rmax) continue;
+ if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -327,7 +328,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
m_trigger = false;
- if(!m_pixel && !m_sct) return; erase();
+ if(!m_pixel && !m_sct) return;
+ erase();
buildBeamFrameWork();
@@ -337,10 +339,10 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
}
else m_K = 2./(300.* 5. );
- i_spforseed = l_spforseed.begin();
+ m_i_spforseed = m_l_spforseed.begin();
- float irstep = 1./r_rstep;
- int irmax = r_size-1 ;
+ float irstep = 1./m_r_rstep;
+ int irmax = m_r_size-1 ;
// Get pixels space points containers from store gate
//
@@ -365,13 +367,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -401,13 +403,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
for(; sp != spe; ++sp) {
- float r = (*sp)->r(); if(r<0. || r>=r_rmax) continue;
+ float r = (*sp)->r(); if(r<0. || r>=m_r_rmax) continue;
InDet::SiSpacePointForSeed* sps = newSpacePoint((*sp));
int ir = int(sps->radius()*irstep); if(ir>irmax) ir = irmax;
- r_Sorted[ir].push_back(sps); ++r_map[ir];
- if(r_map[ir]==1) r_index[m_nr++] = ir;
+ m_r_Sorted[ir].push_back(sps); ++m_r_map[ir];
+ if(m_r_map[ir]==1) m_r_index[m_nr++] = ir;
++m_ns;
}
}
@@ -453,7 +455,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex>
if(newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
m_state = 1 ;
m_nspoint = 2 ;
m_nlist = 0 ;
@@ -464,7 +466,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex>
m_zMin = 0 ;
production2Sp ();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
if(m_outputlevel<=0) {
m_nprint=1; msg(MSG::DEBUG)<<(*this)<<endmsg;
@@ -484,7 +486,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>
if(newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 3 ;
m_nlist = 0 ;
@@ -495,7 +497,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_mapSeeds.begin();
m_seede = m_mapSeeds.end ();
@@ -523,7 +525,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp (const std::list<Trk::Vertex
if(newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
- i_seede = l_seeds.begin() ;
+ m_i_seede = m_l_seeds.begin() ;
m_state = 1 ;
m_nspoint = 4 ;
m_nlist = 0 ;
@@ -534,7 +536,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp (const std::list<Trk::Vertex
m_zMin = 0 ;
production3Sp();
}
- i_seed = l_seeds.begin ();
+ m_i_seed = m_l_seeds.begin ();
m_seed = m_mapSeeds.begin();
m_seede = m_mapSeeds.end ();
@@ -549,7 +551,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp (const std::list<Trk::Vertex
MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dump( MsgStream& out ) const
{
- if(m_nprint) return dumpEvent(out); return dumpConditions(out);
+ if(m_nprint) return dumpEvent(out);
+ return dumpConditions(out);
}
///////////////////////////////////////////////////////////////////
@@ -597,10 +600,10 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpConditions( MsgStream& out
<<std::setw(12)<<std::setprecision(5)<<m_rapcut
<<" |"<<std::endl;
out<<"| max radius SP | "
- <<std::setw(12)<<std::setprecision(5)<<r_rmax
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rmax
<<" |"<<std::endl;
out<<"| radius step | "
- <<std::setw(12)<<std::setprecision(5)<<r_rstep
+ <<std::setw(12)<<std::setprecision(5)<<m_r_rstep
<<" |"<<std::endl;
out<<"| min Z-vertex position | "
<<std::setw(12)<<std::setprecision(5)<<m_zmin
@@ -709,7 +712,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpEvent( MsgStream& out ) co
<<std::setw(12)<<m_nsazv
<<" |"<<std::endl;
out<<"| seeds | "
- <<std::setw(12)<<l_seeds.size()
+ <<std::setw(12)<<m_l_seeds.size()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
@@ -784,13 +787,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findNext ()
{
if(m_endlist) return;
- i_seede = l_seeds.begin();
+ m_i_seede = m_l_seeds.begin();
if (m_mode==0 || m_mode==1) production2Sp ();
else if(m_mode==2 || m_mode==3) production3Sp ();
else if(m_mode==5 || m_mode==6) production3Sp ();
- i_seed = l_seeds.begin();
+ m_i_seed = m_l_seeds.begin();
m_seed = m_mapSeeds.begin();
m_seede = m_mapSeeds.end ();
++m_nlist;
@@ -802,17 +805,17 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findNext ()
bool InDet::SiSpacePointsSeedMaker_Trigger::newVertices(const std::list<Trk::Vertex>& lV)
{
- unsigned int s1 = l_vertex.size();
+ unsigned int s1 = m_l_vertex.size();
unsigned int s2 = lV .size();
if(s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- l_vertex.erase(l_vertex.begin(),l_vertex.end());
+ m_l_vertex.erase(m_l_vertex.begin(),m_l_vertex.end());
for(v=lV.begin(); v!=lV.end(); ++v) {
- l_vertex.push_back(float((*v).position().z()));
- if(l_vertex.size() >= m_maxNumberVertices) break;
+ m_l_vertex.push_back(float((*v).position().z()));
+ if(m_l_vertex.size() >= m_maxNumberVertices) break;
}
return false;
}
@@ -827,7 +830,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
m_rapcut = fabs(m_rapcut) ;
m_dzdrmax = 1./tan(2.*atan(exp(-m_rapcut)));
m_dzdrmin =-m_dzdrmax ;
- m_r3max = r_rmax ;
+ m_r3max = m_r_rmax ;
m_COF = 134*.05*9. ;
m_ipt = 1./fabs(.9*m_ptmin) ;
m_ipt2 = m_ipt*m_ipt ;
@@ -837,26 +840,26 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
// Build radius sorted containers
//
- r_size = int((r_rmax+.1)/r_rstep);
- r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[r_size];
- r_index = new int[r_size];
- r_map = new int[r_size];
- m_nr = 0; for(int i=0; i!=r_size; ++i) {r_index[i]=0; r_map[i]=0;}
+ m_r_size = int((m_r_rmax+.1)/m_r_rstep);
+ m_r_Sorted = new std::list<InDet::SiSpacePointForSeed*>[m_r_size];
+ m_r_index = new int[m_r_size];
+ m_r_map = new int[m_r_size];
+ m_nr = 0; for(int i=0; i!=m_r_size; ++i) {m_r_index[i]=0; m_r_map[i]=0;}
// Build radius-azimuthal sorted containers
//
const float pi2 = 2.*M_PI ;
const int NFmax = 53 ;
const float sFmax = float(NFmax )/pi2;
- const float m_sFmin = 100./60. ;
+ const float sFmin = 100./60. ;
- m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < m_sFmin) m_sF = m_sFmin;
+ m_sF = m_ptmin /60. ; if(m_sF >sFmax ) m_sF = sFmax ; else if(m_sF < sFmin) m_sF = sFmin;
m_fNmax = int(pi2*m_sF); if(m_fNmax >=NFmax) m_fNmax = NFmax-1;
// Build radius-azimuthal-Z sorted containers
//
- m_nrfz = 0; for(int i=0; i!=583; ++i) {rfz_index [i]=0; rfz_map [i]=0;}
+ m_nrfz = 0; for(int i=0; i!=583; ++i) {m_rfz_index [i]=0; m_rfz_map [i]=0;}
// Build radius-azimuthal-Z sorted containers for Z-vertices
//
@@ -864,7 +867,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
const float sFvmax = float(NFtmax)/pi2;
m_sFv = m_ptmin/120. ; if(m_sFv >sFvmax) m_sFv = sFvmax;
m_fvNmax = int(pi2*m_sFv); if(m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
- m_nrfzv = 0; for(int i=0; i!=300; ++i) {rfzv_index[i]=0; rfzv_map[i]=0;}
+ m_nrfzv = 0; for(int i=0; i!=300; ++i) {m_rfzv_index[i]=0; m_rfzv_map[i]=0;}
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -880,62 +883,62 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
int a = f *11+z;
int b = fb*11+z;
int c = ft*11+z;
- rfz_b [a] = 3; rfz_t [a] = 3;
- rfz_ib[a][0] = a; rfz_it[a][0] = a;
- rfz_ib[a][1] = b; rfz_it[a][1] = b;
- rfz_ib[a][2] = c; rfz_it[a][2] = c;
+ m_rfz_b [a] = 3; m_rfz_t [a] = 3;
+ m_rfz_ib[a][0] = a; m_rfz_it[a][0] = a;
+ m_rfz_ib[a][1] = b; m_rfz_it[a][1] = b;
+ m_rfz_ib[a][2] = c; m_rfz_it[a][2] = c;
if (z==5) {
- rfz_t [a] = 9 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
- rfz_it[a][6] = a-1;
- rfz_it[a][7] = b-1;
- rfz_it[a][8] = c-1;
+ m_rfz_t [a] = 9 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
+ m_rfz_it[a][6] = a-1;
+ m_rfz_it[a][7] = b-1;
+ m_rfz_it[a][8] = c-1;
}
else if(z> 5) {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a-1;
- rfz_ib[a][4] = b-1;
- rfz_ib[a][5] = c-1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a-1;
+ m_rfz_ib[a][4] = b-1;
+ m_rfz_ib[a][5] = c-1;
if(z<10) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a+1;
- rfz_it[a][4] = b+1;
- rfz_it[a][5] = c+1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a+1;
+ m_rfz_it[a][4] = b+1;
+ m_rfz_it[a][5] = c+1;
}
}
else {
- rfz_b [a] = 6 ;
- rfz_ib[a][3] = a+1;
- rfz_ib[a][4] = b+1;
- rfz_ib[a][5] = c+1;
+ m_rfz_b [a] = 6 ;
+ m_rfz_ib[a][3] = a+1;
+ m_rfz_ib[a][4] = b+1;
+ m_rfz_ib[a][5] = c+1;
if(z>0) {
- rfz_t [a] = 6 ;
- rfz_it[a][3] = a-1;
- rfz_it[a][4] = b-1;
- rfz_it[a][5] = c-1;
+ m_rfz_t [a] = 6 ;
+ m_rfz_it[a][3] = a-1;
+ m_rfz_it[a][4] = b-1;
+ m_rfz_it[a][5] = c-1;
}
}
if (z==3) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a+2;
- rfz_ib[a][7] = b+2;
- rfz_ib[a][8] = c+2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a+2;
+ m_rfz_ib[a][7] = b+2;
+ m_rfz_ib[a][8] = c+2;
}
else if(z==7) {
- rfz_b[a] = 9;
- rfz_ib[a][6] = a-2;
- rfz_ib[a][7] = b-2;
- rfz_ib[a][8] = c-2;
+ m_rfz_b[a] = 9;
+ m_rfz_ib[a][6] = a-2;
+ m_rfz_ib[a][7] = b-2;
+ m_rfz_ib[a][8] = c-2;
}
}
}
@@ -954,21 +957,21 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
int a = f *3+z;
int b = fb*3+z;
int c = ft*3+z;
- rfzv_n[a] = 3;
- rfzv_i[a][0] = a;
- rfzv_i[a][1] = b;
- rfzv_i[a][2] = c;
+ m_rfzv_n[a] = 3;
+ m_rfzv_i[a][0] = a;
+ m_rfzv_i[a][1] = b;
+ m_rfzv_i[a][2] = c;
if (z>1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a-1;
- rfzv_i[a][4] = b-1;
- rfzv_i[a][5] = c-1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a-1;
+ m_rfzv_i[a][4] = b-1;
+ m_rfzv_i[a][5] = c-1;
}
else if(z<1) {
- rfzv_n[a] = 6;
- rfzv_i[a][3] = a+1;
- rfzv_i[a][4] = b+1;
- rfzv_i[a][5] = c+1;
+ m_rfzv_n[a] = 6;
+ m_rfzv_i[a][3] = a+1;
+ m_rfzv_i[a][4] = b+1;
+ m_rfzv_i[a][5] = c+1;
}
}
}
@@ -982,8 +985,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildFrameWork()
if(!m_Zo) m_Zo = new float[m_maxsizeSP];
if(!m_OneSeeds) m_OneSeeds = new InDet::SiSpacePointsSeed [m_maxOneSize];
- i_seed = l_seeds.begin();
- i_seede = l_seeds.end ();
+ m_i_seed = m_l_seeds.begin();
+ m_i_seede = m_l_seeds.end ();
m_seed = m_mapSeeds.begin();
m_seede = m_mapSeeds.end ();
}
@@ -1028,7 +1031,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Trigger::convertToBeamFrameWork
-(Trk::SpacePoint*const& sp,float* r)
+(const Trk::SpacePoint*const& sp,float* r)
{
r[0] = float(sp->globalPosition().x())-m_xbeam[0];
r[1] = float(sp->globalPosition().y())-m_ybeam[0];
@@ -1044,17 +1047,22 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
const float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
- for(int i=0; i!= r_size; ++i) {
+ for(int i=0; i!= m_r_size; ++i) {
- if(!r_map[i]) continue; r = r_Sorted[i].begin();
+ if(!m_r_map[i]) continue;
+ r = m_r_Sorted[i].begin();
- while(r!=r_Sorted[i].end()) {
+ while(r!=m_r_Sorted[i].end()) {
// Azimuthal angle sort
//
float F = (*r)->phi(); if(F<0.) F+=pi2;
- int f = int(F*m_sF); f<0 ? f = m_fNmax : f>m_fNmax ? f = 0 : f=f;
+ int f = int(F*m_sF);
+ if (f < 0)
+ f = m_fNmax;
+ else if (f > m_fNmax)
+ f = 0;
int z; float Z = (*r)->z();
@@ -1063,20 +1071,25 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
if(Z>0.) {Z < 250.? z=5 : z=6;}
else {Z >-250.? z=5 : z=4;}
int n = f*11+z; ++m_nsaz;
- rfz_Sorted[n].push_back(*r); if(!rfz_map[n]++) rfz_index[m_nrfz++] = n;
+ m_rfz_Sorted[n].push_back(*r); if(!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
if((*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
- // Azimutla angle and Z-coordinate sort for fast vertex search
+ // Azimuthal angle and Z-coordinate sort for fast vertex search
//
- f = int(F*m_sFv); f<0 ? f+=m_fvNmax : f> m_fvNmax ? f-=m_fvNmax : f=f;
+ f = int(F*m_sFv);
+ if (f < 0)
+ f+=m_fvNmax;
+ else if (f> m_fvNmax)
+ f-=m_fvNmax;
+
n = f*3+z; ++m_nsazv;
- rfzv_Sorted[n].push_back(*r); if(!rfzv_map[n]++) rfzv_index[m_nrfzv++] = n;
+ m_rfzv_Sorted[n].push_back(*r); if(!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
}
- r_Sorted[i].erase(r++);
+ m_r_Sorted[i].erase(r++);
}
- r_map[i] = 0;
+ m_r_map[i] = 0;
}
m_nr = 0;
m_state = 0;
@@ -1089,18 +1102,18 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillLists()
void InDet::SiSpacePointsSeedMaker_Trigger::erase()
{
for(int i=0; i!=m_nr; ++i) {
- int n = r_index[i]; r_map[n] = 0;
- r_Sorted[n].clear();
+ int n = m_r_index[i]; m_r_map[n] = 0;
+ m_r_Sorted[n].clear();
}
for(int i=0; i!=m_nrfz; ++i) {
- int n = rfz_index[i]; rfz_map[n] = 0;
- rfz_Sorted[n].clear();
+ int n = m_rfz_index[i]; m_rfz_map[n] = 0;
+ m_rfz_Sorted[n].clear();
}
for(int i=0; i!=m_nrfzv; ++i) {
- int n = rfzv_index[i]; rfzv_map[n] = 0;
- rfzv_Sorted[n].clear();
+ int n = m_rfzv_index[i]; m_rfzv_map[n] = 0;
+ m_rfzv_Sorted[n].clear();
}
m_state = 0;
m_ns = 0;
@@ -1131,9 +1144,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
int z = 0; if(!m_endlist) z = m_zMin;
for(; z!=3; ++z) {
- int a = f*3+z; if(!rfzv_map[a]) continue;
- r0 = rfzv_Sorted[a].begin();
- r0e = rfzv_Sorted[a].end ();
+ int a = f*3+z; if(!m_rfzv_map[a]) continue;
+ r0 = m_rfzv_Sorted[a].begin();
+ r0e = m_rfzv_Sorted[a].end ();
if(!m_endlist) {r0 = m_rMin; m_endlist = true;}
@@ -1144,28 +1157,31 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
float X = (*r0)->x();
float Y = (*r0)->y();
float R = (*r0)->radius();
- if(R<m_r2minv) continue; if(R>m_r2maxv) break;
+ if(R<m_r2minv) continue;
+ if(R>m_r2maxv) break;
float Z = (*r0)->z();
float ax = X/R;
float ay = Y/R;
// Bottom links production
//
- int NB = rfzv_n[a];
+ int NB = m_rfzv_n[a];
for(int i=0; i!=NB; ++i) {
- int an = rfzv_i[a][i];
- if(!rfzv_map[an]) continue;
+ int an = m_rfzv_i[a][i];
+ if(!m_rfzv_map[an]) continue;
- r = rfzv_Sorted[an].begin();
- re = rfzv_Sorted[an].end ();
+ r = m_rfzv_Sorted[an].begin();
+ re = m_rfzv_Sorted[an].end ();
for(; r!=re; ++r) {
float Rb =(*r)->radius();
- if(Rb<m_r1minv) continue; if(Rb>m_r1maxv) break;
+ if(Rb<m_r1minv) continue;
+ if(Rb>m_r1maxv) break;
float dR = R-Rb;
- if(dR<m_drminv) break; if(dR>m_drmax) continue;
+ if(dR<m_drminv) break;
+ if(dR>m_drmax) continue;
float dZ = Z-(*r)->z();
float Tz = dZ/dR; if(Tz<m_dzdrmin || Tz>m_dzdrmax) continue;
float Zo = Z-R*Tz;
@@ -1187,7 +1203,8 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production2Sp()
float UR = Ut*R+1. ; if(UR == 0.) continue;
float A = Vt*R/UR ;
float B = Vt-A*Ut ;
- if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue; ++nseed;
+ if(fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
+ ++nseed;
newSeed((*r)->spacepoint,(*r0)->spacepoint,Zo);
}
}
@@ -1222,19 +1239,19 @@ void InDet::SiSpacePointsSeedMaker_Trigger::production3Sp()
for(; z!=11; ++z) {
- int a = f *11+ZI[z]; if(!rfz_map[a]) continue;
+ int a = f *11+ZI[z]; if(!m_rfz_map[a]) continue;
int NB = 0, NT = 0;
- for(int i=0; i!=rfz_b[a]; ++i) {
+ for(int i=0; i!=m_rfz_b[a]; ++i) {
- int an = rfz_ib[a][i];
- if(!rfz_map[an]) continue;
- rb [NB] = rfz_Sorted[an].begin(); rbe[NB++] = rfz_Sorted[an].end();
+ int an = m_rfz_ib[a][i];
+ if(!m_rfz_map[an]) continue;
+ rb [NB] = m_rfz_Sorted[an].begin(); rbe[NB++] = m_rfz_Sorted[an].end();
}
- for(int i=0; i!=rfz_t[a]; ++i) {
+ for(int i=0; i!=m_rfz_t[a]; ++i) {
- int an = rfz_it[a][i];
- if(!rfz_map[an]) continue;
- rt [NT] = rfz_Sorted[an].begin(); rte[NT++] = rfz_Sorted[an].end();
+ int an = m_rfz_it[a][i];
+ if(!m_rfz_map[an]) continue;
+ rt [NT] = m_rfz_Sorted[an].begin(); rte[NT++] = m_rfz_Sorted[an].end();
}
if(!m_trigger) production3Sp (rb,rbe,rt,rte,NB,NT,nseed);
else production3SpTrigger(rb,rbe,rt,rte,NB,NT,nseed);