minor

docs, code cleanup. More code cleanup forthcoming.
bsumlin · Oct 2, 2017 · ecde343 · ecde343
1 parent 6aedecc
commit ecde343
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/PyMieScatt/Inverse.py b/PyMieScatt/Inverse.py
@@ -684,29 +684,29 @@ def IterativeInversion_SD(Bsca,Babs,wavelength,dp,ndp,tolerance=0.0005):
   else:
     return resultM, resultScaErr, resultAbsErr
 
-def fastMie_SD(m, wavelength, ndpdp, ndp):
+def fastMie_SD(m, wavelength, dp, ndp):
 #  http://pymiescatt.readthedocs.io/en/latest/inverse.html#fastMie_SD
-  ndpdp = coerceDType(ndpdp)
+  dp = coerceDType(dp)
   ndp = coerceDType(ndp)
-  _length = np.size(ndpdp)
+  _length = np.size(dp)
   Q_sca = np.zeros(_length)
   Q_abs = np.zeros(_length)
 
-  aSDn = np.pi*((ndpdp/2)**2)*ndp*(1e-6)
+  aSDn = np.pi*((dp/2)**2)*ndp*(1e-6)
 
   for i in range(_length):
-    Q_sca[i],Q_abs[i],_ = fastMieQ(m,wavelength,ndpdp[i])
+    Q_sca[i],Q_abs[i],_ = fastMieQ(m,wavelength,dp[i])
 
-  Bsca = trapz(Q_sca*aSDn,ndpdp)
-  Babs = trapz(Q_abs*aSDn,ndpdp)
+  Bsca = trapz(Q_sca*aSDn)
+  Babs = trapz(Q_abs*aSDn)
 
   return Bsca, Babs
 
 def fastMieQ(m, wavelength, diameter):
 #  http://pymiescatt.readthedocs.io/en/latest/inverse.html#fastMieQ
   x = np.pi*diameter/wavelength
   if x==0:
-    return 0, 0
+    return 0, 0, 0
   elif x>0:
     nmax = np.round(2+x+4*(x**(1/3)))
     n = np.arange(1,nmax+1)

diff --git a/PyMieScatt/Mie.py b/PyMieScatt/Mie.py
@@ -203,12 +203,12 @@ def Mie_withSizeDistribution(m, wavelength, sizeDistributionDiameterBins, sizeDi
   for i in range(_length):
     Q_ext[i], Q_sca[i], Q_abs[i], g[i], Q_pr[i], Q_back[i], Q_ratio[i] = MieQ(m,wavelength,sizeDistributionDiameterBins[i])
 
-  Bext = trapz(Q_ext*aSDn,sizeDistributionDiameterBins)
-  Bsca = trapz(Q_sca*aSDn,sizeDistributionDiameterBins)
+  Bext = trapz(Q_ext*aSDn)
+  Bsca = trapz(Q_sca*aSDn)
   Babs = Bext-Bsca
-  Bback = trapz(Q_back*aSDn,sizeDistributionDiameterBins)
-  Bratio = trapz(Q_ratio*aSDn,sizeDistributionDiameterBins)
-  bigG = trapz(g*Q_sca*aSDn,sizeDistributionDiameterBins)/trapz(Q_sca*aSDn,sizeDistributionDiameterBins)
+  Bback = trapz(Q_back*aSDn)
+  Bratio = trapz(Q_ratio*aSDn)
+  bigG = trapz(g*Q_sca*aSDn)/trapz(Q_sca*aSDn)
   Bpr = Bext - bigG*Bsca
 
   if asDict:

diff --git a/build/lib/PyMieScatt/Inverse.py b/build/lib/PyMieScatt/Inverse.py
@@ -684,29 +684,29 @@ def IterativeInversion_SD(Bsca,Babs,wavelength,dp,ndp,tolerance=0.0005):
   else:
     return resultM, resultScaErr, resultAbsErr
 
-def fastMie_SD(m, wavelength, ndpdp, ndp):
+def fastMie_SD(m, wavelength, dp, ndp):
 #  http://pymiescatt.readthedocs.io/en/latest/inverse.html#fastMie_SD
-  ndpdp = coerceDType(ndpdp)
+  dp = coerceDType(dp)
   ndp = coerceDType(ndp)
-  _length = np.size(ndpdp)
+  _length = np.size(dp)
   Q_sca = np.zeros(_length)
   Q_abs = np.zeros(_length)
 
-  aSDn = np.pi*((ndpdp/2)**2)*ndp*(1e-6)
+  aSDn = np.pi*((dp/2)**2)*ndp*(1e-6)
 
   for i in range(_length):
-    Q_sca[i],Q_abs[i],_ = fastMieQ(m,wavelength,ndpdp[i])
+    Q_sca[i],Q_abs[i],_ = fastMieQ(m,wavelength,dp[i])
 
-  Bsca = trapz(Q_sca*aSDn,ndpdp)
-  Babs = trapz(Q_abs*aSDn,ndpdp)
+  Bsca = trapz(Q_sca*aSDn)
+  Babs = trapz(Q_abs*aSDn)
 
   return Bsca, Babs
 
 def fastMieQ(m, wavelength, diameter):
 #  http://pymiescatt.readthedocs.io/en/latest/inverse.html#fastMieQ
   x = np.pi*diameter/wavelength
   if x==0:
-    return 0, 0
+    return 0, 0, 0
   elif x>0:
     nmax = np.round(2+x+4*(x**(1/3)))
     n = np.arange(1,nmax+1)

diff --git a/build/lib/PyMieScatt/Mie.py b/build/lib/PyMieScatt/Mie.py
@@ -203,12 +203,12 @@ def Mie_withSizeDistribution(m, wavelength, sizeDistributionDiameterBins, sizeDi
   for i in range(_length):
     Q_ext[i], Q_sca[i], Q_abs[i], g[i], Q_pr[i], Q_back[i], Q_ratio[i] = MieQ(m,wavelength,sizeDistributionDiameterBins[i])
 
-  Bext = trapz(Q_ext*aSDn,sizeDistributionDiameterBins)
-  Bsca = trapz(Q_sca*aSDn,sizeDistributionDiameterBins)
+  Bext = trapz(Q_ext*aSDn)
+  Bsca = trapz(Q_sca*aSDn)
   Babs = Bext-Bsca
-  Bback = trapz(Q_back*aSDn,sizeDistributionDiameterBins)
-  Bratio = trapz(Q_ratio*aSDn,sizeDistributionDiameterBins)
-  bigG = trapz(g*Q_sca*aSDn,sizeDistributionDiameterBins)/trapz(Q_sca*aSDn,sizeDistributionDiameterBins)
+  Bback = trapz(Q_back*aSDn)
+  Bratio = trapz(Q_ratio*aSDn)
+  bigG = trapz(g*Q_sca*aSDn)/trapz(Q_sca*aSDn)
   Bpr = Bext - bigG*Bsca
 
   if asDict:

diff --git a/dist/PyMieScatt-1.2.2-py3-none-any.whl b/dist/PyMieScatt-1.2.2-py3-none-any.whl
diff --git a/dist/PyMieScatt-1.2.2.tar.gz b/dist/PyMieScatt-1.2.2.tar.gz