comparison data/fft/FFTMemoryCache.h @ 509:6066bde1c126

* Cut back on the locking and general workload in
  FFTDataServer::getMagnitudes().  This stuff is far too complicated!

     virtual void reset(); // zero-fill or 1-fill as appropriate without changing size
     
     virtual float getMagnitudeAt(size_t x, size_t y) const {
         if (m_storageType == Rectangular) {
             Profiler profiler("FFTMemoryCache::getMagnitudeAt: cart to polar");
-            return sqrt(m_freal[x][y] * m_freal[x][y] +
-                        m_fimag[x][y] * m_fimag[x][y]);
+            return sqrtf(m_freal[x][y] * m_freal[x][y] +
+                         m_fimag[x][y] * m_fimag[x][y]);
         } else {
             return getNormalizedMagnitudeAt(x, y) * m_factor[x];
         }
     }
     

             Profiler profiler("FFTMemoryCache::getValuesAt: polar to cart");
             float mag = getMagnitudeAt(x, y);
             float phase = getPhaseAt(x, y);
             real = mag * cosf(phase);
             imag = mag * sinf(phase);
+        }
+    }
+
+    virtual void getMagnitudesAt(size_t x, float *values, size_t minbin, size_t count, size_t step) const
+    {
+        if (m_storageType == Rectangular) {
+            for (size_t i = 0; i < count; ++i) {
+                size_t y = i * step + minbin;
+                values[i] = sqrtf(m_freal[x][y] * m_freal[x][y] +
+                                  m_fimag[x][y] * m_fimag[x][y]);
+            }
+        } else if (m_storageType == Polar) {
+            for (size_t i = 0; i < count; ++i) {
+                size_t y = i * step + minbin;
+                values[i] = m_fmagnitude[x][y] * m_factor[x];
+            }
+        } else {
+            for (size_t i = 0; i < count; ++i) {
+                size_t y = i * step + minbin;
+                values[i] = (float(m_magnitude[x][y]) * m_factor[x]) / 65535.0;
+            }
         }
     }
 
     virtual bool haveSetColumnAt(size_t x) const {
         return m_colset.get(x);