1.3.4

name changes to inverse functions
bsumlin · Oct 16, 2017 · a74a456 · a74a456
1 parent 505fca4
commit a74a456
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 577 deletions.
diff --git a/PyMieScatt.egg-info/PKG-INFO b/PyMieScatt.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: PyMieScatt
-Version: 1.3.1
+Version: 1.3.2
 Summary: A collection of forward and inverse Mie solving routines based on Bohren and Huffman's Mie Theory derivations.
 Home-page: http://air.eece.wustl.edu/people/ben-sumlin/
 Author: Benjamin Sumlin
 Author-email: bsumlin@wustl.edu
 License: GPL
-Description: 1.3.1 - Added error bounds as an option for the graphical inversion method. Added new automatic inversion methods Inversion() and Inversion_SD(). Significantly improved the iterative methods.
+Description: 1.3.2 - Added error bounds as an option for the graphical inversion method. Added new automatic inversion methods Inversion() and Inversion_SD(). Significantly improved the iterative methods.
         Docs are hosted at `ReadTheDocs <http://pymiescatt.readthedocs.io/>`_.
 Keywords: Mie Rayleigh scattering absorption extinction light refraction
 Platform: UNKNOWN

diff --git a/PyMieScatt.egg-info/SOURCES.txt b/PyMieScatt.egg-info/SOURCES.txt
@@ -5,7 +5,6 @@ PyMieScatt/Inverse.py
 PyMieScatt/Mie.py
 PyMieScatt/__init__.py
 PyMieScatt/_version.py
-PyMieScatt/graphicalWithError.py
 PyMieScatt.egg-info/PKG-INFO
 PyMieScatt.egg-info/SOURCES.txt
 PyMieScatt.egg-info/dependency_links.txt

diff --git a/PyMieScatt/Inverse.py b/PyMieScatt/Inverse.py
@@ -72,8 +72,8 @@ def Inversion_SD(Bsca,Babs,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0,kMax=1,scatter
 
   return np.intersect1d(validScattering,validAbsorption)
 
-def GraphicalInversion(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax=3,kMin=0.00001,kMax=1,QbackMeasured=None,gridPoints=100,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
-#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#GraphicalInversion
+def ContourIntersection(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax=3,kMin=0.00001,kMax=1,QbackMeasured=None,gridPoints=100,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
+#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#ContourIntersection
   error = lambda measured,calculated: np.abs((calculated-measured)/measured)
   if QbackMeasured is not None:
     if gridPoints*interpolationFactor<400:
@@ -294,8 +294,8 @@ def GraphicalInversion(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax
 
   return solutionSet,forwardCalculations,solutionErrors, fig, ax, graphElements
 
-def GraphicalInversion_SD(BscaMeasured,BabsMeasured,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0.00001,kMax=1,BbackMeasured=None,gridPoints=60,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
-#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#GraphicalInversion_SD
+def ContourIntersection_SD(BscaMeasured,BabsMeasured,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0.00001,kMax=1,BbackMeasured=None,gridPoints=60,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
+#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#ContourIntersection_SD
   error = lambda measured,calculated: np.abs((calculated-measured)/measured)
   if BbackMeasured is not None:
     if gridPoints*interpolationFactor<120:

diff --git a/PyMieScatt/__init__.py b/PyMieScatt/__init__.py
@@ -2,5 +2,5 @@
 
 from PyMieScatt.Mie import MieQ, RayleighMieQ, AutoMieQ, LowFrequencyMieQ, Mie_SD, ScatteringFunction, SF_SD, MatrixElements, MieQ_withDiameterRange, MieQ_withWavelengthRange, MieQ_withSizeParameterRange, Mie_Lognormal
 from PyMieScatt.CoreShell import MieQCoreShell, CoreShellScatteringFunction, CoreShellMatrixElements
-from PyMieScatt.Inverse import GraphicalInversion, GraphicalInversion_SD, SurveyIteration, SurveyIteration_SD, Inversion, Inversion_SD, fastMieQ, fastMie_SD
+from PyMieScatt.Inverse import ContourIntersection, ContourIntersection_SD, SurveyIteration, SurveyIteration_SD, Inversion, Inversion_SD, fastMieQ, fastMie_SD
 from PyMieScatt._version import __version__
diff --git a/PyMieScatt/_version.py b/PyMieScatt/_version.py
@@ -1 +1 @@
-__version__ = "1.3.1"
+__version__ = "1.3.2"
diff --git a/PyMieScatt/graphicalWithError.py b/PyMieScatt/graphicalWithError.py
diff --git a/build/lib/PyMieScatt/Inverse.py b/build/lib/PyMieScatt/Inverse.py
@@ -72,8 +72,8 @@ def Inversion_SD(Bsca,Babs,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0,kMax=1,scatter
 
   return np.intersect1d(validScattering,validAbsorption)
 
-def GraphicalInversion(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax=3,kMin=0.00001,kMax=1,QbackMeasured=None,gridPoints=100,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
-#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#GraphicalInversion
+def ContourIntersection(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax=3,kMin=0.00001,kMax=1,QbackMeasured=None,gridPoints=100,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
+#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#ContourIntersection
   error = lambda measured,calculated: np.abs((calculated-measured)/measured)
   if QbackMeasured is not None:
     if gridPoints*interpolationFactor<400:
@@ -294,8 +294,8 @@ def GraphicalInversion(QscaMeasured,QabsMeasured,wavelength,diameter,nMin=1,nMax
 
   return solutionSet,forwardCalculations,solutionErrors, fig, ax, graphElements
 
-def GraphicalInversion_SD(BscaMeasured,BabsMeasured,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0.00001,kMax=1,BbackMeasured=None,gridPoints=60,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
-#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#GraphicalInversion_SD
+def ContourIntersection_SD(BscaMeasured,BabsMeasured,wavelength,dp,ndp,nMin=1,nMax=3,kMin=0.00001,kMax=1,BbackMeasured=None,gridPoints=60,interpolationFactor=2,maxError=0.005,fig=None,ax=None,axisOption=0):
+#  http://pymiescatt.readthedocs.io/en/latest/inverse.html#ContourIntersection_SD
   error = lambda measured,calculated: np.abs((calculated-measured)/measured)
   if BbackMeasured is not None:
     if gridPoints*interpolationFactor<120:

diff --git a/build/lib/PyMieScatt/__init__.py b/build/lib/PyMieScatt/__init__.py
@@ -2,5 +2,5 @@
 
 from PyMieScatt.Mie import MieQ, RayleighMieQ, AutoMieQ, LowFrequencyMieQ, Mie_SD, ScatteringFunction, SF_SD, MatrixElements, MieQ_withDiameterRange, MieQ_withWavelengthRange, MieQ_withSizeParameterRange, Mie_Lognormal
 from PyMieScatt.CoreShell import MieQCoreShell, CoreShellScatteringFunction, CoreShellMatrixElements
-from PyMieScatt.Inverse import GraphicalInversion, GraphicalInversion_SD, SurveyIteration, SurveyIteration_SD, Inversion, Inversion_SD, fastMieQ, fastMie_SD
+from PyMieScatt.Inverse import ContourIntersection, ContourIntersection_SD, SurveyIteration, SurveyIteration_SD, Inversion, Inversion_SD, fastMieQ, fastMie_SD
 from PyMieScatt._version import __version__
diff --git a/build/lib/PyMieScatt/_version.py b/build/lib/PyMieScatt/_version.py
@@ -1 +1 @@
-__version__ = "1.3.1"
+__version__ = "1.3.2"