AOT-biomaps 2.9.213__py3-none-any.whl → 2.9.215__py3-none-any.whl

AOT_biomaps/AOT_Experiment/_mainExperiment.py

@@ -290,28 +290,34 @@ class Experiment(ABC):
 
     @staticmethod
     def _loadAOSignal(AOsignalPath):
-        # if extension is .cdh load .cdf file
         if AOsignalPath.endswith(".cdh"):
             with open(AOsignalPath, "r") as file:
                 cdh_content = file.readlines()
 
+            # 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])
+            num_elements = int([line.split(":")[1].strip() for line in cdh_content if "Number of US transducers" in line][0])
 
-            AOsignal_matrix = np.zeros((n_events, n_acquisitions), dtype=np.float32)
+            # Initialisation avec la bonne forme : (n_acquisitions, n_events)
+            AOsignal_matrix = np.zeros((n_acquisitions, n_events), dtype=np.float32)
 
             with open(AOsignalPath.replace(".cdh", ".cdf"), "rb") as file:
+                hex_length = (num_elements + 3) // 4
                 for event in range(n_events):
-                    num_elements = int([line.split(":")[1].strip() for line in cdh_content if "Number of US transducers" in line][0])
-                    hex_length = (num_elements + 3) // 4
-                    file.read(hex_length // 2)
-
+                    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
+                    AOsignal_matrix[:, event] = signal  # Remplir par colonne
+                    
+            AOsignal_matrix = AOsignal_matrix
 
             return AOsignal_matrix
-        if AOsignalPath.endswith(".npy"):
-            return np.load(AOsignalPath)
+
+        elif AOsignalPath.endswith(".npy"):
+            return np.load(AOsignalPath)  # Supposé déjà au bon format
+        else:
+            raise ValueError("Format de fichier non supporté. Utilisez .cdh/.cdf ou .npy.")
+
 
     def saveAOsignals_Castor(self, save_directory, withTumor=True):
         if withTumor:

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.213'
+__version__ = '2.9.215'
 __process__ = config.get_process()
 
 def initialize(process=None):
@@ -247,6 +247,8 @@ def initialize(process=None):
 
 
 
+
+
 
 
 

{aot_biomaps-2.9.213.dist-info → aot_biomaps-2.9.215.dist-info}/METADATA

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

{aot_biomaps-2.9.213.dist-info → aot_biomaps-2.9.215.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=R0ULRNskr136iJHYbHrDIPcPxX1o7D7gxCX8ZmM8hq8,4296
+AOT_biomaps/__init__.py,sha256=Z_7Ypmz0RNXbhYWqcFpyQJChgR7QN04s2nPMWGrlmk4,4300
 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=ZDd-H-hA4ZByMqsE1uwf0mMhihRveqgYGeSbUTS0RsM,23696
+AOT_biomaps/AOT_Experiment/_mainExperiment.py,sha256=XPBaAq94m67JbtVGpju0f2mNO7_Z_9zBV1N-AnfajNk,24034
 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.213.dist-info/METADATA,sha256=lndUh1zVY-SEQCbypPH4aV56KRnsvh42Q04dR6M8Hzc,663
-aot_biomaps-2.9.213.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aot_biomaps-2.9.213.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
-aot_biomaps-2.9.213.dist-info/RECORD,,
+aot_biomaps-2.9.215.dist-info/METADATA,sha256=X_uTUKBuD3rCMAabQB9EK5l1muH2VB0pv2UrFXUmviU,663
+aot_biomaps-2.9.215.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aot_biomaps-2.9.215.dist-info/top_level.txt,sha256=6STF-lT4kaAnBHJYCripmN5mZABoHjMuY689JdiDphk,12
+aot_biomaps-2.9.215.dist-info/RECORD,,