Merge branch 'main' into new-data-template

SIMPLE-AstroDB · Jan 23, 2024 · fae94e5 · fae94e5
2 parents 4a3c972 + 735c7b7
commit fae94e5
Show file tree

Hide file tree

Showing 124 changed files with 4,747 additions and 1,049 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 # Ignore the database file and misc
 *.db
+*.sqlite
 *.pyc
 .idea
 .vscode
 .pytest_cache
 .ds_store
-bdnyc/
+*.code-workspace
+
diff --git a/README.md b/README.md
@@ -81,4 +81,4 @@ The schema for the SIMPLE database is described
 in the [Documentation](documentation) and can be found in `simple/schema.py`.
 
 A graphical representation of the SIMPLE schema:
-![schema](documentation/figures/schema.png)
+<img src="https://github.com/kelle/SIMPLE-db/blob/new-schema/documentation/figures/schema2023.png?raw=true" width=75%>
diff --git a/data/2mass_j04285096-2253227.json b/data/2mass_j04285096-2253227.json
@@ -262,8 +262,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/0428-2253.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J04285096-2253227_2012-09-25.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/0428-2253.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/0428-2253.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j04510093-3402150.json b/data/2mass_j04510093-3402150.json
@@ -301,8 +301,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/0451-3402.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J04510093-3402150_2012-09-27.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/0451-3402.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/0451-3402.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j05002100+0330501.json b/data/2mass_j05002100+0330501.json
@@ -258,8 +258,8 @@
             "other_references": null
         },
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/0500%2B0330.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J05002100%2b0330501_2012-12-27.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/0500%2B0330.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/0500+0330.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j06411840-4322329.json b/data/2mass_j06411840-4322329.json
@@ -220,8 +220,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/0641-4322.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J06411840-4322329_2012-12-27.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/0641-4322.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/0641-4322.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j06521977-2534505.json b/data/2mass_j06521977-2534505.json
@@ -287,8 +287,8 @@
             "other_references": null
         },
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/U50078_JHK_2009jan25.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J06521977-2534505_2009-01-25.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/U50078_JHK_2009jan25.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/U50078_JHK_2009jan25.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j07511645-2530432.json b/data/2mass_j07511645-2530432.json
@@ -265,8 +265,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/U50080_JHK_2009nov04.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J07511645-2530432_2009-11-04.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/U50080_JHK_2009nov04.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/U50080_JHK_2009nov04.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j12560183-1257276.json b/data/2mass_j12560183-1257276.json
@@ -30,6 +30,9 @@
         {
             "other_name": "VHS 1256-1257b"
         },
+        {
+            "other_name": "VHS 1256b"
+        },
         {
             "other_name": "VHS J125601.92-125723.9 b"
         },
@@ -38,9 +41,6 @@
         },
         {
             "other_name": "WISEA J125601.66-125728.7"
-        },
-        {
-            "other_name": "VHS 1256b"
         }
     ],
     "Parallaxes": [
@@ -267,4 +267,4 @@
             "reference": "Gauz15"
         }
     ]
-}
+}
diff --git a/data/2mass_j13204427+0409045.json b/data/2mass_j13204427+0409045.json
@@ -262,8 +262,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/1320%2B0409.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J13204427%2b0409045_2013-04-24.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/1320%2B0409.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/1320+0409.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j13595510-4034582.json b/data/2mass_j13595510-4034582.json
@@ -238,8 +238,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/SpeX/Prism/1359-4034_2012-03-30.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J13595510-4034582_2012-03-30.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/SpeX/Prism/1359-4034_2012-03-30.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/1359-4034_2012-03-30.txt",
             "regime": "nir",
             "telescope": "IRTF",
@@ -251,8 +251,8 @@
             "other_references": null
         },
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/1359-4034_2013-04-25.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J13595510-4034582_2013-04-25.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/1359-4034_2013-04-25.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/1359-4034_2013-04-25.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j14283132+5923354.json b/data/2mass_j14283132+5923354.json
@@ -200,9 +200,9 @@
             "other_references": null
         },
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/optical_spectra/U20752.fits",
+            "spectrum": "https://s3.amazonaws.com/bdnyc/optical_spectra/U20570.fits",
             "original_spectrum": null,
-            "local_spectrum": "$BDNYC_spectra/optical_spectra/U20752.fits",
+            "local_spectrum": "$BDNYC_spectra/optical_spectra/U20570.fits",
             "regime": "optical",
             "telescope": "Gemini North",
             "instrument": "GMOS-N",

diff --git a/data/2mass_j14402293+1339230.json b/data/2mass_j14402293+1339230.json
@@ -280,8 +280,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/1440%2B1339.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J14402293%2b1339230_2013-03-27.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/1440%2B1339.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/1440+1339.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2mass_j14563831-2809473.json b/data/2mass_j14563831-2809473.json
@@ -303,8 +303,8 @@
             "other_references": null
         },
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/spex_prism_lhs3003_080729.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASS+J14563831-2809473_2008-07-29.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/spex_prism_lhs3003_080729.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/spex_prism_lhs3003_080729.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/2massi_j0953212-101420.json b/data/2massi_j0953212-101420.json
@@ -216,8 +216,8 @@
     ],
     "Spectra": [
         {
-            "spectrum": "https://s3.amazonaws.com/bdnyc/SpeX/Prism/U10857_JHK_2008jan12.txt",
-            "original_spectrum": null,
+            "spectrum": "https://bdnyc.s3.amazonaws.com/SpeX/Prism/2MASSI+J0953212-101420_2008-01-12.fits",
+            "original_spectrum": "https://s3.amazonaws.com/bdnyc/SpeX/Prism/U10857_JHK_2008jan12.txt",
             "local_spectrum": "$BDNYC_spectra/SpeX/Prism/U10857_JHK_2008jan12.txt",
             "regime": "nir",
             "telescope": "IRTF",

diff --git a/data/Publications.json b/data/Publications.json
@@ -6928,5 +6928,17 @@
         "bibcode": "2020ApJ...903L..33V",
         "doi": "10.3847/2041-8213/abc256",
         "description": "Direct Radio Discovery of a Cold Brown Dwarf"
+    },
+    {
+        "reference": "Schn20",
+        "bibcode": "2020ApJ...898...77S",
+        "doi": "10.3847/1538-4357/ab9a40",
+        "description": "WISEA J041451.67-585456.7 and WISEA J181006.18-101000.5: The First Extreme T-type Subdwarfs?"
+    },
+    {
+        "reference": "Lodi22",
+        "bibcode": "2022A&A...663A..84L",
+        "doi": "10.1051/0004-6361/202243516",
+        "description": "Physical properties and trigonometric distance of the peculiar dwarf WISE J181005.5\u2212101002.3"
     }
 ]
diff --git a/data/Versions.json b/data/Versions.json
@@ -48,9 +48,21 @@
         "description": "Companions table, fixed IRS spectra"
     },
     {
-        "version": "latest",
+        "version": "2023.4",
         "start_date": "2023-10-18",
+        "end_date": "2023-12-12",
+        "description": "Added two sources"
+    },
+    {
+        "version": "2023.5",
+        "start_date": "2023-12-12",
+        "end_date": "2023-12-29",
+        "description": "Included Roth sources, fixed Bard14 spectra"
+    },
+    {
+        "version": "latest",
+        "start_date": "2023-12-29",
         "end_date": null,
         "description": "Version in development"
     }
-]
+]
diff --git a/data/cwise_j000021.45-481314.9.json b/data/cwise_j000021.45-481314.9.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J000021.45-481314.9",
+            "ra": 0.0893808,
+            "dec": -48.2208077,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0000-4813"
+        },
+        {
+            "other_name": "CWISE J000021.45-481314.9"
+        }
+    ]
+}
diff --git a/data/cwise_j002029.72-153527.5.json b/data/cwise_j002029.72-153527.5.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J002029.72-153527.5",
+            "ra": 5.1238388,
+            "dec": -15.5909815,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0020-1535"
+        },
+        {
+            "other_name": "CWISE J002029.72-153527.5"
+        }
+    ]
+}
diff --git a/data/cwise_j002101.45-334631.5.json b/data/cwise_j002101.45-334631.5.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J002101.45-334631.5",
+            "ra": 5.2560473,
+            "dec": -33.7754218,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0021-3346"
+        },
+        {
+            "other_name": "CWISE J002101.45-334631.5"
+        }
+    ]
+}
diff --git a/data/cwise_j002159.02-451434.4.json b/data/cwise_j002159.02-451434.4.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J002159.02-451434.4",
+            "ra": 5.4959547,
+            "dec": -45.2428987,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0021-4514"
+        },
+        {
+            "other_name": "CWISE J002159.02-451434.4"
+        }
+    ]
+}
diff --git a/data/cwise_j002414.30-403053.7.json b/data/cwise_j002414.30-403053.7.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J002414.30-403053.7",
+            "ra": 6.0596207,
+            "dec": -40.5149259,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0024-4030"
+        },
+        {
+            "other_name": "CWISE J002414.30-403053.7"
+        }
+    ]
+}
diff --git a/data/cwise_j002658.73-260859.6.json b/data/cwise_j002658.73-260859.6.json
@@ -0,0 +1,23 @@
+{
+    "Sources": [
+        {
+            "source": "CWISE J002658.73-260859.6",
+            "ra": 6.7447362,
+            "dec": -26.1499067,
+            "epoch": 2015.4041,
+            "equinox": "ICRS",
+            "shortname": null,
+            "reference": "Roth",
+            "other_references": null,
+            "comments": null
+        }
+    ],
+    "Names": [
+        {
+            "other_name": "CWISE 0026-2608"
+        },
+        {
+            "other_name": "CWISE J002658.73-260859.6"
+        }
+    ]
+}