Skip to content

Commit

Permalink
Included bounds_error=False with interp1d in ReadModel and CompareSpe…
Browse files Browse the repository at this point in the history
…ctra
  • Loading branch information
tomasstolker committed Jul 26, 2023
1 parent 3d1d8aa commit 864f54a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
4 changes: 3 additions & 1 deletion species/analysis/compare_spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,9 @@ def compare_model(
# Resample model spectrum

flux_intep = interp1d(
model_box_full.wavelength, model_flux
model_box_full.wavelength,
model_flux,
bounds_error=False,
)
model_flux = flux_intep(obj_spec[:, 0])

Expand Down
28 changes: 20 additions & 8 deletions species/read/read_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from typing import Dict, List, Optional, Tuple, Union

import h5py

# import spectres
import numpy as np

Expand Down Expand Up @@ -841,7 +842,9 @@ def get_model(
else:
planck_box = readplanck.get_spectrum(disk_param, spec_res, smooth=False)

flux_interp = interp1d(planck_box.wavelength, planck_box.flux)
flux_interp = interp1d(
planck_box.wavelength, planck_box.flux, bounds_error=False
)
flux += flux_interp(self.wl_points)

# flux += spectres.spectres(
Expand All @@ -862,7 +865,9 @@ def get_model(
# Apply rotational broadening vsin(i) in km/s

if "vsini" in model_param:
spec_interp = interp1d(model_box.wavelength, model_box.flux)
spec_interp = interp1d(
model_box.wavelength, model_box.flux, bounds_error=False
)

wavel_new = np.linspace(
model_box.wavelength[0],
Expand All @@ -888,8 +893,7 @@ def get_model(
edgeHandling="firstlast",
)

spec_interp = interp1d(wavel_new, flux_broad)

spec_interp = interp1d(wavel_new, flux_broad, bounds_error=False)
model_box.flux = spec_interp(model_box.wavelength)

# Apply veiling
Expand Down Expand Up @@ -975,7 +979,9 @@ def get_model(
# Resample the spectrum

if wavel_resample is not None:
flux_interp = interp1d(model_box.wavelength, model_box.flux)
flux_interp = interp1d(
model_box.wavelength, model_box.flux, bounds_error=False
)
model_box.flux = flux_interp(wavel_resample)

# model_box.flux = spectres.spectres(
Expand Down Expand Up @@ -1010,7 +1016,9 @@ def get_model(

wavel_resample = wavel_resample[indices]

flux_interp = interp1d(model_box.wavelength, model_box.flux)
flux_interp = interp1d(
model_box.wavelength, model_box.flux, bounds_error=False
)
model_box.flux = flux_interp(wavel_resample)

# model_box.flux = spectres.spectres(
Expand Down Expand Up @@ -1281,7 +1289,9 @@ def get_data(
else:
planck_box = readplanck.get_spectrum(disk_param, spec_res, smooth=False)

flux_interp = interp1d(planck_box.wavelength, planck_box.flux)
flux_interp = interp1d(
planck_box.wavelength, planck_box.flux, bounds_error=False
)
flux += flux_interp(wl_points)

# flux += spectres.spectres(wl_points, planck_box.wavelength, planck_box.flux)
Expand Down Expand Up @@ -1359,7 +1369,9 @@ def get_data(
# Resample the spectrum

if wavel_resample is not None:
flux_interp = interp1d(model_box.wavelength, model_box.flux)
flux_interp = interp1d(
model_box.wavelength, model_box.flux, bounds_error=False
)
model_box.flux = flux_interp(wavel_resample)

# model_box.flux = spectres.spectres(
Expand Down

0 comments on commit 864f54a

Please sign in to comment.