AOT-biomaps 2.9.363__py3-none-any.whl → 2.9.365__py3-none-any.whl

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

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

@@ -1,17 +1,17 @@
 AOT_biomaps/Config.py,sha256=ghEOP1n8aO1pR-su13wMeAZAxZRfry5hH67NbtZ8SqI,3614
 AOT_biomaps/Settings.py,sha256=v8fPhnvvcfBJP29m1RLOTEr3jndGLGwbUiORXmsj2Bo,2853
-AOT_biomaps/__init__.py,sha256=zk35QRhwc7B3tvwuqdebCl3ta7phMGwg-eZJn4f5bSU,4388
+AOT_biomaps/__init__.py,sha256=gGOhX--gA5aULu4u7YlRzww0diK7Y7E3tjFiMy_Emes,4392
 AOT_biomaps/AOT_Acoustic/AcousticEnums.py,sha256=s5kXa6jKzbS4btwbubrVcynLOr0yg5tth5vL_FGfbMk,1802
 AOT_biomaps/AOT_Acoustic/AcousticTools.py,sha256=h2sCtGVcDtyLtEF1q7sLZmuWivWmesVGUBPnW-ndQqc,7535
 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=jTLVlOhYLWJb5MxZPxhq3OFVlz2McoyMPBmfLvnekDU,18209
+AOT_biomaps/AOT_Acoustic/StructuredWave.py,sha256=TO8in7HfPx5rZ_9pIi9__mKsaZbHRVQ1lcRLdr4f-aw,19020
 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
 AOT_biomaps/AOT_Experiment/Focus.py,sha256=B2nBawmv-NG2AWJx9zgQ8GlN6aFB9FwTSqX-M-phKXg,3193
-AOT_biomaps/AOT_Experiment/Tomography.py,sha256=jVygQy-uOkBL2l-F_D9DpkhAS0WJNAvpIeqq1ybMP8s,37484
+AOT_biomaps/AOT_Experiment/Tomography.py,sha256=9mJDwV9WVphoX8drL7MgN3WhS6fjYwS6HWQD3x1CrVs,37625
 AOT_biomaps/AOT_Experiment/__init__.py,sha256=H9zMLeBLA6uhbaHohAa-2u5mDDxqJi8oE5c6tShdQp8,308
 AOT_biomaps/AOT_Experiment/_mainExperiment.py,sha256=zSfuNrsz7nhiKrGIdK6CAXjlI2T6qYC5-JXHFgPNzhc,24674
 AOT_biomaps/AOT_Optic/Absorber.py,sha256=jEodzRy7gkEH-wbazVasRQiri0dU16BfapmR-qnTSvM,867
@@ -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.363.dist-info/METADATA,sha256=VXAfn0-XO5Slj_c2LUfydgcrNxIlK9r13cdwD0S9UnA,700
-aot_biomaps-2.9.363.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.363.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.363.dist-info/RECORD,,
+aot_biomaps-2.9.365.dist-info/METADATA,sha256=0QqOVmpZwZKKRyL9MY6otBIEL1vbuc7qVOIdK-F3CZc,700
+aot_biomaps-2.9.365.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.365.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.365.dist-info/RECORD,,