Even more small (format) changes.

nmie.h

@@ -28,7 +28,7 @@
 #include <complex>
 #include <vector>
 
-int ScattCoeffs(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int n_max,
+int ScattCoeffs(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int nmax,
 		        std::vector<std::complex<double> > &an, std::vector<std::complex<double> > &bn);
 
 int nMie(int L, std::vector<double> x, std::vector<std::complex<double> > m,
@@ -42,12 +42,12 @@ int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double>
          std::vector<std::complex<double> > &S1, std::vector<std::complex<double> > &S2);
 
 int nMie(int L, std::vector<double> x, std::vector<std::complex<double> > m,
-         int nTheta, std::vector<double> Theta, int n_max,
+         int nTheta, std::vector<double> Theta, int nmax,
          double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo,
          std::vector<std::complex<double> > &S1, std::vector<std::complex<double> > &S2);
 
 int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m,
-         int nTheta, std::vector<double> Theta, int n_max,
+         int nTheta, std::vector<double> Theta, int nmax,
          double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo,
 		 std::vector<std::complex<double> > &S1, std::vector<std::complex<double> > &S2);
 

py_nmie.cc

@@ -34,7 +34,7 @@
 // This is a workaround because I have not been able to return the results using 
 // std::vector<std::complex<double> >
 int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m,
-         int nTheta, std::vector<double> Theta, int n_max,
+         int nTheta, std::vector<double> Theta, int nmax,
          double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo,
 		 double S1r[], double S1i[], double S2r[], double S2i[]) {
 
@@ -43,7 +43,7 @@ int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double>
   S1.resize(nTheta);
   S2.resize(nTheta);
 
-  result = nMie(L, pl, x, m, nTheta, Theta, n_max, Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo, S1, S2);
+  result = nMie(L, pl, x, m, nTheta, Theta, nmax, Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo, S1, S2);
 
   for (i = 0; i < nTheta; i++) {
     S1r[i] = S1[i].real();
@@ -58,7 +58,7 @@ int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double>
 // Same as nField in 'nmie.h' but uses double arrays to return the results (useful for python).
 // This is a workaround because I have not been able to return the results using 
 // std::vector<std::complex<double> >
-int nField(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int n_max,
+int nField(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int nmax,
            int nCoords, std::vector<double> Xp, std::vector<double> Yp, std::vector<double> Zp,
            double Er[], double Ei[], double Hr[], double Hi[]) {
 
@@ -67,7 +67,7 @@ int nField(int L, int pl, std::vector<double> x, std::vector<std::complex<double
   E.resize(nCoords);
   H.resize(nCoords);
 
-  result = nField(L, pl, x, m, n_max, nCoords, Xp, Yp, Zp, E, H);
+  result = nField(L, pl, x, m, nmax, nCoords, Xp, Yp, Zp, E, H);
 
   for (i = 0; i < nCoords; i++) {
     Er[i] = E[i].real();

py_nmie.h

@@ -28,11 +28,11 @@
 #include <vector>
 
 int nMie(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m,
-         int nTheta, std::vector<double> Theta, int n_max,
+         int nTheta, std::vector<double> Theta, int nmax,
          double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo,
 		 double S1r[], double S1i[], double S2r[], double S2i[]);
 
-int nField(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int n_max,
+int nField(int L, int pl, std::vector<double> x, std::vector<std::complex<double> > m, int nmax,
            int nCoords, std::vector<double> Xp, std::vector<double> Yp, std::vector<double> Zp,
            double Er[], double Ei[], double Hr[], double Hi[]);
 

scattnlay.pyx

@@ -50,10 +50,10 @@ cdef inline double *npy2c(np.ndarray a):
     return <double *>(a.data)
 
 cdef extern from "py_nmie.h":
-    cdef int nMie(int L, int pl, vector[double] x, vector[complex] m, int nTheta, vector[double] Theta, int n_max, double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo, double S1r[], double S1i[], double S2r[], double S2i[])
-    cdef int nField(int L, int pl, vector[double] x, vector[complex] m, int n_max, int nCoords, vector[double] Xp, vector[double] Yp, vector[double] Zp, double Er[], double Ei[], double Hr[], double Hi[])
+    cdef int nMie(int L, int pl, vector[double] x, vector[complex] m, int nTheta, vector[double] Theta, int nmax, double *Qext, double *Qsca, double *Qabs, double *Qbk, double *Qpr, double *g, double *Albedo, double S1r[], double S1i[], double S2r[], double S2i[])
+    cdef int nField(int L, int pl, vector[double] x, vector[complex] m, int nmax, int nCoords, vector[double] Xp, vector[double] Yp, vector[double] Zp, double Er[], double Ei[], double Hr[], double Hi[])
 
-def scattnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t, ndim = 2] m, np.ndarray[np.float64_t, ndim = 1] theta = np.zeros(0, dtype = np.float64), np.int_t pl = -1, np.int_t n_max = -1):
+def scattnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t, ndim = 2] m, np.ndarray[np.float64_t, ndim = 1] theta = np.zeros(0, dtype = np.float64), np.int_t pl = -1, np.int_t nmax = -1):
     cdef Py_ssize_t i
 
     cdef np.ndarray[np.int_t, ndim = 1] terms = np.zeros(x.shape[0], dtype = np.int)
@@ -80,14 +80,14 @@ def scattnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t,
         S2r = np.zeros(theta.shape[0], dtype = np.float64)
         S2i = np.zeros(theta.shape[0], dtype = np.float64)
 
-        terms[i] = nMie(x.shape[1], pl, x[i].copy('C'), m[i].copy('C'), theta.shape[0], theta.copy('C'), n_max, &Qext[i], &Qsca[i], &Qabs[i], &Qbk[i], &Qpr[i], &g[i], &Albedo[i], npy2c(S1r), npy2c(S1i), npy2c(S2r), npy2c(S2i))
+        terms[i] = nMie(x.shape[1], pl, x[i].copy('C'), m[i].copy('C'), theta.shape[0], theta.copy('C'), nmax, &Qext[i], &Qsca[i], &Qabs[i], &Qbk[i], &Qpr[i], &g[i], &Albedo[i], npy2c(S1r), npy2c(S1i), npy2c(S2r), npy2c(S2i))
 
         S1[i] = S1r.copy('C') + 1.0j*S1i.copy('C')
         S2[i] = S2r.copy('C') + 1.0j*S2i.copy('C')
 
     return terms, Qext, Qsca, Qabs, Qbk, Qpr, g, Albedo, S1, S2
 
-def fieldnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t, ndim = 2] m, np.ndarray[np.float64_t, ndim = 2] coords = np.zeros((0, 3), dtype = np.float64), np.int_t pl = 0, np.int_t n_max = 0):
+def fieldnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t, ndim = 2] m, np.ndarray[np.float64_t, ndim = 2] coords = np.zeros((0, 3), dtype = np.float64), np.int_t pl = 0, np.int_t nmax = 0):
     cdef Py_ssize_t i
 
     cdef np.ndarray[np.int_t, ndim = 1] terms = np.zeros(x.shape[0], dtype = np.int)
@@ -106,7 +106,7 @@ def fieldnlay(np.ndarray[np.float64_t, ndim = 2] x, np.ndarray[np.complex128_t,
         Hr = np.zeros(coords.shape[0], dtype = np.float64)
         Hi = np.zeros(coords.shape[0], dtype = np.float64)
 
-        terms[i] = nField(x.shape[1], pl, x[i].copy('C'), m[i].copy('C'), n_max, coords.shape[0], coords[:, 0].copy('C'), coords[:, 1].copy('C'), coords[:, 2].copy('C'), npy2c(Er), npy2c(Ei), npy2c(Hr), npy2c(Hi))
+        terms[i] = nField(x.shape[1], pl, x[i].copy('C'), m[i].copy('C'), nmax, coords.shape[0], coords[:, 0].copy('C'), coords[:, 1].copy('C'), coords[:, 2].copy('C'), npy2c(Er), npy2c(Ei), npy2c(Hr), npy2c(Hi))
 
         E[i] = Er.copy('C') + 1.0j*Ei.copy('C')
         H[i] = Hr.copy('C') + 1.0j*Hi.copy('C')