From 236af23127a004c68abeca6c47e2bed401b87f59 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 12:13:43 -0400 Subject: [PATCH 01/10] Update on 2MASS J04151954-0935066 --- data/source/2mass_j04151954-0935066.json | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index 78686f9c9..988b93865 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -303,6 +303,33 @@ "epoch": null, "comments": null, "reference": "Cutr12" + }, + { + "band": "JWST F1000W", + "magnitude": 10.749, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "TW" + }, + { + "band": "JWST F1280W", + "magnitude": 10.669, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "TW" + }, + { + "band": "JWST F1800W", + "magnitude": 10.327, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "TW" } ], "ProperMotions": [ @@ -420,6 +447,18 @@ "comments": null, "reference": "Kirk08", "other_references": null + }, + { + "original_spectrum": null, + "local_spectrum": null, + "regime":"nir", + "telescope": "JWST", + "instrument": "NIRSpec", + "mode": "F290LP.G395H", + "observation_date": "2022-10-16T00:00:00", + "comments": null, + "reference": "ALEJ25", + "other_references": null } ], "SpectralTypes": [ From 4a6a74a270fe908e4b860c59db31603d8fde95f0 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 15:45:28 -0400 Subject: [PATCH 02/10] Fix --- data/source/2mass_j04151954-0935066.json | 24 ++++++------------------ tests/test_photometry.py | 6 +++--- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index 988b93865..50d170392 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -305,31 +305,31 @@ "reference": "Cutr12" }, { - "band": "JWST F1000W", + "band": "JWST/MIRI.F1000W", "magnitude": 10.749, "magnitude_error": 0.002, "telescope": "JWST", "epoch": null, "comments": null, - "reference": "TW" + "reference": "Alej25" }, { - "band": "JWST F1280W", + "band": "JWST/MIRI.F1280W", "magnitude": 10.669, "magnitude_error": 0.002, "telescope": "JWST", "epoch": null, "comments": null, - "reference": "TW" + "reference": "Alej25" }, { - "band": "JWST F1800W", + "band": "JWST/MIRI.F1800W", "magnitude": 10.327, "magnitude_error": 0.002, "telescope": "JWST", "epoch": null, "comments": null, - "reference": "TW" + "reference": "Alej25" } ], "ProperMotions": [ @@ -447,18 +447,6 @@ "comments": null, "reference": "Kirk08", "other_references": null - }, - { - "original_spectrum": null, - "local_spectrum": null, - "regime":"nir", - "telescope": "JWST", - "instrument": "NIRSpec", - "mode": "F290LP.G395H", - "observation_date": "2022-10-16T00:00:00", - "comments": null, - "reference": "ALEJ25", - "other_references": null } ], "SpectralTypes": [ diff --git a/tests/test_photometry.py b/tests/test_photometry.py index c5d7ba330..9a7a1b959 100644 --- a/tests/test_photometry.py +++ b/tests/test_photometry.py @@ -30,9 +30,9 @@ ("VISTA.J", 67), ("VISTA.H", 39), ("VISTA.Ks", 20), - ("JWST/MIRI.F1000W", 1), - ("JWST/MIRI.F1280W", 1), - ("JWST/MIRI.F1800W", 1), + ("JWST/MIRI.F1000W", 2), + ("JWST/MIRI.F1280W", 2), + ("JWST/MIRI.F1800W", 2), ("IRAC.I1", 828), ("IRAC.I2", 884), ], From 39737b88ed6461ec120c45e455567d047834d30c Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 16:14:37 -0400 Subject: [PATCH 03/10] Add Photometry and Spectra --- data/reference/Instruments.json | 7 +++++++ data/source/2mass_j04151954-0935066.json | 23 ++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/data/reference/Instruments.json b/data/reference/Instruments.json index a43552ed3..a802cd93a 100644 --- a/data/reference/Instruments.json +++ b/data/reference/Instruments.json @@ -356,6 +356,13 @@ "description": null, "reference": null }, + { + "instrument": "NIRSpec", + "mode": "F290LP.G395H", + "telescope": "JWST", + "description": null, + "reference": null + }, { "instrument": "NIRSpec", "mode": "MOS", diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index 50d170392..f9db8143a 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -184,7 +184,16 @@ "magnitude_error": 0.05, "telescope": "Keck II", "epoch": null, - "comments": "From Parallax_Data.xlsx", + "comments": "Actually was UKIRT/IRCAM. From Parallax_Data.xlsx", + "reference": "Goli04.3516" + }, + { + "band": "NSFCam.Mp", + "magnitude": 12.82, + "magnitude_error": 0.15, + "telescope": "Keck II", + "epoch": null, + "comments": "Actually was UKIRT/IRCAM", "reference": "Goli04.3516" }, { @@ -447,6 +456,18 @@ "comments": null, "reference": "Kirk08", "other_references": null + }, + { + "original_spectrum": null, + "local_spectrum": null, + "regime":"nir", + "telescope": "JWST", + "instrument": "NIRSpec", + "mode": "F290LP.G395H", + "observation_date": "2022-10-16T00:00:00", + "comments": null, + "reference": "Alej25", + "other_references": null } ], "SpectralTypes": [ From 10bfa1f0a51e77e0786cf85e600caca9d9163f65 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 16:29:10 -0400 Subject: [PATCH 04/10] fix --- tests/test_data_spectra.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_data_spectra.py b/tests/test_data_spectra.py index bd24e7cbb..f8ccbf597 100644 --- a/tests/test_data_spectra.py +++ b/tests/test_data_spectra.py @@ -4,14 +4,14 @@ def test_spectra_count(db): n_spectra = db.query(db.Spectra).count() - assert n_spectra == 1605, f"found {n_spectra} sources" + assert n_spectra == 1606, f"found {n_spectra} sources" @pytest.mark.parametrize( ("regime", "n_spectra"), [ ("optical", 743), - ("nir", 635), + ("nir", 636), ("mir", 227), ("unknown", 0), ], @@ -38,7 +38,7 @@ def test_spectra_regimes(db, regime, n_spectra): ("Spitzer", 203), ("KPNO 2.1m", 93), ("KPNO 4m", 251), - ("JWST", 48), + ("JWST", 49), ], ) def test_spectra_telescope(db, telescope, n_spectra): @@ -49,7 +49,7 @@ def test_spectra_telescope(db, telescope, n_spectra): @pytest.mark.parametrize( ("telescope", "instrument", "n_spectra"), [ - ("JWST", "NIRSpec", 24), + ("JWST", "NIRSpec", 25), ("JWST", "MIRI", 24), ("HST", "WFC3", 77), ], From b4ae09ccf36879d4f8702e1608c1f0f169ba8a55 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 16:37:50 -0400 Subject: [PATCH 05/10] add URL for Spectra JWST --- data/source/2mass_j04151954-0935066.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index f9db8143a..05f9f7d3b 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -458,6 +458,7 @@ "other_references": null }, { + "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/JWST/NIRSpec/jw02124-o059_s00001_nirspec_f290lp-g395h-s200a1-subs200a1_x1d_manual.fits", "original_spectrum": null, "local_spectrum": null, "regime":"nir", From 7b582cb97b6a5a330b2d6c28b1595147c74899c9 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Mon, 9 Jun 2025 16:42:47 -0400 Subject: [PATCH 06/10] update Version table --- data/reference/Versions.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/reference/Versions.json b/data/reference/Versions.json index 9920325b8..ab8424792 100644 --- a/data/reference/Versions.json +++ b/data/reference/Versions.json @@ -138,8 +138,14 @@ "description": "Spectra from Rothermich et. al. 2024, spectral types from BONES Archive, ingest_spectra and ingest_spectraltype changes" }, { - "version": "latest", + "version": "2.3.2025.6", "start_date": "2025-05-22", + "end_date": "2025-06-09", + "description": "Added data for 0415-0935" + }, + { + "version": "latest", + "start_date": "2025-06-09", "end_date": null, "description": "Version in development" } From f5475ad2dfb4f157262707f5809cf198eef738a2 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Tue, 10 Jun 2025 16:40:17 -0400 Subject: [PATCH 07/10] Ingest Beil24 Photometry --- data/reference/PhotometryFilters.json | 12 +++ .../BeilerSIMPLE.Photometry.Ingest.1.xlsx | Bin 0 -> 11658 bytes scripts/ingests/beiler24/ingestphot_b24.py | 84 ++++++++++++++++++ .../~$BeilerSIMPLE.Photometry.Ingest.1.xlsx | Bin 0 -> 165 bytes 4 files changed, 96 insertions(+) create mode 100644 scripts/ingests/beiler24/BeilerSIMPLE.Photometry.Ingest.1.xlsx create mode 100644 scripts/ingests/beiler24/~$BeilerSIMPLE.Photometry.Ingest.1.xlsx diff --git a/data/reference/PhotometryFilters.json b/data/reference/PhotometryFilters.json index a5d19fae1..123e4a3e9 100644 --- a/data/reference/PhotometryFilters.json +++ b/data/reference/PhotometryFilters.json @@ -431,10 +431,22 @@ "effective_wavelength": 127059.67976377, "width": 25306.737398933 }, + { + "band": "JWST/MIRI.F1500W", + "ucd": "em.IR.8-15um", + "effective_wavelength": 149257.06715155, + "width": 29426.240113509 + }, { "band": "JWST/MIRI.F1800W", "ucd": "em.IR.15-30um", "effective_wavelength": 178734.17093674, "width": 29839.892353346 + }, + { + "band": "JWST/MIRI.F2100W", + "ucd": "em.IR.15-30um", + "effective_wavelength": 205601.06046254, + "width": 44045.732879671 } ] \ No newline at end of file diff --git a/scripts/ingests/beiler24/BeilerSIMPLE.Photometry.Ingest.1.xlsx b/scripts/ingests/beiler24/BeilerSIMPLE.Photometry.Ingest.1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f7b7b58218a67be5fce267dd1fc9814cd87469d1 GIT binary patch literal 11658 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 literal 0 HcmV?d00001 diff --git a/scripts/ingests/beiler24/ingestphot_b24.py b/scripts/ingests/beiler24/ingestphot_b24.py index e69de29bb..15c624d0f 100644 --- a/scripts/ingests/beiler24/ingestphot_b24.py +++ b/scripts/ingests/beiler24/ingestphot_b24.py @@ -0,0 +1,84 @@ +import logging + +# SIMPLE & Astrodb Packages +from astrodb_utils import load_astrodb, AstroDBError +from simple import REFERENCE_TABLES +from astrodb_utils.photometry import ingest_photometry, ingest_photometry_filter +import pandas as pd + +# Set the loggging level of the astrodb_utils logger +astrodb_utils_logger = logging.getLogger("astrodb_utils") +astrodb_utils_logger.setLevel(logging.INFO) + +# Set up the logging for this ingest script. +logger = logging.getLogger( + "astrodb_utils.beiler24" +) + +logger.setLevel(logging.INFO) + +# Load Database +recreate_db = True +save_db = False + +SCHEMA_PATH = "simple/schema.yaml" +db = load_astrodb( + "SIMPLE.sqlite", + recreatedb=recreate_db, + reference_tables=REFERENCE_TABLES, + felis_schema=SCHEMA_PATH +) + +# Read the Excel file +excel_path = "scripts/ingests/beiler24/BeilerSIMPLE.Photometry.Ingest.1.xlsx" +data = pd.read_excel(excel_path) + +# Ingest Photometry +def ingest_photo(data): + photometry_added = 0 + skipped = 0 + inaccessible = 0 + + for _, row in data.iterrows(): + print(row["source"]) + try: + ingest_photometry( + db, + source=row["source"], + band=row["band"], + magnitude=row["magnitude"], + magnitude_error=row["magnitude_error"], + reference="Beil24", + telescope=row["telescope"], + epoch=row["epoch"], + comments = None, + raise_error=True + ) + photometry_added += 1 + logger.info(f"Photometry added: {photometry_added}" ) + + except AstroDBError as e: + if "already exists" in str(e): + skipped += 1 + logger.info(f"Photometry skipped: {skipped}") + print(f"Skipping {row['source']}: Photometry already exists.") + else: + inaccessible += 1 + logger.info(f"Inaccessible data: {inaccessible}") + print(f"Inaccessible data for {row['source']}: {e}") + + logger.info(f"Total photometry added: {photometry_added}") + logger.info(f"Total photometry skipped: {skipped}") + logger.info(f"Total inaccessible data: {inaccessible}") + logger.info(f"Total Photometry: {photometry_added + skipped + inaccessible}/ {len(data)}") + +# Call function +ingest_photo(data=data) + +if save_db: + db.save_database(directory="data/") + logger.info("Database saved as SIMPLE.sqlite") + + + + diff --git a/scripts/ingests/beiler24/~$BeilerSIMPLE.Photometry.Ingest.1.xlsx b/scripts/ingests/beiler24/~$BeilerSIMPLE.Photometry.Ingest.1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..529221cbc77f98f8c3b3180a6d714295f9fe4b82 GIT binary patch literal 165 pcmd-~FHOu-sLaeuS0Dv&GNdz Date: Tue, 10 Jun 2025 16:50:13 -0400 Subject: [PATCH 08/10] save to db and json file --- data/reference/Instruments.json | 2 +- data/reference/Versions.json | 4 +- data/source/2mass_j04151954-0935066.json | 80 ++++++++++----------- data/source/2mass_j13464634-0031501.json | 36 ++++++++++ data/source/2mass_j16241436+0029158.json | 36 ++++++++++ data/source/cwisep_j104756.81+545741.6.json | 36 ++++++++++ data/source/cwisep_j144606.62-231717.8.json | 36 ++++++++++ data/source/ulas_j102940.52+093514.6.json | 36 ++++++++++ data/source/wise_j024714.52+372523.5.json | 36 ++++++++++ data/source/wise_j035934.06-540154.6.json | 36 ++++++++++ data/source/wise_j043052.92+463331.6.json | 36 ++++++++++ data/source/wise_j053516.80-750024.9.json | 36 ++++++++++ data/source/wise_j073444.02-715744.0.json | 36 ++++++++++ data/source/wise_j140518.39+553421.3.json | 36 ++++++++++ data/source/wise_j150115.92-400418.4.json | 36 ++++++++++ data/source/wise_j154151.65-225024.9.json | 36 ++++++++++ data/source/wise_j210200.15-442919.5.json | 36 ++++++++++ data/source/wise_j215949.48-480854.9.json | 36 ++++++++++ data/source/wise_j220905.73+271143.9.json | 36 ++++++++++ data/source/wise_j235402.77+024015.0.json | 36 ++++++++++ data/source/wisea_j082507.37+280548.2.json | 36 ++++++++++ data/source/wisea_j120604.25+840110.5.json | 36 ++++++++++ data/source/wisep_j031325.96+780744.2.json | 36 ++++++++++ data/source/wisep_j041022.71+150248.5.json | 36 ++++++++++ data/source/wisep_j205628.90+145953.3.json | 36 ++++++++++ data/source/wisepa_j195905.66-333833.7.json | 36 ++++++++++ data/source/wisepa_j201824.96-742325.9.json | 36 ++++++++++ scripts/ingests/beiler24/ingestphot_b24.py | 2 +- 28 files changed, 908 insertions(+), 44 deletions(-) diff --git a/data/reference/Instruments.json b/data/reference/Instruments.json index a802cd93a..52ff22607 100644 --- a/data/reference/Instruments.json +++ b/data/reference/Instruments.json @@ -482,7 +482,7 @@ "description": null, "reference": null }, - { + { "instrument": "NIRSpec", "mode": "FS-G395H/F290LP", "telescope": "JWST", diff --git a/data/reference/Versions.json b/data/reference/Versions.json index ab8424792..a7b9106bd 100644 --- a/data/reference/Versions.json +++ b/data/reference/Versions.json @@ -125,7 +125,7 @@ "end_date": "2025-04-22", "description": "Sanghi 23 Sources (43 Added)" }, - { + { "version": "2.2.2025.4", "start_date": "2025-04-22", "end_date": "2025-05-16", @@ -149,4 +149,4 @@ "end_date": null, "description": "Version in development" } -] +] \ No newline at end of file diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index 05f9f7d3b..0a0c45204 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -169,6 +169,33 @@ "comments": null, "reference": "Patt06" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 10.749, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Alej25" + }, + { + "band": "JWST/MIRI.F1280W", + "magnitude": 10.669, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Alej25" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 10.327, + "magnitude_error": 0.002, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Alej25" + }, { "band": "NICMOS1.F110W", "magnitude": 16.47, @@ -312,33 +339,6 @@ "epoch": null, "comments": null, "reference": "Cutr12" - }, - { - "band": "JWST/MIRI.F1000W", - "magnitude": 10.749, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" - }, - { - "band": "JWST/MIRI.F1280W", - "magnitude": 10.669, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" - }, - { - "band": "JWST/MIRI.F1800W", - "magnitude": 10.327, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" } ], "ProperMotions": [ @@ -431,6 +431,19 @@ "reference": "Alej25", "other_references": null }, + { + "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/JWST/NIRSpec/jw02124-o059_s00001_nirspec_f290lp-g395h-s200a1-subs200a1_x1d_manual.fits", + "original_spectrum": null, + "local_spectrum": null, + "regime": "nir", + "telescope": "JWST", + "instrument": "NIRSpec", + "mode": "F290LP.G395H", + "observation_date": "2022-10-16T00:00:00", + "comments": null, + "reference": "Alej25", + "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, @@ -456,19 +469,6 @@ "comments": null, "reference": "Kirk08", "other_references": null - }, - { - "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/JWST/NIRSpec/jw02124-o059_s00001_nirspec_f290lp-g395h-s200a1-subs200a1_x1d_manual.fits", - "original_spectrum": null, - "local_spectrum": null, - "regime":"nir", - "telescope": "JWST", - "instrument": "NIRSpec", - "mode": "F290LP.G395H", - "observation_date": "2022-10-16T00:00:00", - "comments": null, - "reference": "Alej25", - "other_references": null } ], "SpectralTypes": [ diff --git a/data/source/2mass_j13464634-0031501.json b/data/source/2mass_j13464634-0031501.json index 577a9b3a6..e31c57c6d 100644 --- a/data/source/2mass_j13464634-0031501.json +++ b/data/source/2mass_j13464634-0031501.json @@ -172,6 +172,42 @@ "comments": null, "reference": "Patt06" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.914, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.713, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.662, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.654, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "SDSS.g", "magnitude": 24.36, diff --git a/data/source/2mass_j16241436+0029158.json b/data/source/2mass_j16241436+0029158.json index 70e521478..6d2dd1c98 100644 --- a/data/source/2mass_j16241436+0029158.json +++ b/data/source/2mass_j16241436+0029158.json @@ -172,6 +172,42 @@ "comments": null, "reference": "Patt06" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.74, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.53, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.522, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.581, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NICMOS1.F110W", "magnitude": 16.28, diff --git a/data/source/cwisep_j104756.81+545741.6.json b/data/source/cwisep_j104756.81+545741.6.json index b22bc105c..c84a82644 100644 --- a/data/source/cwisep_j104756.81+545741.6.json +++ b/data/source/cwisep_j104756.81+545741.6.json @@ -45,6 +45,42 @@ "comments": null, "reference": "Meis20.74" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 14.155, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 13.233, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 13.097, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 13.141, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.J", "magnitude": 19.83, diff --git a/data/source/cwisep_j144606.62-231717.8.json b/data/source/cwisep_j144606.62-231717.8.json index 9ca1f18aa..a414fe667 100644 --- a/data/source/cwisep_j144606.62-231717.8.json +++ b/data/source/cwisep_j144606.62-231717.8.json @@ -63,6 +63,42 @@ "comments": null, "reference": "Meis20.74" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.672, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.461, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.225, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.176, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.J", "magnitude": 22.36, diff --git a/data/source/ulas_j102940.52+093514.6.json b/data/source/ulas_j102940.52+093514.6.json index d14f0e951..01799fc91 100644 --- a/data/source/ulas_j102940.52+093514.6.json +++ b/data/source/ulas_j102940.52+093514.6.json @@ -52,6 +52,42 @@ "comments": null, "reference": "Thom13" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.59, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.254, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.214, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.329, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 17.63, diff --git a/data/source/wise_j024714.52+372523.5.json b/data/source/wise_j024714.52+372523.5.json index 0c0bb98d5..d726be862 100644 --- a/data/source/wise_j024714.52+372523.5.json +++ b/data/source/wise_j024714.52+372523.5.json @@ -52,6 +52,42 @@ "comments": null, "reference": "Mace13.6" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.146, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.638, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.619, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.635, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.J", "magnitude": 18.02, diff --git a/data/source/wise_j035934.06-540154.6.json b/data/source/wise_j035934.06-540154.6.json index 9ad92319b..4bf1338e1 100644 --- a/data/source/wise_j035934.06-540154.6.json +++ b/data/source/wise_j035934.06-540154.6.json @@ -101,6 +101,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.663, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.844, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.654, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.616, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 21.84, diff --git a/data/source/wise_j043052.92+463331.6.json b/data/source/wise_j043052.92+463331.6.json index 5066507e8..62cf10e5f 100644 --- a/data/source/wise_j043052.92+463331.6.json +++ b/data/source/wise_j043052.92+463331.6.json @@ -70,6 +70,42 @@ "comments": null, "reference": "Mace13.6" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.22, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.506, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.334, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.399, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 19.25, diff --git a/data/source/wise_j053516.80-750024.9.json b/data/source/wise_j053516.80-750024.9.json index 3fe11eb4e..d8901a745 100644 --- a/data/source/wise_j053516.80-750024.9.json +++ b/data/source/wise_j053516.80-750024.9.json @@ -101,6 +101,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.388, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.302, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.044, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.953, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 22.73, diff --git a/data/source/wise_j073444.02-715744.0.json b/data/source/wise_j073444.02-715744.0.json index f276a33a1..c279a9cc1 100644 --- a/data/source/wise_j073444.02-715744.0.json +++ b/data/source/wise_j073444.02-715744.0.json @@ -101,6 +101,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.468, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.634, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.5, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.509, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 21.02, diff --git a/data/source/wise_j140518.39+553421.3.json b/data/source/wise_j140518.39+553421.3.json index c22e28771..a68490edd 100644 --- a/data/source/wise_j140518.39+553421.3.json +++ b/data/source/wise_j140518.39+553421.3.json @@ -107,6 +107,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.534, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.396, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.158, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.093, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 21.24, diff --git a/data/source/wise_j150115.92-400418.4.json b/data/source/wise_j150115.92-400418.4.json index c109bc92a..9fd16dc72 100644 --- a/data/source/wise_j150115.92-400418.4.json +++ b/data/source/wise_j150115.92-400418.4.json @@ -45,6 +45,42 @@ "comments": null, "reference": "Kirk19" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.529, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.321, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.333, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.289, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 16.38, diff --git a/data/source/wise_j154151.65-225024.9.json b/data/source/wise_j154151.65-225024.9.json index 8da278673..294769c93 100644 --- a/data/source/wise_j154151.65-225024.9.json +++ b/data/source/wise_j154151.65-225024.9.json @@ -86,6 +86,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.977, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 10.927, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 10.714, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 10.665, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 21.46, diff --git a/data/source/wise_j210200.15-442919.5.json b/data/source/wise_j210200.15-442919.5.json index 8ab2af355..dd82a5895 100644 --- a/data/source/wise_j210200.15-442919.5.json +++ b/data/source/wise_j210200.15-442919.5.json @@ -63,6 +63,42 @@ "comments": null, "reference": "Kirk19" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.588, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.98, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.95, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.993, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 18.39, diff --git a/data/source/wise_j215949.48-480854.9.json b/data/source/wise_j215949.48-480854.9.json index c4f0506b7..01019dd5d 100644 --- a/data/source/wise_j215949.48-480854.9.json +++ b/data/source/wise_j215949.48-480854.9.json @@ -48,6 +48,42 @@ "comments": null, "reference": "Kirk19" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.417, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.724, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.642, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.666, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 19.25, diff --git a/data/source/wise_j220905.73+271143.9.json b/data/source/wise_j220905.73+271143.9.json index e4809269a..5c604d49c 100644 --- a/data/source/wise_j220905.73+271143.9.json +++ b/data/source/wise_j220905.73+271143.9.json @@ -101,6 +101,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.674, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.477, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.217, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.119, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 22.389, diff --git a/data/source/wise_j235402.77+024015.0.json b/data/source/wise_j235402.77+024015.0.json index 18509d34a..b73e2a0f2 100644 --- a/data/source/wise_j235402.77+024015.0.json +++ b/data/source/wise_j235402.77+024015.0.json @@ -76,6 +76,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 13.44, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.234, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.989, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.944, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 22.882, diff --git a/data/source/wisea_j082507.37+280548.2.json b/data/source/wisea_j082507.37+280548.2.json index 8837ca873..301457d6b 100644 --- a/data/source/wisea_j082507.37+280548.2.json +++ b/data/source/wisea_j082507.37+280548.2.json @@ -65,6 +65,42 @@ "comments": null, "reference": "Kirk19" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.437, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.294, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.075, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 10.975, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 22.965, diff --git a/data/source/wisea_j120604.25+840110.5.json b/data/source/wisea_j120604.25+840110.5.json index e7cf52d22..42f776799 100644 --- a/data/source/wisea_j120604.25+840110.5.json +++ b/data/source/wisea_j120604.25+840110.5.json @@ -83,6 +83,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.907, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.201, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.993, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.976, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 21.061, diff --git a/data/source/wisep_j031325.96+780744.2.json b/data/source/wisep_j031325.96+780744.2.json index ce53915a6..0138a3d8d 100644 --- a/data/source/wisep_j031325.96+780744.2.json +++ b/data/source/wisep_j031325.96+780744.2.json @@ -68,6 +68,42 @@ "epoch": null, "comments": null, "reference": "Kirk19" + }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.617, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.011, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 10.917, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 10.986, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" } ], "ProperMotions": [ diff --git a/data/source/wisep_j041022.71+150248.5.json b/data/source/wisep_j041022.71+150248.5.json index e286f66a3..ca5ca5592 100644 --- a/data/source/wisep_j041022.71+150248.5.json +++ b/data/source/wisep_j041022.71+150248.5.json @@ -107,6 +107,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.27, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.35, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.24, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.21, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 19.61, diff --git a/data/source/wisep_j205628.90+145953.3.json b/data/source/wisep_j205628.90+145953.3.json index d84afd970..633bac345 100644 --- a/data/source/wisep_j205628.90+145953.3.json +++ b/data/source/wisep_j205628.90+145953.3.json @@ -107,6 +107,42 @@ "comments": null, "reference": "Schn15" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.74, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 10.931, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 10.792, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 10.816, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "NIRI.Y", "magnitude": 19.77, diff --git a/data/source/wisepa_j195905.66-333833.7.json b/data/source/wisepa_j195905.66-333833.7.json index 6d8a6716b..12d729f0d 100644 --- a/data/source/wisepa_j195905.66-333833.7.json +++ b/data/source/wisepa_j195905.66-333833.7.json @@ -48,6 +48,42 @@ "comments": null, "reference": "Mace13.6" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 11.96, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 11.769, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 11.54, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 11.548, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 17.178, diff --git a/data/source/wisepa_j201824.96-742325.9.json b/data/source/wisepa_j201824.96-742325.9.json index 4de2576d0..4c0733fef 100644 --- a/data/source/wisepa_j201824.96-742325.9.json +++ b/data/source/wisepa_j201824.96-742325.9.json @@ -45,6 +45,42 @@ "comments": null, "reference": "Mace13.6" }, + { + "band": "JWST/MIRI.F1000W", + "magnitude": 12.507, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1500W", + "magnitude": 12.037, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F1800W", + "magnitude": 12.002, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, + { + "band": "JWST/MIRI.F2100W", + "magnitude": 12.019, + "magnitude_error": 0.033, + "telescope": "JWST", + "epoch": null, + "comments": null, + "reference": "Beil24" + }, { "band": "WFCAM.H", "magnitude": 17.17, diff --git a/scripts/ingests/beiler24/ingestphot_b24.py b/scripts/ingests/beiler24/ingestphot_b24.py index 15c624d0f..0db4586ae 100644 --- a/scripts/ingests/beiler24/ingestphot_b24.py +++ b/scripts/ingests/beiler24/ingestphot_b24.py @@ -19,7 +19,7 @@ # Load Database recreate_db = True -save_db = False +save_db = True SCHEMA_PATH = "simple/schema.yaml" db = load_astrodb( From 5bad1dbf1ba9a04af9044635cfadfc9dcdd87381 Mon Sep 17 00:00:00 2001 From: ying2212 Date: Tue, 10 Jun 2025 16:54:08 -0400 Subject: [PATCH 09/10] Fix test_photometry --- tests/test_photometry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_photometry.py b/tests/test_photometry.py index 9a7a1b959..0f11d42cb 100644 --- a/tests/test_photometry.py +++ b/tests/test_photometry.py @@ -30,9 +30,9 @@ ("VISTA.J", 67), ("VISTA.H", 39), ("VISTA.Ks", 20), - ("JWST/MIRI.F1000W", 2), + ("JWST/MIRI.F1000W", 26), ("JWST/MIRI.F1280W", 2), - ("JWST/MIRI.F1800W", 2), + ("JWST/MIRI.F1800W", 26), ("IRAC.I1", 828), ("IRAC.I2", 884), ], From 6b69bf56669e05a38cc632f9e21d23ca61746f7e Mon Sep 17 00:00:00 2001 From: ying2212 Date: Tue, 10 Jun 2025 17:15:49 -0400 Subject: [PATCH 10/10] fix error --- data/source/2mass_j04151954-0935066.json | 40 ------------------------ 1 file changed, 40 deletions(-) diff --git a/data/source/2mass_j04151954-0935066.json b/data/source/2mass_j04151954-0935066.json index fcb18324d..05f9f7d3b 100644 --- a/data/source/2mass_j04151954-0935066.json +++ b/data/source/2mass_j04151954-0935066.json @@ -169,33 +169,6 @@ "comments": null, "reference": "Patt06" }, - { - "band": "JWST/MIRI.F1000W", - "magnitude": 10.749, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" - }, - { - "band": "JWST/MIRI.F1280W", - "magnitude": 10.669, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" - }, - { - "band": "JWST/MIRI.F1800W", - "magnitude": 10.327, - "magnitude_error": 0.002, - "telescope": "JWST", - "epoch": null, - "comments": null, - "reference": "Alej25" - }, { "band": "NICMOS1.F110W", "magnitude": 16.47, @@ -458,19 +431,6 @@ "reference": "Alej25", "other_references": null }, - { - "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/JWST/NIRSpec/jw02124-o059_s00001_nirspec_f290lp-g395h-s200a1-subs200a1_x1d_manual.fits", - "original_spectrum": null, - "local_spectrum": null, - "regime": "nir", - "telescope": "JWST", - "instrument": "NIRSpec", - "mode": "F290LP.G395H", - "observation_date": "2022-10-16T00:00:00", - "comments": null, - "reference": "Alej25", - "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,