From 3db255b139991d1643ee054b4586ad6b692a7c4a Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Fri, 10 May 2019 17:52:14 +0000
Subject: [PATCH] Make methods of SiSpacePointsSeedMaker_HeavyIon const by
defining EventData to hold event dependent data.
---
.../SiSpacePointsSeedMaker_HeavyIon.h | 259 ++---
.../src/SiSpacePointsSeedMaker_HeavyIon.cxx | 980 +++++++++---------
2 files changed, 644 insertions(+), 595 deletions(-)
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
index f0fde32e8f5..032e2081f78 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
@@ -33,6 +33,7 @@
#include <iosfwd>
#include <list>
#include <map>
+#include <mutex>
#include <vector>
class MsgStream;
@@ -119,43 +120,31 @@ namespace InDet {
ServiceHandle<MagField::IMagFieldSvc> m_fieldServiceHandle{this, "MagFieldSvc", "AtlasFieldSvc"};
- SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
+ ///////////////////////////////////////////////////////////////////
+ // Space points container
+ ///////////////////////////////////////////////////////////////////
+ SG::ReadHandleKey<SpacePointContainer> m_spacepointsSCT{this, "SpacePointsSCTName", "SCT_SpacePoints"};
+ SG::ReadHandleKey<SpacePointContainer> m_spacepointsPixel{this, "SpacePointsPixelName", "PixelSpacePoints"};
+ SG::ReadHandleKey<SpacePointOverlapCollection> m_spacepointsOverlap{this, "SpacePointsOverlapName", "OverlapSpacePoints"};
+
+ SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey{this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot"};
+
+ // Properties, which will not be changed after construction
BooleanProperty m_pixel{this, "usePixel", true};
BooleanProperty m_sct{this, "useSCT", true};
- bool m_endlist {true};
BooleanProperty m_useOverlap{this, "useOverlapSpCollection", false};
- bool m_trigger {false};
- bool m_izvertex {};
- int m_outputlevel {};
- int m_nprint {};
- int m_state {0};
- int m_nspoint {2};
- int m_mode {0};
- int m_nlist {0};
IntegerProperty m_maxsize{this, "maxSize", 20000};
+ IntegerProperty m_maxsizeSP{this, "maxSizeSP", 4000};
+ IntegerProperty m_maxOneSize{this, "maxSeedsForSpacePoint", 6};
UnsignedIntegerProperty m_maxNumberVertices{this, "maxNumberVertices", 1};
- FloatProperty m_r1min{this, "minRadius1", 0.};
FloatProperty m_r1minv{this, "minVRadius1", 0.};
- FloatProperty m_r1max{this, "maxRadius1", 600.};
FloatProperty m_r1maxv{this, "maxVRadius1", 60.};
- FloatProperty m_r2min{this, "minRadius2", 0.};
FloatProperty m_r2minv{this, "minVRadius2", 70.};
- FloatProperty m_r2max{this, "maxRadius2", 600.};
FloatProperty m_r2maxv{this, "maxVRadius2", 200.};
- FloatProperty m_r3min{this, "minRadius3", 0.};
- FloatProperty m_r3max{this, "maxRadius3", 600.};
FloatProperty m_drmin{this, "mindRadius", 10.};
- float m_drminv {20.};
FloatProperty m_drmax{this, "maxdRadius", 270.};
- FloatProperty m_rapcut{this, "RapidityCut", 2.7};
- float m_dzdrmin{};
- float m_dzdrmax {};
FloatProperty m_zmin{this, "minZ", -250.};
FloatProperty m_zmax{this, "maxZ", +250.};
- float m_zminU {};
- float m_zmaxU {};
- float m_ftrig {};
- float m_ftrigW {};
FloatProperty m_r_rmax{this, "radMax", 600.};
FloatProperty m_r_rstep{this, "radStep", 2.};
FloatProperty m_dzver{this, "maxdZver", 5.};
@@ -163,74 +152,104 @@ namespace InDet {
FloatProperty m_diver{this, "maxdImpact", 10.};
FloatProperty m_diverpps{this, "maxdImpactPPS", 1.7};
FloatProperty m_diversss{this, "maxdImpactSSS", 1000.};
- float m_dazmax {.02};
- FloatProperty m_ptmin{this, "pTmin", 500.};
- float m_ipt {};
- float m_ipt2 {};
- float m_COF {};
- float m_K {};
- int m_r_size {};
- int m_rf_size {};
- int m_rfz_size {};
- std::vector<std::list<InDet::SiSpacePointForSeed*>> m_r_Sorted;
- std::list<InDet::SiSpacePointForSeed*> m_rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed*> m_rfzv_Sorted[SizeRFZV];
- 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{};
- std::vector<int> m_r_index;
- std::vector<int> m_r_map;
- int m_nrfz {} , m_rfz_index [SizeRFZ], m_rfz_map [SizeRFZ];
- int m_nrfzv{} , m_rfzv_index [SizeRFZV], m_rfzv_map [SizeRFZV];
- int m_rfz_b[SizeRFZ],m_rfz_t[SizeRFZ],m_rfz_ib[SizeRFZ][SizeI],m_rfz_it[SizeRFZ][SizeI];
- int m_rfzv_n[SizeRFZV],m_rfzv_i[SizeRFZV][SizeIV];
- float m_sF{};
- float m_sFv{};
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
-
- IntegerProperty m_maxsizeSP{this, "maxSizeSP", 4000};
- std::vector<InDet::SiSpacePointForSeed*> m_SP;
- std::vector<float> m_R;
- std::vector<float> m_Tz;
- std::vector<float> m_Er;
- std::vector<float> m_U;
- std::vector<float> m_V;
- std::vector<float> m_Zo;
-
- 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::vector<InDet::SiSpacePointsSeed> m_OneSeeds;
- IntegerProperty m_maxOneSize{this, "maxSeedsForSpacePoint", 6};
- int m_nOneSeeds {};
- std::list<float> m_l_vertex;
-
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
-
- float m_xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float m_ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float m_zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
+ // Properties, which can be updated in initialize
+ FloatProperty m_r3max{this, "maxRadius3", 600.}; // Always overwritten by m_r_rmax
+ FloatProperty m_rapcut{this, "RapidityCut", 2.7};
+ FloatProperty m_ptmin{this, "pTmin", 500.};
- ///////////////////////////////////////////////////////////////////
- // Space points container
- ///////////////////////////////////////////////////////////////////
+ // Properties, which are not used in this implementation of SiSpacePointsSeedMaker_HeavyIon class
+ FloatProperty m_r1min{this, "minRadius1", 0.};
+ FloatProperty m_r1max{this, "maxRadius1", 600.};
+ FloatProperty m_r2min{this, "minRadius2", 0.};
+ FloatProperty m_r2max{this, "maxRadius2", 600.};
+ FloatProperty m_r3min{this, "minRadius3", 0.};
- SG::ReadHandleKey<SpacePointContainer> m_spacepointsSCT{this, "SpacePointsSCTName", "SCT_SpacePoints"};
- SG::ReadHandleKey<SpacePointContainer> m_spacepointsPixel{this, "SpacePointsPixelName", "PixelSpacePoints"};
- SG::ReadHandleKey<SpacePointOverlapCollection> m_spacepointsOverlap{this, "SpacePointsOverlapName", "OverlapSpacePoints"};
+ // Not updated at all
+ float m_drminv{20.};
+ float m_zminU{0.};
+ float m_zmaxU{0.};
+ float m_ftrig{0.};
+ float m_ftrigW{0.};
+
+ // Updated in only initialize
+ bool m_initialized{false};
+ int m_outputlevel{0};
+ int m_r_size{0};
+ int m_fNmax{0};
+ int m_fvNmax{0};
+ int m_rfz_b[SizeRFZ];
+ int m_rfz_t[SizeRFZ];
+ int m_rfz_ib[SizeRFZ][SizeI];
+ int m_rfz_it[SizeRFZ][SizeI];
+ int m_rfzv_n[SizeRFZV];
+ int m_rfzv_i[SizeRFZV][SizeIV];
+ float m_dzdrmin{0.};
+ float m_dzdrmax{0.};
+ float m_ipt{0.};
+ float m_ipt2{0.};
+ float m_COF{0.};
+ float m_K{0.};
+ float m_sF{0.};
+ float m_sFv{0.};
+
+ mutable std::mutex m_mutex;
+ mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
+ struct EventData { // To hold event dependent data
+ bool endlist{true};
+ bool trigger{false};
+ bool izvertex{false};
+ int nprint{0};
+ int state{0};
+ int nspoint{2};
+ int mode{0};
+ int nlist{0};
+ int ns{0};
+ int nsaz{0};
+ int nsazv{0};
+ int fNmin{0};
+ int fvNmin{0};
+ int zMin{0};
+ int nr{0};
+ int nrfz{0};
+ int nrfzv{0};
+ int nOneSeeds{0};
+ int rfz_index[SizeRFZ];
+ int rfz_map[SizeRFZ];
+ int rfzv_index[SizeRFZV];
+ int rfzv_map[SizeRFZV];
+ std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
+ std::vector<int> r_index;
+ std::vector<int> r_map;
+ std::vector<InDet::SiSpacePointsSeed> OneSeeds;
+ std::multimap<float,InDet::SiSpacePointsSeed*> mapOneSeeds;
+ std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
+ std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[SizeRFZV];
+ std::list<InDet::SiSpacePointForSeed> l_spforseed;
+ std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
+ std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
+ std::list<InDet::SiSpacePointsSeed> l_seeds;
+ std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
+ std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
+ std::list<float> l_vertex;
+ ///////////////////////////////////////////////////////////////////
+ // Tables for 3 space points seeds search
+ ///////////////////////////////////////////////////////////////////
+ std::vector<InDet::SiSpacePointForSeed*> SP;
+ std::vector<float> R;
+ std::vector<float> Tz;
+ std::vector<float> Er;
+ std::vector<float> U;
+ std::vector<float> V;
+ std::vector<float> Zo;
+ ///////////////////////////////////////////////////////////////////
+ // Beam geometry
+ ///////////////////////////////////////////////////////////////////
+ float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
+ float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
+ float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
+ };
+ mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
///////////////////////////////////////////////////////////////////
// Private methods
@@ -242,54 +261,62 @@ namespace InDet {
SiSpacePointsSeedMaker_HeavyIon &operator=(const SiSpacePointsSeedMaker_HeavyIon&) = delete;
//@}
- MsgStream& dumpConditions(MsgStream & out) const;
- MsgStream& dumpEvent (MsgStream & out) const;
+ MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
+ MsgStream& dumpEvent(EventData& data, MsgStream& out) const;
void buildFrameWork();
- void buildBeamFrameWork();
+ void buildBeamFrameWork(EventData& data) const;
SiSpacePointForSeed* newSpacePoint
- (const Trk::SpacePoint*const&);
+ (EventData& data, const Trk::SpacePoint*const&) const;
void newSeed
- (const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const float&);
+ (EventData& data,
+ const Trk::SpacePoint*&,const Trk::SpacePoint*&,
+ const float&) const;
void newSeed
- (const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const Trk::SpacePoint*&,const float&);
+ (EventData& data,
+ const Trk::SpacePoint*&,const Trk::SpacePoint*&,
+ const Trk::SpacePoint*&,const float&) const;
void newOneSeed
- (const Trk::SpacePoint*&,const Trk::SpacePoint*&,
- const Trk::SpacePoint*&,const float&,const float&);
- void fillSeeds();
-
- void fillLists ();
- void erase ();
- void production2Sp ();
- void production3Sp ();
+ (EventData& data,
+ const Trk::SpacePoint*&,const Trk::SpacePoint*&,
+ const Trk::SpacePoint*&,const float&,const float&) const;
+ void fillSeeds(EventData& data) const;
+
+ void fillLists(EventData& data) const;
+ void erase(EventData& data) const;
+ void production2Sp(EventData& data) const;
+ void production3Sp(EventData& data) const;
void production3Sp
- (std::list<InDet::SiSpacePointForSeed*>::iterator*,
+ (EventData& data,
+ std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
- int,int,int&);
+ int,int,int&) const;
void production3SpTrigger
- (std::list<InDet::SiSpacePointForSeed*>::iterator*,
+ (EventData& data,
+ std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
- int,int,int&);
+ int,int,int&) const;
void production3SpNoVertex
- (std::list<InDet::SiSpacePointForSeed*>::iterator*,
+ (EventData& data,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
std::list<InDet::SiSpacePointForSeed*>::iterator*,
- int,int,int&);
+ std::list<InDet::SiSpacePointForSeed*>::iterator*,
+ int,int,int&) const;
+
+ bool newVertices(EventData& data, const std::list<Trk::Vertex>&) const;
+ void findNext(EventData& data) const;
+ bool isZCompatible(EventData& data, float&,float&,float&) const;
+ float dZVertexMin(EventData& data, float&) const;
+ void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
- bool newVertices(const std::list<Trk::Vertex>&);
- void findNext();
- bool isZCompatible (float&,float&,float&);
- float dZVertexMin(float&);
- void convertToBeamFrameWork(const Trk::SpacePoint*const&,float*);
+ EventData& getEventData() const;
};
MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_HeavyIon&);
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index cafa4fd5e45..181802445ff 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -60,9 +60,13 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- m_nprint=0;
+ EventData& data{getEventData()};
+ data.nprint=0;
ATH_MSG_DEBUG(*this);
}
+
+ m_initialized = true;
+
return sc;
}
@@ -79,12 +83,14 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
+void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent(int)
{
- m_trigger = false;
+ EventData& data{getEventData()};
+
+ data.trigger = false;
if (!m_pixel && !m_sct) return;
- erase();
- buildBeamFrameWork();
+ erase(data);
+ buildBeamFrameWork(data);
double f[3], gP[3] ={10.,10.,0.};
@@ -95,7 +101,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
m_K = 2./(300.* 5. );
}
- m_i_spforseed = m_l_spforseed.begin();
+ data.i_spforseed = data.l_spforseed.begin();
float irstep = 1./m_r_rstep;
int irmax = m_r_size-1 ;
@@ -111,14 +117,14 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
for (const Trk::SpacePoint* sp: *spc) {
float r = sp->r();
if (r < 43. || r>=m_r_rmax) continue;
- InDet::SiSpacePointForSeed* sps = newSpacePoint(sp);
+ InDet::SiSpacePointForSeed* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- 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;
+ data.r_Sorted[ir].push_back(sps);
+ ++data.r_map[ir];
+ if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
+ ++data.ns;
}
}
}
@@ -137,18 +143,18 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
float r = sp->r();
if (r<0. || r>=m_r_rmax) continue;
- InDet::SiSpacePointForSeed* sps = newSpacePoint(sp);
+ InDet::SiSpacePointForSeed* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- 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;
+ data.r_Sorted[ir].push_back(sps);
+ ++data.r_map[ir];
+ if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
+ ++data.ns;
}
}
}
}
- fillLists();
+ fillLists(data);
}
///////////////////////////////////////////////////////////////////
@@ -158,11 +164,13 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent (int)
void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT)
{
- m_trigger = false;
+ EventData& data{getEventData()};
+
+ data.trigger = false;
if (!m_pixel && !m_sct) return;
- erase();
+ erase(data);
- buildBeamFrameWork();
+ buildBeamFrameWork(data);
double f[3], gP[3] ={10.,10.,0.};
@@ -170,13 +178,13 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
m_fieldServiceHandle->getFieldZR(gP,f);
m_K = 2./(300.*f[2]);
} else {
- m_K = 2./(300.* 5. );
+ m_K = 2./(300.* 5.);
}
- m_i_spforseed = m_l_spforseed.begin();
+ data.i_spforseed = data.l_spforseed.begin();
float irstep = 1./m_r_rstep;
- int irmax = m_r_size-1 ;
+ int irmax = m_r_size-1;
// Get pixels space points containers from store gate
//
@@ -194,13 +202,13 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
for (const Trk::SpacePoint* sp: **w) {
float r = sp->r();
if (r<0. || r>=m_r_rmax) continue;
- InDet::SiSpacePointForSeed* sps = newSpacePoint(sp);
+ InDet::SiSpacePointForSeed* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- 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;
+ data.r_Sorted[ir].push_back(sps);
+ ++data.r_map[ir];
+ if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
+ ++data.ns;
}
}
}
@@ -222,18 +230,18 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
for (const Trk::SpacePoint* sp: **w) {
float r = sp->r();
if (r<0. || r>=m_r_rmax) continue;
- InDet::SiSpacePointForSeed* sps = newSpacePoint(sp);
+ InDet::SiSpacePointForSeed* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- 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;
+ data.r_Sorted[ir].push_back(sps);
+ ++data.r_map[ir];
+ if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
+ ++data.ns;
}
}
}
}
- fillLists();
+ fillLists(data);
}
///////////////////////////////////////////////////////////////////
@@ -241,9 +249,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,const IRoiDescriptor&)
+(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&)
{
- newRegion(vPixel,vSCT);
+ newRegion(vPixel, vSCT);
}
///////////////////////////////////////////////////////////////////
@@ -253,29 +261,31 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex>& lv)
{
- lv.empty() ? m_izvertex = false : m_izvertex = true;
+ EventData& data{getEventData()};
+
+ data.izvertex = not lv.empty();
- int mode;
- lv.begin()!=lv.end() ? mode = 1 : mode = 0;
- bool newv = newVertices(lv);
+ int mode = 0;
+ if (lv.begin()!=lv.end()) mode = 1;
+ bool newv = newVertices(data, lv);
- if (newv || !m_state || m_nspoint!=2 || m_mode!=mode || m_nlist) {
-
- m_i_seede = m_l_seeds.begin();
- m_state = 1 ;
- m_nspoint = 2 ;
- m_nlist = 0 ;
- m_mode = mode;
- m_endlist = true;
- m_fvNmin = 0 ;
- m_fNmin = 0 ;
- m_zMin = 0 ;
- production2Sp ();
+ if (newv || !data.state || data.nspoint!=2 || data.mode!=mode || data.nlist) {
+
+ data.i_seede = data.l_seeds.begin();
+ data.state = 1 ;
+ data.nspoint = 2 ;
+ data.nlist = 0 ;
+ data.mode = mode;
+ data.endlist = true;
+ data.fvNmin = 0 ;
+ data.fNmin = 0 ;
+ data.zMin = 0 ;
+ production2Sp(data);
}
- m_i_seed = m_l_seeds.begin();
+ data.i_seed = data.l_seeds.begin();
if (m_outputlevel<=0) {
- m_nprint=1;
+ data.nprint=1;
ATH_MSG_DEBUG(*this);
}
}
@@ -287,29 +297,31 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex
void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex>& lv)
{
- lv.empty() ? m_izvertex = false : m_izvertex = true;
-
- int mode;
- lv.begin()!=lv.end() ? mode = 3 : mode = 2;
- bool newv = newVertices(lv);
-
- if (newv || !m_state || m_nspoint!=3 || m_mode!=mode || m_nlist) {
-
- m_i_seede = m_l_seeds.begin();
- m_state = 1 ;
- m_nspoint = 3 ;
- m_nlist = 0 ;
- m_mode = mode ;
- m_endlist = true ;
- m_fvNmin = 0 ;
- m_fNmin = 0 ;
- m_zMin = 0 ;
- production3Sp();
+ EventData& data{getEventData()};
+
+ data.izvertex = not lv.empty();
+
+ int mode = 2;
+ if (lv.begin()!=lv.end()) mode = 3;
+ bool newv = newVertices(data, lv);
+
+ if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
+
+ data.i_seede = data.l_seeds.begin();
+ data.state = 1 ;
+ data.nspoint = 3 ;
+ data.nlist = 0 ;
+ data.mode = mode ;
+ data.endlist = true ;
+ data.fvNmin = 0 ;
+ data.fNmin = 0 ;
+ data.zMin = 0 ;
+ production3Sp(data);
}
- m_i_seed = m_l_seeds.begin();
+ data.i_seed = data.l_seeds.begin();
if (m_outputlevel<=0) {
- m_nprint=1;
+ data.nprint=1;
ATH_MSG_DEBUG(*this);
}
}
@@ -325,30 +337,30 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Vertex>& lv)
+void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp(const std::list<Trk::Vertex>& lv)
{
+ EventData& data{getEventData()};
- int mode;
- lv.begin()!=lv.end() ? mode = 6 : mode = 5;
- bool newv = newVertices(lv);
+ int mode = 5;
+ if (lv.begin()!=lv.end()) mode = 6;
+ bool newv = newVertices(data, lv);
- if (newv || !m_state || m_nspoint!=4 || m_mode!=mode || m_nlist) {
-
- m_i_seede = m_l_seeds.begin();
- m_state = 1 ;
- m_nspoint = 4 ;
- m_nlist = 0 ;
- m_mode = mode ;
- m_endlist = true ;
- m_fvNmin = 0 ;
- m_fNmin = 0 ;
- m_zMin = 0 ;
- production3Sp();
+ if (newv || !data.state || data.nspoint!=4 || data.mode!=mode || data.nlist) {
+ data.i_seede = data.l_seeds.begin();
+ data.state = 1 ;
+ data.nspoint = 4 ;
+ data.nlist = 0 ;
+ data.mode = mode ;
+ data.endlist = true ;
+ data.fvNmin = 0 ;
+ data.fNmin = 0 ;
+ data.zMin = 0 ;
+ production3Sp(data);
}
- m_i_seed = m_l_seeds.begin();
+ data.i_seed = data.l_seeds.begin();
if (m_outputlevel<=0) {
- m_nprint=1;
+ data.nprint=1;
ATH_MSG_DEBUG(*this);
}
}
@@ -357,17 +369,19 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp (const std::list<Trk::Verte
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump( MsgStream& out ) const
+MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump(MsgStream& out) const
{
- if (m_nprint) return dumpEvent(out);
- return dumpConditions(out);
+ EventData& data{getEventData()};
+
+ if (data.nprint) return dumpEvent(data, out);
+ return dumpConditions(data, out);
}
///////////////////////////////////////////////////////////////////
// Dumps conditions information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions( MsgStream& out ) const
+MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions(EventData& data, MsgStream& out) const
{
int n = 42-m_spacepointsPixel.key().size();
std::string s2; for (int i=0; i<n; ++i) s2.append(" "); s2.append("|");
@@ -473,28 +487,28 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions( MsgStream& ou
out<<"|---------------------------------------------------------------------|"
<<endmsg;
out<<"| Beam X center | "
- <<std::setw(12)<<std::setprecision(5)<<m_xbeam[0]
+ <<std::setw(12)<<std::setprecision(5)<<data.xbeam[0]
<<" |"<<endmsg;
out<<"| Beam Y center | "
- <<std::setw(12)<<std::setprecision(5)<<m_ybeam[0]
+ <<std::setw(12)<<std::setprecision(5)<<data.ybeam[0]
<<" |"<<endmsg;
out<<"| Beam Z center | "
- <<std::setw(12)<<std::setprecision(5)<<m_zbeam[0]
+ <<std::setw(12)<<std::setprecision(5)<<data.zbeam[0]
<<" |"<<endmsg;
out<<"| Beam X-axis direction | "
- <<std::setw(12)<<std::setprecision(5)<<m_xbeam[1]
- <<std::setw(12)<<std::setprecision(5)<<m_xbeam[2]
- <<std::setw(12)<<std::setprecision(5)<<m_xbeam[3]
+ <<std::setw(12)<<std::setprecision(5)<<data.xbeam[1]
+ <<std::setw(12)<<std::setprecision(5)<<data.xbeam[2]
+ <<std::setw(12)<<std::setprecision(5)<<data.xbeam[3]
<<" |"<<endmsg;
out<<"| Beam Y-axis direction | "
- <<std::setw(12)<<std::setprecision(5)<<m_ybeam[1]
- <<std::setw(12)<<std::setprecision(5)<<m_ybeam[2]
- <<std::setw(12)<<std::setprecision(5)<<m_ybeam[3]
+ <<std::setw(12)<<std::setprecision(5)<<data.ybeam[1]
+ <<std::setw(12)<<std::setprecision(5)<<data.ybeam[2]
+ <<std::setw(12)<<std::setprecision(5)<<data.ybeam[3]
<<" |"<<endmsg;
out<<"| Beam Z-axis direction | "
- <<std::setw(12)<<std::setprecision(5)<<m_zbeam[1]
- <<std::setw(12)<<std::setprecision(5)<<m_zbeam[2]
- <<std::setw(12)<<std::setprecision(5)<<m_zbeam[3]
+ <<std::setw(12)<<std::setprecision(5)<<data.zbeam[1]
+ <<std::setw(12)<<std::setprecision(5)<<data.zbeam[2]
+ <<std::setw(12)<<std::setprecision(5)<<data.zbeam[3]
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -505,21 +519,21 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpConditions( MsgStream& ou
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent( MsgStream& out ) const
+MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent(EventData& data, MsgStream& out) const
{
out<<"|---------------------------------------------------------------------|"
<<endmsg;
- out<<"| m_ns | "
- <<std::setw(12)<<m_ns
+ out<<"| data.ns | "
+ <<std::setw(12)<<data.ns
<<" |"<<endmsg;
- out<<"| m_nsaz | "
- <<std::setw(12)<<m_nsaz
+ out<<"| data.nsaz | "
+ <<std::setw(12)<<data.nsaz
<<" |"<<endmsg;
- out<<"| m_nsazv | "
- <<std::setw(12)<<m_nsazv
+ out<<"| data.nsazv | "
+ <<std::setw(12)<<data.nsazv
<<" |"<<endmsg;
out<<"| seeds | "
- <<std::setw(12)<<m_l_seeds.size()
+ <<std::setw(12)<<data.l_seeds.size()
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
@@ -530,7 +544,7 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent( MsgStream& out ) c
// Dumps relevant information into the ostream
///////////////////////////////////////////////////////////////////
-std::ostream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump( std::ostream& out ) const
+std::ostream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump(std::ostream& out) const
{
return out;
}
@@ -559,36 +573,36 @@ std::ostream& InDet::operator <<
// Find next set space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::findNext ()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::findNext(EventData& data) const
{
- if (m_endlist) return;
+ if (data.endlist) return;
- 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 ();
+ data.i_seede = data.l_seeds.begin();
+ if (data.mode==0 || data.mode==1) production2Sp(data);
+ else if (data.mode==2 || data.mode==3) production3Sp(data);
+ else if (data.mode==5 || data.mode==6) production3Sp(data);
- m_i_seed = m_l_seeds.begin();
- ++m_nlist;
+ data.i_seed = data.l_seeds.begin();
+ ++data.nlist;
}
///////////////////////////////////////////////////////////////////
// New and old list vertices comparison
///////////////////////////////////////////////////////////////////
-bool InDet::SiSpacePointsSeedMaker_HeavyIon::newVertices(const std::list<Trk::Vertex>& lV)
+bool InDet::SiSpacePointsSeedMaker_HeavyIon::newVertices(EventData& data, const std::list<Trk::Vertex>& lV) const
{
- unsigned int s1 = m_l_vertex.size();
+ unsigned int s1 = data.l_vertex.size();
unsigned int s2 = lV.size();
if (s1==0 && s2==0) return false;
std::list<Trk::Vertex>::const_iterator v;
- m_l_vertex.erase(m_l_vertex.begin(),m_l_vertex.end());
+ data.l_vertex.erase(data.l_vertex.begin(), data.l_vertex.end());
for (v=lV.begin(); v!=lV.end(); ++v) {
- m_l_vertex.push_back(static_cast<float>((*v).position().z()));
- if (m_l_vertex.size() >= m_maxNumberVertices) break;
+ data.l_vertex.push_back(static_cast<float>((*v).position().z()));
+ if (data.l_vertex.size() >= m_maxNumberVertices) break;
}
return false;
}
@@ -608,52 +622,32 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
m_COF = 134*.05*9. ;
m_ipt = 1./fabs(.9*m_ptmin) ;
m_ipt2 = m_ipt*m_ipt ;
- m_K = 0. ;
-
- m_ns = m_nsaz = m_nsazv = m_nr = m_nrfz = m_nrfzv = 0;
// Build radius sorted containers
//
m_r_size = static_cast<int>((m_r_rmax+.1)/m_r_rstep);
- m_r_Sorted.resize(m_r_size);
- m_r_index.resize(m_r_size, 0);
- m_r_map.resize(m_r_size, 0);
- m_nr = 0;
// Build radius-azimuthal sorted containers
//
constexpr float pi2 = 2.*M_PI;
const int NFmax = SizeRF;
const float sFmax = static_cast<float>(NFmax)/pi2;
- const float sFmin = 100./60. ;
+ const float sFmin = 100./60.;
- m_sF = m_ptmin /60. ;
- if (m_sF >sFmax ) m_sF = sFmax;
+ m_sF = m_ptmin /60.;
+ if (m_sF > sFmax ) m_sF = sFmax;
else if (m_sF < sFmin) m_sF = sFmin;
- m_fNmax = static_cast<int>(pi2*m_sF);
+ m_fNmax = static_cast<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<SizeRFZ; ++i) {
- m_rfz_index [i]=0;
- m_rfz_map [i]=0;
- }
-
// Build radius-azimuthal-Z sorted containers for Z-vertices
//
const int NFtmax = SizeRFV;
const float sFvmax = static_cast<float>(NFtmax)/pi2;
- m_sFv = m_ptmin/120.;
- if (m_sFv >sFvmax) m_sFv = sFvmax;
- m_fvNmax = static_cast<int>(pi2*m_sFv);
+ m_sFv = m_ptmin/120.;
+ if (m_sFv > sFvmax) m_sFv = sFvmax;
+ m_fvNmax = static_cast<int>(pi2*m_sFv);
if (m_fvNmax>=NFtmax) m_fvNmax = NFtmax-1;
- m_nrfzv = 0;
- for (int i=0; i<SizeRFZV; ++i) {
- m_rfzv_index[i]=0;
- m_rfzv_map[i]=0;
- }
// Build maps for radius-azimuthal-Z sorted collections
//
@@ -666,8 +660,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
// For each azimuthal region loop through all Z regions
//
- for (int z=0; z<SizeZ; ++z) {
-
+ for (int z=0; z<SizeZ; ++z) {
int a = f *SizeZ+z;
int b = fb*SizeZ+z;
int c = ft*SizeZ+z;
@@ -676,7 +669,6 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
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) {
-
m_rfz_t [a] = 9 ;
m_rfz_it[a][3] = a+1;
m_rfz_it[a][4] = b+1;
@@ -685,35 +677,28 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
m_rfz_it[a][7] = b-1;
m_rfz_it[a][8] = c-1;
} else if (z> 5) {
-
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) {
-
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 {
-
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) {
-
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) {
m_rfz_b[a] = 9;
m_rfz_ib[a][6] = a+2;
@@ -731,14 +716,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
// Build maps for radius-azimuthal-Z sorted collections for Z
//
for (int f=0; f<=m_fvNmax; ++f) {
-
int fb = f-1; if (fb<0 ) fb=m_fvNmax;
int ft = f+1; if (ft>m_fvNmax) ft=0;
// For each azimuthal region loop through central Z regions
//
- for (int z=0; z<SizeZV; ++z) {
-
+ for (int z=0; z<SizeZV; ++z) {
int a = f *SizeZV+z;
int b = fb*SizeZV+z;
int c = ft*SizeZV+z;
@@ -759,31 +742,19 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildFrameWork()
}
}
}
-
- m_SP.resize(m_maxsizeSP, nullptr);
- m_R.resize(m_maxsizeSP, 0.);
- m_Tz.resize(m_maxsizeSP, 0.);
- m_Er.resize(m_maxsizeSP, 0.);
- m_U.resize(m_maxsizeSP, 0.);
- m_V.resize(m_maxsizeSP, 0.);
- m_Zo.resize(m_maxsizeSP, 0.);
- m_OneSeeds.resize(m_maxOneSize);
-
- m_i_seed = m_l_seeds.begin();
- m_i_seede = m_l_seeds.end ();
}
///////////////////////////////////////////////////////////////////
// Initiate beam frame work for seed generator
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork(EventData& data) const
{
- SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
+ SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle{m_beamSpotKey};
- const Amg::Vector3D &cb = beamSpotHandle->beamPos();
- double tx = tan(beamSpotHandle->beamTilt(0));
- double ty = tan(beamSpotHandle->beamTilt(1));
+ const Amg::Vector3D& cb = beamSpotHandle->beamPos();
+ double tx = tan(beamSpotHandle->beamTilt(0));
+ double ty = tan(beamSpotHandle->beamTilt(1));
double ph = atan2(ty,tx);
double th = acos(1./sqrt(1.+tx*tx+ty*ty));
@@ -792,20 +763,20 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork()
double sinp = sin(ph);
double cosp = cos(ph);
- m_xbeam[0] = static_cast<float>(cb.x()) ;
- m_xbeam[1] = static_cast<float>(cost*cosp*cosp+sinp*sinp);
- m_xbeam[2] = static_cast<float>(cost*sinp*cosp-sinp*cosp);
- m_xbeam[3] =-static_cast<float>(sint*cosp );
+ data.xbeam[0] = static_cast<float>(cb.x()) ;
+ data.xbeam[1] = static_cast<float>(cost*cosp*cosp+sinp*sinp);
+ data.xbeam[2] = static_cast<float>(cost*sinp*cosp-sinp*cosp);
+ data.xbeam[3] =-static_cast<float>(sint*cosp );
- m_ybeam[0] = static_cast<float>(cb.y()) ;
- m_ybeam[1] = static_cast<float>(cost*cosp*sinp-sinp*cosp);
- m_ybeam[2] = static_cast<float>(cost*sinp*sinp+cosp*cosp);
- m_ybeam[3] =-static_cast<float>(sint*sinp );
+ data.ybeam[0] = static_cast<float>(cb.y()) ;
+ data.ybeam[1] = static_cast<float>(cost*cosp*sinp-sinp*cosp);
+ data.ybeam[2] = static_cast<float>(cost*sinp*sinp+cosp*cosp);
+ data.ybeam[3] =-static_cast<float>(sint*sinp );
- m_zbeam[0] = static_cast<float>(cb.z()) ;
- m_zbeam[1] = static_cast<float>(sint*cosp) ;
- m_zbeam[2] = static_cast<float>(sint*sinp) ;
- m_zbeam[3] = static_cast<float>(cost) ;
+ data.zbeam[0] = static_cast<float>(cb.z()) ;
+ data.zbeam[1] = static_cast<float>(sint*cosp) ;
+ data.zbeam[2] = static_cast<float>(sint*sinp) ;
+ data.zbeam[3] = static_cast<float>(cost) ;
}
///////////////////////////////////////////////////////////////////
@@ -813,32 +784,33 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::buildBeamFrameWork()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::convertToBeamFrameWork
-(const Trk::SpacePoint*const& sp,float* r)
+(EventData& data, const Trk::SpacePoint*const& sp,float* r) const
{
- r[0] = static_cast<float>(sp->globalPosition().x())-m_xbeam[0];
- r[1] = static_cast<float>(sp->globalPosition().y())-m_ybeam[0];
- r[2] = static_cast<float>(sp->globalPosition().z())-m_zbeam[0];
+ r[0] = static_cast<float>(sp->globalPosition().x())-data.xbeam[0];
+ r[1] = static_cast<float>(sp->globalPosition().y())-data.ybeam[0];
+ r[2] = static_cast<float>(sp->globalPosition().z())-data.zbeam[0];
}
///////////////////////////////////////////////////////////////////
// Initiate space points seed maker
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists(EventData& data) const
{
constexpr float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r;
for (int i=0; i!= m_r_size; ++i) {
- if (!m_r_map[i]) continue;
- r = m_r_Sorted[i].begin();
+ if (!data.r_map[i]) continue;
+ r = data.r_Sorted[i].begin();
- while (r!=m_r_Sorted[i].end()) {
+ while (r!=data.r_Sorted[i].end()) {
// Azimuthal angle sort
//
- float F = (*r)->phi(); if (F<0.) F+=pi2;
+ float F = (*r)->phi();
+ if (F<0.) F+=pi2;
int f = static_cast<int>(F*m_sF);
if (f < 0) f = m_fNmax;
@@ -855,9 +827,9 @@ 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*SizeZ+z;
- ++m_nsaz;
- m_rfz_Sorted[n].push_back(*r);
- if (!m_rfz_map[n]++) m_rfz_index[m_nrfz++] = n;
+ ++data.nsaz;
+ data.rfz_Sorted[n].push_back(*r);
+ if (!data.rfz_map[n]++) data.rfz_index[data.nrfz++] = n;
if ((*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
z<=4 ? z=0 : z>=6 ? z=2 : z=1;
@@ -868,77 +840,80 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillLists()
if (f < 0) f += m_fvNmax;
else if (f> m_fvNmax) f -= m_fvNmax;
n = f*SizeZV+z;
- ++m_nsazv;
- m_rfzv_Sorted[n].push_back(*r);
- if (!m_rfzv_map[n]++) m_rfzv_index[m_nrfzv++] = n;
+ ++data.nsazv;
+ data.rfzv_Sorted[n].push_back(*r);
+ if (!data.rfzv_map[n]++) data.rfzv_index[data.nrfzv++] = n;
}
- m_r_Sorted[i].erase(r++);
+ data.r_Sorted[i].erase(r++);
}
- m_r_map[i] = 0;
+ data.r_map[i] = 0;
}
- m_nr = 0;
- m_state = 0;
+ data.nr = 0;
+ data.state = 0;
}
///////////////////////////////////////////////////////////////////
// Erase space point information
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::erase()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::erase(EventData& data) const
{
- for (int i=0; i!=m_nr; ++i) {
- int n = m_r_index[i];
- m_r_map[n] = 0;
- m_r_Sorted[n].clear();
+ for (int i=0; i!=data.nr; ++i) {
+ int n = data.r_index[i];
+ data.r_map[n] = 0;
+ data.r_Sorted[n].clear();
}
- for (int i=0; i!=m_nrfz; ++i) {
- int n = m_rfz_index[i];
- m_rfz_map[n] = 0;
- m_rfz_Sorted[n].clear();
+ for (int i=0; i!=data.nrfz; ++i) {
+ int n = data.rfz_index[i];
+ data.rfz_map[n] = 0;
+ data.rfz_Sorted[n].clear();
}
- for (int i=0; i!=m_nrfzv; ++i) {
- int n = m_rfzv_index[i];
- m_rfzv_map[n] = 0;
- m_rfzv_Sorted[n].clear();
+ for (int i=0; i!=data.nrfzv; ++i) {
+ int n = data.rfzv_index[i];
+ data.rfzv_map[n] = 0;
+ data.rfzv_Sorted[n].clear();
}
- m_state = 0;
- m_ns = 0;
- m_nsaz = 0;
- m_nsazv = 0;
- m_nr = 0;
- m_nrfz = 0;
- m_nrfzv = 0;
+ data.state = 0;
+ data.ns = 0;
+ data.nsaz = 0;
+ data.nsazv = 0;
+ data.nr = 0;
+ data.nrfz = 0;
+ data.nrfzv = 0;
}
///////////////////////////////////////////////////////////////////
// 2 space points seeds production
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp(EventData& data) const
{
- if (m_nsazv<2) return;
+ if (data.nsazv<2) return;
std::list<InDet::SiSpacePointForSeed*>::iterator r0,r0e,r,re;
int nseed = 0;
// Loop thorugh all azimuthal regions
//
- for (int f=m_fvNmin; f<=m_fvNmax; ++f) {
+ for (int f=data.fvNmin; f<=m_fvNmax; ++f) {
// For each azimuthal region loop through Z regions
//
int z = 0;
- if (!m_endlist) z = m_zMin;
+ if (!data.endlist) z = data.zMin;
for (; z<SizeZV; ++z) {
int a = f*SizeZV+z;
- if (!m_rfzv_map[a]) continue;
- r0 = m_rfzv_Sorted[a].begin();
- r0e = m_rfzv_Sorted[a].end ();
+ if (!data.rfzv_map[a]) continue;
+ r0 = data.rfzv_Sorted[a].begin();
+ r0e = data.rfzv_Sorted[a].end ();
- if (!m_endlist) {r0 = m_rMin; m_endlist = true;}
+ if (!data.endlist) {
+ r0 = data.rMin;
+ data.endlist = true;
+ }
// Loop through trigger space points
//
@@ -959,10 +934,10 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
for (int i=0; i!=NB; ++i) {
int an = m_rfzv_i[a][i];
- if (!m_rfzv_map[an]) continue;
+ if (!data.rfzv_map[an]) continue;
- r = m_rfzv_Sorted[an].begin();
- re = m_rfzv_Sorted[an].end ();
+ r = data.rfzv_Sorted[an].begin();
+ re = data.rfzv_Sorted[an].end ();
for (; r!=re; ++r) {
@@ -979,7 +954,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
// Comparison with vertices Z coordinates
//
- if (!isZCompatible(Zo,Rb,Tz)) continue;
+ if (!isZCompatible(data, Zo, Rb, Tz)) continue;
// Momentum cut
//
@@ -996,28 +971,28 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production2Sp()
float B = Vt-A*Ut ;
if (fabs(B*m_K) > m_ipt*sqrt(1.+A*A)) continue;
++nseed;
- newSeed((*r)->spacepoint,(*r0)->spacepoint,Zo);
+ newSeed(data, (*r)->spacepoint, (*r0)->spacepoint,Zo);
}
}
if (nseed < m_maxsize) continue;
- m_endlist=false;
- m_rMin = (++r0);
- m_fvNmin=f;
- m_zMin=z;
+ data.endlist=false;
+ data.rMin = (++r0);
+ data.fvNmin=f;
+ data.zMin=z;
return;
}
}
}
- m_endlist = true;
+ data.endlist = true;
}
///////////////////////////////////////////////////////////////////
// Production 3 space points seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp(EventData& data) const
{
- if (m_nsaz<3) return;
+ if (data.nsaz<3) return;
const int ZI[SizeZ] = {5,6,7,8,9,10,4,3,2,1,0};
std::list<InDet::SiSpacePointForSeed*>::iterator rt[9],rte[9],rb[9],rbe[9];
@@ -1025,42 +1000,46 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp()
// Loop thorugh all azimuthal regions
//
- for (int f=m_fNmin; f<=m_fNmax; ++f) {
+ for (int f=data.fNmin; f<=m_fNmax; ++f) {
// For each azimuthal region loop through all Z regions
//
int z = 0;
- if (!m_endlist) z = m_zMin;
+ if (!data.endlist) z = data.zMin;
for (; z<SizeZ; ++z) {
int a = f*SizeZ+ZI[z];
- if (!m_rfz_map[a]) continue;
+ if (!data.rfz_map[a]) continue;
int NB = 0, NT = 0;
for (int i=0; i!=m_rfz_b[a]; ++i) {
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();
+ if (!data.rfz_map[an]) continue;
+ rb [NB] = data.rfz_Sorted[an].begin();
+ rbe[NB++] = data.rfz_Sorted[an].end();
}
for (int i=0; i!=m_rfz_t[a]; ++i) {
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 (!data.rfz_map[an]) continue;
+ rt [NT] = data.rfz_Sorted[an].begin();
+ rte[NT++] = data.rfz_Sorted[an].end();
}
- if (m_izvertex) {
- if (!m_trigger) production3Sp (rb,rbe,rt,rte,NB,NT,nseed);
- else production3SpTrigger(rb,rbe,rt,rte,NB,NT,nseed);
+ if (data.izvertex) {
+ if (!data.trigger) production3Sp (data, rb, rbe, rt, rte, NB, NT, nseed);
+ else production3SpTrigger(data, rb, rbe, rt, rte, NB, NT, nseed);
} else {
- production3SpNoVertex(rb,rbe,rt,rte,NB,NT,nseed);
+ production3SpNoVertex(data, rb, rbe, rt, rte, NB, NT, nseed);
}
- if (!m_endlist) {m_fNmin=f; m_zMin = z; return;}
+ if (!data.endlist) {
+ data.fNmin=f;
+ data.zMin = z;
+ return;
+ }
}
}
- m_endlist = true;
+ data.endlist = true;
}
///////////////////////////////////////////////////////////////////
@@ -1068,21 +1047,22 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp()
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
-( std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
- int NB, int NT, int& nseed)
+(EventData& data,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
+ int NB, int NT, int& nseed) const
{
std::list<InDet::SiSpacePointForSeed*>::iterator r0=rb[0],r;
- if (!m_endlist) {r0 = m_rMin; m_endlist = true;}
+ if (!data.endlist) {r0 = data.rMin; data.endlist = true;}
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
- m_nOneSeeds = 0;
- m_mapOneSeeds.erase(m_mapOneSeeds.begin(), m_mapOneSeeds.end());
+ data.nOneSeeds = 0;
+ data.mapOneSeeds.erase(data.mapOneSeeds.begin(), data.mapOneSeeds.end());
float R = (*r0)->radius();
@@ -1114,8 +1094,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,Rb,Tz)) continue;
- m_SP[Nb] = (*r);
+ if (!isZCompatible(data, Zo, Rb, Tz)) continue;
+ data.SP[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1145,8 +1125,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,R ,Tz)) continue;
- m_SP[Nt] = (*r);
+ if (!isZCompatible(data, Zo, R ,Tz)) continue;
+ data.SP[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1154,15 +1134,14 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
breakt:
if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr ();
- float covz0 = (*r0)->covz ();
+ float covr0 = (*r0)->covr();
+ float covz0 = (*r0)->covz();
float ax = X/R;
float ay = Y/R;
for (int i=0; i!=Nt; ++i) {
-
- InDet::SiSpacePointForSeed* sp = m_SP[i];
+ InDet::SiSpacePointForSeed* sp = data.SP[i];
float dx = sp->x()-X ;
float dy = sp->y()-Y ;
@@ -1174,12 +1153,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
float tz = dz*dr ;
if (i < Nb) tz = -tz;
- m_Tz[i] = tz ;
- m_Zo[i] = Z-R*tz ;
- m_R [i] = dr ;
- m_U [i] = x*r2 ;
- m_V [i] = y*r2 ;
- m_Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
+ data.Tz[i] = tz ;
+ data.Zo[i] = Z-R*tz ;
+ data.R [i] = dr ;
+ data.U [i] = x*r2 ;
+ data.V [i] = y*r2 ;
+ data.Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
}
float imc = m_diver ;
@@ -1195,30 +1174,28 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
//
for (int b=0; b!=Nb; ++b) {
-
- const Trk::SpacePoint* SPb = m_SP[b]->spacepoint;
+ const Trk::SpacePoint* SPb = data.SP[b]->spacepoint;
- float Zob = m_Zo[b] ;
- float Tzb = m_Tz[b] ;
- float Rb2r = m_R [b]*covr0;
- float Rb2z = m_R [b]*covz0;
- float Erb = m_Er[b] ;
- float Vb = m_V [b] ;
- float Ub = m_U [b] ;
+ float Zob = data.Zo[b] ;
+ float Tzb = data.Tz[b] ;
+ float Rb2r = data.R [b]*covr0;
+ float Rb2z = data.R [b]*covz0;
+ float Erb = data.Er[b] ;
+ float Vb = data.V [b] ;
+ float Ub = data.U [b] ;
float Tzb2 = (1.+Tzb*Tzb) ;
float CSA = Tzb2*COFK ;
float ICSA = Tzb2*ipt2C ;
- float dZ = dZVertexMin(Zob);
+ float dZ = dZVertexMin(data, Zob);
float Iz = (dZ*dZ)/Tzb2 ;
for (int t=Nb; t!=Nt; ++t) {
-
- float Ts = .5*(Tzb+m_Tz[t]) ;
- float dt = Tzb-m_Tz[t] ;
- float dT = dt*dt-Erb-m_Er[t]-m_R[t]*(Ts*Ts*Rb2r+Rb2z);
+ float Ts = .5*(Tzb+data.Tz[t]) ;
+ float dt = Tzb-data.Tz[t] ;
+ float dT = dt*dt-Erb-data.Er[t]-data.R[t]*(Ts*Ts*Rb2r+Rb2z);
if ( dT > ICSA) continue;
- float dU = m_U[t]-Ub; if (dU == 0.) continue ;
- float A = (m_V[t]-Vb)/dU ;
+ float dU = data.U[t]-Ub; if (dU == 0.) continue ;
+ float A = (data.V[t]-Vb)/dU ;
float S2 = 1.+A*A ;
float B = Vb-A*Ub ;
float B2 = B*B ;
@@ -1227,15 +1204,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
if ( Im > imc ) continue;
Im = Im*Im+Iz;
- newOneSeed(SPb,SP0,m_SP[t]->spacepoint,Zob,Im);
+ newOneSeed(data, SPb, SP0, data.SP[t]->spacepoint, Zob, Im);
}
}
- nseed += m_mapOneSeeds.size();
- fillSeeds();
+ nseed += data.mapOneSeeds.size();
+ fillSeeds(data);
if (nseed>=m_maxsize) {
- m_endlist=false;
+ data.endlist=false;
++r0;
- m_rMin = r0;
+ data.rMin = r0;
return;
}
}
@@ -1246,23 +1223,26 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3Sp
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
-( std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
- int NB, int NT, int& nseed)
+(EventData& data,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
+ int NB, int NT, int& nseed) const
{
constexpr float pi2 = 2.*M_PI;
std::list<InDet::SiSpacePointForSeed*>::iterator r0=rb[0],r;
- if (!m_endlist) {r0 = m_rMin; m_endlist = true;}
+ if (!data.endlist) {
+ r0 = data.rMin;
+ data.endlist = true;
+ }
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
-
- m_nOneSeeds = 0;
- m_mapOneSeeds.erase(m_mapOneSeeds.begin(), m_mapOneSeeds.end());
+ data.nOneSeeds = 0;
+ data.mapOneSeeds.erase(data.mapOneSeeds.begin(), data.mapOneSeeds.end());
float R = (*r0)->radius();
@@ -1279,14 +1259,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
// Bottom links production
//
for (int i=0; i!=NB; ++i) {
-
for (r=rb[i]; r!=rbe[i]; ++r) {
-
float Rb =(*r)->radius();
float dR = R-Rb;
if (dR<m_drmin) break;
- if (dR > m_drmax) {rb[i]=r; continue;}
+ if (dR > m_drmax) {
+ rb[i]=r;
+ continue;
+ }
if ((*r)->sur()==sur0) continue;
if (!pix && !(*r)->spacepoint->clusterList().second) continue;
@@ -1298,8 +1279,8 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,Rb,Tz)) continue;
- m_SP[Nb] = (*r);
+ if (!isZCompatible(data, Zo, Rb, Tz)) continue;
+ data.SP[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1310,9 +1291,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
// Top links production
//
for (int i=0; i!=NT; ++i) {
-
for (r=rt[i]; r!=rte[i]; ++r) {
-
float Rt =(*r)->radius();
float dR = Rt-R;
if (dR<m_drmin) {
@@ -1330,14 +1309,14 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,R,Tz)) continue;
+ if (!isZCompatible(data, Zo, R, Tz)) continue;
// Polar angle test
//
Zo = (*r)->z()+(550.-Rt)*Tz;
if ( Zo < m_zminU || Zo > m_zmaxU) continue;
- m_SP[Nt] = (*r);
+ data.SP[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1345,15 +1324,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
breakt:
if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr ();
- float covz0 = (*r0)->covz ();
+ float covr0 = (*r0)->covr();
+ float covz0 = (*r0)->covz();
float ax = X/R;
float ay = Y/R;
for (int i=0; i!=Nt; ++i) {
- InDet::SiSpacePointForSeed* sp = m_SP[i];
+ InDet::SiSpacePointForSeed* sp = data.SP[i];
float dx = sp->x()-X ;
float dy = sp->y()-Y ;
@@ -1365,12 +1344,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
float tz = dz*dr ;
if (i < Nb) tz = -tz;
- m_Tz[i] = tz ;
- m_Zo[i] = Z-R*tz ;
- m_R [i] = dr ;
- m_U [i] = x*r2 ;
- m_V [i] = y*r2 ;
- m_Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
+ data.Tz[i] = tz ;
+ data.Zo[i] = Z-R*tz ;
+ data.R [i] = dr ;
+ data.U [i] = x*r2 ;
+ data.V [i] = y*r2 ;
+ data.Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
}
float imc = m_diver ;
@@ -1388,29 +1367,29 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
//
for (int b=0; b!=Nb; ++b) {
- const Trk::SpacePoint* SPb = m_SP[b]->spacepoint;
+ const Trk::SpacePoint* SPb = data.SP[b]->spacepoint;
- float Zob = m_Zo[b] ;
- float Tzb = m_Tz[b] ;
- float Rb2r = m_R [b]*covr0;
- float Rb2z = m_R [b]*covz0;
- float Erb = m_Er[b] ;
- float Vb = m_V [b] ;
- float Ub = m_U [b] ;
+ float Zob = data.Zo[b] ;
+ float Tzb = data.Tz[b] ;
+ float Rb2r = data.R [b]*covr0;
+ float Rb2z = data.R [b]*covz0;
+ float Erb = data.Er[b] ;
+ float Vb = data.V [b] ;
+ float Ub = data.U [b] ;
float Tzb2 = (1.+Tzb*Tzb) ;
float CSA = Tzb2*COFK ;
float ICSA = Tzb2*ipt2C ;
- float dZ = dZVertexMin(Zob);
+ float dZ = dZVertexMin(data, Zob);
float Iz = (dZ*dZ)/Tzb2 ;
for (int t=Nb; t!=Nt; ++t) {
- float Ts = .5*(Tzb+m_Tz[t]) ;
- float dt = Tzb-m_Tz[t] ;
- float dT = dt*dt-Erb-m_Er[t]-m_R[t]*(Ts*Ts*Rb2r+Rb2z);
+ float Ts = .5*(Tzb+data.Tz[t]) ;
+ float dt = Tzb-data.Tz[t] ;
+ float dT = dt*dt-Erb-data.Er[t]-data.R[t]*(Ts*Ts*Rb2r+Rb2z);
if ( dT > ICSA) continue;
- float dU = m_U[t]-Ub; if (dU == 0.) continue ;
- float A = (m_V[t]-Vb)/dU ;
+ float dU = data.U[t]-Ub; if (dU == 0.) continue ;
+ float A = (data.V[t]-Vb)/dU ;
float S2 = 1.+A*A ;
float B = Vb-A*Ub ;
float B2 = B*B ;
@@ -1427,15 +1406,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
if (df > M_PI) df=pi2-df;
if (df > m_ftrigW) continue;
Im = Im*Im+Iz;
- newOneSeed(SPb,SP0,m_SP[t]->spacepoint,Zob,Im);
+ newOneSeed(data, SPb, SP0, data.SP[t]->spacepoint, Zob, Im);
}
}
- nseed += m_mapOneSeeds.size();
- fillSeeds();
+ nseed += data.mapOneSeeds.size();
+ fillSeeds(data);
if (nseed>=m_maxsize) {
- m_endlist=false;
+ data.endlist=false;
++r0;
- m_rMin = r0;
+ data.rMin = r0;
return;
}
}
@@ -1447,24 +1426,25 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpTrigger
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
-( std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
- std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
- int NB, int NT, int& nseed)
+(EventData& data,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rb ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rbe,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rt ,
+ std::list<InDet::SiSpacePointForSeed*>::iterator* rte,
+ int NB, int NT, int& nseed) const
{
std::list<InDet::SiSpacePointForSeed*>::iterator r0=rb[0],r;
- if (!m_endlist) {
- r0 = m_rMin;
- m_endlist = true;
+ if (!data.endlist) {
+ r0 = data.rMin;
+ data.endlist = true;
}
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
- m_nOneSeeds = 0;
- m_mapOneSeeds.erase(m_mapOneSeeds.begin(), m_mapOneSeeds.end());
+ data.nOneSeeds = 0;
+ data.mapOneSeeds.erase(data.mapOneSeeds.begin(), data.mapOneSeeds.end());
float R = (*r0)->radius();
@@ -1481,9 +1461,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
// Bottom links production
//
for (int i=0; i!=NB; ++i) {
-
for (r=rb[i]; r!=rbe[i]; ++r) {
-
float Rb =(*r)->radius();
float dR = R-Rb;
if (dR > m_drmax) {
@@ -1491,20 +1469,16 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
continue;
}
if (dR < m_drmin) break;
-
if ((*r)->sur()==sur0) continue;
-
if ( !pix && !(*r)->spacepoint->clusterList().second) continue;
-
float Tz = (Z-(*r)->z())/dR;
-
if (Tz < m_dzdrmin || Tz > m_dzdrmax) continue;
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,Rb,Tz)) continue;
- m_SP[Nb] = (*r);
+ if (!isZCompatible(data, Zo, Rb, Tz)) continue;
+ data.SP[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1515,9 +1489,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
// Top links production
//
for (int i=0; i!=NT; ++i) {
-
for (r=rt[i]; r!=rte[i]; ++r) {
-
float Rt =(*r)->radius();
float dR = Rt-R;
if (dR<m_drmin) {
@@ -1525,18 +1497,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
continue;
}
if (dR > m_drmax) break;
-
- if ( (*r)->sur()==sur0) continue;
-
+ if ((*r)->sur()==sur0) continue;
float Tz = ((*r)->z()-Z)/dR;
-
if (Tz < m_dzdrmin || Tz > m_dzdrmax) continue;
// Comparison with vertices Z coordinates
//
float Zo = Z-R*Tz;
- if (!isZCompatible(Zo,R,Tz)) continue;
- m_SP[Nt] = (*r);
+ if (!isZCompatible(data, Zo, R, Tz)) continue;
+ data.SP[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1544,15 +1513,15 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
breakt:
if (!(Nt-Nb)) continue;
- float covr0 = (*r0)->covr ();
- float covz0 = (*r0)->covz ();
+ float covr0 = (*r0)->covr();
+ float covz0 = (*r0)->covz();
float ax = X/R;
float ay = Y/R;
for (int i=0; i!=Nt; ++i) {
- InDet::SiSpacePointForSeed* sp = m_SP[i];
+ InDet::SiSpacePointForSeed* sp = data.SP[i];
float dx = sp->x()-X ;
float dy = sp->y()-Y ;
@@ -1564,12 +1533,12 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
float tz = dz*dr ;
if (i < Nb) tz = -tz;
- m_Tz[i] = tz ;
- m_Zo[i] = Z-R*tz ;
- m_R [i] = dr ;
- m_U [i] = x*r2 ;
- m_V [i] = y*r2 ;
- m_Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
+ data.Tz[i] = tz ;
+ data.Zo[i] = Z-R*tz ;
+ data.R [i] = dr ;
+ data.U [i] = x*r2 ;
+ data.V [i] = y*r2 ;
+ data.Er[i] = (covz0+sp->covz()+tz*tz*(covr0+sp->covr()))*r2;
}
float imc = m_diver ;
@@ -1587,29 +1556,27 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
// Three space points comparison
//
for (int b=0; b!=Nb; ++b) {
-
- const Trk::SpacePoint* SPb = m_SP[b]->spacepoint;
+ const Trk::SpacePoint* SPb = data.SP[b]->spacepoint;
- float Zob = m_Zo[b] ;
- float Tzb = m_Tz[b] ;
- float Rb2r = m_R [b]*covr0;
- float Rb2z = m_R [b]*covz0;
- float Erb = m_Er[b] ;
- float Vb = m_V [b] ;
- float Ub = m_U [b] ;
+ float Zob = data.Zo[b] ;
+ float Tzb = data.Tz[b] ;
+ float Rb2r = data.R [b]*covr0;
+ float Rb2z = data.R [b]*covz0;
+ float Erb = data.Er[b] ;
+ float Vb = data.V [b] ;
+ float Ub = data.U [b] ;
float Tzb2 = (1.+Tzb*Tzb) ;
float CSA = Tzb2*COFK ;
float ICSA = Tzb2*ipt2C ;
for (int t=Nb; t!=Nt; ++t) {
-
- float Ts = .5*(Tzb+m_Tz[t]) ;
- float dt = Tzb-m_Tz[t] ;
- float dT = dt*dt-Erb-m_Er[t]-m_R[t]*(Ts*Ts*Rb2r+Rb2z);
+ float Ts = .5*(Tzb+data.Tz[t]) ;
+ float dt = Tzb-data.Tz[t] ;
+ float dT = dt*dt-Erb-data.Er[t]-data.R[t]*(Ts*Ts*Rb2r+Rb2z);
if ( dT > ICSA) continue;
- float dU = m_U[t]-Ub;
+ float dU = data.U[t]-Ub;
if (dU == 0.) continue;
- float A = (m_V[t]-Vb)/dU ;
+ float A = (data.V[t]-Vb)/dU ;
float S2 = 1.+A*A ;
float B = Vb-A*Ub ;
float B2 = B*B ;
@@ -1618,19 +1585,19 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
if (pix) {
if ( Im > imc ) continue;
- if (m_SP[t]->spacepoint->clusterList().second && Im > imcs) continue;
+ if (data.SP[t]->spacepoint->clusterList().second && Im > imcs) continue;
} else if (Im > m_diversss) {
continue;
}
- newOneSeed(SPb,SP0,m_SP[t]->spacepoint,Zob,Im);
+ newOneSeed(data, SPb, SP0, data.SP[t]->spacepoint, Zob, Im);
}
}
- nseed += m_mapOneSeeds.size();
- fillSeeds();
+ nseed += data.mapOneSeeds.size();
+ fillSeeds(data);
if (nseed>=m_maxsize) {
- m_endlist=false;
+ data.endlist=false;
++r0;
- m_rMin = r0;
+ data.rMin = r0;
return;
}
}
@@ -1641,35 +1608,36 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::production3SpNoVertex
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newOneSeed
-(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const Trk::SpacePoint*& p3,const float& z,const float& q)
+(EventData& data,
+ const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
+ const Trk::SpacePoint*& p3,const float& z,const float& q) const
{
- if (m_nOneSeeds < m_maxOneSize) {
-
- m_OneSeeds [m_nOneSeeds].erase ( );
- m_OneSeeds [m_nOneSeeds].add (p1);
- m_OneSeeds [m_nOneSeeds].add (p2);
- m_OneSeeds [m_nOneSeeds].add (p3);
- m_OneSeeds [m_nOneSeeds].setZVertex(static_cast<double>(z));
- m_mapOneSeeds.insert(std::make_pair(q, &(m_OneSeeds[m_nOneSeeds])));
- ++m_nOneSeeds;
+ if (data.nOneSeeds < m_maxOneSize) {
+
+ data.OneSeeds[data.nOneSeeds].erase();
+ data.OneSeeds[data.nOneSeeds].add(p1);
+ data.OneSeeds[data.nOneSeeds].add(p2);
+ data.OneSeeds[data.nOneSeeds].add(p3);
+ data.OneSeeds[data.nOneSeeds].setZVertex(static_cast<double>(z));
+ data.mapOneSeeds.insert(std::make_pair(q, &(data.OneSeeds[data.nOneSeeds])));
+ ++data.nOneSeeds;
} else {
std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator
- l = m_mapOneSeeds.rbegin();
+ l = data.mapOneSeeds.rbegin();
if ((*l).first <= q) return;
InDet::SiSpacePointsSeed* s = (*l).second;
- s->erase ( );
- s->add (p1);
- s->add (p2);
- s->add (p3);
+ s->erase();
+ s->add(p1);
+ s->add(p2);
+ s->add(p3);
s->setZVertex(static_cast<double>(z));
std::multimap<float,InDet::SiSpacePointsSeed*>::iterator
- i = m_mapOneSeeds.insert(std::make_pair(q,s));
+ i = data.mapOneSeeds.insert(std::make_pair(q,s));
- for (++i; i!=m_mapOneSeeds.end(); ++i) {
+ for (++i; i!=data.mapOneSeeds.end(); ++i) {
if ((*i).second==s) {
- m_mapOneSeeds.erase(i);
+ data.mapOneSeeds.erase(i);
return;
}
}
@@ -1678,20 +1646,22 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newOneSeed
const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::next()
{
- if (m_i_seed==m_i_seede) {
- findNext();
- if (m_i_seed==m_i_seede) return nullptr;
+ EventData& data{getEventData()};
+
+ if (data.i_seed==data.i_seede) {
+ findNext(data);
+ if (data.i_seed==data.i_seede) return nullptr;
}
- return &(*m_i_seed++);
+ return &(*data.i_seed++);
}
bool InDet::SiSpacePointsSeedMaker_HeavyIon::isZCompatible
-(float& Zv,float& R,float& T)
+(EventData& data, float& Zv, float& R, float& T) const
{
if (Zv < m_zmin || Zv > m_zmax) return false;
- if (!m_izvertex ) return true;
+ if (!data.izvertex ) return true;
- std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
+ std::list<float>::iterator v=data.l_vertex.begin(),ve=data.l_vertex.end();
float dZmin = fabs((*v)-Zv);
++v;
@@ -1701,10 +1671,10 @@ bool InDet::SiSpacePointsSeedMaker_HeavyIon::isZCompatible
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
}
-float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(float& Z)
+float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(EventData& data, float& Z) const
{
float dZm = 1.E10;
- std::list<float>::iterator v=m_l_vertex.begin(),ve=m_l_vertex.end();
+ std::list<float>::iterator v=data.l_vertex.begin(), ve=data.l_vertex.end();
for (; v!=ve; ++v) {
float dZ = fabs((*v)-Z);
@@ -1718,20 +1688,20 @@ float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(float& Z)
///////////////////////////////////////////////////////////////////
InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::newSpacePoint
-(const Trk::SpacePoint*const& sp)
+(EventData& data, const Trk::SpacePoint*const& sp) const
{
InDet::SiSpacePointForSeed* sps = nullptr;
float r[3];
- convertToBeamFrameWork(sp, r);
+ convertToBeamFrameWork(data, sp, r);
- if (m_i_spforseed!=m_l_spforseed.end()) {
- sps = &(*m_i_spforseed++);
+ if (data.i_spforseed!=data.l_spforseed.end()) {
+ sps = &(*data.i_spforseed++);
sps->set(sp,r);
} else {
- m_l_spforseed.push_back(InDet::SiSpacePointForSeed(sp, r));
- sps = &(m_l_spforseed.back());
- m_i_spforseed = m_l_spforseed.end();
+ data.l_spforseed.push_back(InDet::SiSpacePointForSeed(sp, r));
+ sps = &(data.l_spforseed.back());
+ data.i_spforseed = data.l_spforseed.end();
}
return sps;
@@ -1742,18 +1712,19 @@ InDet::SiSpacePointForSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::newSpacePoin
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
-(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const float& z)
+(EventData& data,
+ const Trk::SpacePoint*& p1, const Trk::SpacePoint*& p2,
+ const float& z) const
{
- if (m_i_seede!=m_l_seeds.end()) {
- InDet::SiSpacePointsSeed* s = &(*m_i_seede++);
- s->erase ( );
- s->add (p1);
- s->add (p2);
+ if (data.i_seede!=data.l_seeds.end()) {
+ InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
+ s->erase();
+ s->add(p1);
+ s->add(p2);
s->setZVertex(static_cast<double>(z));
} else {
- m_l_seeds.push_back(InDet::SiSpacePointsSeed(p1, p2, z));
- m_i_seede = m_l_seeds.end();
+ data.l_seeds.push_back(InDet::SiSpacePointsSeed(p1, p2, z));
+ data.i_seede = data.l_seeds.end();
}
}
@@ -1762,19 +1733,20 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
-(const Trk::SpacePoint*& p1,const Trk::SpacePoint*& p2,
- const Trk::SpacePoint*& p3,const float& z)
+(EventData& data,
+ const Trk::SpacePoint*& p1, const Trk::SpacePoint*& p2,
+ const Trk::SpacePoint*& p3, const float& z) const
{
- if (m_i_seede!=m_l_seeds.end()) {
- InDet::SiSpacePointsSeed* s = &(*m_i_seede++);
- s->erase ( );
- s->add (p1);
- s->add (p2);
- s->add (p3);
+ if (data.i_seede!=data.l_seeds.end()) {
+ InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
+ s->erase();
+ s->add(p1);
+ s->add(p2);
+ s->add(p3);
s->setZVertex(static_cast<double>(z));
} else {
- m_l_seeds.push_back(InDet::SiSpacePointsSeed(p1, p2, p3, z));
- m_i_seede = m_l_seeds.end();
+ data.l_seeds.push_back(InDet::SiSpacePointsSeed(p1, p2, p3, z));
+ data.i_seede = data.l_seeds.end();
}
}
@@ -1782,18 +1754,68 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newSeed
// Fill seeds
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::fillSeeds ()
+void InDet::SiSpacePointsSeedMaker_HeavyIon::fillSeeds(EventData& data) const
{
std::multimap<float, InDet::SiSpacePointsSeed*>::iterator
- l = m_mapOneSeeds.begin(),
- le = m_mapOneSeeds.end ();
+ l = data.mapOneSeeds.begin(),
+ le = data.mapOneSeeds.end ();
for (; l!=le; ++l) {
- if (m_i_seede!=m_l_seeds.end()) {
- InDet::SiSpacePointsSeed* s = &(*m_i_seede++);
+ if (data.i_seede!=data.l_seeds.end()) {
+ InDet::SiSpacePointsSeed* s = &(*data.i_seede++);
*s = *(*l).second;
} else {
- m_l_seeds.push_back(InDet::SiSpacePointsSeed(*(*l).second));
- m_i_seede = m_l_seeds.end();
+ data.l_seeds.push_back(InDet::SiSpacePointsSeed(*(*l).second));
+ data.i_seede = data.l_seeds.end();
+ }
+ }
+}
+
+InDet::SiSpacePointsSeedMaker_HeavyIon::EventData&
+InDet::SiSpacePointsSeedMaker_HeavyIon::getEventData() const {
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ EventContext::ContextID_t slot{ctx.slot()};
+ EventContext::ContextEvt_t evt{ctx.evt()};
+ if (not m_initialized) slot = 0;
+ std::lock_guard<std::mutex> lock{m_mutex};
+ if (slot>=m_cache.size()) { // Need to extend vectors
+ static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
+ m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
+ m_eventData.resize(slot+1);
+ }
+ if (m_cache[slot]!=evt) { // New event
+ m_cache[slot] = evt;
+ // Initialization
+ m_eventData[slot] = EventData{}; // This will be improved later.
+
+ m_eventData[slot].r_Sorted.resize(m_r_size);
+ m_eventData[slot].r_index.resize(m_r_size, 0);
+ m_eventData[slot].r_map.resize(m_r_size, 0);
+
+ m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
+ m_eventData[slot].R.resize(m_maxsizeSP, 0.);
+ m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
+ m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
+ m_eventData[slot].U.resize(m_maxsizeSP, 0.);
+ m_eventData[slot].V.resize(m_maxsizeSP, 0.);
+ m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
+
+ m_eventData[slot].OneSeeds.resize(m_maxOneSize);
+
+ // Build radius-azimuthal-Z sorted containers
+ for (int i=0; i<SizeRFZ; ++i) {
+ m_eventData[slot].rfz_index[i] = 0;
+ m_eventData[slot].rfz_map[i] = 0;
}
+
+ // Build radius-azimuthal-Z sorted containers for Z-vertices
+ for (int i=0; i<SizeRFZV; ++i) {
+ m_eventData[slot].rfzv_index[i] = 0;
+ m_eventData[slot].rfzv_map[i] = 0;
+ }
+
+ m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
+ m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end();
}
+
+ return m_eventData[slot];
}
--
GitLab