@@ -329,7 +329,7 @@ void CookedTracker::makeSeeds(std::vector<TrackITS>& seeds, Int_t first, Int_t l
329329 if (std::abs (z3 - zr3) > 0.2 * dz3)
330330 continue ;
331331
332- Point3Df txyz2 = c2->getXYZ (); // tracking coordinates
332+ const Point3Df& txyz2 = c2->getXYZ (); // tracking coordinates
333333
334334 TrackITS seed = cookSeed (xyz1, xyz3, txyz2, layer2.getR (), layer3.getR (), layer2.getAlphaRef (n2), getBz ());
335335
@@ -383,21 +383,18 @@ void CookedTracker::trackSeeds(std::vector<TrackITS>& seeds)
383383 }
384384
385385 for (auto & track : seeds) {
386- Double_t x = track.getX ();
387- Double_t y = track.getY ();
388- Double_t phi = track.getAlpha () + TMath::ATan2 (y, x);
389- if (phi < 0 .)
390- phi += k2PI;
391- else if (phi >= k2PI)
392- phi -= k2PI;
393-
394- Double_t z = track.getZ ();
395- Double_t crv = track.getCurvature (getBz ());
396- Double_t tgl = track.getTgl ();
397- Double_t r1 = sLayers [kSeedingLayer2 ].getR ();
386+ auto x = track.getX ();
387+ auto y = track.getY ();
388+ Float_t phi = track.getAlpha () + TMath::ATan2 (y, x);
389+ BringTo02Pi (phi);
390+
391+ auto z = track.getZ ();
392+ auto crv = track.getCurvature (getBz ());
393+ auto tgl = track.getTgl ();
394+ Float_t r1 = sLayers [kSeedingLayer2 ].getR ();
398395
399396 for (Int_t l = kSeedingLayer2 - 1 ; l >= 0 ; l--) {
400- Double_t r2 = sLayers [l].getR ();
397+ Float_t r2 = sLayers [l].getR ();
401398 phi += 0.5 * crv * (r2 - r1);
402399 z += tgl / (0.5 * crv) * (TMath::ASin (0.5 * crv * r2) - TMath::ASin (0.5 * crv * r1));
403400 selec[l].clear ();
@@ -751,10 +748,7 @@ void CookedTracker::Layer::selectClusters(std::vector<Int_t>& selec, Float_t phi
751748 Float_t zMin = z - dz;
752749 Float_t zMax = z + dz;
753750
754- if (phi < 0 .)
755- phi += k2PI;
756- else if (phi >= k2PI)
757- phi -= k2PI;
751+ BringTo02Pi (phi);
758752
759753 Float_t dphi = dy / mR ;
760754
0 commit comments