From 9d354aa3f9afe2a608c395f9ad9e85bf8afff179 Mon Sep 17 00:00:00 2001
From: Ewan Barr <ewan.d.barr@googlemail.com>
Date: Thu, 3 May 2018 11:51:21 +0200
Subject: [PATCH] cleaned up and added flag to only call handler once the data
is valid
---
psrdada_cpp/effelsberg/edd/detail/eddfft.cu | 2 --
psrdada_cpp/effelsberg/edd/src/eddfft.cu | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/psrdada_cpp/effelsberg/edd/detail/eddfft.cu b/psrdada_cpp/effelsberg/edd/detail/eddfft.cu
index 89ec148d..face31f4 100644
--- a/psrdada_cpp/effelsberg/edd/detail/eddfft.cu
+++ b/psrdada_cpp/effelsberg/edd/detail/eddfft.cu
@@ -22,7 +22,6 @@ SimpleFFTSpectrometer<HandlerType>::SimpleFFTSpectrometer(
, _nbits(nbits)
, _handler(handler)
, _fft_plan(0)
- , _data_valid(true)
, _pass(0)
{
BOOST_LOG_TRIVIAL(debug)
@@ -154,7 +153,6 @@ bool SimpleFFTSpectrometer<HandlerType>::operator()(RawBytes& block)
_detected_host_previous->size() * sizeof(float));
BOOST_LOG_TRIVIAL(debug) << "Calling handler";
-
CUDA_ERROR_CHECK(cudaStreamSynchronize(_h2d_stream));
std::swap(_edd_raw_current, _edd_raw_previous);
diff --git a/psrdada_cpp/effelsberg/edd/src/eddfft.cu b/psrdada_cpp/effelsberg/edd/src/eddfft.cu
index 1e18356a..e75a9d9b 100644
--- a/psrdada_cpp/effelsberg/edd/src/eddfft.cu
+++ b/psrdada_cpp/effelsberg/edd/src/eddfft.cu
@@ -110,7 +110,7 @@ void detect_and_accumulate(float2* __restrict__ in, float* __restrict__ out, int
float y = tmp.y * tmp.y;
sum += x + y;
}
- out[write_offset + chan_idx] = sum;
+ out[write_offset + chan_idx] = sum / naccumulate;
}
}
}
--
GitLab