Skip to content

Commit

Permalink
update galex sfr ingestion code
Browse files Browse the repository at this point in the history
  • Loading branch information
yymao committed Dec 5, 2023
1 parent a2c6090 commit fa1c9ef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
6 changes: 0 additions & 6 deletions SAGA/database/saga_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,12 +389,6 @@ def __init__(self, shared_dir=None, local_dir=None):
format="ascii.fast_basic",
)
),
"galex_sfr": DataObject(
FileObject(
os.path.join(self._shared_dir, "Spectra", "galex_sfr_NUV.dat"),
format="ascii.fast_basic",
)
),
"spectra_hecs": DataObject(
FitsTable(os.path.join(self._shared_dir, "Spectra", "Final", "other", "rines_2013.fits")),
),
Expand Down
3 changes: 2 additions & 1 deletion SAGA/objects/object_catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,8 @@ def build_and_write_to_database(
halpha = self._database["spectra_halpha"].read() if build_version >= 2 else None
galex_precalculated_lists = []
if build_version >= 3:
for key in ["galex_sfr", "galex_sfr_host", "galex_sfr_lowz"]:
# galex_sfr_lowz goes BEFORE galex_sfr_host as the latter overwrites overlapping entries in the former
for key in ["galex_sfr_lowz", "galex_sfr_host"]:
try:
t = self._database[key]
except KeyError:
Expand Down
2 changes: 1 addition & 1 deletion SAGA/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
SAGA package version
"""
__version__ = "0.65.3"
__version__ = "0.66.0"

0 comments on commit fa1c9ef

Please sign in to comment.