Skip to content
Snippets Groups Projects
Commit d18aa42f authored by Thomas Strebler's avatar Thomas Strebler
Browse files

Merged ITK FastTracking SpaceSpointsSeedMaker in standard ITK one

parent 553dc8f4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 366 additions and 2022 deletions
InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+ 5
− 0
View file @ d18aa42f
......@@ -123,6 +123,11 @@ class ConfiguredNewTrackingSiPattern:
InDetSiSpacePointsSeedMaker.DeltaThetaRoISP = 0.8
InDetSiSpacePointsSeedMaker.DeltaPhiRoISP = 0.8
InDetSiSpacePointsSeedMaker.RoISeedTool = RoISeedTool
if NewTrackingCuts.mode() == "SLHC" and InDetFlags.doFastTracking() :
InDetSiSpacePointsSeedMaker.useFastTracking = True
InDetSiSpacePointsSeedMaker.maxSeedsForSpacePoint = 3
#InDetSiSpacePointsSeedMaker.OutputLevel = VERBOSE
ToolSvc += InDetSiSpacePointsSeedMaker
......
InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+ 43
− 13
View file @ d18aa42f
......@@ -128,6 +128,7 @@ namespace InDet {
bool m_trigger ;
bool m_checketa ;
bool m_isvertex ;
bool m_fastTracking ;
int m_outputlevel ;
int m_nprint ;
int m_state ;
......@@ -140,8 +141,8 @@ namespace InDet {
int m_nCmSp ;
float m_etamin, m_etamax ;
float m_drmin ;
float m_drmax ;
float m_drminSSS ;
float m_drmaxSSS ;
float m_drminPPP ;
float m_drmaxPPP ;
float m_rmaxPPP ;
......@@ -167,7 +168,6 @@ namespace InDet {
float m_dzdrver ;
float m_diver ;
float m_diversss ;
float m_divermax ;
float m_dazmax ;
float m_ptmin ;
float m_ipt ;
......@@ -186,20 +186,16 @@ namespace InDet {
int rfz_size ;
std::list<InDet::SiSpacePointForSeedITK*>* r_Sorted ;
std::vector<InDet::SiSpacePointForSeedITK*> rfz_Sorted [2211] ;
std::list<InDet::SiSpacePointForSeedITK*> rfzv_Sorted[ 300] ;
std::list<InDet::SiSpacePointForSeedITK*> l_spforseed ;
std::list<InDet::SiSpacePointForSeedITK*>::iterator i_spforseed;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax[2],m_fvNmax ;
int m_fNmin,m_fvNmin ;
int m_fNmax[2] ;
int m_fNmin ;
int m_nr ; int* r_index ; int* r_map ;
int m_nrfz , rfz_index [2211], rfz_map [2211] ;
int m_nrfzv , rfzv_index [300], rfzv_map [300] ;
int rfz_b[2][2211],rfz_t[2][2211],rfz_ib[2][2211][9],rfz_it[2][2211][9];
int rfzv_n[300],rfzv_i[300][6] ;
float m_sF[2] ;
float m_sFv ;
///////////////////////////////////////////////////////////////////
// Tables for 3 space points seeds search
......@@ -272,6 +268,9 @@ namespace InDet {
SiSpacePointForSeedITK* newSpacePoint
(Trk::SpacePoint*const&) ;
SiSpacePointForSeedITK* newSpacePoint
(Trk::SpacePoint*const&,float*) ;
void newSeed
(SiSpacePointForSeedITK*&,SiSpacePointForSeedITK*&,float) ;
......@@ -292,6 +291,8 @@ namespace InDet {
void fillLists () ;
void fillListsSSS () ;
void fillListsPPP () ;
void fillListsPPPFast() ;
void erase () ;
void production3Sp () ;
void production3SpSSS() ;
......@@ -327,6 +328,11 @@ namespace InDet {
float AzimuthalStep(float,float,float,float);
void sort (FloatInt*,int);
void QuickSort(FloatInt*,int);
void SmallSort(FloatInt*,int);
int Partition(FloatInt*,int);
void Middle (FloatInt*,int);
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_ITK&);
......@@ -376,10 +382,20 @@ namespace InDet {
inline SiSpacePointForSeedITK* SiSpacePointsSeedMaker_ITK::newSpacePoint
(Trk::SpacePoint*const& sp)
{
float r[15];
return newSpacePoint(sp,r);
}
inline SiSpacePointForSeedITK* SiSpacePointsSeedMaker_ITK::newSpacePoint
(Trk::SpacePoint*const& sp,float* r)
{
SiSpacePointForSeedITK* sps;
float r[15]; convertToBeamFrameWork(sp,r);
convertToBeamFrameWork(sp,r);
if(m_checketa) {
......@@ -389,8 +405,17 @@ namespace InDet {
if((z*z )<(x*x+y*y)) return 0;
}
if(!sp->clusterList().second) {pixInform(sp,r);}
else {sctInform(sp,r);}
if(m_fastTracking) {
float R2 = r[0]*r[0]+r[1]*r[1];
if(fabs(r[2]) > 200. && R2 < 2500. ) return 0;
if(fabs(r[2])-m_zmax > m_dzdrmax*sqrt(R2)) return 0;
}
if(!sp->clusterList().second || m_fastTracking) {pixInform(sp,r);}
else if(!m_fastTracking) {sctInform(sp,r);}
if(i_spforseed!=l_spforseed.end()) {
sps = (*i_spforseed++); sps->set(sp,r);
......@@ -428,7 +453,12 @@ namespace InDet {
inline void SiSpacePointsSeedMaker_ITK::sort(FloatInt* s,int n)
{
std::sort(s,s+n,[](const FloatInt &a,const FloatInt&b)->bool {return a.Fl < b.Fl;});
if(m_fastTracking){
if(n>1) QuickSort(s,n-1);
}
else{
std::sort(s,s+n,[](const FloatInt &a,const FloatInt&b)->bool {return a.Fl < b.Fl;});
}
}
} // end of name space
......
InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITkTrigger.h deleted 100755 → 0
+ 0
− 386
View file @ 553dc8f4
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
// Header file for class SiSpacePointsSeedMaker_ITkTrigger
/////////////////////////////////////////////////////////////////////////////////
// (c) ATLAS Detector software
/////////////////////////////////////////////////////////////////////////////////
// Class for track candidates generation using space points information
// for standard Atlas geometry
/////////////////////////////////////////////////////////////////////////////////
// Version 1.0 3/10/2004 I.Gavrilenko
/////////////////////////////////////////////////////////////////////////////////
#ifndef SiSpacePointsSeedMaker_ITkTrigger_H
#define SiSpacePointsSeedMaker_ITkTrigger_H
#include <list>
#include "GaudiKernel/ServiceHandle.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
#include "InDetBeamSpotService/IBeamCondSvc.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsProSeedITK.h"
class MsgStream ;
class IBeamCondSvc;
namespace Trk {
class IPRD_AssociationTool;
}
namespace InDet {
class FloatIntT {
public:
float Fl;
int In;
};
class SiSpacePointsSeedMaker_ITkTrigger :
virtual public ISiSpacePointsSeedMaker, public AthAlgTool
{
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
public:
///////////////////////////////////////////////////////////////////
// Standard tool methods
///////////////////////////////////////////////////////////////////
SiSpacePointsSeedMaker_ITkTrigger(const std::string&,
const std::string&,
const IInterface*);
virtual ~SiSpacePointsSeedMaker_ITkTrigger();
virtual StatusCode initialize();
virtual StatusCode finalize ();
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
void newEvent (int);
void newRegion(const std::vector<IdentifierHash>&,
const std::vector<IdentifierHash>&);
void newRegion(const std::vector<IdentifierHash>&,
const std::vector<IdentifierHash>&,
const IRoiDescriptor&);
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
// Unused but needed for common interface with other SiSpacePointsSeedMaker
///////////////////////////////////////////////////////////////////
void find2Sp (const std::list<Trk::Vertex>&){};
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
void find3Sp (const std::list<Trk::Vertex>&);
void find3Sp (const std::list<Trk::Vertex>&,
const double*);
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with variable number space points with or without vertex constraint
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
void findVSp (const std::list<Trk::Vertex>&);
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
const SiSpacePointsSeed* next();
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
MsgStream& dump (MsgStream & out) const;
std::ostream& dump (std::ostream& out) const;
protected:
///////////////////////////////////////////////////////////////////
// Protected data and methods
///////////////////////////////////////////////////////////////////
ServiceHandle<MagField::IMagFieldSvc> m_fieldServiceHandle ;
MagField::IMagFieldSvc* m_fieldService ;
IBeamCondSvc* p_beam ;
bool m_pixel ;
bool m_sct ;
bool m_endlist ;
bool m_useOverlap ;
bool m_useassoTool ;
bool m_checketa ;
bool m_isvertex ;
int m_outputlevel ;
int m_nprint ;
int m_state ;
int m_nspoint ;
int m_mode ;
int m_nlist ;
int m_maxsize ;
int m_iteration ;
int m_ndyncut ;
int m_nCmSp ;
float m_etamin, m_etamax ;
float m_drminPPP ;
float m_drmaxPPP ;
float m_rmaxPPP ;
float m_dzdrmin0 ;
float m_dzdrmax0 ;
float m_dzdrmin ;
float m_dzdrmax ;
float m_zmin ;
float m_zmax ;
float m_zminU ;
float m_zmaxU ;
float m_zminB ;
float m_zmaxB ;
float m_ftrig ;
float m_ftrigW ;
float r_rmax ;
float r_rmin ;
float r_rstep ;
float m_dzver ;
float m_dzdrver ;
float m_diver ;
float m_divermax ;
float m_dazmax ;
float m_ptmin ;
float m_ipt ;
float m_ipt2 ;
float m_COF ;
float m_K ;
float m_ipt2K ;
float m_ipt2C ;
float m_COFK ;
float m_RTmin ;
float m_RTmax ;
int rf_size ;
int rfz_size ;
std::vector<InDet::SiSpacePointForSeedITK*> m_rSortedPIX ;
std::vector<InDet::SiSpacePointForSeedITK*> rfz_Sorted [2211] ;
std::list<InDet::SiSpacePointForSeedITK*> l_spforseed ;
std::list<InDet::SiSpacePointForSeedITK*>::iterator i_spforseed;
int m_ns,m_nsaz,m_nsazv ;
int m_fNmax ;
int m_fNmin ;
int rfz_b[2211],rfz_t[2211],rfz_ib[2211][9],rfz_it[2211][9] ;
int rfzv_n[300],rfzv_i[300][6] ;
float m_sF ;
///////////////////////////////////////////////////////////////////
// Tables for 3 space points seeds search
///////////////////////////////////////////////////////////////////
int m_maxsizeSP ;
InDet::SiSpacePointForSeedITK** m_SP ;
float * m_Tz ;
float * m_R ;
float * m_U ;
float * m_V ;
float * m_X ;
float * m_Y ;
float * m_Er ;
float * m_L ;
float * m_Im ;
FloatIntT * m_Tn ;
FloatIntT m_CmSp[500] ;
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::multimap<float,InDet::SiSpacePointsProSeedITK*> m_seeds ;
std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator m_seed ;
std::multimap<float,InDet::SiSpacePointsProSeedITK*> m_mapOneSeeds;
InDet::SiSpacePointsProSeedITK* m_OneSeeds ;
int m_nOneSeeds ;
std::multimap<float,InDet::SiSpacePointsProSeedITK*> m_mapOneSeedsQ;
InDet::SiSpacePointsProSeedITK* m_OneSeedsQ ;
int m_nOneSeedsQ ;
int m_maxOneSize ;
int m_fillOneSeeds;
std::set<float> l_vertex ;
///////////////////////////////////////////////////////////////////
// Beam geometry
///////////////////////////////////////////////////////////////////
float m_xbeam[4]; // x,ax,ay,az - center and x-axis direction
float m_ybeam[4]; // y,ax,ay,az - center and y-axis direction
float m_zbeam[4]; // z,ax,ay,az - center and z-axis direction
///////////////////////////////////////////////////////////////////
// Space points container
///////////////////////////////////////////////////////////////////
std::string m_beamconditions ;
SG::ReadHandle<SpacePointContainer> m_spacepointsSCT ;
SG::ReadHandle<SpacePointContainer> m_spacepointsPixel ;
SG::ReadHandle<SpacePointOverlapCollection> m_spacepointsOverlap;
ToolHandle<Trk::IPRD_AssociationTool> m_assoTool ;
///////////////////////////////////////////////////////////////////
// Protected methods
///////////////////////////////////////////////////////////////////
MsgStream& dumpConditions(MsgStream & out) const;
MsgStream& dumpEvent (MsgStream & out) const;
void buildFrameWork() ;
void buildBeamFrameWork() ;
SiSpacePointForSeedITK* newSpacePoint(Trk::SpacePoint*const&) ;
SiSpacePointForSeedITK* newSpacePoint(Trk::SpacePoint*const&,float*) ;
void newSeed(SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
float);
void newOneSeed(SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
float,
float);
void newOneSeedQ(SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
float,
float);
void newOneSeedWithCurvaturesComparisonPPP(SiSpacePointForSeedITK*&,
SiSpacePointForSeedITK*&,
float);
void fillSeeds () ;
void fillLists () ;
void fillListsPPP () ;
void erase () ;
void production2Sp () ;
void production3Sp () ;
void production3SpPPP() ;
void production3SpPPP(std::vector<InDet::SiSpacePointForSeedITK*>::iterator*,
std::vector<InDet::SiSpacePointForSeedITK*>::iterator*,
std::vector<InDet::SiSpacePointForSeedITK*>::iterator*,
std::vector<InDet::SiSpacePointForSeedITK*>::iterator*,
int,int,int&);
bool newVertices(const std::list<Trk::Vertex>&) ;
void findNext() ;
bool isZCompatible (float&,float&,float&) ;
void convertToBeamFrameWork(Trk::SpacePoint*const&,float*) ;
bool isUsed(const Trk::SpacePoint*);
void pixInform(Trk::SpacePoint*const&,float*);
float AzimuthalStep(float,float,float,float);
void sort (FloatIntT*,int);
void QuickSort(FloatIntT*,int);
void SmallSort(FloatIntT*,int);
int Partition(FloatIntT*,int);
void Middle (FloatIntT*,int);
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_ITkTrigger&);
std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_ITkTrigger&);
///////////////////////////////////////////////////////////////////
// Inline methods
///////////////////////////////////////////////////////////////////
inline const SiSpacePointsSeed* SiSpacePointsSeedMaker_ITkTrigger::next()
{
if(m_nspoint==3) {
do {
while(i_seed!=i_seede) {
if((*i_seed++)->set3(*m_seedOutput)) return m_seedOutput;
}
findNext();
}
while(i_seed!=i_seede);
return 0;
}
else {
if(i_seed==i_seede) {findNext(); if(i_seed==i_seede) return 0;}
(*i_seed++)->set2(*m_seedOutput); return(m_seedOutput);
}
return 0;
}
inline bool SiSpacePointsSeedMaker_ITkTrigger::isZCompatible
(float& Zv,float& R,float& T)
{
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();
float dZmin = fabs((*v)-Zv);
for(++v; v!=ve; ++v) {
float dZ = fabs((*v)-Zv); if(dZ >= dZmin) break; dZmin=dZ;
}
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
}
///////////////////////////////////////////////////////////////////
// New 2 space points seeds
///////////////////////////////////////////////////////////////////
inline void SiSpacePointsSeedMaker_ITkTrigger::newSeed
(SiSpacePointForSeedITK*& p1,SiSpacePointForSeedITK*& p2, float z)
{
SiSpacePointForSeedITK* p3 = 0;
if(i_seede!=l_seeds.end()) {
SiSpacePointsProSeedITK* s = (*i_seede++);
s->set(p1,p2,p3,z);
} else {
l_seeds.push_back(new SiSpacePointsProSeedITK(p1,p2,p3,z));
i_seede = l_seeds.end();
}
}
///////////////////////////////////////////////////////////////////
// The procedure sorts the elements into ascending order.
///////////////////////////////////////////////////////////////////
inline void SiSpacePointsSeedMaker_ITkTrigger::sort(FloatIntT* s,int n)
{
if(n > 1) QuickSort(s,n-1);
}
} // end of name space
#endif // SiSpacePointsSeedMaker_ITkTrigger_H
InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
+ 0
− 3
View file @ d18aa42f
......@@ -7,7 +7,6 @@
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITkTrigger.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_TrkSeeded.h"
#include "SiSpacePointsSeedTool_xk/RoISeedTool.h"
......@@ -20,7 +19,6 @@ DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Cosmic )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_HeavyIon )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Trigger )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ITK )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ITkTrigger )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_TrkSeeded )
DECLARE_TOOL_FACTORY( RoISeedTool )
......@@ -33,7 +31,6 @@ DECLARE_FACTORY_ENTRIES( SiSpacePointsSeedTool_xk )
DECLARE_TOOL( SiSpacePointsSeedMaker_HeavyIon )
DECLARE_TOOL( SiSpacePointsSeedMaker_Trigger )
DECLARE_TOOL( SiSpacePointsSeedMaker_ITK )
DECLARE_TOOL( SiSpacePointsSeedMaker_ITkTrigger )
DECLARE_TOOL( SiSpacePointsSeedMaker_TrkSeeded )
DECLARE_TOOL( RoISeedTool )
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment