Fix csv whitespace delimiters and use more modern rv_shift backend

BrownDwarf · May 28, 2024 · 66cc7b9 · 66cc7b9
1 parent 327de86
commit 66cc7b9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/docs/tutorials/best_fit_for_fixed_template.ipynb b/docs/tutorials/best_fit_for_fixed_template.ipynb
diff --git a/src/gollum/coolTLUSTY.py b/src/gollum/coolTLUSTY.py
@@ -76,7 +76,7 @@ def __init__(
             fn = "{}T{:3d}_g{:0.2f}_Z{:0.3f}.21".format(base_path, int(teff), logg, z)
 
             df_native = read_csv(
-                fn, delim_whitespace=True, usecols=["LAMBDA(mic)", "FLAM"]
+                fn, sep=r"\s+", usecols=["LAMBDA(mic)", "FLAM"]
             )
             df_native["wavelength_um"] = (
                 df_native["LAMBDA(mic)"].str.replace("D", "e").astype(float)

diff --git a/src/gollum/precomputed_spectrum.py b/src/gollum/precomputed_spectrum.py
@@ -178,7 +178,7 @@ def rv_shift(self, rv):
             RV-Shifted Spectrum
         """
         shifted_spec = deepcopy(self)
-        shifted_spec.radial_velocity = rv * u.km / u.s
+        shifted_spec.shift_spectrum_to(radial_velocity=rv*u.km/u.s)
         return shifted_spec
 
     def resample(self, target_spectrum):

diff --git a/src/gollum/sonora.py b/src/gollum/sonora.py
@@ -88,7 +88,7 @@ def __init__(
                 read_csv(
                     fn,
                     skiprows=[0, 1, 2],
-                    delim_whitespace=True,
+                    sep=r"\s+",
                     names=["wavelength_um", "flux"],
                 )
                 .sort_values("wavelength_um")
@@ -170,7 +170,7 @@ def __init__(
                 read_csv(
                     fn,
                     skiprows=[0, 1],
-                    delim_whitespace=True,
+                    sep=r"\s+",
                     compression="gzip",
                     names=["wavelength_um", "flux"],
                 )
@@ -265,7 +265,7 @@ def __init__(
                 read_csv(
                     fn,
                     skiprows=[0, 1],
-                    delim_whitespace=True,
+                    sep=r"\s+",
                     names=["wavelength_um", "flux"],
                 )
                 .sort_values("wavelength_um")

diff --git a/src/gollum/telluric.py b/src/gollum/telluric.py
@@ -47,7 +47,7 @@ def __init__(
             df_native = (
                 read_csv(
                     path,
-                    delim_whitespace=True,
+                    sep=r"\s+",
                     names=["wavelength_nm", "transmittance"],
                 )
                 .sort_values("wavelength_nm")
@@ -88,7 +88,7 @@ def __init__(self, *args, path=None, **kwargs):
             names = ["wavelength_nm", "transmission", "continuum", "err"]
             df_native = read_csv(
                 path,
-                delim_whitespace=True,
+                sep=r"\s+",
                 names=names,
                 usecols=names[0:2],
                 encoding="unicode_escape",  # or UTF-8?