fix formatting issue and typo in copyright (diffpy#35)

sbillinge · Jul 30, 2024 · 978dca1 · 978dca1
1 parent 81b261b
commit 978dca1
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 28 deletions.
diff --git a/diffpy/srmise/basefunction.py b/diffpy/srmise/basefunction.py
@@ -3,8 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/baselines/arbitrary.py b/diffpy/srmise/baselines/arbitrary.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund
@@ -89,11 +89,12 @@ def __init__(self, npars, valuef, jacobianf=None, estimatef=None, Cache=None):
 
         # TODO: figure out how the metadict can be used to save the functions
         # and use them again when a file is loaded...
-        metadict = {}
-        metadict["npars"] = (npars, repr)
-        metadict["valuef"] = (valuef, repr)
-        metadict["jacobianf"] = (jacobianf, repr)
-        metadict["estimatef"] = (estimatef, repr)
+        metadict = {
+            "npars": (npars, repr),
+            "valuef": (valuef, repr),
+            "jacobianf": (jacobianf, repr),
+            "estimatef": (estimatef, repr),
+        }
         BaselineFunction.__init__(self, parameterdict, formats, default_formats, metadict, None, Cache)
 
     # Methods required by BaselineFunction ####
@@ -182,7 +183,6 @@ def _transform_parametersraw(self, pars, in_format, out_format):
     def _valueraw(self, pars, r):
         """Return value of polynomial for the given parameters and r values.
 
-        Parameters
         Parameters
         pars: Sequence of parameters
             pars[0] = a_0

diff --git a/diffpy/srmise/baselines/base.py b/diffpy/srmise/baselines/base.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/baselines/fromsequence.py b/diffpy/srmise/baselines/fromsequence.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/baselines/nanospherical.py b/diffpy/srmise/baselines/nanospherical.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund
@@ -35,7 +35,7 @@ class NanoSpherical(BaselineFunction):
     scale factor is 4*pi*rho_0, where rho_r is the nanoparticle density.
 
     gamma_0(r) Reference:
-    Guinier et. al. (1955). Small-angle Scattering from X-rays. New York: John Wiley & Sons, Inc.
+    Guinier et al. (1955). Small-angle Scattering from X-rays. New York: John Wiley & Sons, Inc.
     """
 
     def __init__(self, Cache=None):

diff --git a/diffpy/srmise/baselines/polynomial.py b/diffpy/srmise/baselines/polynomial.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund
@@ -49,8 +49,7 @@ def __init__(self, degree, Cache=None):
             parameterdict["a_" + str(d)] = self.degree - d
         formats = ["internal"]
         default_formats = {"default_input": "internal", "default_output": "internal"}
-        metadict = {}
-        metadict["degree"] = (degree, repr)
+        metadict = {"degree": (degree, repr)}
         BaselineFunction.__init__(self, parameterdict, formats, default_formats, metadict, None, Cache)
 
     # Methods required by BaselineFunction ####
@@ -95,12 +94,11 @@ def estimate_parameters(self, r, y):
 
                 import numpy.linalg as la
 
-                A = np.array([r[cut_idx]]).T
-                slope = la.lstsq(A, y[cut_idx])[0][0]
+                a = np.array([r[cut_idx]]).T
+                slope = la.lstsq(a, y[cut_idx])[0][0]
                 return np.array([slope, 0.0])
             except Exception as e:
                 emsg = "Error during estimation -- " + str(e)
-                raise
                 raise SrMiseEstimationError(emsg)
 
     def _jacobianraw(self, pars, r, free):

diff --git a/diffpy/srmise/dataclusters.py b/diffpy/srmise/dataclusters.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/modelcluster.py b/diffpy/srmise/modelcluster.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/modelevaluators/aic.py b/diffpy/srmise/modelevaluators/aic.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/modelevaluators/aicc.py b/diffpy/srmise/modelevaluators/aicc.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/modelevaluators/base.py b/diffpy/srmise/modelevaluators/base.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/peaks/base.py b/diffpy/srmise/peaks/base.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/peaks/gaussian.py b/diffpy/srmise/peaks/gaussian.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/peaks/gaussianoverr.py b/diffpy/srmise/peaks/gaussianoverr.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund

diff --git a/diffpy/srmise/peaks/terminationripples.py b/diffpy/srmise/peaks/terminationripples.py
@@ -3,7 +3,7 @@
 #
 # SrMise            by Luke Granlund
 #                   (c) 2014 trustees of the Michigan State University
-#                   (c) 2024 trustees of Columia University in the City of New York
+#                   (c) 2024 trustees of Columbia University in the City of New York
 #                   All rights reserved.
 #
 # File coded by:    Luke Granlund