further test fixes

segasai · Nov 16, 2024 · a23ee33 · a23ee33
1 parent 77b0fdf
commit a23ee33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/py/rvspecfit/spec_inter.py b/py/rvspecfit/spec_inter.py
@@ -1,11 +1,11 @@
 import numpy as np
 import scipy.spatial
 import scipy.interpolate
-import pickle
 import itertools
 import importlib
 from rvspecfit import make_nd
 from rvspecfit import make_interpol
+from rvspecfit import serializer
 
 
 class TriInterp:
@@ -314,8 +314,7 @@ def getInterpolator(HR, config, warmup_cache=False, cache=None):
     if HR not in cache:
         savefile = (config['template_lib'] + '/' +
                     make_nd.INTERPOL_H5_NAME % HR)
-        with open(savefile, 'rb') as fd0:
-            fd = pickle.load(fd0)
+        fd = serializer.load_dict_from_hdf5(savefile)
         log_spec = fd.get('log_spec') or True
 
         (templ_lam, parnames) = (fd['lam'], fd['parnames'])

diff --git a/tests/test_spline.py b/tests/test_spline.py
@@ -8,7 +8,7 @@ def test_lin():
     y = 0.00001 * x**2 + np.random.normal(size=len(x))
     xnew = np.random.uniform(1000, 2000, size=10000)
     yref = scipy.interpolate.CubicSpline(x, y, bc_type='natural')(xnew)
-    ymy = rvspecfit.spliner.Spline(x, y, logstep=False)(xnew)
+    ymy = rvspecfit.spliner.Spline(x, y, log_step=False)(xnew)
     assert (np.allclose(yref, ymy))
 
 
@@ -17,5 +17,5 @@ def test_loglin():
     y = np.sin(x / 10) + np.random.normal(size=len(x))
     xnew = np.random.uniform(1000, 2000, size=10000)
     yref = scipy.interpolate.CubicSpline(x, y, bc_type='natural')(xnew)
-    ymy = rvspecfit.spliner.Spline(x, y, logstep=True)(xnew)
+    ymy = rvspecfit.spliner.Spline(x, y, log_step=True)(xnew)
     assert (np.allclose(yref, ymy))