Incorporate Dan Riley's suggested changes

gartung · May 13, 2022 · dbc748c · dbc748c
1 parent d6ae2c9
commit dbc748c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/RecoTracker/MkFitCore/src/PropagationMPlex.cc b/RecoTracker/MkFitCore/src/PropagationMPlex.cc
@@ -782,9 +782,6 @@ namespace mkfit {
 #pragma omp simd
     for (int n = 0; n < NN; ++n) {
       cosP[n] = std::cos(phiin[n]);
-    }
-#pragma omp simd
-    for (int n = 0; n < NN; ++n) {
       sinP[n] = std::sin(phiin[n]);
     }
     float cosT[NN];
@@ -839,7 +836,7 @@ namespace mkfit {
     }
     float cosahTmp[NN] = {0.};
     float sinahTmp[NN] = {0.};
-    if (Config::useTrigApprox) {
+    if constexpr (Config::useTrigApprox) {
 #pragma omp simd
       for (int n = 0; n < NN; ++n) {
         sincos4(alpha[n] * 0.5f, sinahTmp[n], cosahTmp[n]);

diff --git a/RecoTracker/MkFitCore/src/PropagationMPlex.icc b/RecoTracker/MkFitCore/src/PropagationMPlex.icc
@@ -99,10 +99,17 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar,
 #pragma omp simd
   for (int n = nmin; n < nmax; ++n) {
     cosPorT[n-nmin] = std::cos(phiin[n-nmin]);
+  }
+#pragma omp simd
+  for (int n = nmin; n < nmax; ++n) {
     sinPorT[n-nmin] = std::sin(phiin[n-nmin]);
   }
   float pxin[nmax-nmin]={0.};
   float pyin[nmax-nmin]={0.};
+#pragma omp simd
+  for (int n = nmin; n < nmax; ++n) {
+    pxin[n-nmin] = cosPorT[n-nmin] * pt[n-nmin];
+  }
 #pragma omp simd
   for (int n = nmin; n < nmax; ++n) {
     pxin[n-nmin] = cosPorT[n-nmin] * pt[n-nmin];
@@ -123,6 +130,9 @@ static inline void helixAtRFromIterativeCCS_impl(const Tf& __restrict__ inPar,
   for (int n = nmin; n < nmax; ++n) {
     //derivatives initialized to value for first iteration, i.e. distance = r-r0in
     dDdx[n-nmin] = r0[n-nmin] > 0.f ? -xin[n-nmin] / r0[n-nmin] : 0.f;
+  }
+#pragma omp simd
+  for (int n = nmin; n < nmax; ++n) {
     dDdy[n-nmin] = r0[n-nmin] > 0.f ? -yin[n-nmin] / r0[n-nmin] : 0.f;
   }
   float oodotp[nmax-nmin];