bump version, more linting

scottprahl · Jun 10, 2023 · 33ae5d1 · 33ae5d1
1 parent 0896cd3
commit 33ae5d1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+v2.4.0 (6/10/2023)
+-------------------
+*   add mie_phase_matrix() to calculate scattering (Mueller) matrix
+
 v2.3.2
 -------------------
 *   fix typo in README.rst that prevented pypi upload

diff --git a/Makefile b/Makefile
@@ -19,7 +19,6 @@ rstcheck:
 	-rstcheck README.rst
 	-rstcheck CHANGELOG.rst
 	-rstcheck docs/index.rst
-	-rstcheck docs/changelog.rst
 	-rstcheck --ignore-directives automodapi docs/miepython.rst
 
 lintcheck:

diff --git a/miepython/__init__.py b/miepython/__init__.py
@@ -36,8 +36,13 @@
     miepython.i_per(m, x, mu, norm='one')
     miepython.i_par(m, x, mu, norm='one')
     miepython.i_unpolarized(m, x, mu, norm='one')
+
+The scattering matrix
+
+    miepython.mie_phase_matrix(m, x, mu)
+
 """
-__version__ = '2.3.2'
+__version__ = '2.4.0'
 __author__ = 'Scott Prahl'
 __email__ = '[email protected]'
 __copyright__ = 'Copyright 2017-23, Scott Prahl'

diff --git a/miepython/miepython.py b/miepython/miepython.py
@@ -645,7 +645,7 @@ def mie_S1_S2(m, x, mu, norm='albedo'):
 
 def mie_phase_matrix(m, x, mu, norm='albedo'):
     """
-    Calculate the phase scattering matrix.
+    Calculate the scattering (Mueller) matrix.
 
     If mu has length N, then the returned matrix is 4x4xN.  If mu is a scalar
     then the matrix is 4x4

diff --git a/miepython/miepython_nojit.py b/miepython/miepython_nojit.py
@@ -559,7 +559,7 @@ def mie_S1_S2(m, x, mu, norm='albedo'):
 
 def mie_phase_matrix(m, x, mu, norm='albedo'):
     """
-    Calculate the phase scattering matrix.
+    Calculate the scattering (Mueller) matrix.
 
     If mu has length N, then the returned matrix is 4x4xN.  If mu is a scalar
     then the matrix is 4x4