AOT-biomaps 2.9.366__tar.gz → 2.9.368__tar.gz

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/AOT_biomaps/AOT_Acoustic/AcousticTools.py

@@ -217,3 +217,20 @@ def next_power_of_2(n):
     """Calculate the next power of 2 greater than or equal to n."""
     return int(2 ** np.ceil(np.log2(n)))
         
+def hex_to_binary_profile(hex_string, n_piezos=192):
+    hex_string = hex_string.strip().replace(" ", "").replace("\n", "")
+    if set(hex_string.lower()) == {'f'}:
+        return np.ones(n_piezos, dtype=int)
+    
+    try:
+        n_char = len(hex_string)
+        n_bits = n_char * 4
+        binary_str = bin(int(hex_string, 16))[2:].zfill(n_bits)
+        if len(binary_str) < n_piezos:
+             # Tronquer/padder en fonction de la taille réelle de la sonde
+             binary_str = binary_str.ljust(n_piezos, '0') 
+        elif len(binary_str) > n_piezos:
+             binary_str = binary_str[:n_piezos]
+        return np.array([int(b) for b in binary_str])
+    except ValueError:
+        return np.zeros(n_piezos, dtype=int)

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/AOT_biomaps/AOT_Acoustic/StructuredWave.py

@@ -1,8 +1,8 @@
 from AOT_biomaps.Config import config
-from AOT_biomaps.AOT_Experiment.ExperimentTools import hex_to_binary_profile
 from ._mainAcoustic import AcousticField
 from .AcousticEnums import WaveType
 from .AcousticTools import detect_space_0_and_space_1, getAngle
+from .AcousticTools import hex_to_binary_profile
 
 import os
 import numpy as np
@@ -170,7 +170,7 @@ class StructuredWave(AcousticField):
                     fs_m_inv = abs(freqs[idx_max]) 
 
                     fs_key = fs_m_inv # Fréquence spatiale en mm^-1
-                return  int(fs_key / (1000* self.params['dx']))  # Convert number decimation (f_s  = n * delta_x)
+                return  int(fs_key / (1/(len(profile)*self.params.general['dx'])))
             except Exception as e:
                 print(f"Error calculating decimation frequency: {e}")
                 return None

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/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.366'
+__version__ = '2.9.368'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -227,6 +227,8 @@ def initialize(process=None):
 
 
 
+
+
 
 
 

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/AOT_biomaps.egg-info/PKG-INFO

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

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/PKG-INFO

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

{aot_biomaps-2.9.366 → aot_biomaps-2.9.368}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='AOT_biomaps',
-    version='2.9.366',
+    version='2.9.368',
     packages=find_packages(),
     include_package_data=True,
     
@@ -385,6 +385,8 @@ setup(
 
 
 
+
+