AOT-biomaps 2.9.381__tar.gz → 2.9.383__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/_mainAcoustic.py +4 -2
  2. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/__init__.py +3 -1
  3. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps.egg-info/PKG-INFO +1 -1
  4. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/PKG-INFO +1 -1
  5. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/setup.py +3 -1
  6. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/AcousticEnums.py +0 -0
  7. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/AcousticTools.py +0 -0
  8. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/FocusedWave.py +0 -0
  9. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/IrregularWave.py +0 -0
  10. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/PlaneWave.py +0 -0
  11. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/StructuredWave.py +0 -0
  12. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Acoustic/__init__.py +0 -0
  13. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Experiment/ExperimentTools.py +0 -0
  14. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Experiment/Focus.py +0 -0
  15. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Experiment/Tomography.py +0 -0
  16. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Experiment/__init__.py +0 -0
  17. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Experiment/_mainExperiment.py +0 -0
  18. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Optic/Absorber.py +0 -0
  19. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Optic/Laser.py +0 -0
  20. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Optic/OpticEnums.py +0 -0
  21. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Optic/__init__.py +0 -0
  22. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Optic/_mainOptic.py +0 -0
  23. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/DEPIERRO.py +0 -0
  24. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/LS.py +0 -0
  25. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MAPEM.py +0 -0
  26. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MLEM.py +0 -0
  27. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/PDHG.py +0 -0
  28. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_Optimizers/__init__.py +0 -0
  29. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Huber.py +0 -0
  30. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Quadratic.py +0 -0
  31. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/RelativeDifferences.py +0 -0
  32. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py +0 -0
  33. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_CSR.py +0 -0
  34. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_SELL.py +0 -0
  35. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/__init__.py +0 -0
  36. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AOT_biomaps_kernels.cubin +0 -0
  37. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AlgebraicRecon.py +0 -0
  38. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/AnalyticRecon.py +0 -0
  39. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/BayesianRecon.py +0 -0
  40. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/DeepLearningRecon.py +0 -0
  41. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/PrimalDualRecon.py +0 -0
  42. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/ReconEnums.py +0 -0
  43. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/ReconTools.py +0 -0
  44. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/__init__.py +0 -0
  45. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/AOT_Recon/_mainRecon.py +0 -0
  46. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/Config.py +0 -0
  47. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps/Settings.py +0 -0
  48. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps.egg-info/SOURCES.txt +0 -0
  49. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps.egg-info/dependency_links.txt +0 -0
  50. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps.egg-info/requires.txt +0 -0
  51. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/AOT_biomaps.egg-info/top_level.txt +0 -0
  52. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/README.md +0 -0
  53. {aot_biomaps-2.9.381 → aot_biomaps-2.9.383}/setup.cfg +0 -0
@@ -536,8 +536,7 @@ class AcousticField(ABC):
536
536
 
537
537
  Nx_final = int(round((self.params['Xrange'][1] - self.params['Xrange'][0]) / self.params['dx']))
538
538
  Nz_final = int(round((self.params['Zrange'][1] - self.params['Zrange'][0]) / self.params['dx']))
539
- # --- 2. Time and space factors ---
540
- factorT = int(np.ceil(self.params['f_AQ'] / self.params['f_saving']))
539
+ # --- 2. space factors ---
541
540
  factorX = int(np.ceil(self.params['dx'] / dx))
542
541
  factorZ = factorX
543
542
 
@@ -565,6 +564,9 @@ class AcousticField(ABC):
565
564
  dt = cfl * dx / c_max
566
565
  kgrid.setTime(self.kgrid.Nt, dt)
567
566
 
567
+ factorT = int(np.ceil((1/dt) / (self.params['f_saving'])))
568
+ print(f"factorT: {factorT}")
569
+ print(f"dt: {dt}")
568
570
 
569
571
  source = kSource()
570
572
  source.p_mask = np.zeros((Nx, Nz))
@@ -85,7 +85,7 @@ from .AOT_Recon.AOT_PotentialFunctions.RelativeDifferences import *
85
85
  from .Config import config
86
86
  from .Settings import *
87
87
 
88
- __version__ = '2.9.381'
88
+ __version__ = '2.9.383'
89
89
  __process__ = config.get_process()
90
90
 
91
91
  def initialize(process=None):
@@ -242,6 +242,8 @@ def initialize(process=None):
242
242
 
243
243
 
244
244
 
245
+
246
+
245
247
 
246
248
 
247
249
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: AOT_biomaps
3
- Version: 2.9.381
3
+ Version: 2.9.383
4
4
  Summary: Acousto-Optic Tomography
5
5
  Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
6
6
  Author: Lucas Duclos
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: AOT_biomaps
3
- Version: 2.9.381
3
+ Version: 2.9.383
4
4
  Summary: Acousto-Optic Tomography
5
5
  Home-page: https://github.com/LucasDuclos/AcoustoOpticTomography
6
6
  Author: Lucas Duclos
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name='AOT_biomaps',
5
- version='2.9.381',
5
+ version='2.9.383',
6
6
  packages=find_packages(),
7
7
  include_package_data=True,
8
8
 
@@ -400,6 +400,8 @@ setup(
400
400
 
401
401
 
402
402
 
403
+
404
+
403
405
 
404
406
 
405
407
 
File without changes
File without changes