From 258f61273405010914f288cf540b8f949a37fea6 Mon Sep 17 00:00:00 2001
From: Tobias Winchen <tobias.winchen@rwth-aachen.de>
Date: Tue, 13 Apr 2021 08:27:26 +0000
Subject: [PATCH] Code layout
---
.../effelsberg/edd/detail/GatedSpectrometer.cu | 12 +-----------
psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu | 2 +-
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/psrdada_cpp/effelsberg/edd/detail/GatedSpectrometer.cu b/psrdada_cpp/effelsberg/edd/detail/GatedSpectrometer.cu
index db69b92b..735acd85 100644
--- a/psrdada_cpp/effelsberg/edd/detail/GatedSpectrometer.cu
+++ b/psrdada_cpp/effelsberg/edd/detail/GatedSpectrometer.cu
@@ -112,7 +112,7 @@ GatedSpectrometer<HandlerType, InputType, OutputType>::GatedSpectrometer(
_nBlocks = 1;
}
else
- { // multiple blocks are integrated intoone output
+ { // multiple blocks are integrated into one output
size_t N = nsamps_per_output_spectra / nsamps_per_pol;
// All data in multiple blocks has to be used
assert(N * nsamps_per_pol == nsamps_per_output_spectra);
@@ -419,16 +419,6 @@ void GatedSpectrometer<HandlerType, InputType, OutputType>::process(DualPolariza
_nchans, _naccumulate / _nBlocks
);
}
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G0.I.a().begin(), outputDataStream->G0.I.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G0.Q.a().begin(), outputDataStream->G0.Q.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G0.U.a().begin(), outputDataStream->G0.U.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G0.V.a().begin(), outputDataStream->G0.V.a().end(), _call_count);
-
-
- // thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G1.I.a().begin(), outputDataStream->G1.I.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G1.Q.a().begin(), outputDataStream->G1.Q.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G1.U.a().begin(), outputDataStream->G1.U.a().end(), _call_count);
- //thrust::fill(thrust::cuda::par.on(_proc_stream),outputDataStream->G1.V.a().begin(), outputDataStream->G1.V.a().end(), _call_count);
// cudaDeviceSynchronize();
}
diff --git a/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu b/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
index 4ca8fde5..cfac0913 100644
--- a/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
+++ b/psrdada_cpp/effelsberg/edd/src/GatedSpectrometer.cu
@@ -353,7 +353,7 @@ void GatedPowerSpectrumOutput::data2Host(cudaStream_t &_d2h_stream)
// size of individual spectrum + meta
size_t memslicesize = (_nchans * sizeof(IntegratedPowerType));
// number of spectra per output
- size_t memOffset = 2 * i * (memslicesize + + sizeof(size_t));
+ size_t memOffset = 2 * i * (memslicesize + sizeof(size_t));
// copy 2x channel data
CUDA_ERROR_CHECK(
--
GitLab