Skip to content

Commit 5b37058

Browse files
committed
Spec_mu: Check for nans, no mandatory wave interval
1 parent 9ed7fef commit 5b37058

1 file changed

Lines changed: 21 additions & 14 deletions

File tree

SOAP/classes.py

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,27 +1065,34 @@ def __init__(self,
10651065
mu_array,
10661066
wavelength,
10671067
spectra,
1068-
wave_range,
1068+
wave_range=None,
10691069
air_wave=True
10701070
):
10711071
self.μ = mu_array
10721072
wave=wavelength
10731073
flux=spectra
10741074

10751075
# wave cuts
1076-
mask = (wave > wave_range[0]) & (wave < wave_range[1])
1077-
wave = wave[mask]
1078-
flux = flux[mask]
1079-
1080-
# remove NaNs
1081-
nan_mask = np.zeros_like(wave, dtype=bool)
1082-
for i,f in enumerate(flux.T):
1083-
flux.T[i]=f/np.max(flux.T[i])
1084-
1085-
for f in flux.T:
1086-
nan_mask = np.logical_or(nan_mask, np.isnan(f))
1087-
wave = wave[~nan_mask]
1088-
flux = flux[~nan_mask, :]
1076+
if wave_range is not None:
1077+
mask = (wave > wave_range[0]) & (wave < wave_range[1])
1078+
wave = wave[mask]
1079+
flux = flux[mask]
1080+
else:
1081+
None
1082+
wave = wave
1083+
flux = flux
1084+
1085+
nan_check = np.isnan(flux).any()
1086+
if nan_check:
1087+
# remove NaNs
1088+
nan_mask = np.zeros_like(wave, dtype=bool)
1089+
for i,f in enumerate(flux.T):
1090+
flux.T[i]=f/np.max(flux.T[i])
1091+
1092+
for f in flux.T:
1093+
nan_mask = np.logical_or(nan_mask, np.isnan(f))
1094+
wave = wave[~nan_mask]
1095+
flux = flux[~nan_mask, :]
10891096

10901097
# conversions
10911098
wave = wave.astype(float)

0 commit comments

Comments
 (0)