Merge pull request creatis-ULTIM#43 from creatis-ULTIM/gbernardino-devel

Allow 1D arrays as input to dasmtx

Author: gbernardino

examples/DW_echo_demo.ipynb

@@ -509,7 +509,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "xi,zi = pymust.impolgrid(np.array([256, 128]),15e-2,np.deg2rad(80), param)"
+    "xi,zi = pymust.impolgrid(np.array([256, 128]),15e-2,np.deg2rad(80), param)\n"
    ]
   },
   {

src/pymust/dasmtx.py

@@ -332,6 +332,9 @@ def dasmtx(SIG: np.ndarray, x: np.ndarray, z: np.ndarray, *varargin) -> scipy.sp
 
 
     #%-- Number of elements
+    assert isinstance(delaysTX,np.ndarray), 'delaysTX must be a numpy array.'
+    if len(delaysTX.shape) == 1:
+        delaysTX = delaysTX.reshape((1, -1))
     if delaysTX.shape[0] == nc and delaysTX.shape[1] != nc:
         delaysTX = delaysTX.T
 

src/pymust/dasmtx3.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import numpy as np
 import scipy, scipy.interpolate
 from . import  utils

src/pymust/pfield.py

@@ -256,7 +256,7 @@ def pfield(x: np.ndarray, y: np.ndarray, z: np.ndarray, delaysTX: np.ndarray, pa
         isMKMOVIE = options.CallFun == 'mkmovie'    
 
     #GB: TODO: do parallelism
-    #GB TODO:  For txhe moment no statistics.
+    #GB TODO:  For the moment no statistics of usage.
 
 
     #%---------------------------%

tutorials/Figures/s1_ex1.png

@@ -36,7 +36,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -56,13 +56,22 @@
     "\n",
     "### Execise 2.1: Pressure field\n",
     "\n",
-    "1. Execute the code to generate the pressure field for a linear wave without a tilt. Place two points at regions which are at the same distance but the center of the probe, but recieve different energy.\n",
+    "1. Execute the code to generate the pressure field for a linear wave without a tilt. Place two points at regions which are at the same distance to the center of the probe, but receive different energy.\n",
     "\n",
     "1. Use two times simus in order to get the RF associated to each point chosen in the previous exercise. What do you observe? [Note: now the probe involves many piezoelectrical elements, and as such the RF signal will have a channel for each. Now you can use the center element (channel #31)]\n",
     "\n",
     "1. Add attenuation of 0.5dB/cm. What do you observe in the pressure field and why?"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!pip install pymust --upgrade"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -99,7 +108,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -131,7 +140,7 @@
     }
    ],
    "source": [
-    "plt.imshow(20*np.log10(P.T/np.max(P)),\n",
+    "plt.imshow(20*np.log10(P/np.max(P)),\n",
     "           cmap='hot',\n",
     "           extent=[xGrid[0,0]*1e2,xGrid[0,-1]*1e2,zGrid[-1,0]*1e2,zGrid[0,0]*1e2],aspect='auto')\n",
     "plt.colorbar()\n",
@@ -279,13 +288,18 @@
     "    param.width *= factor\n",
     "    param.pitch *= factor\n",
     "    param.kerf *= factor\n",
+    "    if 'TXapodization' in param:\n",
+    "        del param['TXapodization']\n",
     "    return param\n",
     "\n",
     "def changeNumberOfElements(param, factor):\n",
     "    \"\"\"\n",
     "    Scale the number of piezoelectrical elements to 1\n",
     "    \"\"\"\n",
-    "    param.Nelements *= int(factor)\n",
+    "    param.Nelements = int(param.Nelements*factor)\n",
+    "    if 'TXapodization' in param:\n",
+    "        del param['TXapodization']\n",
+    "\n",
     "    return param\n",
     "\n",
     "\n",
@@ -350,7 +364,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "pymust",
+   "display_name": "pymust-test",
    "language": "python",
    "name": "python3"
   },
@@ -364,7 +378,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.3"
   },
   "orig_nbformat": 4
  },