AOT-biomaps 2.9.332__tar.gz → 2.9.334__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.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AnalyticRecon.py +5 -3
  2. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/__init__.py +3 -1
  3. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps.egg-info/PKG-INFO +1 -1
  4. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/PKG-INFO +1 -1
  5. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/setup.py +3 -1
  6. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/AcousticEnums.py +0 -0
  7. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/AcousticTools.py +0 -0
  8. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/FocusedWave.py +0 -0
  9. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/IrregularWave.py +0 -0
  10. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/PlaneWave.py +0 -0
  11. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/StructuredWave.py +0 -0
  12. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/__init__.py +0 -0
  13. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Acoustic/_mainAcoustic.py +0 -0
  14. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Experiment/ExperimentTools.py +0 -0
  15. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Experiment/Focus.py +0 -0
  16. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Experiment/Tomography.py +0 -0
  17. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Experiment/__init__.py +0 -0
  18. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Experiment/_mainExperiment.py +0 -0
  19. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Optic/Absorber.py +0 -0
  20. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Optic/Laser.py +0 -0
  21. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Optic/OpticEnums.py +0 -0
  22. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Optic/__init__.py +0 -0
  23. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Optic/_mainOptic.py +0 -0
  24. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/DEPIERRO.py +0 -0
  25. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/LS.py +0 -0
  26. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MAPEM.py +0 -0
  27. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/MLEM.py +0 -0
  28. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/PDHG.py +0 -0
  29. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_Optimizers/__init__.py +0 -0
  30. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Huber.py +0 -0
  31. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/Quadratic.py +0 -0
  32. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/RelativeDifferences.py +0 -0
  33. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_PotentialFunctions/__init__.py +0 -0
  34. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_CSR.py +0 -0
  35. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/SparseSMatrix_SELL.py +0 -0
  36. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_SparseSMatrix/__init__.py +0 -0
  37. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AOT_biomaps_kernels.cubin +0 -0
  38. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/AlgebraicRecon.py +0 -0
  39. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/BayesianRecon.py +0 -0
  40. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/DeepLearningRecon.py +0 -0
  41. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/PrimalDualRecon.py +0 -0
  42. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/ReconEnums.py +0 -0
  43. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/ReconTools.py +0 -0
  44. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/__init__.py +0 -0
  45. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/AOT_Recon/_mainRecon.py +0 -0
  46. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/Config.py +0 -0
  47. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps/Settings.py +0 -0
  48. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps.egg-info/SOURCES.txt +0 -0
  49. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps.egg-info/dependency_links.txt +0 -0
  50. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps.egg-info/requires.txt +0 -0
  51. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/AOT_biomaps.egg-info/top_level.txt +0 -0
  52. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/README.md +0 -0
  53. {aot_biomaps-2.9.332 → aot_biomaps-2.9.334}/setup.cfg +0 -0
@@ -14,6 +14,7 @@ class AnalyticRecon(Recon):
14
14
  super().__init__(**kwargs)
15
15
  self.reconType = ReconType.Analytic
16
16
  self.analyticType = analyticType
17
+ self.AOsignal_demoldulated = None
17
18
 
18
19
 
19
20
 
@@ -97,10 +98,9 @@ class AnalyticRecon(Recon):
97
98
 
98
99
  real = s0 - s_pi
99
100
  imag = s_pi_2 - s_3pi_2
100
-
101
-
101
+
102
102
  demodulated_data[(fs, theta)] = (real - 1j * imag) / (2/np.pi)
103
-
103
+
104
104
  return demodulated_data
105
105
 
106
106
  def run(self, processType = ProcessType.PYTHON, withTumor= True):
@@ -127,6 +127,7 @@ class AnalyticRecon(Recon):
127
127
  analyticType: The type of analytic reconstruction to perform (default is iFOURIER).
128
128
  """
129
129
  if withTumor:
130
+ self.AOsignal_demoldulated = self.parse_and_demodulate(withTumor=True)
130
131
  if self.analyticType == AnalyticType.iFOURIER:
131
132
  self.reconPhantom = self._iFourierRecon(self.experiment.AOsignal_withTumor)
132
133
  elif self.analyticType == AnalyticType.iRADON:
@@ -134,6 +135,7 @@ class AnalyticRecon(Recon):
134
135
  else:
135
136
  raise ValueError(f"Unknown analytic type: {self.analyticType}")
136
137
  else:
138
+ self.AOsignal_demoldulated = self.parse_and_demodulate(withTumor=False)
137
139
  if self.analyticType == AnalyticType.iFOURIER:
138
140
  self.reconLaser = self._iFourierRecon(self.experiment.AOsignal_withoutTumor)
139
141
  elif self.analyticType == AnalyticType.iRADON:
@@ -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.332'
88
+ __version__ = '2.9.334'
89
89
  __process__ = config.get_process()
90
90
 
91
91
  def initialize(process=None):
@@ -193,6 +193,8 @@ def initialize(process=None):
193
193
 
194
194
 
195
195
 
196
+
197
+
196
198
 
197
199
 
198
200
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: AOT_biomaps
3
- Version: 2.9.332
3
+ Version: 2.9.334
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.332
3
+ Version: 2.9.334
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.332',
5
+ version='2.9.334',
6
6
  packages=find_packages(),
7
7
  include_package_data=True,
8
8
 
@@ -351,6 +351,8 @@ setup(
351
351
 
352
352
 
353
353
 
354
+
355
+
354
356
 
355
357
 
356
358
 
File without changes
File without changes