Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent error when read_spectra sees unrecognized FITS extensions #2439

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Prevent error when read_spectra sees unrecognized FITS extensions #2439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f5af5e
prevent fatal error when read_spectra sees unrecognized extensions
rongpu Feb 6, 2025
415cf9c
remove the unnecessary 'continue'
rongpu Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions py/desispec/io/spectra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,44 +347,44 @@ def read_spectra(
else:
# Find the band based on the name
mat = re.match(r"(.*)_(.*)", name)
if mat is None:
raise RuntimeError(
"FITS extension name {} does not contain the band".format(name)
if mat is not None:
band = mat.group(1).lower()
type = mat.group(2)
if band not in bands:
bands.append(band)
if type == "WAVELENGTH":
if wave is None:
wave = {}
# - Note: keep original float64 resolution for wavelength
wave[band] = native_endian(hdus[h].read())
elif type == "FLUX":
if flux is None:
flux = {}
flux[band] = _read_image(hdus, h, ftype, rows=rows)
elif type == "IVAR":
if ivar is None:
ivar = {}
ivar[band] = _read_image(hdus, h, ftype, rows=rows)
elif type == "MASK" and type not in skip_hdus:
if mask is None:
mask = {}
mask[band] = _read_image(hdus, h, np.uint32, rows=rows)
elif type == "RESOLUTION" and type not in skip_hdus:
if res is None:
res = {}
res[band] = _read_image(hdus, h, ftype, rows=rows)
elif type != "MASK" and type != "RESOLUTION" and type not in skip_hdus:
# this must be an "extra" HDU
log.debug('Reading extra HDU %s', name)
if extra is None:
extra = {}
if band not in extra:
extra[band] = {}
extra[band][type] = _read_image(hdus, h, ftype, rows=rows)
else:
log.warning(
"FITS extension {} is not recognized and is ignored".format(name)
)
band = mat.group(1).lower()
type = mat.group(2)
if band not in bands:
bands.append(band)
if type == "WAVELENGTH":
if wave is None:
wave = {}
# - Note: keep original float64 resolution for wavelength
wave[band] = native_endian(hdus[h].read())
elif type == "FLUX":
if flux is None:
flux = {}
flux[band] = _read_image(hdus, h, ftype, rows=rows)
elif type == "IVAR":
if ivar is None:
ivar = {}
ivar[band] = _read_image(hdus, h, ftype, rows=rows)
elif type == "MASK" and type not in skip_hdus:
if mask is None:
mask = {}
mask[band] = _read_image(hdus, h, np.uint32, rows=rows)
elif type == "RESOLUTION" and type not in skip_hdus:
if res is None:
res = {}
res[band] = _read_image(hdus, h, ftype, rows=rows)
elif type != "MASK" and type != "RESOLUTION" and type not in skip_hdus:
# this must be an "extra" HDU
log.debug('Reading extra HDU %s', name)
if extra is None:
extra = {}
if band not in extra:
extra[band] = {}

extra[band][type] = _read_image(hdus, h, ftype, rows=rows)

hdus.close()
duration = time.time() - t0
Expand Down
Loading