sunwen/URDepends
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change detection function args type from

Browse Source 
float to double.
This commit is contained in:
kradchen
2023-05-30 13:43:44 +08:00
parent 6f4db0077f
commit d6d9d28d84
4 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
TransmissionDetection/src/calculateBankDetectAndHilbertTransformation.cpp
View File

@@ -25,14 +25,14 @@
* @param[out] resEnvelopeRef, result of envelope of reference aScan * @param[out] resEnvelopeRef, result of envelope of reference aScan
* *
**/ **/
int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRef_r,int numberScans, int numberSamples, int RESAMPLE_FACTOR, int nthreads, float* resDetect, float* resEnvelope, float* resEnvelopeRef) { int calculateBankDetectAndHilbertTransformation(double* aScans_r, double* aScansRef_r,int numberScans, int numberSamples, int RESAMPLE_FACTOR, int nthreads, double* resDetect, double* resEnvelope, double* resEnvelopeRef) {
// resampling infos // resampling infos
int nresample_c; // for complex hermetian symmetry for upsample 2 -> stays the same (!) int nresample_c; // for complex hermetian symmetry for upsample 2 -> stays the same (!)
int nresample_r; // for real from hermetian symmetry for upsample 2 -> stays the same (!) int nresample_r; // for real from hermetian symmetry for upsample 2 -> stays the same (!)
float scale; double scale;
bool even; bool even;
@@ -43,18 +43,18 @@ int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRe
int endIndex; int endIndex;
// interim results // interim results
static fftwf_complex* resultCrossCor_c = NULL; static fftw_complex* resultCrossCor_c = NULL;
static fftwf_complex* aScans_c_res = NULL; static fftw_complex* aScans_c_res = NULL;
static fftwf_complex* aScansRef_c_res = NULL; static fftw_complex* aScansRef_c_res = NULL;
static fftwf_complex* aScans_c = NULL; static fftw_complex* aScans_c = NULL;
static fftwf_complex* aScansRef_c = NULL; static fftw_complex* aScansRef_c = NULL;
float* resultCrossCor_r; double* resultCrossCor_r;
float* aScans; double* aScans;
// fftw plans // fftw plans
static fftwf_plan plan_fftAScans_rc = NULL; static fftw_plan plan_fftAScans_rc = NULL;
static fftwf_plan plan_ifftAScans_cr = NULL; static fftw_plan plan_ifftAScans_cr = NULL;
static fftwf_plan plan_ifftAScans_cc = NULL; static fftw_plan plan_ifftAScans_cc = NULL;
// fftw wisdom // fftw wisdom
char filenameFftwWisdom[200] = ""; char filenameFftwWisdom[200] = "";
@@ -63,14 +63,14 @@ int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRe
nresample_r = numberSamples * RESAMPLE_FACTOR; nresample_r = numberSamples * RESAMPLE_FACTOR;
nresample_c = numberSamples * RESAMPLE_FACTOR / 2; nresample_c = numberSamples * RESAMPLE_FACTOR / 2;
scale = float((1.0 / nresample_r)* RESAMPLE_FACTOR); scale = double((1.0 / nresample_r)* RESAMPLE_FACTOR);
even = (nresample_r / 2.0); even = (nresample_r / 2.0);
// load wisdom // load wisdom
sprintf(filenameFftwWisdom, "fftwf_wisdom_detection_%d.wis", FFTW_WISDOM_TYPE); sprintf(filenameFftwWisdom, "fftw_wisdom_detection_%d.wis", FFTW_WISDOM_TYPE);
int loadedWisdomUsed = 0; int loadedWisdomUsed = 0;
if(fftwf_import_wisdom_from_filename(filenameFftwWisdom) == 0) { if(fftw_import_wisdom_from_filename(filenameFftwWisdom) == 0) {
// printf("wisdom not loaded.\n"); // printf("wisdom not loaded.\n");
} else { } else {
loadedWisdomUsed = 1; loadedWisdomUsed = 1;
@@ -78,33 +78,33 @@ int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRe
} }
// mem alloc // mem alloc
resultCrossCor_c = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * numberScans * nresample_r); resultCrossCor_c = (fftw_complex*)fftw_malloc(sizeof(fftw_complex) * numberScans * nresample_r);
aScans_c_res = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * numberScans * nresample_r); aScans_c_res = (fftw_complex*)fftw_malloc(sizeof(fftw_complex) * numberScans * nresample_r);
aScansRef_c_res = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * numberScans * nresample_r); aScansRef_c_res = (fftw_complex*)fftw_malloc(sizeof(fftw_complex) * numberScans * nresample_r);
resultCrossCor_r = (float*)malloc(numberScans * nresample_r * sizeof(float)); resultCrossCor_r = (double*)malloc(numberScans * nresample_r * sizeof(double));
aScans_c = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * numberScans * numberSamples); aScans_c = (fftw_complex*)fftw_malloc(sizeof(fftw_complex) * numberScans * numberSamples);
aScansRef_c = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * numberScans * numberSamples); aScansRef_c = (fftw_complex*)fftw_malloc(sizeof(fftw_complex) * numberScans * numberSamples);
aScans = (float*)malloc(numberScans * numberSamples * sizeof(float)); aScans = (double*)malloc(numberScans * numberSamples * sizeof(double));
/* fftw initializations */ /* fftw initializations */
// thread ini // thread ini
if ((nthreads > 0)) { if ((nthreads > 0)) {
if (fftwf_init_threads() == 0){ if (fftw_init_threads() == 0){
printf("Data input are not the same size. Exiting."); printf("Data input are not the same size. Exiting.");
return 1; return 1;
} }
fftwf_plan_with_nthreads(nthreads); fftw_plan_with_nthreads(nthreads);
} }
// plan creations // plan creations
plan_fftAScans_rc = fftwf_plan_many_dft_r2c(1, &numberSamples, numberScans, aScans, NULL, 1, numberSamples, aScans_c_res, &nresample_r, 1, nresample_r, FFTW_WISDOM_TYPE); plan_fftAScans_rc = fftw_plan_many_dft_r2c(1, &numberSamples, numberScans, aScans, NULL, 1, numberSamples, aScans_c_res, &nresample_r, 1, nresample_r, FFTW_WISDOM_TYPE);
plan_ifftAScans_cr = fftwf_plan_many_dft_c2r(1, &nresample_r, numberScans, resultCrossCor_c, NULL, 1, nresample_r, resultCrossCor_r, &nresample_r, 1, nresample_r, FFTW_WISDOM_TYPE); plan_ifftAScans_cr = fftw_plan_many_dft_c2r(1, &nresample_r, numberScans, resultCrossCor_c, NULL, 1, nresample_r, resultCrossCor_r, &nresample_r, 1, nresample_r, FFTW_WISDOM_TYPE);
plan_ifftAScans_cc = fftwf_plan_many_dft(1, &numberSamples, numberScans, aScans_c_res, NULL, 1, nresample_r, aScans_c, &numberSamples, 1, numberSamples, 1, FFTW_WISDOM_TYPE); plan_ifftAScans_cc = fftw_plan_many_dft(1, &numberSamples, numberScans, aScans_c_res, NULL, 1, nresample_r, aScans_c, &numberSamples, 1, numberSamples, 1, FFTW_WISDOM_TYPE);
// DFT of input signals // DFT of input signals
fftwf_execute_dft_r2c(plan_fftAScans_rc, aScans_r, aScans_c_res); fftw_execute_dft_r2c(plan_fftAScans_rc, aScans_r, aScans_c_res);
fftwf_execute_dft_r2c(plan_fftAScans_rc, aScansRef_r, aScansRef_c_res); fftw_execute_dft_r2c(plan_fftAScans_rc, aScansRef_r, aScansRef_c_res);
/* Calculus of fft(tab1)* conj(fft(tab2)) (first part) */ /* Calculus of fft(tab1)* conj(fft(tab2)) (first part) */
/* and calculations for hilbert transform */ /* and calculations for hilbert transform */
@@ -154,38 +154,39 @@ int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRe
// Execute a IDFT plan // Execute a IDFT plan
fftwf_execute(plan_ifftAScans_cr); fftw_execute(plan_ifftAScans_cr);
fftwf_execute_dft(plan_ifftAScans_cc,aScans_c_res,aScans_c); fftw_execute_dft(plan_ifftAScans_cc,aScans_c_res,aScans_c);
fftwf_execute_dft(plan_ifftAScans_cc,aScansRef_c_res,aScansRef_c); fftw_execute_dft(plan_ifftAScans_cc,aScansRef_c_res,aScansRef_c);
// maximum detection // maximum detection
maximumDetection(resultCrossCor_r, numberScans, nresample_r, resDetect); maximumDetection(resultCrossCor_r, numberScans, nresample_r, resDetect);
// abs calculation, adapt scaling // abs calculation, adapt scaling
#pragma omp parallel for num_threads(nthreads)
for (int i = 0; i < numberSamples * numberScans; i++) { for (int i = 0; i < numberSamples * numberScans; i++) {
resEnvelope[i] = sqrt(aScans_c[i][REAL] * aScans_c[i][REAL] + aScans_c[i][IMAG] * aScans_c[i][IMAG]) * scale; resEnvelope[i] = sqrt(aScans_c[i][REAL] * aScans_c[i][REAL] + aScans_c[i][IMAG] * aScans_c[i][IMAG]) * scale;
resEnvelopeRef[i] = sqrt(aScansRef_c[i][REAL] * aScansRef_c[i][REAL] + aScansRef_c[i][IMAG] * aScansRef_c[i][IMAG]) * scale; resEnvelopeRef[i] = sqrt(aScansRef_c[i][REAL] * aScansRef_c[i][REAL] + aScansRef_c[i][IMAG] * aScansRef_c[i][IMAG]) * scale;
} }
// Store Wisdom // Store Wisdom
fftwf_export_wisdom_to_filename(filenameFftwWisdom); fftw_export_wisdom_to_filename(filenameFftwWisdom);
// clean // clean
fftwf_destroy_plan(plan_fftAScans_rc); fftw_destroy_plan(plan_fftAScans_rc);
fftwf_destroy_plan(plan_ifftAScans_cr); fftw_destroy_plan(plan_ifftAScans_cr);
fftwf_destroy_plan(plan_ifftAScans_cc); fftw_destroy_plan(plan_ifftAScans_cc);
fftwf_free(resultCrossCor_c); fftw_free(resultCrossCor_c);
fftwf_free(aScans_c_res); fftw_free(aScans_c_res);
fftwf_free(aScansRef_c_res); fftw_free(aScansRef_c_res);
fftwf_free(aScans_c); fftw_free(aScans_c);
fftwf_free(aScansRef_c); fftw_free(aScansRef_c);
free(resultCrossCor_r); free(resultCrossCor_r);
free(aScans); free(aScans);
// fftwf_cleanup_threads(); // fftw_cleanup_threads();
// fftwf_cleanup(); // fftw_cleanup();
fftwf_forget_wisdom(); fftw_forget_wisdom();
return 0; return 0;
} }

2
TransmissionDetection/src/calculateBankDetectAndHilbertTransformation.hpp
View File

@@ -1 +1 @@
extern int calculateBankDetectAndHilbertTransformation(float* aScans_r, float* aScansRef_r,int numberScans, int numberSamples, int resampleFactor, int nthreads, float* resDetect, float* resEnvelope, float* resEnvelopeRef); extern int calculateBankDetectAndHilbertTransformation(double* aScans_r, double* aScansRef_r,int numberScans, int numberSamples, int resampleFactor, int nthreads, double* resDetect, double* resEnvelope, double* resEnvelopeRef);

4
TransmissionDetection/src/mathMethods.cpp
View File

@@ -9,9 +9,9 @@
* @param[out] outVector pointer to output array, calculated idx for each 0:n-1 * @param[out] outVector pointer to output array, calculated idx for each 0:n-1
* *
**/ **/
void maximumDetection(float* inArray, int n, int m, float* outVector) { void maximumDetection(double* inArray, int n, int m, double* outVector) {
float maxVal; double maxVal;
for (int j = 0; j < n; j++) { for (int j = 0; j < n; j++) {
outVector[j] = 0; outVector[j] = 0;
maxVal = inArray[j*m]; maxVal = inArray[j*m];

2
TransmissionDetection/src/mathMethods.hpp
View File

@@ -1 +1 @@
extern void maximumDetection(float* inArray, int n, int m, float* outVector); extern void maximumDetection(double* inArray, int n, int m, double* outVector);