diff --git a/lib/hooks/dft.cpp b/lib/hooks/dft.cpp index 4f1d8f46e..b0c5c4ca3 100644 --- a/lib/hooks/dft.cpp +++ b/lib/hooks/dft.cpp @@ -227,21 +227,8 @@ public: filterWindowCoefficents.resize(windowSize); -<<<<<<< HEAD for (unsigned i = 0; i < freqCount; i++) { absFrequencies.emplace_back(startFrequency + i * frequencyResolution); -======= - if (logger->level() <= SPDLOG_LEVEL_DEBUG) { -#ifdef DFT_MEM_DUMP - //origSigSync = std::make_shared("/tmp/plot/origSigSync"); - //windowdSigSync = std::make_shared("/tmp/plot/windowdSigSync"); - //ppsSigSync = std::make_shared("/tmp/plot/ppsSigSync"); -#endif - phasorPhase = std::make_shared("/tmp/plot/phasorPhase"); - phasorAmplitude = std::make_shared("/tmp/plot/phasorAmplitude"); - phasorFreq = std::make_shared("/tmp/plot/phasorFreq"); - ppsSigSync = std::make_shared("/tmp/plot/ppsSigSync"); ->>>>>>> dft: ifdef for full mem dump of dft } generateDftMatrix(); @@ -974,6 +961,7 @@ public: /** * This function prepares the selected window coefficents */ +<<<<<<< HEAD void calculateWindow(enum WindowType windowTypeIn) { switch (windowTypeIn) { @@ -1060,6 +1048,8 @@ static HookPlugin>>>>>> dft: change memory layout for dft results to provide one vector per signal void calculateDft(enum PaddingType padding, std::vector &ringBuffer, std::vector> &results, unsigned ringBufferPos) { /* RingBuffer size needs to be equal to windowSize @@ -1091,6 +1081,7 @@ static HookPlugin>>>>>> dft: change memory layout for dft results to provide one vector per signal else results[i] += 0; } else if (padding == PaddingType::SIG_REPEAT) /* Repeat samples */ +<<<<<<< HEAD results[i] += tmpSmpWindow[j % windowSize] * matrix[i][j]; +======= + results[i] += tmpSmpWindow[j % windowSize] * dftMatrix[i][j]; +>>>>>>> dft: change memory layout for dft results to provide one vector per signal } } }