AOT-biomaps 2.9.378__tar.gz → 2.9.380__tar.gz

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/AOT_biomaps/AOT_Acoustic/StructuredWave.py

@@ -190,7 +190,7 @@ class StructuredWave(AcousticField):
         """
         return f"{'1' if self.angle < 0 else '0'}{abs(self.angle):02d}"
 
-    def _apply_delay(self,dx=None):
+    def _apply_delay(self,dt=None,dx=None,c0=None):
         """
         Apply a temporal delay to the signal for each transducer element.
 
@@ -198,9 +198,13 @@ class StructuredWave(AcousticField):
             ndarray: Array of delayed signals.
         """
         try:
+            print(f"dx in _apply_delay: {dx}")
             is_positive = self.angle >= 0
             if dx is None:
                 dx = self.params['dx']
+            if c0 is None:
+                c0 = self.params['c0']
+            actual_dt = dt if dt is not None else self.kgrid.dt
             # Calculate the total number of grid points for all elements
             total_grid_points = self.params['num_elements'] * int(round(self.params['element_width'] / dx))
 
@@ -212,10 +216,10 @@ class StructuredWave(AcousticField):
 
             # Calculate delays based on physical positions
             for i in range(total_grid_points):
-                delays[i] = (element_positions[i] * np.tan(np.deg2rad(abs(self.angle)))) / self.params['c0']  # Delay in seconds
+                delays[i] = (element_positions[i] * np.tan(np.deg2rad(abs(self.angle)))) / c0  # Delay in seconds
 
 
-            delay_samples = np.round(delays / self.kgrid.dt).astype(int)
+            delay_samples = np.round(delays / actual_dt).astype(int)
             max_delay = np.max(np.abs(delay_samples))
 
             delayed_signals = np.zeros((total_grid_points, len(self.burst) + max_delay))
@@ -332,76 +336,119 @@ class StructuredWave(AcousticField):
                 f_hdr2.write(headerFieldGlob)
         except Exception as e:
             print(f"Error saving HDR/IMG files: {e}")
-    
-    def _SetUpSource(self, source, Nx, dx, factorT):
-        """
-        Set up source for both 2D and 3D structured waves.
-        """
-        active_list = np.array([int(char) for char in ''.join(f"{int(self.pattern.activeList[i:i+2], 16):08b}" for i in range(0, len(self.pattern.activeList), 2))])
-        element_width_grid_points = int(round(self.params['element_width'] / dx))
-
-        if source.p_mask.ndim == 2:
-            element_width_grid_points = int(round(self.params['element_width'] / dx))
-            total_elements_width = self.params['num_elements'] * element_width_grid_points
-
-            # Vérifier que les éléments rentrent dans le grid
-            if total_elements_width > Nx:
-                raise ValueError(f"La largeur totale des éléments ({total_elements_width}) dépasse Nx ({Nx}).")
-
-            remaining_space = Nx - total_elements_width
-            if remaining_space < 0:
-                raise ValueError(f"Pas assez d'espace pour placer les éléments: total_elements_width ({total_elements_width}) > Nx ({Nx}).")
-
-            spacing = remaining_space // (self.params['num_elements'] + 1)
-            center_index = np.argmin(np.abs(np.linspace(self.params['Xrange'][0], self.params['Xrange'][1], Nx)))
-
-            activeListGrid = np.zeros(total_elements_width, dtype=int)
-            current_position = center_index - (total_elements_width + (self.params['num_elements'] - 1) * spacing) // 2
-
-            # Placement des éléments actifs
-            for i in range(self.params['num_elements']):
-                if active_list[i] == 1:
-                    x_pos = max(0, current_position)  # Éviter les indices négatifs
-                    x_end = x_pos + element_width_grid_points
-                    if x_end > Nx:
-                        x_end = Nx  # Limiter à Nx
-                    source.p_mask[x_pos:x_end,0] = 1
-
-                    start_idx = i * element_width_grid_points
-                    end_idx = start_idx + element_width_grid_points
-                    if end_idx > total_elements_width:
-                        end_idx = total_elements_width
-                    activeListGrid[start_idx:end_idx] = 1
-
-                current_position += element_width_grid_points + spacing
-
-            # Chargement des signaux retardés
-            if factorT != 1:
-                delayedSignal = self._apply_delay(dx=dx)
-            else:
-                delayedSignal = self.delayedSignal
-
-            # Vérification de la taille de delayedSignal
-            num_active_elements = np.sum(activeListGrid == 1)
-            if delayedSignal.shape[0] < num_active_elements:
-                raise ValueError(f"delayedSignal a une taille insuffisante: {delayedSignal.shape[0]} < {num_active_elements}.")
-
-            # Assigner source.p
-            source.p =  float(self.params['voltage']) * float(self.params['sensitivity']) * delayedSignal[activeListGrid == 1, :]
-
 
-        elif source.p_mask.ndim == 3:
-            # --- 3D ---
-            center_index_x = Nx // 2
-            center_index_y = self.params['Ny'] // 2
-            spacing = (Nx - self.params['num_elements'] * element_width_grid_points) // (self.params['num_elements'] + 1)
-            current_position = center_index_x - (self.params['num_elements'] * element_width_grid_points + (self.params['num_elements'] - 1) * spacing) // 2
-
-            for i in range(self.params['num_elements']):
-                if active_list[i] == 1:
-                    x_pos = current_position
-                    source.p_mask[x_pos:x_pos + element_width_grid_points, center_index_y, 0] = 1
-                current_position += element_width_grid_points + spacing
-
-            delayed_signals = self._apply_delay()
-            source.p =  float(self.params['voltage']) * float(self.params['sensitivity']) * delayed_signals.T
+    def _SetUpSource(self, source, Nx, dt, dx, c0, factorT):
+        active_list = np.array([int(char) for char in ''.join(f"{int(self.pattern.activeList[i:i+2], 16):08b}" for i in range(0, len(self.pattern.activeList), 2))])
+        
+        # Largeur d'un élément en pixels
+        el_width_px = int(round(self.params['element_width'] / dx))
+        # Largeur totale de la sonde en pixels
+        total_sonde_px = self.params['num_elements'] * el_width_px
+        
+        # On récupère pva_nx depuis l'appel ou on le recalcule
+        pva_nx = int(np.round(self.params['width_phantom'] / dx))
+        air_margin = (Nx - pva_nx) // 2
+        
+        # Position de départ pour que la sonde soit centrée sur le PHANTOM
+        # On commence à la fin de la marge d'air, et on centre la sonde dans le pva_nx
+        current_position = air_margin + (pva_nx - total_sonde_px) // 2
+
+        activeListGrid = np.zeros(total_sonde_px, dtype=int)
+
+        for i in range(self.params['num_elements']):
+            if active_list[i] == 1:
+                x_start = current_position
+                x_end = x_start + el_width_px
+                
+                # On remplit le masque k-Wave (z=0)
+                source.p_mask[x_start:x_end, 0] = 1
+                
+                # On marque les indices actifs pour injecter le signal delayed
+                idx_start = i * el_width_px
+                idx_end = idx_start + el_width_px
+                activeListGrid[idx_start:idx_end] = 1
+
+            current_position += el_width_px # Pas de "spacing" variable, les éléments sont collés
+
+        # Injection du signal
+        if factorT != 1:
+            delayedSignal = self._apply_delay(dt=dt, dx=dx, c0=c0)
+        else:
+            delayedSignal = self.delayedSignal
+
+        # On injecte uniquement là où p_mask == 1
+        source.p = float(self.params['voltage']) * float(self.params['sensitivity']) * delayedSignal[activeListGrid == 1, :]
+        return source
+    
+    # def _SetUpSource(self, source, Nx, dx, factorT):
+    #     """
+    #     Set up source for both 2D and 3D structured waves.
+    #     """
+    #     active_list = np.array([int(char) for char in ''.join(f"{int(self.pattern.activeList[i:i+2], 16):08b}" for i in range(0, len(self.pattern.activeList), 2))])
+    #     element_width_grid_points = int(round(self.params['element_width'] / dx))
+
+    #     if source.p_mask.ndim == 2:
+    #         element_width_grid_points = int(round(self.params['element_width'] / dx))
+    #         total_elements_width = self.params['num_elements'] * element_width_grid_points
+
+    #         # Vérifier que les éléments rentrent dans le grid
+    #         if total_elements_width > Nx:
+    #             raise ValueError(f"La largeur totale des éléments ({total_elements_width}) dépasse Nx ({Nx}).")
+
+    #         remaining_space = Nx - total_elements_width
+    #         if remaining_space < 0:
+    #             raise ValueError(f"Pas assez d'espace pour placer les éléments: total_elements_width ({total_elements_width}) > Nx ({Nx}).")
+
+    #         spacing = remaining_space // (self.params['num_elements'] + 1)
+    #         center_index = np.argmin(np.abs(np.linspace(self.params['Xrange'][0], self.params['Xrange'][1], Nx)))
+
+    #         activeListGrid = np.zeros(total_elements_width, dtype=int)
+    #         current_position = center_index - (total_elements_width + (self.params['num_elements'] - 1) * spacing) // 2
+
+    #         # Placement des éléments actifs
+    #         for i in range(self.params['num_elements']):
+    #             if active_list[i] == 1:
+    #                 x_pos = max(0, current_position)  # Éviter les indices négatifs
+    #                 x_end = x_pos + element_width_grid_points
+    #                 if x_end > Nx:
+    #                     x_end = Nx  # Limiter à Nx
+    #                 source.p_mask[x_pos:x_end,0] = 1
+
+    #                 start_idx = i * element_width_grid_points
+    #                 end_idx = start_idx + element_width_grid_points
+    #                 if end_idx > total_elements_width:
+    #                     end_idx = total_elements_width
+    #                 activeListGrid[start_idx:end_idx] = 1
+
+    #             current_position += element_width_grid_points + spacing
+
+    #         # Chargement des signaux retardés
+    #         if factorT != 1:
+    #             delayedSignal = self._apply_delay(dx=dx)
+    #         else:
+    #             delayedSignal = self.delayedSignal
+
+    #         # Vérification de la taille de delayedSignal
+    #         num_active_elements = np.sum(activeListGrid == 1)
+    #         if delayedSignal.shape[0] < num_active_elements:
+    #             raise ValueError(f"delayedSignal a une taille insuffisante: {delayedSignal.shape[0]} < {num_active_elements}.")
+
+    #         # Assigner source.p
+    #         source.p =  float(self.params['voltage']) * float(self.params['sensitivity']) * delayedSignal[activeListGrid == 1, :]
+
+
+    #     elif source.p_mask.ndim == 3:
+    #         # --- 3D ---
+    #         center_index_x = Nx // 2
+    #         center_index_y = self.params['Ny'] // 2
+    #         spacing = (Nx - self.params['num_elements'] * element_width_grid_points) // (self.params['num_elements'] + 1)
+    #         current_position = center_index_x - (self.params['num_elements'] * element_width_grid_points + (self.params['num_elements'] - 1) * spacing) // 2
+
+    #         for i in range(self.params['num_elements']):
+    #             if active_list[i] == 1:
+    #                 x_pos = current_position
+    #                 source.p_mask[x_pos:x_pos + element_width_grid_points, center_index_y, 0] = 1
+    #             current_position += element_width_grid_points + spacing
+
+    #         delayed_signals = self._apply_delay()
+    #         source.p =  float(self.params['voltage']) * float(self.params['sensitivity']) * delayed_signals.T

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/AOT_biomaps/AOT_Acoustic/_mainAcoustic.py

@@ -569,7 +569,7 @@ class AcousticField(ABC):
             source = kSource()
             source.p_mask = np.zeros((Nx, Nz))
             # Appel à la méthode spécialisée
-            self._SetUpSource(self,source, Nx, dt, dx, c_mean,factorT)  # factorT=1 pour simplifier
+            source = self._SetUpSource(source, Nx, dt, dx, c_mean,factorT)  # factorT=1 pour simplifier
 
             # --- 4. Sensor setup ---
             sensor = kSensor()
@@ -620,7 +620,6 @@ class AcousticField(ABC):
             print(f"Error generating 2D acoustic field: {e}")
             return None
     
-    
     def _generate_acoustic_field_KWAVE_3D(self, isGPU=True, show_log=True):
         """
         Generate a 3D acoustic field using k-Wave.
@@ -700,7 +699,7 @@ class AcousticField(ABC):
             return None
         
     @abstractmethod
-    def _SetUpSource(self, source, Nx, dx, factorT):
+    def _SetUpSource(self, source, Nx, dt, dx, c0, factorT):
         """
         Abstract method: each subclass must implement its own source setup.
         """

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/AOT_biomaps/__init__.py

@@ -85,7 +85,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
 from .Config import config
 from .Settings import *
 
-__version__ = '2.9.378'
+__version__ = '2.9.380'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -239,6 +239,8 @@ def initialize(process=None):
 
 
 
+
+
 
 
 

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/AOT_biomaps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AOT_biomaps
-Version: 2.9.378
+Version: 2.9.380
 Summary: Acousto-Optic Tomography
 Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
 Author: Lucas Duclos

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AOT_biomaps
-Version: 2.9.378
+Version: 2.9.380
 Summary: Acousto-Optic Tomography
 Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
 Author: Lucas Duclos

{aot_biomaps-2.9.378 → aot_biomaps-2.9.380}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='AOT_biomaps',
-    version='2.9.378',
+    version='2.9.380',
     packages=find_packages(),
     include_package_data=True,
     
@@ -397,6 +397,8 @@ setup(
 
 
 
+
+