@@ -24,7 +24,7 @@ void TrackerTraitsGPU<NLayers>::initialiseTimeFrame(const int iteration)
2424{
2525 mTimeFrameGPU ->initialise (this ->mTrkParams [iteration], NLayers);
2626
27- if (this ->mTrkParams [iteration].IterationSteps .test (IterationStep::FirstPass)) {
27+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep::FirstPass)) {
2828 // on default stream
2929 mTimeFrameGPU ->loadVertices ();
3030 // TODO these tables can be put in persistent memory
@@ -46,7 +46,7 @@ void TrackerTraitsGPU<NLayers>::initialiseTimeFrame(const int iteration)
4646 mTimeFrameGPU ->createCellsBuffersArray ();
4747 mTimeFrameGPU ->createCellsLUTDeviceArray ();
4848 }
49- if (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass) || this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::UseUPCMask)) {
49+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass) || this ->mTrkParams [iteration].PassFlags .test (IterationStep ::UseUPCMask)) {
5050 mTimeFrameGPU ->loadROFCutMask (iteration);
5151 }
5252 // push every create artefact on the stack
@@ -65,7 +65,7 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
6565{
6666 // start by queuing loading needed of two last layers
6767 for (int iLayer{NLayers}; iLayer-- > NLayers - 2 ;) {
68- if (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass)) {
68+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass)) {
6969 mTimeFrameGPU ->createUsedClustersDevice (iLayer);
7070 mTimeFrameGPU ->loadClustersDevice (iLayer);
7171 mTimeFrameGPU ->loadClustersIndexTables (iLayer);
@@ -76,15 +76,15 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
7676
7777 for (int iLayer{this ->mTrkParams [iteration].TrackletsPerRoad ()}; iLayer--;) {
7878 if (iLayer) { // queue loading data of next layer in parallel, this the copies are overlapping with computation kernels
79- if (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass)) {
79+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass)) {
8080 mTimeFrameGPU ->createUsedClustersDevice (iLayer - 1 );
8181 mTimeFrameGPU ->loadClustersDevice (iLayer - 1 );
8282 mTimeFrameGPU ->loadClustersIndexTables (iLayer - 1 );
8383 mTimeFrameGPU ->loadROFrameClustersDevice (iLayer - 1 );
8484 }
8585 mTimeFrameGPU ->recordEvent (iLayer - 1 );
8686 }
87- mTimeFrameGPU ->createTrackletsLUTDevice (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass), iLayer);
87+ mTimeFrameGPU ->createTrackletsLUTDevice (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass), iLayer);
8888 mTimeFrameGPU ->waitEvent (iLayer, iLayer + 1 ); // wait stream until all data is available
8989 countTrackletsInROFsHandler<NLayers>(mTimeFrameGPU ->getDeviceIndexTableUtils (),
9090 mTimeFrameGPU ->getDeviceROFMaskTableView (),
@@ -101,7 +101,7 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
101101 mTimeFrameGPU ->getDeviceArrayClustersIndexTables (),
102102 mTimeFrameGPU ->getDeviceArrayTrackletsLUT (),
103103 mTimeFrameGPU ->getDeviceTrackletsLUTs (),
104- this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::SelectUPCVertices),
104+ this ->mTrkParams [iteration].PassFlags .test (IterationStep ::SelectUPCVertices),
105105 this ->mTrkParams [iteration].NSigmaCut ,
106106 mTimeFrameGPU ->getPhiCuts (),
107107 this ->mTrkParams [iteration].PVres ,
@@ -134,7 +134,7 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
134134 mTimeFrameGPU ->getNTracklets (),
135135 mTimeFrameGPU ->getDeviceArrayTrackletsLUT (),
136136 mTimeFrameGPU ->getDeviceTrackletsLUTs (),
137- this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::SelectUPCVertices),
137+ this ->mTrkParams [iteration].PassFlags .test (IterationStep ::SelectUPCVertices),
138138 this ->mTrkParams [iteration].NSigmaCut ,
139139 mTimeFrameGPU ->getPhiCuts (),
140140 this ->mTrkParams [iteration].PVres ,
@@ -153,7 +153,7 @@ void TrackerTraitsGPU<NLayers>::computeLayerCells(const int iteration)
153153{
154154 // start by queuing loading needed of three last layers
155155 for (int iLayer{NLayers}; iLayer-- > NLayers - 3 ;) {
156- if (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass)) {
156+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass)) {
157157 mTimeFrameGPU ->loadUnsortedClustersDevice (iLayer);
158158 mTimeFrameGPU ->loadTrackingFrameInfoDevice (iLayer);
159159 }
@@ -162,7 +162,7 @@ void TrackerTraitsGPU<NLayers>::computeLayerCells(const int iteration)
162162
163163 for (int iLayer{this ->mTrkParams [iteration].CellsPerRoad ()}; iLayer--;) {
164164 if (iLayer) {
165- if (this ->mTrkParams [iteration].PassFlags .test (RecoPassFlag ::FirstPass)) {
165+ if (this ->mTrkParams [iteration].PassFlags .test (IterationStep ::FirstPass)) {
166166 mTimeFrameGPU ->loadUnsortedClustersDevice (iLayer - 1 );
167167 mTimeFrameGPU ->loadTrackingFrameInfoDevice (iLayer - 1 );
168168 }
0 commit comments