Merge branch 'master' into develop

# Conflicts: # api/python/arrus/utils/iq_raw_2_lri.cu
us4useu · Nov 8, 2021 · 82268fd · 82268fd
2 parents 86f3371 + 02d71df
commit 82268fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/api/python/arrus/utils/iq_raw_2_lri.cu b/api/python/arrus/utils/iq_raw_2_lri.cu
@@ -38,6 +38,7 @@ iqRaw2Lri(complex<float> *iqLri, const complex<float> *iqRaw,
 
     for (int iTx = 0; iTx < nTx; ++iTx) {
         int txOffset = iTx*nSamp*nRx;
+
         if (!isinf(txFoc[iTx])) {
             /* STA */
             float zFoc = txApCentZ[iTx] + txFoc[iTx]*cosf(txAngZX[iTx]);
@@ -83,10 +84,10 @@ iqRaw2Lri(complex<float> *iqLri, const complex<float> *iqRaw,
                         (xPix[x] - xElem[txApLstElem[iTx]])*cosf(txAngZX[iTx])) >= 0.f)) ? 1.f : 0.f;
         }
         pixWgh = 0.0f;
-        pix.real(0);
-        pix.imag(0);
-        if (txApod != 0.0f) {
+        pix.real(0.0f);
+        pix.imag(0.0f);
 
+        if (txApod != 0.0f) {
             for (int iRx = 0; iRx < nRx; iRx++) {
                 iElem = iRx + rxApOrigElem[iTx];
                 if (iElem < 0 || iElem >= nElem) continue;
@@ -120,8 +121,8 @@ iqRaw2Lri(complex<float> *iqLri, const complex<float> *iqRaw,
             iqLri[z + x*nZPix + iTx*nZPix*nXPix] = complex<float>(0.0f, 0.0f);
         }
         else {
-            iqLri[z + x*nZPix + iTx*nZPix*nXPix] = pix/pixWgh*txApod;
+            iqLri[z + x * nZPix + iTx * nZPix * nXPix] = pix/pixWgh*txApod;
         }
     }
 
-}
+}
diff --git a/arrus/cfg/default.dict b/arrus/cfg/default.dict
@@ -358,7 +358,7 @@ probe_models: [
         },
         voltage_range: {
 			begin: 0,
-			end: 75
+			end: 90
 		}
     },
     {
@@ -375,7 +375,7 @@ probe_models: [
         },
         voltage_range: {
     	    begin: 0,
-    		end: 75
+    		end: 90
     	}
     },
     {
@@ -391,7 +391,7 @@ probe_models: [
         },
         voltage_range: {
 			begin: 0,
-			end: 75
+			end: 90
 		}
     },
     {
@@ -407,7 +407,7 @@ probe_models: [
         },
         voltage_range: {
 			begin: 0,
-			end: 75
+			end: 90
 		}
     },
     {