diff --git a/data/source/2mass_j00250365+4759191.json b/data/source/2mass_j00250365+4759191.json index 96912df8d..a92e3d975 100644 --- a/data/source/2mass_j00250365+4759191.json +++ b/data/source/2mass_j00250365+4759191.json @@ -41,10 +41,17 @@ } ], "Parallaxes": [ + { + "parallax": 18.5162, + "parallax_error": 0.1365, + "adopted": true, + "comments": null, + "reference": "Reid06.891" + }, { "parallax": 22.82, "parallax_error": 0.88, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -180,6 +187,16 @@ } ], "SpectralTypes": [ + { + "spectral_type_string": "L4+L4", + "spectral_type_code": 74.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Reid06.891" + }, { "spectral_type_string": "L4:", "spectral_type_code": 74.0, diff --git a/data/source/2mass_j06462756+7935045.json b/data/source/2mass_j06462756+7935045.json index 01b10ddba..a3a065f17 100644 --- a/data/source/2mass_j06462756+7935045.json +++ b/data/source/2mass_j06462756+7935045.json @@ -38,10 +38,17 @@ } ], "Parallaxes": [ + { + "parallax": 54.9292, + "parallax_error": 0.1076, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 55.95, "parallax_error": 0.27, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/2mass_j09121469+1459396.json b/data/source/2mass_j09121469+1459396.json index afd2f4a29..b20d114d5 100644 --- a/data/source/2mass_j09121469+1459396.json +++ b/data/source/2mass_j09121469+1459396.json @@ -69,9 +69,16 @@ { "parallax": 49.11, "parallax_error": 0.54, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" + }, + { + "parallax": 49.1493, + "parallax_error": 0.3467, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" } ], "Photometry": [ diff --git a/data/source/2mass_j11102921-2925186.json b/data/source/2mass_j11102921-2925186.json index 706c455b6..2b837a1be 100644 --- a/data/source/2mass_j11102921-2925186.json +++ b/data/source/2mass_j11102921-2925186.json @@ -27,5 +27,26 @@ { "other_name": "2MASS J11102921-2925186" } + ], + "Parallaxes": [ + { + "parallax": 25.1329, + "parallax_error": 0.0417, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L2", + "spectral_type_code": 72.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "GaiaEDR3" + } ] } \ No newline at end of file diff --git a/data/source/2mass_j13054106+2046394.json b/data/source/2mass_j13054106+2046394.json index 3acb84f16..82fbd2b0f 100644 --- a/data/source/2mass_j13054106+2046394.json +++ b/data/source/2mass_j13054106+2046394.json @@ -236,6 +236,16 @@ } ], "SpectralTypes": [ + { + "spectral_type_string": "L4", + "spectral_type_code": 74.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Gome13" + }, { "spectral_type_string": "L5", "spectral_type_code": 75.0, diff --git a/data/source/2mass_j13204427+0409045.json b/data/source/2mass_j13204427+0409045.json index 33f274984..1fa5f28d5 100644 --- a/data/source/2mass_j13204427+0409045.json +++ b/data/source/2mass_j13204427+0409045.json @@ -362,6 +362,16 @@ "photometric": null, "comments": null, "reference": "Reid08.1290" + }, + { + "spectral_type_string": "L5", + "spectral_type_code": 75.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Gome13" } ] } \ No newline at end of file diff --git a/data/source/2mass_j14165987+5006258.json b/data/source/2mass_j14165987+5006258.json index d8ac7cf9a..e8d8c25fa 100644 --- a/data/source/2mass_j14165987+5006258.json +++ b/data/source/2mass_j14165987+5006258.json @@ -66,10 +66,17 @@ } ], "Parallaxes": [ + { + "parallax": 21.2259, + "parallax_error": 0.0256, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 21.9, "parallax_error": 0.62, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/2mass_j14571496-2121477.json b/data/source/2mass_j14571496-2121477.json index 4bd8c821b..da217343a 100644 --- a/data/source/2mass_j14571496-2121477.json +++ b/data/source/2mass_j14571496-2121477.json @@ -81,10 +81,17 @@ } ], "Parallaxes": [ + { + "parallax": 170.0112, + "parallax_error": 0.0851, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 171.22, "parallax_error": 0.94, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/2mass_j15232263+3014562.json b/data/source/2mass_j15232263+3014562.json index d70c16332..04a67e904 100644 --- a/data/source/2mass_j15232263+3014562.json +++ b/data/source/2mass_j15232263+3014562.json @@ -81,6 +81,13 @@ } ], "Parallaxes": [ + { + "parallax": 55.98, + "parallax_error": 0.78, + "adopted": false, + "comments": null, + "reference": "Pinf06" + }, { "parallax": 55.98, "parallax_error": 0.78, diff --git a/data/source/2mass_j18005854+1505198.json b/data/source/2mass_j18005854+1505198.json index a29a5d113..be4c6ad78 100644 --- a/data/source/2mass_j18005854+1505198.json +++ b/data/source/2mass_j18005854+1505198.json @@ -27,5 +27,26 @@ { "other_name": "2MASS J18005854+1505198" } + ], + "Parallaxes": [ + { + "parallax": 22.0086, + "parallax_error": 0.0363, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L1", + "spectral_type_code": 71.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Maro20" + } ] } \ No newline at end of file diff --git a/data/source/2mass_j19073307+3015304.json b/data/source/2mass_j19073307+3015304.json index 89288b83f..8459aa179 100644 --- a/data/source/2mass_j19073307+3015304.json +++ b/data/source/2mass_j19073307+3015304.json @@ -27,5 +27,26 @@ { "other_name": "2MASS J19073307+3015304" } + ], + "Parallaxes": [ + { + "parallax": 36.8771, + "parallax_error": 0.0259, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L1", + "spectral_type_code": 71.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "GaiaEDR3" + } ] } \ No newline at end of file diff --git a/data/source/2mass_j21442847+1446077.json b/data/source/2mass_j21442847+1446077.json index db17889bc..4624bd13a 100644 --- a/data/source/2mass_j21442847+1446077.json +++ b/data/source/2mass_j21442847+1446077.json @@ -87,6 +87,13 @@ } ], "Parallaxes": [ + { + "parallax": 55.1631, + "parallax_error": 0.0608, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 54.37, "parallax_error": 0.85, @@ -97,7 +104,7 @@ { "parallax": 55.91, "parallax_error": 0.45, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/54_psc_b.json b/data/source/54_psc_b.json index ab7e01832..361cca6b5 100644 --- a/data/source/54_psc_b.json +++ b/data/source/54_psc_b.json @@ -78,10 +78,17 @@ } ], "Parallaxes": [ + { + "parallax": 89.7891, + "parallax_error": 0.0581, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 90.42, "parallax_error": 0.32, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/bd_+01_2920b.json b/data/source/bd_+01_2920b.json index 13fc85cdc..c603380fc 100644 --- a/data/source/bd_+01_2920b.json +++ b/data/source/bd_+01_2920b.json @@ -35,10 +35,17 @@ } ], "Parallaxes": [ + { + "parallax": 57.3445, + "parallax_error": 0.0362, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 58.17, "parallax_error": 0.53, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -144,7 +151,7 @@ "spectral_type_code": 88.0, "spectral_type_error": null, "regime": "nir", - "adopted": null, + "adopted": false, "photometric": null, "comments": null, "reference": "Mace13.6" diff --git a/data/source/cwise_j005635.48-240401.9.json b/data/source/cwise_j005635.48-240401.9.json index 3f0d0bc91..fe44dc801 100644 --- a/data/source/cwise_j005635.48-240401.9.json +++ b/data/source/cwise_j005635.48-240401.9.json @@ -65,13 +65,22 @@ "other_name": "CatWISE J005635.48-240401.9" } ], + "Parallaxes": [ + { + "parallax": 14.7937, + "parallax_error": 0.0168, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "SpectralTypes": [ { "spectral_type_string": "(L8)", "spectral_type_code": 78.0, "spectral_type_error": 2.0, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": true, "comments": null, "reference": "Roth24" diff --git a/data/source/cwise_j030005.73-062218.6.json b/data/source/cwise_j030005.73-062218.6.json index 8b56aacf6..2c1eae4e0 100644 --- a/data/source/cwise_j030005.73-062218.6.json +++ b/data/source/cwise_j030005.73-062218.6.json @@ -46,13 +46,22 @@ "other_name": "CatWISE J030005.73-062218.6" } ], + "Parallaxes": [ + { + "parallax": 14.8971, + "parallax_error": 0.0168, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "SpectralTypes": [ { "spectral_type_string": "(L9)", "spectral_type_code": 79.0, "spectral_type_error": 2.0, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": true, "comments": null, "reference": "Roth24" diff --git a/data/source/cwise_j055909.00-384219.8.json b/data/source/cwise_j055909.00-384219.8.json index f8a4d5b5c..9e0bab25f 100644 --- a/data/source/cwise_j055909.00-384219.8.json +++ b/data/source/cwise_j055909.00-384219.8.json @@ -56,13 +56,22 @@ "other_name": "CatWISE J055909.00-384219.8" } ], + "Parallaxes": [ + { + "parallax": 16.4877, + "parallax_error": 0.3623, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "SpectralTypes": [ { "spectral_type_string": "(L4)", "spectral_type_code": 74.0, "spectral_type_error": 2.0, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": true, "comments": null, "reference": "Roth24" diff --git a/data/source/cwise_j065752.45+163350.2.json b/data/source/cwise_j065752.45+163350.2.json index 982c2c96a..a65ff651a 100644 --- a/data/source/cwise_j065752.45+163350.2.json +++ b/data/source/cwise_j065752.45+163350.2.json @@ -56,6 +56,15 @@ "other_name": "CatWISE J065752.45+163350.2" } ], + "Parallaxes": [ + { + "parallax": 26.9694, + "parallax_error": 0.5771, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "Spectra": [ { "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/Roth24/AUS-0657%2B1633.fits", @@ -77,7 +86,7 @@ "spectral_type_code": 76.0, "spectral_type_error": 0.5, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": false, "comments": null, "reference": "Roth24" diff --git a/data/source/cwise_j085131.24-603056.2.json b/data/source/cwise_j085131.24-603056.2.json index ff4bca6b6..467145027 100644 --- a/data/source/cwise_j085131.24-603056.2.json +++ b/data/source/cwise_j085131.24-603056.2.json @@ -65,13 +65,22 @@ "other_name": "CatWISE J085131.24-603056.2" } ], + "Parallaxes": [ + { + "parallax": 32.3313, + "parallax_error": 0.0137, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "SpectralTypes": [ { "spectral_type_string": "(L3)", "spectral_type_code": 73.0, "spectral_type_error": 2.0, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": true, "comments": null, "reference": "Roth24" diff --git a/data/source/cwise_j133427.70-273053.1.json b/data/source/cwise_j133427.70-273053.1.json index 2ddc3f916..18bd5d032 100644 --- a/data/source/cwise_j133427.70-273053.1.json +++ b/data/source/cwise_j133427.70-273053.1.json @@ -34,6 +34,15 @@ "other_name": "CatWISE J133427.70-273053.1" } ], + "Parallaxes": [ + { + "parallax": 27.0633, + "parallax_error": 0.3387, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "Spectra": [ { "access_url": "https://bdnyc.s3.us-east-1.amazonaws.com/Roth24/AUS-1334-2730.fits", diff --git a/data/source/cwise_j183207.94-540943.3.json b/data/source/cwise_j183207.94-540943.3.json index a59dd08d3..c35e83d2a 100644 --- a/data/source/cwise_j183207.94-540943.3.json +++ b/data/source/cwise_j183207.94-540943.3.json @@ -47,10 +47,17 @@ } ], "Parallaxes": [ + { + "parallax": 52.2903, + "parallax_error": 0.0223, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 57.0, "parallax_error": 4.3, - "adopted": true, + "adopted": false, "comments": null, "reference": "Kirk21" } diff --git a/data/source/epsilon_indib.json b/data/source/epsilon_indib.json index b5c39c1cd..29529f990 100644 --- a/data/source/epsilon_indib.json +++ b/data/source/epsilon_indib.json @@ -226,6 +226,16 @@ "photometric": null, "comments": null, "reference": "Burg06.1067" + }, + { + "spectral_type_string": "T1.5+T6", + "spectral_type_code": 81.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Fahe09" } ] } \ No newline at end of file diff --git a/data/source/eta_cnc_b.json b/data/source/eta_cnc_b.json index 6312ed7b3..836dc350b 100644 --- a/data/source/eta_cnc_b.json +++ b/data/source/eta_cnc_b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 10.258, + "parallax_error": 0.088, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 10.93, "parallax_error": 0.4, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/g_255-34b.json b/data/source/g_255-34b.json index 52f28f873..61aea653a 100644 --- a/data/source/g_255-34b.json +++ b/data/source/g_255-34b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 28.2493, + "parallax_error": 0.0117, + "adopted": true, + "comments": null, + "reference": "Gome13" + }, { "parallax": 27.62, "parallax_error": 1.14, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/gl_337c.json b/data/source/gl_337c.json index d39c2de53..03640bc44 100644 --- a/data/source/gl_337c.json +++ b/data/source/gl_337c.json @@ -45,5 +45,26 @@ { "other_name": "Gl 337C" } + ], + "Parallaxes": [ + { + "parallax": 49.1493, + "parallax_error": 0.3467, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L8.5", + "spectral_type_code": 78.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Wils01" + } ] } \ No newline at end of file diff --git a/data/source/gl_337d.json b/data/source/gl_337d.json index b7e28a6c8..d4013a5bb 100644 --- a/data/source/gl_337d.json +++ b/data/source/gl_337d.json @@ -45,5 +45,26 @@ { "other_name": "Gl 337D" } + ], + "Parallaxes": [ + { + "parallax": 49.1493, + "parallax_error": 0.3467, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L7.5", + "spectral_type_code": 77.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Wils01" + } ] } \ No newline at end of file diff --git a/data/source/gl_417b.json b/data/source/gl_417b.json index 987eb83bf..985840f31 100644 --- a/data/source/gl_417b.json +++ b/data/source/gl_417b.json @@ -45,5 +45,26 @@ { "other_name": "Gl 417B" } + ], + "Parallaxes": [ + { + "parallax": 44.1428, + "parallax_error": 0.0383, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L4.5", + "spectral_type_code": 74.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Kirk00" + } ] } \ No newline at end of file diff --git a/data/source/gl_417c.json b/data/source/gl_417c.json index a92578572..bd2f847f3 100644 --- a/data/source/gl_417c.json +++ b/data/source/gl_417c.json @@ -45,5 +45,26 @@ { "other_name": "Gl 417C" } + ], + "Parallaxes": [ + { + "parallax": 44.1428, + "parallax_error": 0.0383, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L6", + "spectral_type_code": 76.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Kirk00" + } ] } \ No newline at end of file diff --git a/data/source/hd_130948b.json b/data/source/hd_130948b.json index 17b79316c..ca8539231 100644 --- a/data/source/hd_130948b.json +++ b/data/source/hd_130948b.json @@ -45,5 +45,26 @@ { "other_name": "HD 130948B" } + ], + "Parallaxes": [ + { + "parallax": 54.9502, + "parallax_error": 0.0343, + "adopted": true, + "comments": null, + "reference": "Pott02" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L4", + "spectral_type_code": 74.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Pott02" + } ] } \ No newline at end of file diff --git a/data/source/hd_130948bc.json b/data/source/hd_130948bc.json index 418d6eabf..40a07d108 100644 --- a/data/source/hd_130948bc.json +++ b/data/source/hd_130948bc.json @@ -47,10 +47,17 @@ } ], "Parallaxes": [ + { + "parallax": 54.9502, + "parallax_error": 0.0343, + "adopted": true, + "comments": null, + "reference": "Pott02" + }, { "parallax": 55.03, "parallax_error": 0.34, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -105,6 +112,16 @@ } ], "SpectralTypes": [ + { + "spectral_type_string": "L4+L4", + "spectral_type_code": 74.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Pott02" + }, { "spectral_type_string": "L4:", "spectral_type_code": 74.0, diff --git a/data/source/hd_130948c.json b/data/source/hd_130948c.json index 3b482fd76..875000cc2 100644 --- a/data/source/hd_130948c.json +++ b/data/source/hd_130948c.json @@ -45,5 +45,26 @@ { "other_name": "HD 130948C" } + ], + "Parallaxes": [ + { + "parallax": 54.9502, + "parallax_error": 0.0343, + "adopted": true, + "comments": null, + "reference": "Pott02" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L4", + "spectral_type_code": 74.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Pott02" + } ] } \ No newline at end of file diff --git a/data/source/hd_13724_b.json b/data/source/hd_13724_b.json index 5ad3b8d64..2a4a7030a 100644 --- a/data/source/hd_13724_b.json +++ b/data/source/hd_13724_b.json @@ -27,5 +27,26 @@ { "other_name": "HD 13724 B" } + ], + "Parallaxes": [ + { + "parallax": 23.0, + "parallax_error": 0.03, + "adopted": true, + "comments": null, + "reference": "Rick20" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "T4", + "spectral_type_code": 84.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Rick20" + } ] } \ No newline at end of file diff --git a/data/source/hd_19467b.json b/data/source/hd_19467b.json index fac01b8e8..e088f9fb2 100644 --- a/data/source/hd_19467b.json +++ b/data/source/hd_19467b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 31.21913928, + "parallax_error": 0.023966862, + "adopted": true, + "comments": null, + "reference": "Crep14.29" + }, { "parallax": 32.4, "parallax_error": 0.62, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -61,6 +68,16 @@ } ], "SpectralTypes": [ + { + "spectral_type_string": "T5.5", + "spectral_type_code": 85.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Crep14.29" + }, { "spectral_type_string": "T6:", "spectral_type_code": 86.0, diff --git a/data/source/hd_203030b.json b/data/source/hd_203030b.json index 82dc0c560..b66021464 100644 --- a/data/source/hd_203030b.json +++ b/data/source/hd_203030b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 25.4488, + "parallax_error": 0.061, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 24.46, "parallax_error": 0.74, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hd_253662b.json b/data/source/hd_253662b.json index 2273d6b07..af5de19cd 100644 --- a/data/source/hd_253662b.json +++ b/data/source/hd_253662b.json @@ -31,6 +31,15 @@ "other_name": "HD 253662B" } ], + "Parallaxes": [ + { + "parallax": 11.5667, + "parallax_error": 0.0461, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "Photometry": [ { "band": "WFCAM.H", diff --git a/data/source/hd_33632_ab.json b/data/source/hd_33632_ab.json index e67a39b38..c5458fba7 100644 --- a/data/source/hd_33632_ab.json +++ b/data/source/hd_33632_ab.json @@ -27,5 +27,26 @@ { "other_name": "HD 33632 Ab" } + ], + "Parallaxes": [ + { + "parallax": 37.8953, + "parallax_error": 0.0263, + "adopted": true, + "comments": null, + "reference": "Curr20" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L9.5", + "spectral_type_code": 79.5, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Curr20" + } ] } \ No newline at end of file diff --git a/data/source/hd_4113_c.json b/data/source/hd_4113_c.json index ad9eae0bb..c1dda82a4 100644 --- a/data/source/hd_4113_c.json +++ b/data/source/hd_4113_c.json @@ -27,5 +27,26 @@ { "other_name": "HD 4113 C" } + ], + "Parallaxes": [ + { + "parallax": 23.8531, + "parallax_error": 0.0536, + "adopted": true, + "comments": null, + "reference": "Chee18" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "T9", + "spectral_type_code": 89.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Chee18" + } ] } \ No newline at end of file diff --git a/data/source/hd_44627b.json b/data/source/hd_44627b.json index d88b793f3..84ad549e9 100644 --- a/data/source/hd_44627b.json +++ b/data/source/hd_44627b.json @@ -69,10 +69,17 @@ } ], "Parallaxes": [ + { + "parallax": 19.9452, + "parallax_error": 0.0124, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 21.71, "parallax_error": 0.69, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -258,6 +265,16 @@ "photometric": null, "comments": null, "reference": "Alle13" + }, + { + "spectral_type_string": "L1", + "spectral_type_code": 71.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Chau05" } ] } \ No newline at end of file diff --git a/data/source/hd_4747_b.json b/data/source/hd_4747_b.json index a186cfe88..531d430b8 100644 --- a/data/source/hd_4747_b.json +++ b/data/source/hd_4747_b.json @@ -27,5 +27,26 @@ { "other_name": "HD 4747 B" } + ], + "Parallaxes": [ + { + "parallax": 53.0526, + "parallax_error": 0.0282, + "adopted": true, + "comments": null, + "reference": "Crep16" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L/T", + "spectral_type_code": 70.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Crep16" + } ] } \ No newline at end of file diff --git a/data/source/hd_49197b.json b/data/source/hd_49197b.json index df150ab96..62e58a0d9 100644 --- a/data/source/hd_49197b.json +++ b/data/source/hd_49197b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 24.1155, + "parallax_error": 0.0318, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 22.27, "parallax_error": 0.6, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hd_72946_b.json b/data/source/hd_72946_b.json index a2d2bde6d..bb5b85d15 100644 --- a/data/source/hd_72946_b.json +++ b/data/source/hd_72946_b.json @@ -27,5 +27,17 @@ { "other_name": "HD 72946 B" } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L5", + "spectral_type_code": 75.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Mair20" + } ] } \ No newline at end of file diff --git a/data/source/hip_11161b.json b/data/source/hip_11161b.json index f4b7584c0..4a60b319a 100644 --- a/data/source/hip_11161b.json +++ b/data/source/hip_11161b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 12.43641025, + "parallax_error": 0.07154321, + "adopted": true, + "comments": null, + "reference": "Deac14.119" + }, { "parallax": 14.43, "parallax_error": 0.8, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_112422b.json b/data/source/hip_112422b.json index e67baec3b..e0ea815ca 100644 --- a/data/source/hip_112422b.json +++ b/data/source/hip_112422b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 15.45979861, + "parallax_error": 0.81259197, + "adopted": true, + "comments": null, + "reference": "Deac14.119" + }, { "parallax": 15.28, "parallax_error": 1.72, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_21152_b.json b/data/source/hip_21152_b.json index b90662dcc..520cafa02 100644 --- a/data/source/hip_21152_b.json +++ b/data/source/hip_21152_b.json @@ -27,5 +27,17 @@ { "other_name": "HIP 21152 B" } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L/T", + "spectral_type_code": 70.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Kuzu22" + } ] } \ No newline at end of file diff --git a/data/source/hip_2397b.json b/data/source/hip_2397b.json index 295240700..63bd9beb9 100644 --- a/data/source/hip_2397b.json +++ b/data/source/hip_2397b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 26.3748, + "parallax_error": 0.0965, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 29.51, "parallax_error": 1.15, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_26653b.json b/data/source/hip_26653b.json index a64d64cae..1ab28db8d 100644 --- a/data/source/hip_26653b.json +++ b/data/source/hip_26653b.json @@ -24,9 +24,6 @@ } ], "Names": [ - { - "other_name": "2MASS J05394952+525352" - }, { "other_name": "2MASS J05394952+5253597" }, diff --git a/data/source/hip_38939b.json b/data/source/hip_38939b.json index 309d21bad..c640f4f50 100644 --- a/data/source/hip_38939b.json +++ b/data/source/hip_38939b.json @@ -39,10 +39,17 @@ "comments": null, "reference": "Best20.257" }, + { + "parallax": 54.1012, + "parallax_error": 0.0386, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 54.02, "parallax_error": 1.11, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_59933b.json b/data/source/hip_59933b.json index 768489496..4a9ab0dd5 100644 --- a/data/source/hip_59933b.json +++ b/data/source/hip_59933b.json @@ -35,10 +35,17 @@ } ], "Parallaxes": [ + { + "parallax": 14.8863, + "parallax_error": 0.1274, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 17.53, "parallax_error": 0.77, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_63506c.json b/data/source/hip_63506c.json index f17fb182b..ac4b7f2ff 100644 --- a/data/source/hip_63506c.json +++ b/data/source/hip_63506c.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 22.6476, + "parallax_error": 0.0297, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 23.54, "parallax_error": 2.37, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -99,6 +106,16 @@ "photometric": null, "comments": null, "reference": "Deac14.119" + }, + { + "spectral_type_string": "L1", + "spectral_type_code": 71.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "GaiaEDR3" } ] } \ No newline at end of file diff --git a/data/source/hip_6407b.json b/data/source/hip_6407b.json index 0e983c803..03beed098 100644 --- a/data/source/hip_6407b.json +++ b/data/source/hip_6407b.json @@ -35,10 +35,17 @@ } ], "Parallaxes": [ + { + "parallax": 19.8488, + "parallax_error": 0.1403, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 17.49, "parallax_error": 0.97, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_70849b.json b/data/source/hip_70849b.json index 89fcd81f4..67b58fa34 100644 --- a/data/source/hip_70849b.json +++ b/data/source/hip_70849b.json @@ -35,10 +35,17 @@ } ], "Parallaxes": [ + { + "parallax": 41.5387, + "parallax_error": 0.0424, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 42.42, "parallax_error": 2.09, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_73786b.json b/data/source/hip_73786b.json index 1c4b6bf5c..3a47a04ec 100644 --- a/data/source/hip_73786b.json +++ b/data/source/hip_73786b.json @@ -42,10 +42,17 @@ "comments": null, "reference": "Best20.257" }, + { + "parallax": 52.5873, + "parallax_error": 0.0668, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 53.8, "parallax_error": 2.8, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } @@ -136,6 +143,16 @@ } ], "SpectralTypes": [ + { + "spectral_type_string": "T6", + "spectral_type_code": 86.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Deac14.119" + }, { "spectral_type_string": "T6 pec", "spectral_type_code": 86.0, @@ -151,7 +168,7 @@ "spectral_type_code": 85.5, "spectral_type_error": null, "regime": "nir", - "adopted": true, + "adopted": false, "photometric": false, "comments": "From the BONES archive", "reference": "Zhan19.1260" diff --git a/data/source/hip_85365b.json b/data/source/hip_85365b.json index 2ba35df8c..6f78175bc 100644 --- a/data/source/hip_85365b.json +++ b/data/source/hip_85365b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 30.98630848, + "parallax_error": 0.15813722, + "adopted": true, + "comments": null, + "reference": "Deac14.119" + }, { "parallax": 33.25, "parallax_error": 0.25, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hip_9269b.json b/data/source/hip_9269b.json index 831ef3ab8..e81c0fe0f 100644 --- a/data/source/hip_9269b.json +++ b/data/source/hip_9269b.json @@ -39,10 +39,17 @@ "comments": null, "reference": "Best20.257" }, + { + "parallax": 40.3763, + "parallax_error": 0.0425, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 40.03, "parallax_error": 0.58, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/hr_7672b.json b/data/source/hr_7672b.json index f7d6739d2..83f99b3d2 100644 --- a/data/source/hr_7672b.json +++ b/data/source/hr_7672b.json @@ -32,10 +32,17 @@ } ], "Parallaxes": [ + { + "parallax": 56.2693, + "parallax_error": 0.0433, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 56.28, "parallax_error": 0.35, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/lspm_j0632+5053b.json b/data/source/lspm_j0632+5053b.json index 37d73764b..23794d86e 100644 --- a/data/source/lspm_j0632+5053b.json +++ b/data/source/lspm_j0632+5053b.json @@ -31,6 +31,15 @@ "other_name": "LSPM J0632+5053B" } ], + "Parallaxes": [ + { + "parallax": 12.10950754, + "parallax_error": 0.019127956, + "adopted": true, + "comments": null, + "reference": "Deac14.119" + } + ], "Photometry": [ { "band": "WFCAM.H", diff --git a/data/source/nltt_1011b.json b/data/source/nltt_1011b.json index 95cc6507f..f70b20a10 100644 --- a/data/source/nltt_1011b.json +++ b/data/source/nltt_1011b.json @@ -31,6 +31,15 @@ "other_name": "NLTT 1011B" } ], + "Parallaxes": [ + { + "parallax": 18.1127, + "parallax_error": 0.0358, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], "Photometry": [ { "band": "WFCAM.H", diff --git a/data/source/ulas_j014016.91+015054.7.json b/data/source/ulas_j014016.91+015054.7.json index 52aec06d8..30b7c4779 100644 --- a/data/source/ulas_j014016.91+015054.7.json +++ b/data/source/ulas_j014016.91+015054.7.json @@ -27,5 +27,26 @@ { "other_name": "ULAS J014016.91+015054.7" } + ], + "Parallaxes": [ + { + "parallax": 25.93338328, + "parallax_error": 0.019936247, + "adopted": true, + "comments": null, + "reference": "Burn18" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "T5", + "spectral_type_code": 85.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Burn18" + } ] } \ No newline at end of file diff --git a/data/source/ulas_j13300249+0914321.json b/data/source/ulas_j13300249+0914321.json index bb3487a55..bf44b7dc8 100644 --- a/data/source/ulas_j13300249+0914321.json +++ b/data/source/ulas_j13300249+0914321.json @@ -27,5 +27,26 @@ { "other_name": "ULAS J13300249+0914321" } + ], + "Parallaxes": [ + { + "parallax": 4.0511, + "parallax_error": 0.0464, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L2", + "spectral_type_code": 72.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Maro17" + } ] } \ No newline at end of file diff --git a/data/source/ulas_j133943.79+010436.4.json b/data/source/ulas_j133943.79+010436.4.json index 9439eb140..e1ace3be7 100644 --- a/data/source/ulas_j133943.79+010436.4.json +++ b/data/source/ulas_j133943.79+010436.4.json @@ -35,10 +35,17 @@ } ], "Parallaxes": [ + { + "parallax": 16.4485, + "parallax_error": 0.0554, + "adopted": true, + "comments": null, + "reference": "GaiaEDR3" + }, { "parallax": 16.02, "parallax_error": 0.86, - "adopted": true, + "adopted": false, "comments": null, "reference": "vanL07" } diff --git a/data/source/wise_j124332.17+600126.6.json b/data/source/wise_j124332.17+600126.6.json index bac76bcb2..1447541ea 100644 --- a/data/source/wise_j124332.17+600126.6.json +++ b/data/source/wise_j124332.17+600126.6.json @@ -27,5 +27,26 @@ { "other_name": "WISE J124332.17+600126.6" } + ], + "Parallaxes": [ + { + "parallax": 22.24367115, + "parallax_error": 0.013506583, + "adopted": true, + "comments": null, + "reference": "Fahe21" + } + ], + "SpectralTypes": [ + { + "spectral_type_string": "L8$\\gamma$", + "spectral_type_code": 78.0, + "spectral_type_error": null, + "regime": "unknown", + "adopted": true, + "photometric": false, + "comments": null, + "reference": "Fahe21" + } ] } \ No newline at end of file diff --git a/scripts/ingests/calamari/calamari_data.csv b/scripts/ingests/calamari/calamari_data.csv index 5a6d340a0..3a48995ae 100644 --- a/scripts/ingests/calamari/calamari_data.csv +++ b/scripts/ingests/calamari/calamari_data.csv @@ -1,65 +1,65 @@ -Object,Primary,RA,Dec,SpT_Secondary,SpT_Primary,d_Primary (pc),Separation (arcsec),Proj_Sep (AU),Age (Gyr),Ref,Parallax (mas),ePlx -2MASS J00193275+4018576,LP 192-58,4.8859931,40.3151441,L2,K7,55.21 $\pm$ 0.11,58.5,3990,0.3-10,"1, 2",18.1127,0.0358 -2MASS J00302476+2244492,BD+21 55,7.6042199,22.7461537,L0.5,K2,37.91 $\pm$ 0.14,117.1,3970,0.5-10,"1, 2",26.3748,0.0965 -HD 3651 B,HD 3651,9.829614,21.254559,T7.5,K0.5V,11.14 $\pm$ 0.01,43,480,0.7-4.7,"1, 2, 8, 9, 23",89.7891,0.0581 -HD 4113 C,HD 4113,10.8025,-37.9826306,T9,G5V+M1V,41.92 $\pm$ 0.09,0.535,22,3-6,27,23.8531,0.0536 -HD 4747 B,HD 4747,12.361505,-23.212463,L/T,G8/K0V,18.85 $\pm$ 0.01,0.61,10,0.9-3.7,18,53.0526,0.0282 -ULAS J014016.91+015054.7,BD+01 299,25.071311,1.8484382,T5,K5,38.56 $\pm$ 0.03,31,35-45,6.5-13.5,"3, 12",25.93338328,0.019936247 -2MASS J01591078+3312313,HD 12051,29.7959843,33.207192,L6,G9V,24.77 $\pm$ 0.02,52.1,1300,2.2-10.2,"1, 2",40.3763,0.0425 -HD 13724 B,HD 13724,33.086156,-46.816377,T4,G3/5V,43.48 $\pm$ 0.06,0.24,26.3,0.05-1.5,26,23,0.03 -2MASS J02233667+5240066,HD 14647,35.902796,52.668514,L1.5,F5,80.41 $\pm$ 0.46,47.7,3300,0.5-2.4,2,12.43641025,0.07154321 -2MASS J02355993-2331205,HD 16270,39.00019195,-23.52224277,L1,K2.5Vk,21.22 $\pm$ 0.02,11.95,250,<1,"1, 3",47.1279,0.0475 -HD 19467 B,HD 19467,46.827,-13.762028,T5.5,G3V,32.03 $\pm$ 0.02,1.6,51,4-10,13,31.21913928,0.023966862 -HIP 21152 B,HIP 21152,68.019917,5.409944,L/T,F5V,43.21 $\pm$ 0.05,408,17.5,0.65-0.85,"1, 29",, -HD 33632 Ab,HD 33632 Aa,78.3208,37.2808,L9.5,F8V,26.39 $\pm$ 0.02,0.75,20,1.2-4.5,19,37.8953,0.0263 -2MASS J05394952+525352,HD 37216,84.9566683,52.8992533,L5,G5V,28.08 $\pm$ 0.04,27,753,1.1-9.3,"1, 2",35.6141,0.0464 -2MASS J06135342+1514062,HD 253662,93.4725944,15.234332,L0.5,G8IV,86.46 $\pm$ 0.34,20.1,$>$ 1252,$<$ 10,"1, 2",11.5667,0.0461 -AB Pic B,AB Pic,94.804162,-58.055611,L1,K1V,50.14 $\pm$ 0.03,5.5,250-270,0.03,"1, 16, 23",19.9452,0.0124 -2MASS J06324849+5053351,LSPM J0632+5053,98.202075,50.893106,L1.5,G2,82.58 $\pm$ 0.13,47.4,4499,0.2-10,2,12.10950754,0.019127956 -2MASS J06462756+7935045,HD 46588,101.6121946,79.5818179,L9,F7V,18.21 $\pm$ 0.04,79.2,1420,1.3-4.3,"1, 2",54.9292,0.1076 -HD 47197 B,HD 47197,102.339167,43.759194,L4,F5V,41.47 $\pm$ 0.05,0.8,43,0.26-0.79,"1, 15",24.1155,0.0318 -2MASS J07580132-2538587,HD 65486,119.5073205,-25.6508698,T4.5,K4Vk,18.48 $\pm$ 0.01,88,1630,0.3-2.8,"1, 2",54.1012,0.0386 -eta Cnc B,eta Cnc,128.132502,20.449967,L3.5,K3III,97.48 $\pm$ 0.83,2.2-3.5,154,15000,"1, 17",10.258,0.088 -HD 72946 B,HD 72946,128.963611,6.62277,L5,G8V,25.87 $\pm$ 0.08,6.5,10,1-2,"1, 28",, -2MASS J10221489+4114266,HD 89744,155.5623583,41.2457764,L0,F7V,38.68 $\pm$ 0.11,2460,63,1.5-3,"1, 2, 23",25.8537,0.0716 -2MASS J11102921-2925186,CD-28 8692,167.621714,-29.4221669,L2,K5V,39.79 $\pm$ 0.07,50.8,2026,9.5-13.5,"1, 25",25.1329,0.0417 -2MASS J12173646+1427119,HD 106888,184.4015804,14.4531479,L1,F8,67.18 $\pm$ 0.57,38.1,2170,0.3-2.5,"1, 4",14.8863,0.1274 -WISE J124332.17+600126.6,BD+60 1417,190.88386,60.023957,L8$\gamma$,K0,44.96 $\pm$ 0.03,37,1662,0.01-0.15,11,22.24367115,0.013506583 -2MASS J13005061+4214473,BD+42 2363,195.2084201,42.246548,L1,K6V,44.15 $\pm$ 0.06,132.8,5640,0.3-10,"1, 2",22.6476,0.0297 -GJ 499 C,GJ 499 AB,196.420872,20.7779818,L4,K5+M4,19.65 $\pm$ 0.02,516,9708,3-5,"1, 5",50.9035,0.0435 -2MASS J13204427+0409045,HD 116012,200.1820776,4.1522243,L5,K0V,30.31 $\pm$ 0.046,516,9708,12-14,"1, 5",32.9938,0.0504 -ULAS J13300249+0914321,TYC 892-36-1,202.5102524,9.2422718,L2,K-type,246.85 $\pm$ 2.80,260.4,...,0.2-1.5,"1, 4",4.0511,0.0464 -2MASS J13324530+7459441,BD+75 510,203.188635,74.995628,L2,K8,35.40 $\pm$ 0.01,38.3,1364,0.2-1.4,5,28.2493,0.0117 -HD 118865 B,HD 118865,204.9323213,1.0766982,T5,F7V,60.80 $\pm$ 0.20,148,9200,1.5-4.9,"1, 2",16.4485,0.0554 -2MASS J14165987+5006258,HD 125141,214.2474598,50.1080132,L4,G5,47.11 $\pm$ 0.06,570,...,8.5-11,"1, 34",21.2259,0.0256 -ULAS J142320.79+011638.2,HD 126053,215.8371027,1.276492,T8,G1.5V,17.44 $\pm$ 0.01,152.8,2630,2.3-14.4,"1, 33",57.3445,0.0362 -2MASS J14284235-4628393,CD-45 9206,217.1761684,-46.4784943,T4.5,K7Vk,24.07 $\pm$ 0.02,377.3,9000,1-5,"1, 7",41.5387,0.0424 -HD 130948BC,HD 130948,222.566667,23.911611,L4+L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,"20, 21",54.9502,0.0343 -HD 130948C,HD 130948,222.566667,23.911611,L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,"20, 21",54.9502,0.0343 -HD 130948B,HD 130948,222.566667,23.911611,L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,"20, 21",54.9502,0.0343 -GJ 570 D,GJ 570,224.3175381,-21.3712191,T7,K4V,5.88 $\pm$ 0.002,261.7,1525,2-10,"1, 10, 23",170.0112,0.0851 -ULAS J150457.65+053800.8,BD+06 2986,226.2388579,5.632459,T6,K8V,19.02 $\pm$ 0.02,63.8,1230,$>$ 1.6,"1, 2",52.5873,0.0668 -2MASS J15232263+3014562,* eta CrB,230.8449168,30.2481943,L8,G2V+G2V,17.86 $\pm$ 0.25,195.3,3635,3-5,6,55.98,0.78 -2MASS J17262235-0502110,* 47 Oph,261.59315,-5.0364,L5.5,F3V*,32.27 $\pm$ 0.16,294.1,1890,1.6-1.9,2,30.98630848,0.15813722 -2MASS J18005854+1505198,HD 164507,270.2436883,15.08842874,L1,G5IV,45.44 $\pm$ 0.07,25.5,1136,3-4,"1, 25",22.0086,0.0363 -2MASS J19073307+3015304,V* V478 Lyr,286.8884528,30.258925,L1,G6V,27.12 $\pm$ 0.02,17,...,11.5-13.5,1,36.8771,0.0259 -HR 7672 B,HR 7672,301.025833,17.070278,L4,G0V,17.77 $\pm$ 0.01,0.79,14,1-3,"1, 22",56.2693,0.0433 -HD 203030 B,HD 203030,319.74572,26.22948,L7.5,K0V,39.29 $\pm$ 0.09,11,487,0.13-0.4,"1, 2, 6, 23",25.4488,0.061 -2MASS J21442847+1446077,V* HN Peg,326.1198745,14.7683382,T2.5,G0V$+$,18.13 $\pm$ 0.02,42.9,795,0.1-0.5,"1, 8, 23",55.1631,0.0608 -ε Indi Ba,ε Indi A,331.0767776,-56.793953,T1.5+T6,K5V,3.64 $\pm$ 0.003,,1459,0.8-2.0,"1, 14, 23",274.8048,0.2494 -2MASS J22461844+3319304,BD+32 4510,341.576865,33.325119,L1.5,K2*,64.68 $\pm$ 3.23,16,1040,0.1-10,2,15.45979861,0.81259197 -CatWISE J005635.48-240401.9,HIP 4417,14.1478506,-24.0672083,L8,K0,67.60 $\pm$ 0.08,102,6924,...,"1, 24",14.7937,0.0168 -CatWISE J030005.73-062218.6,BPS CS 22963-0014,45.0238923,-6.371848,L9,K7,67.13 $\pm$ 0.08,63,4200,...,"1, 24",14.8971,0.0168 -CatWISE J055909.00-384219.8,HD 40781,89.787502,-38.7055027,L4,G0V,60.65 $\pm$ 1.30,54.5,3259,$<$ 1,"1, 24",16.4877,0.3623 -CatWISE J065752.45+163350.2,HD 51400,104.46857,16.563966,L6,G5,37.08 $\pm$ 0.78,64,2254,...,"1, 24",26.9694,0.5771 -CatWISE J085131.24-603056.2,PM J08515-6029,132.8801846,-60.5156128,L3,K7,30.93 $\pm$ 0.01,95.3,2948,$<$ 1,"1, 24",32.3313,0.0137 -CatWISE J133427.70-273053.1,HD 117987,203.61543,-27.514766,L0,K3V,36.95 $\pm$ 0.46,50,1772,...,"1, 24",27.0633,0.3387 -CatWISE J183207.94-540943.3,HD 170573,278.03311,-54.162028,T7,K4.5Vk,19.12 $\pm$ 0.01,619.3,11843,9-13.5,"1, 24",52.2903,0.0223 -2MASS J00250365+4759191,HD 2057,6.2669728,47.9877566,L4+L4,F8,54.01 $\pm$ 0.40,210,8800,$<$ 1,32,18.5162,0.1365 -HD 8291 B,HD 8291,20.5708829,3.522572,L1+T3,G5V,50.38 $\pm$ 0.35,44.9,2570,0.5-10,"1, 2",19.8488,0.1403 -Gl 337CD,Gl 337,138.0584919,14.9956706,L8.5+L7.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,"1, 31",49.1493,0.3467 -Gl 337C,Gl 337,138.0584919,14.9956706,L8.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,"1, 31",49.1493,0.3467 -Gl 337D,Gl 337,138.0584919,14.9956706,L7.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,"1, 31",49.1493,0.3467 -Gl 417BC,Gl 417,168.1055653,35.8028953,L4.5+L6,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,"1, 30",44.1428,0.0383 -Gl 417B,Gl 417,168.1055653,35.8028953,L4.5,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,"1, 30",44.1428,0.0383 -Gl 417C,Gl 417,168.1055653,35.8028953,L6,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,"1, 30",44.1428,0.0383 \ No newline at end of file +Object,Primary,RA,Dec,SpT_Secondary,SpT_Primary,d_Primary (pc),Separation (arcsec),Proj_Sep (AU),Age (Gyr),Age,Upper Error,Lower Error,Comment,Age Ref,Ref,Parallax (mas),ePlx +2MASS J00193275+4018576,LP 192-58,4.8859931,40.3151441,L2,K7,55.21 $\pm$ 0.11,58.5,3990,0.3-10,,,,,2,"1, 2",18.1127,0.0358 +2MASS J00302476+2244492,BD+21 55,7.6042199,22.7461537,L0.5,K2,37.91 $\pm$ 0.14,117.1,3970,0.5-10,,,,,2,"1, 2",26.3748,0.0965 +HD 3651 B,HD 3651,9.829614,21.254559,T7.5,K0.5V,11.14 $\pm$ 0.01,43,480,0.7-4.7,,,,,2,"1, 2, 8, 9, 23",89.7891,0.0581 +HD 4113 C,HD 4113,10.8025,-37.9826306,T9,G5V+M1V,41.92 $\pm$ 0.09,0.535,22,3-6,5,1.3,1.7,,27,27,23.8531,0.0536 +HD 4747 B,HD 4747,12.361505,-23.212463,L/T,G8/K0V,18.85 $\pm$ 0.01,0.61,10,0.9-3.7,3.3,2.3,1.9,,18,18,53.0526,0.0282 +ULAS J014016.91+015054.7,BD+01 299,25.071311,1.8484382,T5,K5,38.56 $\pm$ 0.03,31,35-45,6.5-13.5,,,,,,"3, 12",25.93338328,0.019936247 +2MASS J01591078+3312313,HD 12051,29.7959843,33.207192,L6,G9V,24.77 $\pm$ 0.02,52.1,1300,2.2-10.2,,,,,2,"1, 2",40.3763,0.0425 +HD 13724 B,HD 13724,33.086156,-46.816377,T4,G3/5V,43.48 $\pm$ 0.06,0.24,26.3,0.05-1.5,1.04,0.88,0.88,,26,26,23,0.03 +2MASS J02233667+5240066,HD 14647,35.902796,52.668514,L1.5,F5,80.41 $\pm$ 0.46,47.7,3300,0.5-2.4,,,,,2,2,12.43641025,0.07154321 +2MASS J02355993-2331205,HD 16270,39.00019195,-23.52224277,L1,K2.5Vk,21.22 $\pm$ 0.02,11.95,250,<1,,,,,3,"1, 3",47.1279,0.0475 +HD 19467 B,HD 19467,46.827,-13.762028,T5.5,G3V,32.03 $\pm$ 0.02,1.6,51,4-10,4.3,1,1.2,,13,13,31.21913928,0.023966862 +HIP 21152 B,HIP 21152,68.019917,5.409944,L/T,F5V,43.21 $\pm$ 0.05,408,17.5,0.65-0.85,0.676,0.07,0.01,,29,"1, 29",, +HD 33632 Ab,HD 33632,78.3208,37.2808,L9.5,F8V,26.39 $\pm$ 0.02,0.75,20,1.2-4.5,,,,,19,19,37.8953,0.0263 +2MASS J05394952+5253597,HD 37216,84.9566683,52.8992533,L5,G5V,28.08 $\pm$ 0.04,27,753,1.1-9.3,,,,,2,"1, 2",35.6141,0.0464 +2MASS J06135342+1514062,HD 253662,93.4725944,15.234332,L0.5,G8IV,86.46 $\pm$ 0.34,20.1,$>$ 1252,$<$ 10,6,4,4,"<10 Gyr, Disk-like kinematics",2,"1, 2",11.5667,0.0461 +AB Pic B,AB Pic,94.804162,-58.055611,L1,K1V,50.14 $\pm$ 0.03,5.5,250-270,0.03,0.03,,,,16,"1, 16, 23",19.9452,0.0124 +2MASS J06324849+5053351,LSPM J0632+5053,98.202075,50.893106,L1.5,G2,82.58 $\pm$ 0.13,47.4,4499,0.2-10,,,,,2,2,12.10950754,0.019127956 +2MASS J06462756+7935045,HD 46588,101.6121946,79.5818179,L9,F7V,18.21 $\pm$ 0.04,79.2,1420,1.3-4.3,,,,,2,"1, 2",54.9292,0.1076 +HD 49197 B,HD 49197,102.339167,43.759194,L4,F5V,41.47 $\pm$ 0.05,0.8,43,0.26-0.79, 260–790 (Myr) Convert later,,,,15,"1, 15",24.1155,0.0318 +2MASS J07580132-2538587,HD 65486,119.5073205,-25.6508698,T4.5,K4Vk,18.48 $\pm$ 0.01,88,1630,0.3-2.8,,,,,2,"1, 2",54.1012,0.0386 +eta Cnc B,eta Cnc,128.132502,20.449967,L3.5,K3III,97.48 $\pm$ 0.83,2.2-3.5,154,2.2-6.1,,,,,17,"1, 17",10.258,0.088 +HD 72946 B,HD 72946,128.963611,6.62277,L5,G8V,25.87 $\pm$ 0.08,6.5,10,1-2,,,,,28,"1, 28",, +2MASS J10221489+4114266,HD 89744,155.5623583,41.2457764,L0,F7V,38.68 $\pm$ 0.11,2460,63,1.5-3,,,,,2,"1, 2, 23",25.8537,0.0716 +2MASS J11102921-2925186,CD-28 8692,167.621714,-29.4221669,L2,K5V,39.79 $\pm$ 0.07,50.8,2026,9.5-13.5,4.48,,,,25,"1, 25",25.1329,0.0417 +2MASS J12173646+1427119,HD 106888,184.4015804,14.4531479,L1,F8,67.18 $\pm$ 0.57,38.1,2170,0.3-2.5,,,,,4,"1, 4",14.8863,0.1274 +WISE J124332.17+600126.6,BD+60 1417,190.88386,60.023957,L8$\gamma$,K0,44.96 $\pm$ 0.03,37,1662,0.01-0.15,,,,,11,11,22.24367115,0.013506583 +2MASS J13005061+4214473,BD+42 2363,195.2084201,42.246548,L1,K6V,44.15 $\pm$ 0.06,132.8,5640,0.3-10,,,,,2,"1, 2",22.6476,0.0297 +GJ 499 C,GJ 499 AB,196.420872,20.7779818,L4,K5+M4,19.65 $\pm$ 0.02,516,9708,3-5,,,,,5,"1, 5",50.9035,0.0435 +2MASS J13204427+0409045,HD 116012,200.1820776,4.1522243,L5,K0V,30.31 $\pm$ 0.046,516,9708,12-14,,,,,5,"1, 5",32.9938,0.0504 +ULAS J13300249+0914321,TYC 892-36-1,202.5102524,9.2422718,L2,K-type,246.85 $\pm$ 2.80,260.4,...,0.2-1.5,,,,,4,"1, 4",4.0511,0.0464 +2MASS J13324530+7459441,BD+75 510,203.188635,74.995628,L2,K8,35.40 $\pm$ 0.01,38.3,1364,0.2-1.4,,,,,5,5,28.2493,0.0117 +HD 118865 B,HD 118865,204.9323213,1.0766982,T5,F7V,60.80 $\pm$ 0.20,148,9200,1.5-4.9,,,,,2,"1, 2",16.4485,0.0554 +2MASS J14165987+5006258,HD 125141,214.2474598,50.1080132,L4,G5,47.11 $\pm$ 0.06,570,...,8.5-11,,,,,34,"1, 34",21.2259,0.0256 +ULAS J142320.79+011638.2,HD 126053,215.8371027,1.276492,T8,G1.5V,17.44 $\pm$ 0.01,152.8,2630,2.3-14.4,,,,,33,"1, 33",57.3445,0.0362 +2MASS J14284235-4628393,CD-45 9206,217.1761684,-46.4784943,T4.5,K7Vk,24.07 $\pm$ 0.02,377.3,9000,1-5,,,,,7,"1, 7",41.5387,0.0424 +HD 130948BC,HD 130948,222.566667,23.911611,L4+L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,0.79,0.22,0.15,,20,"20, 21",54.9502,0.0343 +HD 130948C,HD 130948,222.566667,23.911611,L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,0.79,0.22,0.15,,20,"20, 21",54.9502,0.0343 +HD 130948B,HD 130948,222.566667,23.911611,L4,G2V,18.20 $\pm$ 0.01,2.64,46.5,0.4-0.9,0.79,0.22,0.15,,20,"20, 21",54.9502,0.0343 +GJ 570 D,GJ 570,224.3175381,-21.3712191,T7,K4V,5.88 $\pm$ 0.002,261.7,1525,2-10,,,,,23,"1, 10, 23",170.0112,0.0851 +ULAS J150457.65+053800.8,BD+06 2986,226.2388579,5.632459,T6,K8V,19.02 $\pm$ 0.02,63.8,1230,$>$ 1.6,6,4.4,4.4,>1.6 based on chromospheric activity,35,"1, 2",52.5873,0.0668 +2MASS J15232263+3014562,* eta CrB,230.8449168,30.2481943,L8,G2V+G2V,17.86 $\pm$ 0.25,195.3,3635,3-5,,,,,6,6,55.98,0.78 +2MASS J17262235-0502110,* 47 Oph,261.59315,-5.0364,L5.5,F3V*,32.27 $\pm$ 0.16,294.1,1890,1.6-1.9,,,,,2,2,30.98630848,0.15813722 +2MASS J18005854+1505198,HD 164507,270.2436883,15.08842874,L1,G5IV,45.44 $\pm$ 0.07,25.5,1136,3-4,,,,,25,"1, 25",22.0086,0.0363 +2MASS J19073307+3015304,V* V478 Lyr,286.8884528,30.258925,L1,G6V,27.12 $\pm$ 0.02,17,...,11.5-13.5,,,,,1,1,36.8771,0.0259 +HR 7672 B,HR 7672,301.025833,17.070278,L4,G0V,17.77 $\pm$ 0.01,0.79,14,1-3,,,,,22,"1, 22",56.2693,0.0433 +HD 203030 B,HD 203030,319.74572,26.22948,L7.5,K0V,39.29 $\pm$ 0.09,11,487,0.13-0.4,,,,,2,"1, 2, 6, 23",25.4488,0.061 +2MASS J21442847+1446077,V* HN Peg,326.1198745,14.7683382,T2.5,G0V$+$,18.13 $\pm$ 0.02,42.9,795,0.1-0.5,,,,,2,"1, 8, 23",55.1631,0.0608 +ε Indi Ba,ε Indi A,331.0767776,-56.793953,T1.5+T6,K5V,3.64 $\pm$ 0.003,,1459,0.8-2.0,,,,,23,"1, 14, 23",274.8048,0.2494 +2MASS J22461844+3319304,BD+32 4510,341.576865,33.325119,L1.5,K2*,64.68 $\pm$ 3.23,16,1040,0.1-10,,,,,2,2,15.45979861,0.81259197 +CatWISE J005635.48-240401.9,HIP 4417,14.1478506,-24.0672083,L8,K0,67.60 $\pm$ 0.08,102,6924,...,,,,,24,"1, 24",14.7937,0.0168 +CatWISE J030005.73-062218.6,BPS CS 22963-0014,45.0238923,-6.371848,L9,K7,67.13 $\pm$ 0.08,63,4200,...,,,,,24,"1, 24",14.8971,0.0168 +CatWISE J055909.00-384219.8,HD 40781,89.787502,-38.7055027,L4,G0V,60.65 $\pm$ 1.30,54.5,3259,$<$ 1,4.2,2.8,2.7,Casagrande et al. (2011),24,"1, 24",16.4877,0.3623 +CatWISE J065752.45+163350.2,HD 51400,104.46857,16.563966,L6,G5,37.08 $\pm$ 0.78,64,2254,...,0.6–0.7,,,"Age range estimated from position on the color–period diagram in comparison to benchmark populations. These ages estimates are not derived from gyrochrones, and should therefore be treated with caution",24,"1, 24",26.9694,0.5771 +CatWISE J085131.24-603056.2,PM J08515-6029,132.8801846,-60.5156128,L3,K7,30.93 $\pm$ 0.01,95.3,2948,$<$ 1,,,,,24,"1, 24",32.3313,0.0137 +CatWISE J133427.70-273053.1,HD 117987,203.61543,-27.514766,L0,K3V,36.95 $\pm$ 0.46,50,1772,...,,,,,24,"1, 24",27.0633,0.3387 +CatWISE J183207.94-540943.3,HD 170573,278.03311,-54.162028,T7,K4.5Vk,19.12 $\pm$ 0.01,619.3,11843,9-13.5,,,,,24,"1, 24",52.2903,0.0223 +2MASS J00250365+4759191,HD 2057,6.2669728,47.9877566,L4+L4,F8,54.01 $\pm$ 0.40,210,8800,$<$ 1,1.1,2.5,0.7,,32,32,18.5162,0.1365 +HD 8291 B,HD 8291,20.5708829,3.522572,L1+T3,G5V,50.38 $\pm$ 0.35,44.9,2570,0.5-10,,,,,2,"1, 2",19.8488,0.1403 +Gl 337CD,Gl 337,138.0584919,14.9956706,L8.5+L7.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,2,1.4,1.4,,31,"1, 31",49.1493,0.3467 +Gl 337C,Gl 337,138.0584919,14.9956706,L8.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,2,1.4,1.4,,31,"1, 31",49.1493,0.3467 +Gl 337D,Gl 337,138.0584919,14.9956706,L7.5,G8V+K1V,20.35 $\pm$ 0.14,43,881,0.6-3.4,2,1.4,1.4,,31,"1, 31",49.1493,0.3467 +Gl 417BC,Gl 417,168.1055653,35.8028953,L4.5+L6,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,,,,,30,"1, 30",44.1428,0.0383 +Gl 417B,Gl 417,168.1055653,35.8028953,L4.5,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,,,,,30,"1, 30",44.1428,0.0383 +Gl 417C,Gl 417,168.1055653,35.8028953,L6,G2,22.65 $\pm$ 0.02,90,2000,0.08-0.3,,,,,30,"1, 30",44.1428,0.0383 \ No newline at end of file diff --git a/scripts/ingests/calamari/calamari_publication_helpers.py b/scripts/ingests/calamari/calamari_publication_helpers.py new file mode 100644 index 000000000..d3310cceb --- /dev/null +++ b/scripts/ingests/calamari/calamari_publication_helpers.py @@ -0,0 +1,142 @@ +import sys +import sqlalchemy +sys.path.append(".") +from astrodb_utils.sources import ( + logger, + AstroDBError, + find_source_in_db, + ingest_name +) +from astrodb_utils.publications import ( + find_publication, +) +from simple.utils.astrometry import ( + ingest_parallax +) + +#helper method to retrieve the publication links from calamari_data +def getRef(ref_index, ref_table): + ref = ref_index.split(',')[0] + ref_link = ref_table[int(ref)]['ADS'] + if 'iopscience' not in ref_link or 'harvard.edu' not in ref_link: + ref_link = ref_table[int(ref)]['Link'] + return ref_link + +#helper method to retrieve the bibcode from a link +def extractADS(link): + start = link.find('abs/')+4 + end = link.find('/abstract') + ads = link[start:end] + ads = ads.replace("%26", "&") + return ads + +#helper method to retrieve the doi from a link +def extractDOI(link): + link = str(link) + if 'iopscience' in link: + start = link.find('article/')+8 + doi = link[start:] + doi = doi.replace("/pdf", "") + else: + start = link.find('doi.org/')+8 + doi=link[start:] + return doi + +def otherReferencesList(db, ref, ref_table): + #get all the ids/indexes of the references + ids = ref.split(", ") + result = [] + #for each reference... + for id in ids: + link = ref_table[int(id)]['ADS'] + #if bibcode or doi is not directly in the link... go to Link column + if 'iopscience' not in link or 'harvard.edu' not in link: + link = ref_table[int(id)]['Link'] + #if bibcode is directly in the link + if 'harvard.edu' in link: + bibcode = extractADS(link) + pub_result=find_publication( + db=db, + bibcode=bibcode + ) + if pub_result[0]: + result.append(pub_result[1]) + else: + print(f"Warning: Publication not found for bibcode {bibcode}") + #if doi code is found directly in the link + elif 'iopscience' in link or 'doi.org' in link: + doi=extractDOI(link) + pub_result=find_publication( + db=db, + doi=doi + ) + if pub_result[0]: + result.append(pub_result[1]) + else: + print(f"Warning: Publication not found for doi {doi}") + #use reference name to find reference + else: + reference= ref_table[int(id)]['Ref'] + reference= reference.replace("+", "") + reference=reference[0:4] + reference[-2:] + pub_result=find_publication( + db=db, + reference=reference + ) + if pub_result[0]: + result.append(pub_result[1]) + else: + print(f"Warning: Publication not found for reference {reference}") + #return list of references + return result + + +# sources Gl 337CD and Gl 417BC do not exist in the database. ingest them. +def ingest_resolved_children( + db, + source, + reference: str, + *, + ra: float = None, + dec: float = None, + epoch: str = None, + equinox: str = None, + other_reference: str = None, + comment: str = None, + raise_error: bool = True, + ra_col_name: str = "ra", + dec_col_name: str = "dec", + epoch_col_name: str = "epoch", +): + # Construct data to be added + source_data = [ + { + "source": source, + ra_col_name: ra, + dec_col_name: dec, + "reference": reference, + epoch_col_name: epoch, + "equinox": equinox, + "other_references": other_reference, + "comments": comment, + } + ] + logger.debug(f" Data: {source_data}.") + + # Try to add the source to the database + try: + with db.engine.connect() as conn: + conn.execute(db.Sources.insert().values(source_data)) + conn.commit() + msg = f"Added {source_data}" + logger.info(f"Added {source}") + logger.debug(msg) + except sqlalchemy.exc.IntegrityError: + msg = f"Not ingesting {source}. Not sure why. \n" + msg2 = f" {source_data} " + logger.warning(msg) + logger.debug(msg2) + + # Add the source name to the Names table + ingest_name(db, source=source, other_name=source, raise_error=raise_error) + return diff --git a/scripts/ingests/calamari/ingest_calamari_companions b/scripts/ingests/calamari/ingest_calamari_companions.py similarity index 100% rename from scripts/ingests/calamari/ingest_calamari_companions rename to scripts/ingests/calamari/ingest_calamari_companions.py diff --git a/scripts/ingests/calamari/ingest_calamari_parallax.py b/scripts/ingests/calamari/ingest_calamari_parallax.py new file mode 100644 index 000000000..355460521 --- /dev/null +++ b/scripts/ingests/calamari/ingest_calamari_parallax.py @@ -0,0 +1,141 @@ +import sys +import logging +sys.path.append(".") +from astropy.io import ascii +from simple import REFERENCE_TABLES +from astrodb_utils import load_astrodb +from astrodb_utils.sources import ( + logger, + AstroDBError, + find_source_in_db +) +from simple.utils.astrometry import ( + ingest_parallax +) + +from scripts.ingests.calamari.calamari_publication_helpers import ( + otherReferencesList +) + +astrodb_utils_logger = logging.getLogger("astrodb_utils") +logger.setLevel(logging.DEBUG) # Set logger to INFO/DEBUG/WARNING/ERROR/CRITICAL level +astrodb_utils_logger.setLevel(logging.DEBUG) + +SAVE_DB = True # save the data files in addition to modifying the .db file +RECREATE_DB = True # recreates the .db file from the data files +SCHEMA_PATH = "simple/schema.yaml" +db = load_astrodb( + "SIMPLE.sqlite", + recreatedb=RECREATE_DB, + reference_tables=REFERENCE_TABLES, + felis_schema=SCHEMA_PATH, +) + +link = ( + "scripts/ingests/calamari/calamari_data.csv" +) +link_2 = ( + "scripts/ingests/calamari/calamari_refs.csv" +) + +calamari_table = ascii.read( + link, + format="csv", + data_start=1, + header_start=0, + guess=False, + fast_reader=False, + delimiter=",", +) + +ref_table = ascii.read( + link_2, + format="csv", + data_start=0, + header_start=0, + guess=False, + fast_reader=False, + delimiter=",", +) + +parallax_ingested = 0 +parallax_already_exist = 0 +skipped= 0 + +binaries = [ + "HD 130948BC", + "HD 130948C", + "HD 130948B", + "Gl 337CD", + "Gl 337C", + "Gl 337D", + "Gl 417BC", + "Gl 417B", + "Gl 417C" +] + +for row in calamari_table: + ignore_neighbors=False + object = row["Object"] + + #skip these two sources because they have no parallax value or have been ingested beforehand + if object == "HIP 21152 B" or object == "HD 72946 B": + skipped+=1 + continue + + if object == "WISE J124332.17+600126.6": + #ingest parallax for WISE J124332.17+600126.6 + ingest_parallax( + db=db, + source = "WISE J124332.17+600126.6", + parallax_mas=22.24367115, + parallax_err_mas=0.013506583, + reference = "Fahe21" + ) + parallax_ingested+=1 + continue + + if object == "2MASS J00250365+4759191": + #ingest parallax for 2MASS J00250365+4759191 + ingest_parallax( + db=db, + source = "2MASS J00250365+4759191", + parallax_mas=18.5162, + parallax_err_mas=0.1365, + reference="Reid06.891" + ) + parallax_ingested+=1 + continue + + reference = otherReferencesList(db=db, ref = row["Ref"], ref_table=ref_table)[0] + parallax_mas=row["Parallax (mas)"] + + if object in binaries: + ignore_neighbors = True + + if not ignore_neighbors: + object = find_source_in_db(db=db, source = object)[0] + try: + ingest_parallax( + db=db, + source = object, + parallax_mas=parallax_mas, + parallax_err_mas=row["ePlx"], + reference = reference + ) + parallax_ingested+=1 + except AstroDBError as e: + msg = "ingest failed with error: " + str(e) + logger.warning(msg) + if "Duplicate measurement exists with same reference" in str(e): + parallax_already_exist+=1 + else: + raise e + + +logger.info(f"parallax already exists: {parallax_already_exist}") # 10 already exists in database +logger.info(f"parallax ingested: {parallax_ingested}") #52 parallax ingested +logger.info(f"parallax skipped: {skipped}") # 2 parallax skipped +logger.info(f"total: {parallax_already_exist+parallax_ingested+skipped}") # 64 total +if SAVE_DB: + db.save_database(directory="data/") \ No newline at end of file diff --git a/scripts/ingests/calamari/ingest_calamari_publications b/scripts/ingests/calamari/ingest_calamari_publications.py similarity index 100% rename from scripts/ingests/calamari/ingest_calamari_publications rename to scripts/ingests/calamari/ingest_calamari_publications.py diff --git a/scripts/ingests/calamari/ingest_calamari_samples b/scripts/ingests/calamari/ingest_calamari_samples.py similarity index 94% rename from scripts/ingests/calamari/ingest_calamari_samples rename to scripts/ingests/calamari/ingest_calamari_samples.py index 960da48ce..22f23c8c6 100644 --- a/scripts/ingests/calamari/ingest_calamari_samples +++ b/scripts/ingests/calamari/ingest_calamari_samples.py @@ -224,33 +224,6 @@ def ingest_resolved_children( ) sources_ingested+=1 -#ingest unresolved parents - -# #ingest source Gl 337 CD -# ingest_source( -# db=db, -# source = "Gl 337CD", -# reference="GaiaEDR3", -# other_reference="Wils01", -# ra = 138.0584919, -# dec = 14.9956706, -# ra_col_name="ra", -# dec_col_name="dec" -# ) -# sources_ingested+=1 - -# #ingest source Gl 417 BC -# ingest_source( -# db=db, -# source = "Gl 417BC", -# reference = "GaiaEDR3", -# other_reference="Kirk00", -# ra = 168.1055653, -# dec = 35.8028953, -# ra_col_name="ra", -# dec_col_name="dec" -# ) -# sources_ingested+=1 ingest_resolved_children( db=db, source = "Gl 337C", diff --git a/scripts/ingests/calamari/ingest_calamari_spt.py b/scripts/ingests/calamari/ingest_calamari_spt.py new file mode 100644 index 000000000..c8ff5ffa3 --- /dev/null +++ b/scripts/ingests/calamari/ingest_calamari_spt.py @@ -0,0 +1,154 @@ +import sys +import logging +sys.path.append(".") +from astropy.io import ascii +from simple import REFERENCE_TABLES +from astrodb_utils import load_astrodb +from astrodb_utils.sources import ( + logger, + AstroDBError, +) +from simple.utils.spectral_types import ( + ingest_spectral_type +) +from scripts.ingests.calamari.calamari_publication_helpers import ( + otherReferencesList, + ingest_resolved_children, +) + +astrodb_utils_logger = logging.getLogger("astrodb_utils") +logger.setLevel(logging.DEBUG) # Set logger to INFO/DEBUG/WARNING/ERROR/CRITICAL level +astrodb_utils_logger.setLevel(logging.DEBUG) + +SAVE_DB = True # save the data files in addition to modifying the .db file +RECREATE_DB = True # recreates the .db file from the data files +SCHEMA_PATH = "simple/schema.yaml" +db = load_astrodb( + "SIMPLE.sqlite", + recreatedb=RECREATE_DB, + reference_tables=REFERENCE_TABLES, + felis_schema=SCHEMA_PATH, +) + +link = ( + "scripts/ingests/calamari/calamari_data.csv" +) +link_2 = ( + "scripts/ingests/calamari/calamari_refs.csv" +) + +calamari_table = ascii.read( + link, + format="csv", + data_start=1, + header_start=0, + guess=False, + fast_reader=False, + delimiter=",", +) + +ref_table = ascii.read( + link_2, + format="csv", + data_start=0, + header_start=0, + guess=False, + fast_reader=False, + delimiter=",", +) + +spectral_types_ingested = 0 +sources_ingested = 0 +spectral_types_already_exist = 0 +binaries = [ + "HD 130948BC", + "HD 130948C", + "HD 130948B", + "Gl 337CD", + "Gl 337C", + "Gl 337D", + "Gl 417BC", + "Gl 417B", + "Gl 417C" +] +#ingest Gl 337CD +ingest_resolved_children( + db=db, + source = "Gl 337CD", + reference = "GaiaEDR3", + ra = 138.0584919, + dec=14.9956706, + ra_col_name="ra", + dec_col_name="dec", + other_reference="Wils01" +) +sources_ingested+=1 + +ingest_resolved_children( + db=db, + source = "Gl 417BC", + reference="GaiaEDR3", + ra = 168.1055653, + dec = 35.8028953, + ra_col_name="ra", + dec_col_name="dec", + other_reference="Kirk00" +) +sources_ingested+=1 + +for row in calamari_table: + object = row["Object"] + object_spt = row["SpT_Secondary"] + ignore_neighbors = False + + if object == "WISE J124332.17+600126.6": + ingest_spectral_type( + db=db, + source = object, + spectral_type_string=object_spt, + reference = "Fahe21", + regime = "unknown", + ) + spectral_types_ingested+=1 + continue + if object == "2MASS J00250365+4759191": + ingest_spectral_type( + db=db, + source = object, + spectral_type_string=object_spt, + reference="Reid06.891", + regime = "unknown" + ) + spectral_types_ingested+=1 + continue + + reference = otherReferencesList(db = db, ref = row["Ref"], ref_table=ref_table)[0] + + if object in binaries: + ignore_neighbors=True + try: + #ingest spectral types for the objects + ingest_spectral_type( + db=db, + source = object, + spectral_type_string=object_spt, + regime = "unknown", + reference = reference, + ignore_neighbors=ignore_neighbors + ) + spectral_types_ingested+=1 + logger.info(f"ingested spectral type for {object}") + except AstroDBError as e: + msg = "ingest failed with error: " + str(e) + logger.warning(msg) + if "Spectral type already in the database" in str(e): + spectral_types_already_exist+=1 + else: + raise e + +logger.info(f"Spectral type already exists: {spectral_types_already_exist}") # 0 already exists in database +logger.info(f"Spectral types ingested: {spectral_types_ingested}") # 64 spectral types ingested +logger.info(f"sources ingested: {sources_ingested}") # 2 sources ingested +logger.info(f"total: {spectral_types_ingested+spectral_types_already_exist}") # 64 total spectral types +if SAVE_DB: + db.save_database(directory="data/") \ No newline at end of file diff --git a/simple/utils/spectral_types.py b/simple/utils/spectral_types.py index 5ddb562d3..0d5cd5ab2 100644 --- a/simple/utils/spectral_types.py +++ b/simple/utils/spectral_types.py @@ -28,6 +28,7 @@ def ingest_spectral_type( comments: str = None, reference: str = None, raise_error: bool = True, + ignore_neighbors: bool = False ): """ Script to ingest spectral types @@ -61,13 +62,16 @@ def ingest_spectral_type( None """ - db_name = find_source_in_db(db, source) - if len(db_name) != 1: - msg = f"No unique source match for {source} in the database " - raise AstroDBError(msg) + if not ignore_neighbors: + db_name = find_source_in_db(db, source) + if len(db_name) != 1: + msg = f"No unique source match for {source} in the database " + raise AstroDBError(msg) + else: + db_name = db_name[0] else: - db_name = db_name[0] + db_name = source # Check for duplicates duplicate_check = ( @@ -82,18 +86,18 @@ def ingest_spectral_type( ) .count() ) - - if duplicate_check > 0: - msg = f"Spectral type already in the database: {db_name}, {spectral_type_string}, {regime}, {reference}" - if raise_error: - logger.error(msg) - raise AstroDBError(msg) + if not ignore_neighbors: + if duplicate_check > 0: + msg = f"Spectral type already in the database: {db_name}, {spectral_type_string}, {regime}, {reference}" + if raise_error: + logger.error(msg) + raise AstroDBError(msg) + else: + logger.warning(msg) else: - logger.warning(msg) - else: - logger.debug( - f"No duplicate spectral types found for : {db_name}, {regime}, {reference}" - ) + logger.debug( + f"No duplicate spectral types found for : {db_name}, {regime}, {reference}" + ) adopted = adopt_spectral_type(db, db_name, spectral_type_error) diff --git a/tests/test_data.py b/tests/test_data.py index 1f2b9b396..9307ed8d8 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -19,7 +19,7 @@ def test_sources(db): assert n_sources == 3618, f"found {n_sources} sources" n_names = db.query(db.Names).count() - assert n_names == 9215, f"found {n_names} names" + assert n_names == 9214, f"found {n_names} names" @pytest.mark.parametrize( @@ -157,13 +157,13 @@ def test_missions(db): f"found {len(s)} sources with Gaia EDR3 parallax " f"and no Gaia EDR3 designation in Names " ) - assert len(s) == 1, msg + assert len(s) == 39, msg # Test to verify existing counts of spectral types grouped by regime @pytest.mark.parametrize( ("regime", "n_spectra"), - [("optical", 1494), ("nir", 2644), ("mir", 0), ("unknown", 11)], + [("optical", 1494), ("nir", 2644), ("mir", 0), ("unknown", 75)], ) def test_spectral_types_regimes(db, regime, n_spectra): t = db.query(db.SpectralTypes).filter(db.SpectralTypes.c.regime == regime).astropy() @@ -173,7 +173,7 @@ def test_spectral_types_regimes(db, regime, n_spectra): # Test numbers of MLTY dwarfs @pytest.mark.parametrize( ("string", "code_min", "code_max", "n_spectra"), - [("M", 60, 70, 967), ("L", 70, 80, 2084), ("T", 80, 90, 1039), ("Y", 90, 100, 59)], + [("M", 60, 70, 967), ("L", 70, 80, 2134), ("T", 80, 90, 1053), ("Y", 90, 100, 59)], ) # Total number of MLTY dwarfs = 3863 def test_spectral_types_classes(db, string, code_min, code_max, n_spectra): result = ( @@ -192,7 +192,7 @@ def test_spectral_types_classes(db, string, code_min, code_max, n_spectra): def test_spectral_types(db): n_spectral_types = db.query(db.SpectralTypes).count() - assert n_spectral_types == 4149, f"found {n_spectral_types} spectral types" + assert n_spectral_types == 4213, f"found {n_spectral_types} spectral types" print(f"found {n_spectral_types} total spectral types") n_photometric_spectral_types = ( @@ -208,7 +208,7 @@ def test_spectral_types(db): db.query(db.SpectralTypes).filter(db.SpectralTypes.c.adopted == 1).count() ) assert ( - n_adopted_spectral_types == 288 + n_adopted_spectral_types == 344 ), f"found {n_adopted_spectral_types} adopted spectral types" print(f"found {n_adopted_spectral_types} adopted spectral types") diff --git a/tests/test_data_astrometry.py b/tests/test_data_astrometry.py index b8734e933..2206aa38f 100644 --- a/tests/test_data_astrometry.py +++ b/tests/test_data_astrometry.py @@ -5,7 +5,7 @@ def test_parallax_refs(db): # Test total adopted measuruments t = db.query(db.Parallaxes).filter(db.Parallaxes.c.adopted == 1).astropy() - assert len(t) == 1876, f"found {len(t)} adopted parallax measuruments." + assert len(t) == 1901, f"found {len(t)} adopted parallax measuruments." ref = "GaiaDR3" t = db.query(db.Parallaxes).filter(db.Parallaxes.c.reference == ref).astropy() @@ -24,7 +24,7 @@ def test_parallax_refs(db): ref = "GaiaEDR3" t = db.query(db.Parallaxes).filter(db.Parallaxes.c.reference == ref).astropy() - assert len(t) == 1134, f"found {len(t)} parallax reference entries for {ref}" + assert len(t) == 1172, f"found {len(t)} parallax reference entries for {ref}" t = ( db.query(db.Parallaxes) @@ -32,7 +32,7 @@ def test_parallax_refs(db): .astropy() ) assert ( - len(t) == 1077 + len(t) == 1115 ), f"found {len(t)} adopted parallax reference entries for {ref}" ref = "Kirk21" @@ -44,7 +44,7 @@ def test_parallax_refs(db): .filter(and_(db.Parallaxes.c.reference == ref, db.Parallaxes.c.adopted == 1)) .astropy() ) - assert len(t) == 248, f"found {len(t)} adopted parallax reference entries for {ref}" + assert len(t) == 247, f"found {len(t)} adopted parallax reference entries for {ref}" ref = "Kirk19" t = db.query(db.Parallaxes).filter(db.Parallaxes.c.reference == ref).astropy()