finishing requested changes

FRBs · Jul 7, 2023 · 0a47dc9 · 0a47dc9
1 parent a386fe7
commit 0a47dc9
Show file tree

Hide file tree

Showing 16 changed files with 105 additions and 411 deletions.
diff --git a/frb/associate/frbs.py b/frb/associate/frbs.py
@@ -46,7 +46,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.252202*units.arcsec,
 )
-FRB20190608B = {**base_config, **updates}  # Use | in 3.9
+FRB20190608B = base_config | updates
 
 
 # ##############################
@@ -64,7 +64,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.1459 * units.arcsec,
 )
-FRB20121102A = {**base_config, **updates}  # Use | in 3.9
+FRB20121102A = base_config | updates
 
 # ##############################
 # FRB 180916
@@ -81,7 +81,7 @@
     cand_separation=20*units.arcsec,
     plate_scale = 0.1616 * units.arcsec,
 )
-FRB20180916B = {**base_config, **updates}  # Use | in 3.9
+FRB20180916B = base_config | updates
 
 
 # ##############################
@@ -97,7 +97,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.25226 * units.arcsec,
 )
-FRB20180924B = {**base_config, **updates}  # Use | in 3.9
+FRB20180924B = base_config | updates
 
 # ##############################
 # FRB 181112
@@ -112,7 +112,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.25226 * units.arcsec,
 )
-FRB20181112A = {**base_config, **updates}  # Use | in 3.9
+FRB20181112A = base_config | updates
 
 # ##############################
 # FRB 190102
@@ -127,7 +127,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.252 * units.arcsec,
 )
-FRB20190102C = {**base_config, **updates}  # Use | in 3.9
+FRB20190102C = base_config | updates
 
 # ##############################
 # FRB 20190520B
@@ -141,7 +141,7 @@
     plate_scale = 0.28 * units.arcsec,
     cand_separation=10*units.arcsec,
 )
-FRB20190520B = {**base_config, **updates}  # Use | in 3.9
+FRB20190520B = base_config | updates
 
 # ##############################
 # FRB 190523
@@ -155,7 +155,7 @@
     plate_scale = 0.28 * units.arcsec,
     cand_separation=10*units.arcsec,
 )
-FRB20190523A = {**base_config, **updates}  # Use | in 3.9
+FRB20190523A = base_config | updates
 
 # ##############################
 # FRB 190611
@@ -169,7 +169,7 @@
     plate_scale = 0.160 * units.arcsec,
     cand_separation=10*units.arcsec,
 )
-FRB20190611B = {**base_config, **updates}
+FRB20190611B = base_config | updates
 
 # ##############################
 # FRB 190614
@@ -183,7 +183,7 @@
     plate_scale = 0.135 * units.arcsec,
     cand_separation=10*units.arcsec,
 )
-FRB20190614D = {**base_config, **updates}
+FRB20190614D = base_config | updates
 
 # ##############################
 # FRB 190711
@@ -202,7 +202,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.160*units.arcsec,
 )
-FRB20190711A = {**base_config, **updates}  # Use | in 3.9
+FRB20190711A = base_config | updates
 
 # ##############################
 # FRB 190714A
@@ -220,7 +220,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.252*units.arcsec,
 )
-FRB20190714A = {**base_config, **updates}  # Use | in 3.9
+FRB20190714A = base_config | updates
 
 # ##############################
 # FRB 191001
@@ -238,7 +238,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.252*units.arcsec,
 )
-FRB20191001A = {**base_config, **updates}  # Use | in 3.9
+FRB20191001A = base_config | updates
 
 # ##############################
 # FRB 191228
@@ -257,7 +257,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.252*units.arcsec,
 )
-FRB20191228A = {**base_config, **updates}  # Use | in 3.9
+FRB20191228A = base_config | updates
 
 ##############################
 # FRB 200430
@@ -275,7 +275,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.134*units.arcsec,
 )
-FRB20200430A = {**base_config, **updates}  # Use | in 3.9
+FRB20200430A = base_config | updates
 
 # ##############################
 # FRB 200906
@@ -295,7 +295,7 @@
     cand_separation=10*units.arcsec,
     plate_scale=0.252*units.arcsec,
 )
-FRB20200906A = {**base_config, **updates}  # Use | in 3.9
+FRB20200906A = base_config | updates
 
 ##############################
 # FRB 180301
@@ -314,7 +314,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.1616 * units.arcsec,
 )
-FRB20180301A = {**base_config, **updates}  # Use | in 3.9
+FRB20180301A = base_config | updates
 #
 #
 
@@ -332,7 +332,7 @@
     cand_separation=10*units.arcsec,
     plate_scale = 0.250 * units.arcsec,
 )
-FRB20201124A = {**base_config, **updates}  # Use | in 3.9
+FRB20201124A = base_config | updates
 #
 #
 ##############################

diff --git a/frb/data/Galaxies/20180916B/FRB20180916B_host.json b/frb/data/Galaxies/20180916B/FRB20180916B_host.json
@@ -160,17 +160,17 @@
         "SDSS_g_err": 0.08271651,
         "SDSS_g_flux": 0.536699504454394,
         "SDSS_g_flux_err": 0.042486152379357434,
-        "SDSS_g_ref": "Gordon2023",
+        "SDSS_g_ref": "Heintz2020",
         "SDSS_i": 15.933784000000001,
         "SDSS_i_err": 0.02263959,
         "SDSS_i_flux": 1.5363366617691698,
         "SDSS_i_flux_err": 0.03237176789245194,
-        "SDSS_i_ref": "Gordon2023",
+        "SDSS_i_ref": "Heintz2020",
         "SDSS_r": 16.170141,
         "SDSS_r_err": 0.03178847,
         "SDSS_r_flux": 1.2357869203292875,
         "SDSS_r_flux_err": 0.036716570189002574,
-        "SDSS_r_ref": "Gordon2023",
+        "SDSS_r_ref": "Heintz2020",
         "SDSS_u": 20.314096,
         "SDSS_u_err": 1.781266,
         "SDSS_u_flux": 0.02718701922420491,
@@ -180,7 +180,7 @@
         "SDSS_z_err": 0.06344854,
         "SDSS_z_flux": 1.6575460174286705,
         "SDSS_z_flux_err": 0.09975034598134898,
-        "SDSS_z_ref": "Gordon2023",
+        "SDSS_z_ref": "Heintz2020",
         "WFC3_F110W": 15.421191273417758,
         "WFC3_F110W_err": 0.005,
         "WFC3_F110W_flux": 2.4633350420456646,

diff --git a/frb/data/Galaxies/20180924B/FRB20180924B_host.json b/frb/data/Galaxies/20180924B/FRB20180924B_host.json
@@ -221,15 +221,15 @@
         "WISE_W1_flux_err": 0.013059014302971891,
         "WISE_W1_ref": "Gordon2023",
         "WISE_W2": 19.291362762451172,
-        "WISE_W2_err": -999.0,
+        "WISE_W2_err": 999.0,
         "WISE_W2_flux": 0.06973565369844437,
         "WISE_W2_flux_err": -99.0,
         "WISE_W3": 16.384897232055664,
-        "WISE_W3_err": -999.0,
+        "WISE_W3_err": 999.0,
         "WISE_W3_flux": 1.014007329940796,
         "WISE_W3_flux_err": -99.0,
         "WISE_W4": 14.614919662475586,
-        "WISE_W4_err": -999.0,
+        "WISE_W4_err": 999.0,
         "WISE_W4_flux": 5.17645263671875,
         "WISE_W4_flux_err": -99.0
     },

diff --git a/frb/data/Galaxies/20181112A/FRB20181112A_host.json b/frb/data/Galaxies/20181112A/FRB20181112A_host.json
@@ -132,31 +132,31 @@
         "DELVE_z_err": 0.173927,
         "DELVE_z_flux": 0.009536818695581623,
         "DELVE_z_flux_err": 0.00165689839419985,
-        "DES_Y": 21.052882045916252,
-        "DES_Y_err": 0.1685202122,
-        "DES_Y_flux": 0.013767249273186953,
-        "DES_Y_flux_err": 0.0023116109867497934,
-        "DES_Y_ref": "Gordon2023",
-        "DES_g": 22.642306056105884,
-        "DES_g_err": 0.08586934209,
-        "DES_g_flux": 0.0031847663204781756,
-        "DES_g_flux_err": 0.00026210689032795813,
-        "DES_g_ref": "Gordon2023",
-        "DES_i": 21.460648105135895,
-        "DES_i_err": 0.06129874289,
-        "DES_i_flux": 0.009456724830846915,
-        "DES_i_flux_err": 0.0005492694287875597,
-        "DES_i_ref": "Gordon2023",
-        "DES_r": 21.682705132459073,
-        "DES_r_err": 0.05068262666,
-        "DES_r_flux": 0.007707578228382421,
-        "DES_r_flux_err": 0.00036832287488935224,
-        "DES_r_ref": "Gordon2023",
-        "DES_z": 21.422575659879588,
-        "DES_z_err": 0.1065403894,
-        "DES_z_flux": 0.009794217188419437,
-        "DES_z_flux_err": 0.001009815415272402,
-        "DES_z_ref": "Gordon2023",
+        "DES_Y": 21.052882046111552,
+        "DES_Y_err": 0.168520212173462,
+        "DES_Y_flux": 0.013767249270710507,
+        "DES_Y_flux_err": 0.002311610985940975,
+        "DES_Y_ref": "Prochaska2019",
+        "DES_g": 22.642306060681083,
+        "DES_g_err": 0.0858693420886993,
+        "DES_g_flux": 0.003184766307057847,
+        "DES_g_flux_err": 0.0002621068892193334,
+        "DES_g_ref": "Prochaska2019",
+        "DES_i": 21.4606481006925,
+        "DES_i_err": 0.061298742890358,
+        "DES_i_flux": 0.009456724869548747,
+        "DES_i_flux_err": 0.0005492694310387544,
+        "DES_i_ref": "Prochaska2019",
+        "DES_r": 21.682705130896572,
+        "DES_r_err": 0.0506826266646385,
+        "DES_r_flux": 0.007707578239474526,
+        "DES_r_flux_err": 0.0003683228754539125,
+        "DES_r_ref": "Prochaska2019",
+        "DES_z": 21.42257566035809,
+        "DES_z_err": 0.106540389358997,
+        "DES_z_flux": 0.009794217184102965,
+        "DES_z_flux_err": 0.0010098154144193435,
+        "DES_z_ref": "Prochaska2019",
         "EBV": 0.0174,
         "VISTA_J": 20.95619708158382,
         "VISTA_J_err": 0.02227128196,

diff --git a/frb/data/Galaxies/20190608B/FRB20190608B_host.json b/frb/data/Galaxies/20190608B/FRB20190608B_host.json
@@ -255,7 +255,7 @@
         "WISE_W3_flux_err": 0.1012260276707851,
         "WISE_W3_ref": "Gordon2023",
         "WISE_W4": 14.360668182373047,
-        "WISE_W4_err": -999.0,
+        "WISE_W4_err": 999.0,
         "WISE_W4_flux": 6.542331695556641,
         "WISE_W4_flux_err": -99.0
     },

diff --git a/frb/data/Galaxies/20190714A/FRB20190714A_host.json b/frb/data/Galaxies/20190714A/FRB20190714A_host.json
@@ -152,31 +152,31 @@
         "DELVE_z_flux": 0.05705454787801134,
         "DELVE_z_flux_err": 0.0018492731884400598,
         "EBV": 0.0525,
-        "Pan-STARRS_g": 20.907203013490285,
-        "Pan-STARRS_g_err": 0.04324100167,
-        "Pan-STARRS_g_flux": 0.015744134415761946,
-        "Pan-STARRS_g_flux_err": 0.0006396863990369857,
-        "Pan-STARRS_g_ref": "Gordon2023",
-        "Pan-STARRS_i": 19.836116884294857,
-        "Pan-STARRS_i_err": 0.02205199935,
-        "Pan-STARRS_i_flux": 0.04222340379534297,
-        "Pan-STARRS_i_flux_err": 0.0008663527460285471,
-        "Pan-STARRS_i_ref": "Gordon2023",
-        "Pan-STARRS_r": 20.339864254973044,
-        "Pan-STARRS_r_err": 0.03209400177,
-        "Pan-STARRS_r_flux": 0.02654937442001702,
-        "Pan-STARRS_r_flux_err": 0.0007965049080648168,
-        "Pan-STARRS_r_ref": "Gordon2023",
-        "Pan-STARRS_y": 19.442511969605068,
-        "Pan-STARRS_y_err": 0.06084499881,
-        "Pan-STARRS_y_flux": 0.06067296327419008,
-        "Pan-STARRS_y_flux_err": 0.003497209111789732,
-        "Pan-STARRS_y_ref": "Gordon2023",
-        "Pan-STARRS_z": 19.644477332960566,
-        "Pan-STARRS_z_err": 0.03058199957,
-        "Pan-STARRS_z_flux": 0.05037430427590645,
-        "Pan-STARRS_z_flux_err": 0.0014390681972240116,
-        "Pan-STARRS_z_ref": "Gordon2023",
+        "Pan-STARRS_g": 20.907203012669974,
+        "Pan-STARRS_g_err": 0.043241001665592194,
+        "Pan-STARRS_g_flux": 0.015744134427657205,
+        "Pan-STARRS_g_flux_err": 0.0006396863994537787,
+        "Pan-STARRS_g_ref": "Bhandari2021",
+        "Pan-STARRS_i": 19.836116885579035,
+        "Pan-STARRS_i_err": 0.02205199934542179,
+        "Pan-STARRS_i_flux": 0.04222340374540236,
+        "Pan-STARRS_i_flux_err": 0.0008663527448221534,
+        "Pan-STARRS_i_ref": "Bhandari2021",
+        "Pan-STARRS_r": 20.339864250500387,
+        "Pan-STARRS_r_err": 0.03209400177001953,
+        "Pan-STARRS_r_flux": 0.026549374529386372,
+        "Pan-STARRS_r_flux_err": 0.0007965049113464901,
+        "Pan-STARRS_r_ref": "Bhandari2021",
+        "Pan-STARRS_y": 19.442511968926357,
+        "Pan-STARRS_y_err": 0.06084499880671501,
+        "Pan-STARRS_y_flux": 0.06067296331211768,
+        "Pan-STARRS_y_flux_err": 0.0034972091137817447,
+        "Pan-STARRS_y_ref": "Bhandari2021",
+        "Pan-STARRS_z": 19.644477330211544,
+        "Pan-STARRS_z_err": 0.030581999570131302,
+        "Pan-STARRS_z_flux": 0.05037430440345137,
+        "Pan-STARRS_z_flux_err": 0.0014390682008739153,
+        "Pan-STARRS_z_ref": "Bhandari2021",
         "VISTA_H": 18.796677134617983,
         "VISTA_H_err": 0.01203702621,
         "VISTA_H_flux": 0.10998390629590934,
@@ -228,11 +228,11 @@
         "WISE_W2_flux_err": 0.021277911246823367,
         "WISE_W2_ref": "Gordon2023",
         "WISE_W3": 16.618148803710938,
-        "WISE_W3_err": -999.0,
+        "WISE_W3_err": 999.0,
         "WISE_W3_flux": 0.8179755210876465,
         "WISE_W3_flux_err": -99.0,
         "WISE_W4": 14.919539451599121,
-        "WISE_W4_err": -999.0,
+        "WISE_W4_err": 999.0,
         "WISE_W4_flux": 3.9100661277770996,
         "WISE_W4_flux_err": -99.0
     },

diff --git a/frb/data/Galaxies/20191001A/FRB20191001A_host.json b/frb/data/Galaxies/20191001A/FRB20191001A_host.json
@@ -172,7 +172,7 @@
         "DES_Y_err": 0.011325641,
         "DES_Y_flux": 0.31992125300908186,
         "DES_Y_flux_err": 0.0033546611607634326,
-        "DES_Y_ref": "Gordon2023",
+        "DES_Y_ref": "Heintz2020",
         "DES_g": 19.136268669620417,
         "DES_g_err": 0.0034412236,
         "DES_g_flux": 0.08044379052683032,
@@ -182,7 +182,7 @@
         "DES_i_err": 0.0023633414,
         "DES_i_flux": 0.2471691640812011,
         "DES_i_flux_err": 0.0005386035178837401,
-        "DES_i_ref": "Gordon2023",
+        "DES_i_ref": "Heintz2020",
         "DES_r": 18.35024025813585,
         "DES_r_err": 0.0021133334,
         "DES_r_flux": 0.16592196830516784,

diff --git a/frb/data/Galaxies/20200430A/FRB20200430A_host.json b/frb/data/Galaxies/20200430A/FRB20200430A_host.json
@@ -142,21 +142,21 @@
         "Pan-STARRS_g_flux": 0.004654593265103259,
         "Pan-STARRS_g_flux_err": 0.0004617601589009483,
         "Pan-STARRS_g_ref": "Bhandari2021",
-        "Pan-STARRS_i": 20.982708736701028,
-        "Pan-STARRS_i_err": 0.05153400078,
-        "Pan-STARRS_i_flux": 0.014686438791194797,
-        "Pan-STARRS_i_flux_err": 0.0007138937931281356,
-        "Pan-STARRS_i_ref": "Gordon2023",
+        "Pan-STARRS_i": 20.982708732477395,
+        "Pan-STARRS_i_err": 0.05153400078415871,
+        "Pan-STARRS_i_flux": 0.014686438848326678,
+        "Pan-STARRS_i_flux_err": 0.0007138937959642477,
+        "Pan-STARRS_i_ref": "Bhandari2021",
         "Pan-STARRS_r": 21.263428038876693,
         "Pan-STARRS_r_err": 0.0739310011267662,
         "Pan-STARRS_r_flux": 0.011340410586624059,
         "Pan-STARRS_r_flux_err": 0.0007991000281303365,
         "Pan-STARRS_r_ref": "Bhandari2021",
-        "Pan-STARRS_y": 20.68040824417792,
-        "Pan-STARRS_y_err": 0.1810850054,
-        "Pan-STARRS_y_flux": 0.019401562030325177,
-        "Pan-STARRS_y_flux_err": 0.0035213980864633584,
-        "Pan-STARRS_y_ref": "Gordon2023",
+        "Pan-STARRS_y": 20.680408242434755,
+        "Pan-STARRS_y_err": 0.181085005402565,
+        "Pan-STARRS_y_flux": 0.019401562061474593,
+        "Pan-STARRS_y_flux_err": 0.0035213980921711525,
+        "Pan-STARRS_y_ref": "Heintz2020",
         "Pan-STARRS_z": 20.71567247089687,
         "Pan-STARRS_z_err": 0.09693799912929535,
         "Pan-STARRS_z_flux": 0.01878153162725466,