diff --git a/data/reference/Instruments.json b/data/reference/Instruments.json index a91080883..a5934a06f 100644 --- a/data/reference/Instruments.json +++ b/data/reference/Instruments.json @@ -456,9 +456,9 @@ }, { "instrument": "IRC", - "mode": "NIR", + "mode": "IRC04", "telescope": "AKARI", "description": null, - "reference": "Mura07" + "reference": "Onak07" } ] \ No newline at end of file diff --git a/data/reference/Publications.json b/data/reference/Publications.json index 1e0eed959..13d19b869 100644 --- a/data/reference/Publications.json +++ b/data/reference/Publications.json @@ -7324,5 +7324,11 @@ "bibcode": "2007PASJ...59S.369M", "doi": "10.1093/pasj/59.sp2.S369", "description": "The Infrared Astronomical Mission AKARI*" + }, + { + "reference": "Onak07", + "bibcode": "2007PASJ...59S.401O", + "doi": "10.1093/pasj/59.sp2.S401", + "description": "The Infrared Camera (IRC) for AKARI -- Design and Imaging Performance" } ] \ No newline at end of file diff --git a/data/reference/Telescopes.json b/data/reference/Telescopes.json index e71f55fde..45c1ddf11 100644 --- a/data/reference/Telescopes.json +++ b/data/reference/Telescopes.json @@ -192,6 +192,6 @@ { "telescope": "AKARI", "description": null, - "reference": null + "reference": "Mura07" } ] \ No newline at end of file diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index 8e81b7202..6e04ff378 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -356,19 +356,6 @@ "reference": "PID3431", "other_references": null }, - { - "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASSJ04151954-0935066_T8_LRIS_Burg03.fits", - "original_spectrum": null, - "local_spectrum": null, - "regime": "nir", - "telescope": "Keck I", - "instrument": "LRIS", - "mode": "Missing", - "observation_date": "2001-02-20T00:00:00", - "comments": null, - "reference": "Burg03.510", - "other_references": null - }, { "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/SpeX/Prism/IRTF_SpeX_2MASS%2BJ04151954-0935066_2003-09-17.fits", "original_spectrum": "https://s3.amazonaws.com/bdnyc/spex-prism_2MASSIJ0415195-093506_20030917_BUR04B.txt", @@ -382,19 +369,6 @@ "reference": "Burg04.2856", "other_references": null }, - { - "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASS_J04151954-0935066_2006-12-26.fits", - "original_spectrum": null, - "local_spectrum": null, - "regime": "nir", - "telescope": "Keck I", - "instrument": "LRIS", - "mode": "Missing", - "observation_date": "2006-12-26T00:00:00", - "comments": null, - "reference": "Kirk08", - "other_references": null - }, { "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/AKARI_2MASS%2BJ04151954-0935066_2007-08-23.fits", "original_spectrum": null, @@ -402,7 +376,7 @@ "regime": "nir", "telescope": "AKARI", "instrument": "IRC", - "mode": "NIR", + "mode": "IRC04", "observation_date": "2007-08-23T00:00:00", "comments": null, "reference": "Sora12", @@ -420,6 +394,32 @@ "comments": null, "reference": "Simc13", "other_references": null + }, + { + "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASSJ04151954-0935066_T8_LRIS_Burg03.fits", + "original_spectrum": null, + "local_spectrum": null, + "regime": "optical", + "telescope": "Keck I", + "instrument": "LRIS", + "mode": "Missing", + "observation_date": "2001-02-20T00:00:00", + "comments": null, + "reference": "Burg03.510", + "other_references": null + }, + { + "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASS_J04151954-0935066_2006-12-26.fits", + "original_spectrum": null, + "local_spectrum": null, + "regime": "optical", + "telescope": "Keck I", + "instrument": "LRIS", + "mode": "Missing", + "observation_date": "2006-12-26T00:00:00", + "comments": null, + "reference": "Kirk08", + "other_references": null } ], "SpectralTypes": [ diff --git a/scripts/ingests/Ingest_2MASS_J0415_09.py b/scripts/ingests/Ingest_2MASS_J0415_09.py index 7758c143d..f043a6da7 100644 --- a/scripts/ingests/Ingest_2MASS_J0415_09.py +++ b/scripts/ingests/Ingest_2MASS_J0415_09.py @@ -20,7 +20,7 @@ #Load in Database db = load_astrodb("SIMPLE.sqlite", recreatedb=True, reference_tables=REFERENCE_TABLES) -#Ingest data +Ingest data ingest_publication( db, bibcode = "2012ApJ...760..151S" @@ -36,6 +36,11 @@ bibcode="2007PASJ...59S.369M" ) +ingest_publication( + db, + bibcode = "2007PASJ...59S.401O" +) + ingest_spectrum( db, source="2MASS J04151954-0935066", @@ -43,7 +48,7 @@ regime="nir", telescope="AKARI", instrument="IRC", - mode="NIR", + mode="IRC04", obs_date="2007-08-23", reference="Sora12" @@ -66,7 +71,7 @@ db, source="2MASS J04151954-0935066", spectrum="https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASS_J04151954-0935066_2006-12-26.fits", - regime="nir", + regime="optical", instrument="LRIS", telescope="Keck I", mode="Missing", @@ -78,7 +83,7 @@ db, source="2MASS J04151954-0935066", spectrum="https://bdnyc.s3.us-east-1.amazonaws.com/LRIS/KECK_LRIS_2MASSJ04151954-0935066_T8_LRIS_Burg03.fits", - regime="nir", + regime="optical", instrument="LRIS", telescope="Keck I", mode="Missing", diff --git a/tests/test_data.py b/tests/test_data.py index 58fb5816a..b9a47645b 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -242,11 +242,11 @@ def test_missions(db): def test_spectra(db): regime = "optical" t = db.query(db.Spectra).filter(db.Spectra.c.regime == regime).astropy() - assert len(t) == 740, f"found {len(t)} spectra in the {regime} regime" + assert len(t) == 742, f"found {len(t)} spectra in the {regime} regime" regime = "nir" t = db.query(db.Spectra).filter(db.Spectra.c.regime == regime).astropy() - assert len(t) == 582, f"found {len(t)} spectra in the {regime} regime" + assert len(t) == 580, f"found {len(t)} spectra in the {regime} regime" regime = "mir" t = db.query(db.Spectra).filter(db.Spectra.c.regime == regime).astropy()