AOT-biomaps 2.9.366__py3-none-any.whl → 2.9.368__py3-none-any.whl

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/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/__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.dist-info → aot_biomaps-2.9.368.dist-info}/METADATA

@@ -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.dist-info → aot_biomaps-2.9.368.dist-info}/RECORD

@@ -1,12 +1,12 @@
 AOT_biomaps/Config.py,sha256=ghEOP1n8aO1pR-su13wMeAZAxZRfry5hH67NbtZ8SqI,3614
 AOT_biomaps/Settings.py,sha256=v8fPhnvvcfBJP29m1RLOTEr3jndGLGwbUiORXmsj2Bo,2853
-AOT_biomaps/__init__.py,sha256=0kNzNLr0qhjKnLXIX04dpN28pG8qfcuOMa8TtbI6RyE,4394
+AOT_biomaps/__init__.py,sha256=kDJFxrvQQ-jwvpeI9M8hdKHjf3C6ofWGuhW-t5NUiL4,4398
 AOT_biomaps/AOT_Acoustic/AcousticEnums.py,sha256=s5kXa6jKzbS4btwbubrVcynLOr0yg5tth5vL_FGfbMk,1802
-AOT_biomaps/AOT_Acoustic/AcousticTools.py,sha256=h2sCtGVcDtyLtEF1q7sLZmuWivWmesVGUBPnW-ndQqc,7535
+AOT_biomaps/AOT_Acoustic/AcousticTools.py,sha256=7kuWIIGyzZPQrzRI0zVvdwNUp7qKUE67yCYOMzSb0Ug,8283
 AOT_biomaps/AOT_Acoustic/FocusedWave.py,sha256=3kGKKDx_3Msy5COYqIwzROPORGWvNjw8UsDanBfkMXE,11037
 AOT_biomaps/AOT_Acoustic/IrregularWave.py,sha256=yZhtxkR6zlciRcEpdTR0BAhvgQl40XHKFaF8f4VXarE,3035
 AOT_biomaps/AOT_Acoustic/PlaneWave.py,sha256=xza-rj5AUWDecLkGDxRcULrwZVWeBvGnEP2d51TyR04,1447
-AOT_biomaps/AOT_Acoustic/StructuredWave.py,sha256=5JqNpdfpA3Y2IhJRbs4yVVy5Z3BqIlaySiRXBsIdIsU,18997
+AOT_biomaps/AOT_Acoustic/StructuredWave.py,sha256=sbEksHjyL2D9MZUajwIOVVZU2llCDDge9n31dgkqPC8,18938
 AOT_biomaps/AOT_Acoustic/__init__.py,sha256=t9M2rRqa_L9pk7W2FeELTkHEMuP4DBr4gBRldMqsQbg,491
 AOT_biomaps/AOT_Acoustic/_mainAcoustic.py,sha256=RdmhRF1i0KAlpsP7_wnZ7F4J27br3eUc4XR91Qq7C64,44158
 AOT_biomaps/AOT_Experiment/ExperimentTools.py,sha256=aFvJw6J_jfFVTDFnG7J3a61SHEgORdZKZS0UI82VMaY,2637
@@ -42,7 +42,7 @@ AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py,sha256=RwrJdLOFbAFBFnRx
 AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_CSR.py,sha256=RACc2P5oxmp0uPLAGnNj9mEtAxa_OlepNgCawKij3jI,12062
 AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_SELL.py,sha256=ti3dZQsb_Uu62C7Bn65Z-yf-R5NKCFsmnBT5GlLd_HY,15138
 AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/__init__.py,sha256=8nou-hqjQjuCTLhoL5qv4EM_lMPFviAZAZKSPhi84jE,67
-aot_biomaps-2.9.366.dist-info/METADATA,sha256=HUpcCsc7od3wXHAdtx5PirG9dPqoOYEDvMOfWzk5jLY,700
-aot_biomaps-2.9.366.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.366.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.366.dist-info/RECORD,,
+aot_biomaps-2.9.368.dist-info/METADATA,sha256=4rg-Xx6Us0AXpmOQ782P0WKAdRdUEC8AOMuvaZAhVUQ,700
+aot_biomaps-2.9.368.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.368.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.368.dist-info/RECORD,,