Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ref-ARRUS-112: Removal of shallow artifacts related to TX signal #246

Merged
merged 3 commits into from
Nov 19, 2021
Merged

Ref-ARRUS-112: Removal of shallow artifacts related to TX signal #246

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57eaf8f
iqRaw2Lri - omit initial samples
PiotrKarwat Nov 18, 2021
3cdd93c
Us4R - pass the nSampOmit to the reconstruction kernel
PiotrKarwat Nov 18, 2021
7da7811
iqRaw2Lri - remove commented piece of code
PiotrKarwat Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/matlab/arrus/Us4R.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ function setRecParams(obj,varargin)
obj.seq.txApFstElem = gpuArray( int32(obj.seq.txApFstElem - 1));
obj.seq.txApLstElem = gpuArray( int32(obj.seq.txApLstElem - 1));
obj.seq.rxApFstElem = gpuArray( int32(obj.seq.rxApOrig - 1)); % rxApOrig remains unchanged as it is used in data reorganization
obj.seq.nSampOmit = gpuArray( int32(((max(obj.seq.txDel) + obj.seq.txNPer/obj.seq.txFreq) * obj.seq.rxSampFreq + 50) / obj.rec.dec));
obj.rec.bmodeRxTangLim = single(obj.rec.bmodeRxTangLim);
obj.rec.colorRxTangLim = single(obj.rec.colorRxTangLim);
obj.rec.vect0RxTangLim = single(obj.rec.vect0RxTangLim);
Expand Down Expand Up @@ -1171,6 +1172,7 @@ function closeSequence(obj)
obj.seq.txApFstElem(selFrames), ...
obj.seq.txApLstElem(selFrames), ...
obj.seq.rxApFstElem(selFrames), ...
obj.seq.nSampOmit(selFrames), ...
rxTangLim(1), ...
rxTangLim(2), ...
obj.seq.rxSampFreq / obj.rec.dec, ...
Expand Down
38 changes: 28 additions & 10 deletions api/matlab/arrus/mexcuda/iqRaw2Lri.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ __global__ void iqRaw2Lri( float2 * iqLri, float const * zPix, float const * xP
float const * txFoc, float const * txAngZX,
float const * txApCentZ, float const * txApCentX,
int const * txApFstElem, int const * txApLstElem,
int const * rxApOrigElem,
int const * rxApOrigElem, int const * nSampOmit,
float const minRxTang, float const maxRxTang,
float const fs, float const fn,
float const sos, float const initDel,
Expand Down Expand Up @@ -114,7 +114,7 @@ __global__ void iqRaw2Lri( float2 * iqLri, float const * zPix, float const * xP

time = (txDist + rxDist) * sosInv + initDel;
iSamp = time * fs;
if (iSamp<0.f || iSamp>static_cast<float>(nSamp-1)) continue;
if (iSamp<static_cast<float>(nSampOmit[iTx]) || iSamp>static_cast<float>(nSamp-1)) continue;

float2 iqSamp = tex1DLayered(iqRawTex, iSamp + 0.5f, iRx + iTx*nRx);
sampRe = iqSamp.x;
Expand Down Expand Up @@ -184,6 +184,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
mxGPUArray const * elemFst;
mxGPUArray const * elemLst;
mxGPUArray const * rxElemOrig;
mxGPUArray const * nSampOmit;

float2 * dev_iqLri;
float2 const * dev_iqRaw;
Expand All @@ -199,6 +200,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
int const * dev_elemFst;
int const * dev_elemLst;
int const * dev_rxElemOrig;
int const * dev_nSampOmit;

float minRxTang;
float maxRxTang;
Expand All @@ -222,8 +224,8 @@ void mexFunction(int nlhs, mxArray * plhs[],
char const * const invalidOutputMsgId = "iqRaw2Lri:InvalidOutput";

/* Validate mex inputs/outputs */
if (nrhs!=19) {
mexErrMsgIdAndTxt( invalidInputMsgId, "19 inputs required");
if (nrhs!=20) {
mexErrMsgIdAndTxt( invalidInputMsgId, "20 inputs required");
}

if (nlhs>1) {
Expand Down Expand Up @@ -251,13 +253,14 @@ void mexFunction(int nlhs, mxArray * plhs[],
elemFst = mxGPUCreateFromMxArray(prhs[10]);
elemLst = mxGPUCreateFromMxArray(prhs[11]);
rxElemOrig = mxGPUCreateFromMxArray(prhs[12]);
nSampOmit = mxGPUCreateFromMxArray(prhs[13]);

minRxTang = mxGetScalar(prhs[13]);
maxRxTang = mxGetScalar(prhs[14]);
fs = mxGetScalar(prhs[15]);
fn = mxGetScalar(prhs[16]);
sos = mxGetScalar(prhs[17]);
initDel = mxGetScalar(prhs[18]);
minRxTang = mxGetScalar(prhs[14]);
maxRxTang = mxGetScalar(prhs[15]);
fs = mxGetScalar(prhs[16]);
fn = mxGetScalar(prhs[17]);
sos = mxGetScalar(prhs[18]);
initDel = mxGetScalar(prhs[19]);

/* Validate inputs */
checkData(iqRaw, "iqRaw", true, 3, invalidInputMsgId);
Expand All @@ -273,6 +276,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
// checkData(elemFst, "elemFst", false, 1, invalidInputMsgId); //int
// checkData(elemLst, "elemLst", false, 1, invalidInputMsgId); //int
// checkData(rxElemOrig,"rxElemOrig",false, 1, invalidInputMsgId); //int
// checkData(nSampOmit,"nSampOmit",false, 1, invalidInputMsgId); //int

/* Get some additional information */
nSamp = mxGPUGetDimensions(iqRaw)[0];
Expand Down Expand Up @@ -316,6 +320,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
dev_elemFst = static_cast<int const *>(mxGPUGetDataReadOnly(elemFst));
dev_elemLst = static_cast<int const *>(mxGPUGetDataReadOnly(elemLst));
dev_rxElemOrig = static_cast<int const *>(mxGPUGetDataReadOnly(rxElemOrig));
dev_nSampOmit = static_cast<int const *>(mxGPUGetDataReadOnly(nSampOmit));

/* set constant memory */
if(nElem > 256) {
Expand Down Expand Up @@ -359,6 +364,17 @@ void mexFunction(int nlhs, mxArray * plhs[],
// dev_centX + iPart*nTxPerPart,
// minRxTang, maxRxTang, fs, fn, sos, initDel,
// nZPix, nXPix, nSamp, nElem, nTxInThisPart);
// iqRaw2Lri<<<blocksPerGrid, threadsPerBlock, sharedPerBlock>>>(dev_iqLri + iPart*nZPix*nXPix*nTxPerPart,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why keep this comment? (and others)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One obsolete call to the kernel is removed. The other stays as it will be used with the kernel version optimized for linear arrays.

// dev_zPix, dev_xPix,
// dev_foc + iPart*nTxPerPart,
// dev_ang + iPart*nTxPerPart,
// dev_centZ + iPart*nTxPerPart,
// dev_centX + iPart*nTxPerPart,
// dev_elemFst + iPart*nTxPerPart,
// dev_elemLst + iPart*nTxPerPart,
// dev_rxElemOrig + iPart*nTxPerPart,
// minRxTang, maxRxTang, fs, fn, sos, initDel,
// nZPix, nXPix, nSamp, nElem, nRx, nTxInThisPart);
iqRaw2Lri<<<blocksPerGrid, threadsPerBlock, sharedPerBlock>>>(dev_iqLri + iPart*nZPix*nXPix*nTxPerPart,
dev_zPix, dev_xPix,
dev_foc + iPart*nTxPerPart,
Expand All @@ -368,6 +384,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
dev_elemFst + iPart*nTxPerPart,
dev_elemLst + iPart*nTxPerPart,
dev_rxElemOrig + iPart*nTxPerPart,
dev_nSampOmit + iPart*nTxPerPart,
minRxTang, maxRxTang, fs, fn, sos, initDel,
nZPix, nXPix, nSamp, nElem, nRx, nTxInThisPart);

Expand All @@ -394,6 +411,7 @@ void mexFunction(int nlhs, mxArray * plhs[],
mxGPUDestroyGPUArray(elemFst);
mxGPUDestroyGPUArray(elemLst);
mxGPUDestroyGPUArray(rxElemOrig);
mxGPUDestroyGPUArray(nSampOmit);

//cudaDeviceReset();
}