Merge branch 'effelsberg' of https://github.com/ewanbarr/psrdada_cpp into effelsberg

psrdada_cpp/effelsberg/edd/CMakeLists.txt

@@ -13,7 +13,7 @@ set(psrdada_cpp_effelsberg_edd_src
 cuda_add_library(${CMAKE_PROJECT_NAME}_effelsberg_edd ${psrdada_cpp_effelsberg_edd_src})
 
 #simple FFT spectrometer interface
-cuda_add_executable(fft_spectrometer src/fft_spectrometer.cu)
+cuda_add_executable(fft_spectrometer src/fft_spectrometer_cli.cu)
 target_link_libraries(fft_spectrometer ${PSRDADA_CPP_EFFELSBERG_EDD_LIBRARIES} ${CUDA_CUFFT_LIBRARIES})
 install(TARGETS fft_spectrometer DESTINATION bin)
 

psrdada_cpp/effelsberg/edd/src/fft_spectrometer_cli.cu

@@ -27,7 +27,6 @@ int main(int argc, char** argv)
     {
         key_t input_key;
         int fft_length;
-        int nsamps_per_block;
         int naccumulate;
         int nbits;
         float input_level;
@@ -102,7 +101,7 @@ int main(int argc, char** argv)
          */
         MultiLog log("edd::FftSpectrometer");
         DadaClientBase client(input_key, log);
-        std::size_t buffer_bytes = client.data_buffer_size()
+        std::size_t buffer_bytes = client.data_buffer_size();
         SimpleFileWriter sink(filename);
         //NullSink sink;
         effelsberg::edd::FftSpectrometer<decltype(sink)> spectrometer(buffer_bytes, fft_length, naccumulate, nbits, input_level, sink);
@@ -120,4 +119,4 @@ int main(int argc, char** argv)
     }
     return SUCCESS;
 
-}
\ No newline at end of file
+}