clean up/ simplify/move import to top

Author: jason-rpkt

pvlib/iam.py

@@ -13,6 +13,7 @@
 import functools
 from scipy.optimize import minimize
 from pvlib.tools import cosd, sind, acosd
+from scipy.interpolate import make_interp_spline
 
 # a dict of required parameter names for each IAM model
 # keys are the function names for the IAM models
@@ -469,9 +470,6 @@ def interp(aoi, theta_ref, iam_ref, method='linear', normalize=True):
     pvlib.iam.sapm
     '''
     # Contributed by Anton Driesse (@adriesse), PV Performance Labs. July, 2019
-
-    from scipy.interpolate import make_interp_spline
-
     # Scipy doesn't give the clearest feedback, so check number of points here.
     MIN_REF_VALS = {'linear': 2, 'quadratic': 3, 'cubic': 4, 1: 2, 2: 3, 3: 4}
 
@@ -487,22 +485,13 @@ def interp(aoi, theta_ref, iam_ref, method='linear', normalize=True):
     iam_ref = np.asarray(iam_ref)
 
     if method == "linear":
-        spline = make_interp_spline(theta_ref, iam_ref, k=1)
-
-        def interpolator(x):
-            return spline(x)
+        interpolator = make_interp_spline(theta_ref, iam_ref, k=1)
 
     elif method == "quadratic":
-        spline = make_interp_spline(theta_ref, iam_ref, k=2)
-
-        def interpolator(x):
-            return spline(x)
+        interpolator = make_interp_spline(theta_ref, iam_ref, k=2)
 
     elif method == "cubic":
-        spline = make_interp_spline(theta_ref, iam_ref, k=3)
-
-        def interpolator(x):
-            return spline(x)
+        interpolator = make_interp_spline(theta_ref, iam_ref, k=3)
 
     else:
         raise ValueError(f"Invalid interpolation method '{method}'.")

pvlib/spectrum/response.py

@@ -68,8 +68,7 @@ def get_example_spectral_response(wavelength=None):
         wavelength = np.arange(280, 1200 + resolution, resolution)
     x = SR_DATA[0]
     y = SR_DATA[1]
-    spline = make_interp_spline(
-        x, y, k=3)
+    spline = make_interp_spline(x, y, k=3)
 
     values = spline(wavelength)
     values[(wavelength < x[0]) | (wavelength > x[-1])] = 0.0