Compute Periods correctly

Menouard AZIB
1 parent b57f2949
Showing 2 changed files with 10 additions and 8 deletions Show diff stats
src/ParamOutputImpl/Plot/InstantPlot/PlotFunction.cc
src/Parameters/fonctions/fourier/DiscreteFourierTransform.cc
@@ -157,6 +157,7 @@ namespace plot
             xAxis = _panel->getAxis(X_AXIS_ID);
         }
  
+        Range lAxisRange = xAxis->Axis::getRange();
         /*
          * here we should use pow10 in case if min and max are computed as log values
          */
@@ -165,20 +166,20 @@ namespace plot
             minValue = pow10(minValue);
             maxValue = pow10(maxValue);
         }
-        Range lAxisRange = xAxis->Axis::getRange();
+
         lAxisRange.setMin(minValue);
         lAxisRange.setMax(maxValue);
         xAxis->setRange(lAxisRange);
         xAxis->_used = true;
         /************************************** Y AXIS RANGE *********************************************/
         PlotFunction::getMinMax(yValuesMap, &minValue, &maxValue);
+        boost::shared_ptr<Axis> lYAxis = _panel->getAxis(Y_AXIS_ID);
+        lAxisRange = lYAxis->Axis::getRange();
         if (ordonneeScale == Axis::Scale::LOGARITHMIC)
         {
             minValue = pow10(minValue);
             maxValue = pow10(maxValue);
         }
-        boost::shared_ptr<Axis> lYAxis = _panel->getAxis(Y_AXIS_ID);
-        lAxisRange = lYAxis->Axis::getRange();
         lAxisRange.setMin(minValue);
         lAxisRange.setMax(maxValue);
         lYAxis->setRange(lAxisRange);
@@ -303,7 +304,7 @@ namespace plot
                 ParamInfoSPtr paramInfo = piMgr->getParamInfoFromId(parameter._originalParamId);
  
                 std::string unit = AxisLegendManager::getTransformedUnits(paramInfo->getUnits());
-                unit = "[" + unit + "]#u2#d / Hz";
+                unit = "[" + unit + "]#u2";
                 if (PlotFunction::isSpectro)
                 {
                     Label label(lYAxis->_legend.getFont(), lYAxis->_legend.getColor());
@@ -118,8 +118,8 @@ std::vector&lt;E&gt; DiscreteFourierTransform&lt;T, E&gt;::computeDSP(std::vector&lt;std::compl
     std::vector<E> out;
     for (int k = 0; k < N / 2; k++)
     {
-        const E magnitude = (E)pow(abs(x[k]), 1);
-        const E dsp = (E)(2.0 / N) * magnitude;
+        const E magnitude = (E)pow(abs(x[k]), 2);
+        const E dsp = (E)(1.0 / N) * magnitude;
         out.push_back(dsp);
     }
  
@@ -144,11 +144,12 @@ template &lt;class T, class E&gt;
 std::vector<E> DiscreteFourierTransform<T, E>::getPeriods(std::vector<std::complex<E>> x, double frequency_)
 {
     const int N = x.size();
-    const double stepPeriod = N / sampleSpacing_;
     std::vector<E> out;
     for (int k = 0; k < N / 2; k++)
     {
-        const E period = (E)k * frequency_;
+        E period = (E)INT_MAX;
+        if (k != 0)
+            period = N / ((E)k * frequency_);
         out.push_back(period);
     }