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

Bugfix in fft.c, forgot some defines

Browse Source
This commit is contained in:
Anne de Jong 2021-10-17 14:00:16 +02:00
parent 921c1b067f
commit 2b88a9eb52
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lasp/c/lasp_fft.c
View File

@ -28,7 +28,7 @@ typedef struct Fft_s {
d* real_storage; d* real_storage;
} Fft_s; } Fft_s;
#else #else
#error "Cannot compile lasp_ffc.c, no FFT backend specified" #error "Cannot compile lasp_ffc.c, no FFT backend specified. Should either be FFTPack, or FFTW"
#endif #endif
void load_fft_wisdom(const char* wisdom) { void load_fft_wisdom(const char* wisdom) {
@ -130,7 +130,7 @@ void Fft_ifft_single(const Fft* fft,const vc* freqdata,vd* result) {
getvdval(&fft->fft_work,0)); getvdval(&fft->fft_work,0));
#elif defined LASP_FFT_BACKEND_FFTW #elif LASP_FFT_BACKEND == FFTW
c* freqdata_ptr = (c*) getvcval(freqdata,0); c* freqdata_ptr = (c*) getvcval(freqdata,0);
c_copy(fft->complex_storage, freqdata_ptr,nfft/2+1); c_copy(fft->complex_storage, freqdata_ptr,nfft/2+1);
@ -219,7 +219,7 @@ void Fft_fft_single(const Fft* fft,const vd* timedata,vc* result) {
result_ptr[nfft+1] = 0; result_ptr[nfft+1] = 0;
} }
check_overflow_vx(fft->fft_work); check_overflow_vx(fft->fft_work);
#elif defined LASP_FFT_BACKEND_FFTW #elif LASP_FFT_BACKEND == FFTW
d* timedata_ptr = getvdval(timedata,0); d* timedata_ptr = getvdval(timedata,0);
c* result_ptr = getvcval(result,0); c* result_ptr = getvcval(result,0);

8
lasp/c/lasp_mq.c
View File

@ -96,10 +96,10 @@ void print_job_queue(JobQueue* jq) {
JobQueue* JobQueue_alloc(const us max_jobs) { JobQueue* JobQueue_alloc(const us max_jobs) {
TRACE(15,"JobQueue_alloc"); TRACE(15,"JobQueue_alloc");
if(max_jobs > LASP_MAX_NUM_CHANNELS) { /* if(max_jobs > LASP_MAX_NUM_CHANNELS) { */
WARN("Max jobs restricted to LASP_MAX_NUM_CHANNELS"); /* WARN("Max jobs restricted to LASP_MAX_NUM_CHANNELS"); */
return NULL; /* return NULL; */
} /* } */
JobQueue* jq = a_malloc(sizeof(JobQueue)); JobQueue* jq = a_malloc(sizeof(JobQueue));

2
lasp/wrappers.pyx
View File

@ -449,7 +449,7 @@ cdef class SosFilterBank:
""" """
if sos.shape[0] != self.nsections: if sos.shape[0] != self.nsections:
raise RuntimeError('Invalid number of sections in filter data, should be {self.nsections.}') raise RuntimeError(f'Invalid number of sections in filter data, should be {self.nsections}.')
elif sos.shape[1] != 6: elif sos.shape[1] != 6:
raise RuntimeError('Illegal number of filter coefficients in section. Should be 6.') raise RuntimeError('Illegal number of filter coefficients in section. Should be 6.')
cdef dmat coefs = dmat_foreign_data(sos.size,1, cdef dmat coefs = dmat_foreign_data(sos.size,1,