diff --git a/RecoTracker/MkFitCore/src/PropagationMPlex.icc b/RecoTracker/MkFitCore/src/PropagationMPlex.icc index 15e9a644d651f..dbadedfdc29ce 100644 --- a/RecoTracker/MkFitCore/src/PropagationMPlex.icc +++ b/RecoTracker/MkFitCore/src/PropagationMPlex.icc @@ -66,9 +66,9 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, phiin[n - nmin] = inPar(n, 4, 0); theta[n - nmin] = inPar(n, 5, 0); - dprint(std::endl); + //dprint(std::endl); } -#pragma omp simd + for (int n = nmin; n < nmax; ++n) { dprint_np(n, "input parameters" @@ -117,7 +117,7 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, pxin[n - nmin] = cosPorT[n - nmin] * pt[n - nmin]; pyin[n - nmin] = sinPorT[n - nmin] * pt[n - nmin]; } -#pragma omp simd + for (int n = nmin; n < nmax; ++n) { dprint_np(n, "k=" << std::setprecision(9) << k[n - nmin] << " pxin=" << std::setprecision(9) << pxin[n - nmin] @@ -223,7 +223,7 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, sina[n - nmin] = 2.f * sinah[n - nmin] * cosah[n - nmin]; } -#pragma omp simd + for (int n = nmin; n < nmax; ++n) { dprint_np(n, "Attempt propagation from r=" @@ -310,7 +310,8 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, pxinold[n - nmin] = pxin[n - nmin]; //copy before overwriting pxin[n - nmin] = pxin[n - nmin] * cosa[n - nmin] - pyin[n - nmin] * sina[n - nmin]; pyin[n - nmin] = pyin[n - nmin] * cosa[n - nmin] + pxinold[n - nmin] * sina[n - nmin]; - + } + for (int n = nmin; n < nmax; ++n) { dprint_np(n, "outPar(n, 0, 0)=" << outPar(n, 0, 0) << " outPar(n, 1, 0)=" << outPar(n, 1, 0) << " pxin=" << pxin[n - nmin] << " pyin=" << pyin[n - nmin]); @@ -446,7 +447,6 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, errorProp(n, 5, 5) = 1.f; } -#pragma omp simd for (int n = nmin; n < nmax; ++n) { dprint_np(n, "propagation end, dump parameters" @@ -459,7 +459,6 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, } #ifdef DEBUG -#pragma omp simd for (int n = nmin; n < nmax; ++n) { if (n < N_proc) { dmutex_guard; @@ -508,5 +507,7 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar, errorProp(n, 5, 5)); printf("\n"); } -#endif } +#endif + +}