ASCEE/lasp
ASCEE/lasp
5
1
Fork 0
Code Issues 5 Pull Requests Actions Releases 14 Activity

Merge branch 'develop' of ssh://code.ascee.nl:12001/ASCEE/lasp into develop

Browse Source
This commit is contained in:
Casper Jansen 2022-10-13 12:07:05 +02:00
commit a73863d044
8 changed files with 222 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -8,9 +8,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED)
option(LASP_DOUBLE_PRECISION "Compile as double precision floating point" ON)
option(LASP_HAS_RTAUDIO "Compile with RtAudio Daq backend" ON)
option(LASP_HAS_ULDAQ "Compile with UlDaq backend" ON)
option(LASP_BUILD_TUNED "Tune build for current machine" OFF)
option(LASP_WITH_OPENMP "Use OpenMP parallelization" ON)
option(LASP_BUILD_TUNED "Tune build for current machine (Experimental / untested)" OFF)
option(LASP_WITH_OPENMP "Use OpenMP parallelization (Experimental: crashes SHOULD BE EXPECTED)" OFF)
set(LASP_MAX_NFFT "33554432" CACHE STRING "Max FFT size")
option(LASP_BUILD_CPP_TESTS "Build CPP test code" OFF)
# Use ccache if available
find_program(CCACHE_PROGRAM ccache)
@ -100,4 +101,7 @@ include(rtaudio)
include(uldaq)
#
add_subdirectory(src/lasp)
if(LASP_BUILD_CPP_TESTS)
add_subdirectory(test)
endif()

2
src/lasp/CMakeLists.txt
View File

@ -6,7 +6,7 @@ add_definitions(-DARMA_DONT_USE_WRAPPER)
configure_file(lasp_config.h.in lasp_config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(SYSTEM
../../third_party/armadillo-code/include)
${PROJECT_SOURCE_DIR}/third_party/armadillo-code/include)
include_directories(../../third_party/DebugTrace-cpp/include)
include_directories(../../third_party/gsl-lite/include)

5
src/lasp/device/lasp_daqdata.cpp
View File

@ -64,17 +64,18 @@ void DaqData::copyInFromRaw(const std::vector<byte_t *> &ptrs) {
/* std::copy(ptr, ptr + sw * nframes, &_data[sw * ch * nframes]); */
ch++;
}
dmat data2(nframes, nchannels);
}
void DaqData::copyToRaw(const us channel, byte_t *ptr) {
/* std::copy(raw_ptr(0, channel), raw_ptr(nframes, channel), ptr); */
assert(channel<nchannels);
assert(ptr);
memcpy(ptr, raw_ptr(0, channel), sw*nframes);
}
template <typename T>
d DaqData::toFloat(const us frame, const us channel) const {
DEBUGTRACE_ENTER;
/* DEBUGTRACE_ENTER; */
if constexpr (std::is_integral<T>::value) {
return static_cast<d>(value<T>(frame, channel)) /
std::numeric_limits<T>::max();

43
src/lasp/dsp/lasp_fft.cpp
View File

@ -1,34 +1,30 @@
// lasp_fft.c
//
// Author: J.A. de Jong - ASCEE
//
// Description:
// FFt implementation
//
//////////////////////////////////////////////////////////////////////
/* #define DEBUGTRACE_ENABLED */
#include <memory>
#include <cassert>
/* #define DEBUGTRACE_ENABLED */
#include "lasp_fft.h"
#include "debugtrace.hpp"
#include "lasp_config.h"
#include "lasp_fft.h"
using rte = std::runtime_error;
#if LASP_FFT_BACKEND == Armadillo
#include "fftpack.h"
class Fft_impl {
public:
us nfft;
Fft_impl(const us nfft) : nfft(nfft) {
throw runtime_error(
"This code does not output correct results, as it computes the full "
"FFT. It needs to be reworked to single-sided spectra.");
Fft_impl(const us nfft) : nfft(nfft) { DEBUGTRACE_ENTER; }
vc fft(const vd &time) {
DEBUGTRACE_ENTER;
vc res = arma::fft(time);
return res.rows(0, nfft / 2);
}
vd ifft(const vc &f) {
DEBUGTRACE_ENTER;
vc f_full(nfft);
vc f_above_nyq = arma::conj(arma::reverse(f));
f_full.rows(0, nfft / 2) = f;
f_full.rows(nfft / 2, nfft - 1) = f_above_nyq.rows(0, nfft/2-1);
return arma::real(arma::ifft(f_full));
}
vd ifft(const vc &f) { return arma::ifft(f); }
vc fft(const vd &time) { return arma::fft(time); }
};
#elif LASP_FFT_BACKEND == FFTW
#include <fftw3.h>
@ -59,7 +55,6 @@ class Fft_impl {
if (!forward_plan || !reverse_plan || !timeDomain || !frequencyDomain) {
throw rte("Error allocating FFT");
}
};
~Fft_impl() {
@ -123,9 +118,15 @@ Fft::Fft(const us nfft) {
}
Fft::~Fft() {}
us Fft::nfft() const { assert(_impl); return _impl->nfft; }
us Fft::nfft() const {
assert(_impl);
return _impl->nfft;
}
vc Fft::fft(const vd &timedata) { assert(_impl); return _impl->fft(timedata); }
vc Fft::fft(const vd &timedata) {
assert(_impl);
return _impl->fft(timedata);
}
cmat Fft::fft(const dmat &freqdata) {
DEBUGTRACE_ENTER;

52
src/lasp/dsp/lasp_rtaps.cpp
View File

@ -1,4 +1,4 @@
#define DEBUGTRACE_ENABLED
/* #define DEBUGTRACE_ENABLED */
#include "lasp_rtaps.h"
#include "debugtrace.hpp"
#include <mutex>
@ -13,9 +13,9 @@ RtAps::RtAps(StreamMgr &mgr, const Filter *freqWeightingFilter,
: ThreadedInDataHandler(mgr),
_ps(nfft, w, overlap_percentage, time_constant) {
/* if (freqWeightingFilter != nullptr) { */
/* _filterPrototype = freqWeightingFilter->clone(); */
/* } */
if (freqWeightingFilter != nullptr) {
_filterPrototype = freqWeightingFilter->clone();
}
start();
}
@ -29,30 +29,29 @@ bool RtAps::inCallback_threaded(const DaqData &data) {
std::scoped_lock<std::mutex> lck(_mtx);
dmat fltdata = data.toFloat();
data.print();
/* const us nchannels = fltdata.n_cols; */
const us nchannels = fltdata.n_cols;
/* if (_filterPrototype) { */
if (_filterPrototype) {
/* // Adjust number of filters, if necessary */
/* if (nchannels > _freqWeightingFilter.size()) { */
/* while (nchannels > _freqWeightingFilter.size()) { */
/* _freqWeightingFilter.emplace_back(_filterPrototype->clone()); */
/* } */
// Adjust number of filters, if necessary
if (nchannels > _freqWeightingFilter.size()) {
while (nchannels > _freqWeightingFilter.size()) {
_freqWeightingFilter.emplace_back(_filterPrototype->clone());
}
/* for (auto &filter : _freqWeightingFilter) { */
/* filter->reset(); */
/* } */
/* } */
for (auto &filter : _freqWeightingFilter) {
filter->reset();
}
}
/* // Apply filtering */
/* #pragma omp parallel for */
/* for (us i = 0; i < nchannels; i++) { */
/* vd col = fltdata.col(i); */
/* _freqWeightingFilter.at(i)->filter(col); */
/* fltdata.col(i) = col; */
/* } */
/* } // End of if(_filterPrototype) */
// Apply filtering
#pragma omp parallel for
for (us i = 0; i < nchannels; i++) {
vd col = fltdata.col(i);
_freqWeightingFilter.at(i)->filter(col);
fltdata.col(i) = col;
}
} // End of if(_filterPrototype)
_ps.compute(fltdata);
@ -75,9 +74,4 @@ std::unique_ptr<ccube> RtAps::getCurrentValue() {
auto est = _ps.get_est();
return std::make_unique<ccube>(est.value_or(ccube()));
/* return std::move(_latest_est); */
/* if (_latest_est) { */
/* return std::make_unique<cube>(cube(*_latest_est)); */
/* } else */
/* return nullptr; */
}

25
test/CMakeLists.txt
View File

@ -1,17 +1,8 @@
include_directories(${CMAKE_SOURCE_DIR}/lasp/c)
include_directories(${CMAKE_SOURCE_DIR}/lasp/device)
# add_executable(test_bf test_bf.c)
# add_executable(test_workers test_workers.c)
# add_executable(test_fft test_fft.c)
# add_executable(test_math test_math.c)
# target_link_libraries(test_bf lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_fft lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_workers lasp_lib ${LASP_THREADING_LIBRARIES})
# target_link_libraries(test_math lasp_lib ${LASP_THREADING_LIBRARIES})
if(LASP_ULDAQ)
add_executable(test_uldaq test_uldaq.cpp)
target_link_libraries(test_uldaq cpp_daq)
endif(LASP_ULDAQ)
include_directories(SYSTEM
${PROJECT_SOURCE_DIR}/third_party/armadillo-code/include)
add_executable(test_daq test_daq.cpp)
add_executable(test_smgr test_smgr.cpp)
include_directories(../src/lasp/device ../src/lasp/dsp ../src/lasp)
include_directories(../third_party/gsl-lite/include)
target_link_libraries(test_daq lasp_device_lib lasp_dsp_lib)
target_link_libraries(test_smgr lasp_device_lib lasp_dsp_lib)

48
test/test_daq.cpp Normal file
View File

@ -0,0 +1,48 @@
#include "lasp_daq.h"
#include "lasp_deviceinfo.h"
#include <memory>
#include <vector>
using namespace std;
bool inCallback(const DaqData& d) {
d.toFloat();
return true;
}
int main(int argc, const char **const argv) {
std::vector<DeviceInfo> devs = DeviceInfo::getDeviceInfo();
DeviceInfo *mon_device = nullptr;
for (auto &d : devs) {
string name_lower = d.device_name;
transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
::tolower);
if (name_lower.find("monitor") != string::npos) {
mon_device = &d;
}
}
if (!mon_device) {
cerr << "Could not find monitor device\n";
exit(1);
}
DaqConfiguration config(*mon_device);
config.inchannel_config[0].enabled = true;
config.inchannel_config[1].enabled = true;
unique_ptr<Daq> daq = Daq::createDaq(*mon_device, config);
InDaqCallback icb = inCallback;
OutDaqCallback ocb;
daq->start(icb, ocb);
cout << "Press <enter> to stop" << endl;
cin.get();
return 0;
}

52
test/test_smgr.cpp Normal file
View File

@ -0,0 +1,52 @@
#include "lasp_daq.h"
#include "lasp_deviceinfo.h"
#include "lasp_streammgr.h"
#include "lasp_ppm.h"
#include <memory>
#include <vector>
using namespace std;
bool inCallback(const DaqData& d) {
d.toFloat();
return true;
}
int main(int argc, const char **const argv) {
StreamMgr& mgr = StreamMgr::getInstance();
std::vector<DeviceInfo> devs = mgr.getDeviceInfo();
DeviceInfo *mon_device = nullptr;
for (auto &d : devs) {
string name_lower = d.device_name;
transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
::tolower);
if (name_lower.find("monitor") != string::npos) {
mon_device = &d;
}
}
if (!mon_device) {
cerr << "Could not find monitor device\n";
exit(1);
}
cout << "Found device. Name: " << mon_device->device_name << endl;
DaqConfiguration config(*mon_device);
config.inchannel_config.at(0).enabled = true;
config.inchannel_config.at(1).enabled = true;
mgr.startStream(config);
PPMHandler ppm(mgr);
ppm.start();
cout << "Press <enter> to stop" << endl;
cin.get();
return 0;
}