AOT-biomaps 2.9.363__tar.gz → 2.9.365__tar.gz

{aot_biomaps-2.9.363 → aot_biomaps-2.9.365}/AOT_biomaps/AOT_Acoustic/StructuredWave.py

@@ -1,4 +1,5 @@
 from AOT_biomaps.Config import config
+from AcoustoOpticTomography.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
@@ -156,7 +157,20 @@ class StructuredWave(AcousticField):
                 int: Decimation frequency.
             """
             try:
-                return 1/(self.pattern.space_0 + self.pattern.space_1)/self.params['element_width']
+                profile = hex_to_binary_profile(self.getName_field()[6:-4], self.params['num_elements'])
+
+                if set(self.getName_field()[6:-4].lower().replace(" ", "")) == {'f'}:
+                    fs_key = 0.0 # fs_key est en mm^-1 (0.0 mm^-1)
+                else:   
+                    ft_prof = np.fft.fft(profile)
+                    idx_max = np.argmax(np.abs(ft_prof[1:len(profile)//2])) + 1
+                    freqs = np.fft.fftfreq(len(profile), d=self.params['dx'])
+
+                    # freqs est en m^-1 car delta_x est en mètres.
+                    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)
             except Exception as e:
                 print(f"Error calculating decimation frequency: {e}")
                 return None

{aot_biomaps-2.9.363 → aot_biomaps-2.9.365}/AOT_biomaps/AOT_Experiment/Tomography.py

@@ -341,6 +341,7 @@ class Tomography(Experiment):
             self.AOsignal_withoutTumor = self.AOsignal_withoutTumor[:, index]
         self.AcousticFields = newAcousticFields
         self.theta = [field.angle for field in newAcousticFields]
+        self.decimations = [field.f_s for field in newAcousticFields]   
 
     def selectDecimations(self, decimations):
         if self.AOsignal_withTumor is None and self.AOsignal_withoutTumor is None:
@@ -358,7 +359,8 @@ class Tomography(Experiment):
         if self.AOsignal_withoutTumor is not None:
             self.AOsignal_withoutTumor = self.AOsignal_withoutTumor[:, index]
         self.AcousticFields = newAcousticFields
-        self.decimations = [field.f_s for field in newAcousticFields]      
+        self.decimations = [field.f_s for field in newAcousticFields]   
+        self.theta = [field.angle for field in newAcousticFields]   
 
     def selectPatterns(self, pattern_names):
         if self.AOsignal_withTumor is None and self.AOsignal_withoutTumor is None:

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

{aot_biomaps-2.9.363 → aot_biomaps-2.9.365}/AOT_biomaps.egg-info/PKG-INFO

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

{aot_biomaps-2.9.363 → aot_biomaps-2.9.365}/PKG-INFO

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

{aot_biomaps-2.9.363 → aot_biomaps-2.9.365}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='AOT_biomaps',
-    version='2.9.363',
+    version='2.9.365',
     packages=find_packages(),
     include_package_data=True,
     
@@ -382,6 +382,8 @@ setup(
 
 
 
+
+