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

Fix dection bug.

Browse Source
This commit is contained in:
kradchen
2023-05-30 13:39:39 +08:00
parent 0c4a6e8c4a
commit 0d1ea2afe4
1 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/transmissionReconstruction/detection/detection.cpp
View File

@@ -299,44 +299,20 @@ namespace Recon {
int M =std::min(AscanBlock.getDimSize(0),AscanRefBlock.getDimSize(0)); int M =std::min(AscanBlock.getDimSize(0),AscanRefBlock.getDimSize(0));
double * resDetectD = nullptr; Matrix resDetect;
double * resEnvelopeD = nullptr; double * resEnvelopeD = nullptr;
double * resEnvelopeRefD = nullptr; double * resEnvelopeRefD = nullptr;
size_t N = _AscanBlock.getDimSize(1); size_t N = _AscanBlock.getDimSize(1);
size_t totalSize = N*M; size_t totalSize = N*M;
{ Matrix _AscanBlock_trim = _AscanBlock.getDimSize(0)!=M?_AscanBlock.block(0, 0, M-1):_AscanBlock;
// auto resDetect = new float[N]{0}; Matrix _AscanRefBlock_trim = _AscanRefBlock.getDimSize(0)!=M?_AscanRefBlock.block(0, 0, M-1):_AscanRefBlock;
// auto resEnvelope = new float[totalSize]{0}; resDetect = Aurora::zeros(1,N);
// auto resEnvelopeRef = new float[totalSize]{0}; resEnvelopeD = Aurora::malloc(totalSize);
// auto aScans_r = new float[totalSize]{0}; resEnvelopeRefD = Aurora::malloc(totalSize);
// auto aScansRef_r = new float[totalSize]{0}; calculateBankDetectAndHilbertTransformation(
// { _AscanBlock_trim.getData(), _AscanRefBlock_trim.getData(), N, M, resampleFactor, nthreads,
Matrix _AscanBlock_trim = _AscanBlock.getDimSize(0)!=M?_AscanBlock.block(0, 0, M-1):_AscanBlock; resDetect.getData(), resEnvelopeD, resEnvelopeRefD);
Matrix _AscanRefBlock_trim = _AscanRefBlock.getDimSize(0)!=M?_AscanRefBlock.block(0, 0, M-1):_AscanRefBlock;
// std::copy(_AscanBlock_trim.getData(), _AscanBlock_trim.getData() + totalSize, aScans_r);
// std::copy(_AscanRefBlock_trim.getData(), _AscanRefBlock_trim.getData() + totalSize,
// aScansRef_r);
// }
resDetectD = Aurora::malloc(N);
resEnvelopeD = Aurora::malloc(totalSize);
resEnvelopeRefD = Aurora::malloc(totalSize);
calculateBankDetectAndHilbertTransformation(
_AscanBlock_trim.getData(), _AscanBlock_trim.getData(), N, M, resampleFactor, nthreads,
resDetectD, resEnvelopeD, resEnvelopeRefD);
// delete [] aScans_r;
// delete [] aScansRef_r;
// resDetectD = Aurora::malloc(N);
// std::copy(resDetect, resDetect+ N, resDetectD);
// delete [] resDetect;
// std::copy(resEnvelope, resEnvelope+ totalSize, resEnvelopeD);
// delete [] resEnvelope;
// resEnvelopeRefD = Aurora::malloc(totalSize);
// std::copy(resEnvelopeRef, resEnvelopeRef+ totalSize, resEnvelopeRefD);
// delete [] resEnvelopeRef;
}
auto resDetect =Matrix::New(resDetectD,1,N);
auto resEnvelope =Matrix::New(resEnvelopeD,M,N); auto resEnvelope =Matrix::New(resEnvelopeD,M,N);
auto resEnvelopeRef =Matrix::New(resEnvelopeRefD,M,N); auto resEnvelopeRef =Matrix::New(resEnvelopeRefD,M,N);
//floor(size(AscanBlock, 1)*inits.resampleFactor / 2 - 1), //floor(size(AscanBlock, 1)*inits.resampleFactor / 2 - 1),