1.4.2

Changed automieq crossover point to 0.01
bsumlin · Jan 31, 2018 · d7fcf32 · d7fcf32
1 parent d470d5d
commit d7fcf32
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/PyMieScatt.egg-info/PKG-INFO b/PyMieScatt.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.1
 Name: PyMieScatt
-Version: 1.4.1
+Version: 1.4.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-Content-Type: UNKNOWN
-Description: 1.4.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.4.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/Mie.py b/PyMieScatt/Mie.py
@@ -136,7 +136,7 @@ def RayleighMieQ(m, wavelength, diameter, asDict=False):
     else:
       return qext, qsca, qabs, g, qpr, qback, qratio
 
-def AutoMieQ(m, wavelength, diameter, crossover=0.5, asDict=False):
+def AutoMieQ(m, wavelength, diameter, crossover=0.01, asDict=False):
 #  http://pymiescatt.readthedocs.io/en/latest/forward.html#AutoMieQ
   x = np.pi*diameter/wavelength
   if x==0:

diff --git a/PyMieScatt/_version.py b/PyMieScatt/_version.py
@@ -1 +1 @@
-__version__ = "1.4.1"
+__version__ = "1.4.2"
diff --git a/build/lib/PyMieScatt/Mie.py b/build/lib/PyMieScatt/Mie.py
@@ -136,7 +136,7 @@ def RayleighMieQ(m, wavelength, diameter, asDict=False):
     else:
       return qext, qsca, qabs, g, qpr, qback, qratio
 
-def AutoMieQ(m, wavelength, diameter, crossover=0.5, asDict=False):
+def AutoMieQ(m, wavelength, diameter, crossover=0.01, asDict=False):
 #  http://pymiescatt.readthedocs.io/en/latest/forward.html#AutoMieQ
   x = np.pi*diameter/wavelength
   if x==0:

diff --git a/build/lib/PyMieScatt/_version.py b/build/lib/PyMieScatt/_version.py
@@ -1 +1 @@
-__version__ = "1.4.1"
+__version__ = "1.4.2"
diff --git a/dist/PyMieScatt-1.4.1-py3-none-any.whl b/dist/PyMieScatt-1.4.1-py3-none-any.whl
diff --git a/dist/PyMieScatt-1.4.1.tar.gz b/dist/PyMieScatt-1.4.1.tar.gz
diff --git a/dist/PyMieScatt-1.4.2-py3-none-any.whl b/dist/PyMieScatt-1.4.2-py3-none-any.whl
diff --git a/dist/PyMieScatt-1.4.2.tar.gz b/dist/PyMieScatt-1.4.2.tar.gz
diff --git a/docs/forward.rst b/docs/forward.rst
@@ -145,9 +145,9 @@ Functions for single particles
 		 'g': 0}
 
 
-.. py:Function:: AutoMieQ(m, wavelength, diameter[, crossover=0.5, asDict=False])
+.. py:Function:: AutoMieQ(m, wavelength, diameter[, crossover=0.01, asDict=False])
 
-   Returns Mie efficencies of a spherical particle according to either :py:func:`MieQ` or :py:func:`RayleighMieQ` depending on the magnitude of the size parameter. Good for studying parameter ranges or size distributions.
+   Returns Mie efficencies of a spherical particle according to either :py:func:`MieQ` or :py:func:`RayleighMieQ` depending on the magnitude of the size parameter. Good for studying parameter ranges or size distributions. Thanks to `John Kendrick <https://github.com/JohnKendrick/PDielec>`_ for discussions about where to best place the crossover point.
 
    **Parameters**
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -21,7 +21,7 @@ Documentation is currently under development, but almost complete. A manuscript
 Install PyMieScatt
 ------------------
 
-The current version is 1.4.1. You can install PyMieScatt from `The Python Package Index (PyPI) <https://pypi.python.org/pypi/PyMieScatt>`_ with ::
+The current version is 1.4.2. You can install PyMieScatt from `The Python Package Index (PyPI) <https://pypi.python.org/pypi/PyMieScatt>`_ with ::
 
    $ pip install PyMieScatt
 
@@ -30,14 +30,18 @@ or from `GitHub <https://github.com/bsumlin/PyMieScatt>`_. Clone the repository
 
    $ python setup.py install
 
-Revision Notes - version 1.4.1 (25 January, 2018)
+Revision Notes - version 1.4.2 (25 January, 2018)
 -------------------------------------------------
 
-  - Added `Shapely <https://shapely.readthedocs.io/>`_ support! Shapely is a geometric manipulation and analysis package. I wrote it in as a slightly faster, more robust way to look for intersections in n-k space when doing inversions. It also makes the code more readable and makes it clearer how the intersection method works, especially when including backscatter to find a unique solution. There is no change to the user experience, other than slight speedups.
+  - Very minor adjustment to :py:func:`AutoMieQ`; changed the crossover from Rayleigh to Mie to x=0.01 (previously 0.5). Thanks to `John Kendrick <https://github.com/JohnKendrick/PDielec>`_ for the suggestion.
 
 Revision History
 ----------------
 
+- 1.4.1 (25 January, 2018)
+
+  - Added `Shapely <https://shapely.readthedocs.io/>`_ support! Shapely is a geometric manipulation and analysis package. I wrote it in as a slightly faster, more robust way to look for intersections in n-k space when doing inversions. It also makes the code more readable and makes it clearer how the intersection method works, especially when including backscatter to find a unique solution. There is no change to the user experience, other than slight speedups.
+
 - 1.3.7
 
   - Fixed a major bug in :py:func:`ContourIntersection` and :py:func:`ContourIntersection_SD` that prevented them from using the actual input values to derive solutions.