AOT-biomaps 2.9.216__py3-none-any.whl → 2.9.217__py3-none-any.whl

AOT_biomaps/AOT_Experiment/_mainExperiment.py

@@ -293,25 +293,45 @@ class Experiment(ABC):
         if AOsignalPath.endswith(".cdh"):
             with open(AOsignalPath, "r") as file:
                 cdh_content = file.readlines()
+            
+            cdf_path = AOsignalPath.replace(".cdh", ".cdf")
 
-            # Extraction des paramètres
-            n_events = int([line.split(":")[1].strip() for line in cdh_content if "Number of events" in line][0])
-            n_acquisitions = int([line.split(":")[1].strip() for line in cdh_content if "Number of acquisitions per event" in line][0])
+            # Extraire les paramètres depuis le fichier .cdh
+            n_scans = int([line.split(":")[1].strip() for line in cdh_content if "Number of events" in line][0])
+            n_acquisitions_per_event = int([line.split(":")[1].strip() for line in cdh_content if "Number of acquisitions per event" in line][0])
             num_elements = int([line.split(":")[1].strip() for line in cdh_content if "Number of US transducers" in line][0])
 
-            # Initialisation avec la bonne forme : (n_acquisitions, n_events)
-            AOsignal_matrix = np.zeros((n_acquisitions, n_events), dtype=np.float32)
+            print(f"Nombre de scans : {n_scans}")
+            print(f"Nombre d'acquisitions par événement : {n_acquisitions_per_event}")
+            print(f"Nombre d'éléments US : {num_elements}")
+
+
+            # Initialisation des structures
+            AO_signal = np.zeros((n_acquisitions_per_event, n_scans), dtype=np.float32)
+            active_lists = []
+            angles = []
+
+            # Lecture du fichier binaire
+            with open(cdf_path, "rb") as file:
+                for j in trange(n_scans, desc="Lecture des événements"):
+                    # Lire l'activeList : 48 caractères hex = 24 bytes
+                    active_list_bytes = file.read(24)
+                    active_list_hex = active_list_bytes.hex()
+                    active_lists.append(active_list_hex)
+
+                    # Lire l'angle (1 byte signé)
+                    angle_byte = file.read(1)
+                    angle = np.frombuffer(angle_byte, dtype=np.int8)[0]
+                    angles.append(angle)
 
-            with open(AOsignalPath.replace(".cdh", ".cdf"), "rb") as file:
-                hex_length = (num_elements + 3) // 4
-                for event in range(n_events):
-                    file.read(hex_length // 2)  # Sauter l'en-tête de l'événement
-                    signal = np.frombuffer(file.read(n_acquisitions * 4), dtype=np.float32)
-                    AOsignal_matrix[:, event] = signal  # Remplir par colonne
+                    # Lire le signal AO (float32)
+                    data = np.frombuffer(file.read(n_acquisitions_per_event * 4), dtype=np.float32)
+                    if len(data) != n_acquisitions_per_event:
+                        raise ValueError(f"Erreur à l'événement {j} : attendu {n_acquisitions_per_event}, obtenu {len(data)}")
+                    AO_signal[:, j] = data
 
-            AOsignal_matrix = AOsignal_matrix
+            return AO_signal
 
-            return AOsignal_matrix
 
         elif AOsignalPath.endswith(".npy"):
             return np.load(AOsignalPath)  # Supposé déjà au bon format
@@ -348,7 +368,7 @@ class Experiment(ABC):
             f"Number of acquisitions per event: {AO_signal.shape[0]}\n"
             f"Start time (s): 0\n"
             f"Duration (s): 1\n"
-            f"Acquisition frequency (Hz): {1/self.AcousticFields[0].kgrid.dt}\n"
+            f"Acquisition frequency (Hz): {self.params.acoustic['f_saving']}\n"
             f"Data mode: histogram\n"
             f"Data type: AOT\n"
             f"Number of US transducers: {self.params.acoustic['num_elements']}"

AOT_biomaps/__init__.py

@@ -82,7 +82,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
 from .Config import config
 from .Settings import *
 
-__version__ = '2.9.216'
+__version__ = '2.9.217'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -251,5 +251,6 @@ def initialize(process=None):
 
 
 
+
 
 

{aot_biomaps-2.9.216.dist-info → aot_biomaps-2.9.217.dist-info}/METADATA

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

{aot_biomaps-2.9.216.dist-info → aot_biomaps-2.9.217.dist-info}/RECORD

@@ -1,6 +1,6 @@
 AOT_biomaps/Config.py,sha256=ghEOP1n8aO1pR-su13wMeAZAxZRfry5hH67NbtZ8SqI,3614
 AOT_biomaps/Settings.py,sha256=v8fPhnvvcfBJP29m1RLOTEr3jndGLGwbUiORXmsj2Bo,2853
-AOT_biomaps/__init__.py,sha256=xLnxMqvxcnMaz1SxBFK00H3qB891lpWXtB7Uz-y13eE,4302
+AOT_biomaps/__init__.py,sha256=a5-mladvHgmA_M1WKbypLCFGpl5fYpD17MwJ4SLWkv4,4304
 AOT_biomaps/AOT_Acoustic/AcousticEnums.py,sha256=s5kXa6jKzbS4btwbubrVcynLOr0yg5tth5vL_FGfbMk,1802
 AOT_biomaps/AOT_Acoustic/AcousticTools.py,sha256=al7xXKMY5e-qQQ7nrQVPVAmqYiB320OluNlY6ti8iKc,7539
 AOT_biomaps/AOT_Acoustic/FocusedWave.py,sha256=3kGKKDx_3Msy5COYqIwzROPORGWvNjw8UsDanBfkMXE,11037
@@ -12,7 +12,7 @@ AOT_biomaps/AOT_Acoustic/_mainAcoustic.py,sha256=RdmhRF1i0KAlpsP7_wnZ7F4J27br3eU
 AOT_biomaps/AOT_Experiment/Focus.py,sha256=B2nBawmv-NG2AWJx9zgQ8GlN6aFB9FwTSqX-M-phKXg,3193
 AOT_biomaps/AOT_Experiment/Tomography.py,sha256=LoQ304X9pUwpGn_BqNx1JijRFBFtI5Vz2R7bFIKyYKM,20954
 AOT_biomaps/AOT_Experiment/__init__.py,sha256=H9zMLeBLA6uhbaHohAa-2u5mDDxqJi8oE5c6tShdQp8,308
-AOT_biomaps/AOT_Experiment/_mainExperiment.py,sha256=qB7B29HPn-8KjjisYJBYXNqpznHMbxEq8MtUN4hB1Dg,24014
+AOT_biomaps/AOT_Experiment/_mainExperiment.py,sha256=Jv25qvTyh4FU1POC1PIyodvLCi-wfRCeiLoR3RfpklI,24886
 AOT_biomaps/AOT_Optic/Absorber.py,sha256=jEodzRy7gkEH-wbazVasRQiri0dU16BfapmR-qnTSvM,867
 AOT_biomaps/AOT_Optic/Laser.py,sha256=uzQwxswjU0kZWix3CmZLoWmhsBa3VhN27STprNv-xB8,2986
 AOT_biomaps/AOT_Optic/OpticEnums.py,sha256=b349_JyjHqQohmjK4Wke-A_HLGaqb3_BKbyUqFC4jxY,499
@@ -37,7 +37,7 @@ AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Huber.py,sha256=dRd1t5OBag_gVmfji3L
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Quadratic.py,sha256=wTbzcXxMdEl9ReEXrL43DOJQecokBwJYU_s2kQUASZY,2545
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/RelativeDifferences.py,sha256=dgB3Vt40S5D1VerHr-h-YnzB5xNCt6amE19-C0zyIpU,2253
 AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py,sha256=RwrJdLOFbAFBFnRxo5xdlOyeZgtQRDaRWDN9-uCGUiY,84
-aot_biomaps-2.9.216.dist-info/METADATA,sha256=EWVh3UxU1a5Thdxdx5KgruHt0-1a9zOKIYIhAd1utVE,663
-aot_biomaps-2.9.216.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.216.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.216.dist-info/RECORD,,
+aot_biomaps-2.9.217.dist-info/METADATA,sha256=brSxYFUSU9Q3wZC2LleSVDbMvvYk5pjzdAdZQMptPzE,663
+aot_biomaps-2.9.217.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.217.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.217.dist-info/RECORD,,