Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions frb/associate/frbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
for tns_name in ['FRB20180924B','FRB20181112A','FRB20190102C','FRB20190608B','FRB20190611B',
'FRB20190711A','FRB20190714A','FRB20191001A','FRB20191228A',
'FRB20200430A','FRB20200906A','FRB20210117A','FRB20210320C','FRB20210807D',
'FRB20210912A',
'FRB20211127I','FRB20211203C', 'FRB20211212A','FRB20220105A','FRB20220501C',
'FRB20220610A','FRB20220725A','FRB20220918A', 'FRB20221106A',
'FRB20230526A','FRB20230708A',
Expand All @@ -391,6 +392,7 @@
images = glob.glob(os.path.join(gdb_path, 'CRAFT',
'Shannon2024',
f'{tns_name}_VLT-FORS2_*.fits'))
images.sort()
use_this_image = None
for ifilter in ['FORS2_R','FORS2_I','FORS2_g']:
for image in images:
Expand All @@ -400,15 +402,6 @@
break
if use_this_image is not None:
break
#if 'FORS2_R' in image:
# use_this_image = image
# ifilter = 'VLT_FORS2_R'
#if use_this_image is None and 'FORS2_I' in image:
# use_this_image = image
# ifilter = 'VLT_FORS2_I'
#if use_this_image is None and 'FORS2_g' in image:
# use_this_image = image
# ifilter = 'VLT_FORS2_g'
if use_this_image is None:
#embed(header=f'No image found for {tns_name}')
raise IOError("No image found")
Expand All @@ -434,6 +427,10 @@
elif tns_name == 'FRB20190608B':
updates['cand_bright'] = 15.
updates['cut_size'] = 34.
elif tns_name == 'FRB20190711A': # g-band image
updates['cand_bright'] = 19.2 # remove nearby star
assert 'FORS2_g' in images[1]
updates['image_file'] = images[1]
elif tns_name == 'FRB20211212A': # Large SDSS galaxy
updates['cut_size'] = 90.
updates['cand_bright'] = 15.
Expand Down
22 changes: 14 additions & 8 deletions frb/builds/build_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,13 @@ def main(options:str=None, frb:str=None):
# Generate FRBs for PATH analysis
frb_list = host_tbl.FRB.values.tolist()
else:
# Generate the list
frb_list = frb.split(',')
# CSV?
if frb.endswith('.csv'):
df = pandas.read_csv(frb)
frb_list = df.TNS.values.tolist()
else:
# Generate the list
frb_list = frb.split(',')
#ifrb = [FRB.by_name(ifrb) for ifrb in frbs]
#host = ifrb.grab_host()
#frb_list = [ifrb.frb_name]
Expand All @@ -164,18 +169,19 @@ def main(options:str=None, frb:str=None):
# Load prior
priors = load_std_priors()
prior = priors['adopted'] # Default
# Shannon+2025 revised prior
theta_new = dict(method='exp',
max=priors['adopted']['theta']['max'],
scale=0.5)
prior['theta'] = theta_new
prior['U'] = 0.1
print("Using new prior with scale=0.5 and P(U) = 0.1")

# Parse optionsd
write_indiv = False
show = False
add_skipped = False
if options is not None:
if 'new_prior' in options:
theta_new = dict(method='exp',
max=priors['adopted']['theta']['max'],
scale=0.5)
prior['theta'] = theta_new
print("Using new prior with scale=0.5")
if 'write_indiv' in options:
write_indiv = True
if 'show' in options:
Expand Down
2 changes: 1 addition & 1 deletion frb/data/FRBs/FRB20190608B.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 38.06340155213544
"value": 38.063401552135424
},
"DM_err": {
"unit": "pc / cm3",
Expand Down
8 changes: 4 additions & 4 deletions frb/data/FRBs/FRB20190711A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 55.9311071184651
"value": 55.93110567077387
},
"DM_err": {
"unit": "pc / cm3",
Expand All @@ -21,10 +21,10 @@
"value": 2.0
},
"cosmo": "Planck18",
"dec": -80.358032227,
"dec": -80.358028611,
"eellipse": {
"a": 2.409,
"b": 1.281,
"b": 1.28,
"cl": 68.0,
"theta": -67.96
},
Expand All @@ -36,7 +36,7 @@
"unit": "Jy ms",
"value": 3.0
},
"ra": 329.417236328,
"ra": 329.417225,
"refs": [
"MacQuart2020",
"Day2020",
Expand Down
6 changes: 3 additions & 3 deletions frb/data/FRBs/FRB20191001A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 44.70338012418955
"value": 44.703374089604
},
"DM_err": {
"unit": "pc / cm3",
Expand All @@ -21,7 +21,7 @@
"value": 0.9
},
"cosmo": "Planck18",
"dec": -54.748306274,
"dec": -54.748305556,
"eellipse": {
"a": 0.46,
"b": 0.43,
Expand Down Expand Up @@ -63,7 +63,7 @@
"value": 0.2
}
},
"ra": 323.35168457,
"ra": 323.351695833,
"refs": [
"Bhandari2020b",
"Day2021",
Expand Down
16 changes: 6 additions & 10 deletions frb/data/FRBs/FRB20191228A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,26 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 33.88106565644879
"value": 33.88103230189731
},
"DM_err": {
"unit": "pc / cm3",
"value": 0.05
},
"FRB": "FRB20191228A",
"cosmo": "Planck18",
"dec": -29.59408333,
"dec": -29.594116667,
"eellipse": {
"a": 0.34,
"a_sys": 0.83,
"b": 0.34,
"b_sys": 0.823,
"a": 0.84,
"b": 0.76,
"cl": 68.0,
"cl_sys": 68.0,
"theta": 0.0,
"theta_sys": 0.0
"theta": -29.34
},
"fluence": {
"unit": "Jy ms",
"value": 40.0
},
"ra": 344.4304167,
"ra": 344.430529167,
"refs": [
"Bhandari2021",
"Day2021"
Expand Down
6 changes: 3 additions & 3 deletions frb/data/FRBs/FRB20200430A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 27.019684869084777
"value": 27.01968641732365
},
"FRB": "FRB20200430A",
"cosmo": "Planck18",
"dec": 12.376329422,
"dec": 12.376328889,
"eellipse": {
"a": 0.459,
"b": 0.43,
Expand All @@ -24,7 +24,7 @@
"unit": "Jy ms",
"value": 4.0
},
"ra": 229.706451416,
"ra": 229.706454167,
"refs": [
"Bhandari2021",
"Day2021"
Expand Down
8 changes: 4 additions & 4 deletions frb/data/FRBs/FRB20200906A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 35.92456175099442
"value": 35.92456249219822
},
"DM_err": {
"unit": "pc / cm3",
"value": 0.02
},
"FRB": "FRB20200906A",
"cosmo": "Planck18",
"dec": -14.083008766,
"dec": -14.083008333,
"eellipse": {
"a": 0.51,
"b": -0.47,
"b": 0.47,
"cl": 68.0,
"theta": 39.0
},
"fluence": {
"unit": "Jy ms",
"value": 59.0
},
"ra": 53.495544434,
"ra": 53.495545833,
"refs": [
"Bhandari2021",
"Day2021"
Expand Down
7 changes: 3 additions & 4 deletions frb/data/FRBs/FRB20210117A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 35.07712398840523
"value": 35.07712027434532
},
"DM_err": {
"unit": "pc / cm3",
"value": 0.1
},
"FRB": "FRB20210117A",
"cosmo": "Planck18",
"dec": -16.151445389,
"dec": -16.151445278,
"eellipse": {
"a": 0.418,
"b": 0.417,
Expand All @@ -24,8 +24,7 @@
"unit": "Jy ms",
"value": 36.0
},

"ra": 339.979187012,
"ra": 339.979195833,
"refs": [
"Shannon2024",
"Gordon2023"
Expand Down
6 changes: 3 additions & 3 deletions frb/data/FRBs/FRB20210320C.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 38.65484807789649
"value": 38.65484745915762
},
"DM_err": {
"unit": "pc / cm3",
"value": 1.0
},
"FRB": "FRB20210320C",
"cosmo": "Planck18",
"dec": -16.12266922,
"dec": -16.122669722,
"eellipse": {
"a": 0.471,
"b": 0.452,
Expand All @@ -24,7 +24,7 @@
"unit": "Jy ms",
"value": 21.0
},
"ra": 204.458770752,
"ra": 204.458766667,
"refs": [
"Shannon2024",
"Gordon2023"
Expand Down
24 changes: 14 additions & 10 deletions frb/data/FRBs/FRB20210912A.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,30 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 32.21668765129594
"value": 32.21667647472079
},
"DM_err": {
"unit": "pc / cm3",
"value": 1.0
},
"FRB": "FRB20210912A",
"cosmo": "Planck18",
"dec": -30.405431,
"dec": -30.405580278,
"eellipse": {
"a": 0.3,
"a_sys": 0.6,
"b": 0.2,
"b_sys": 0.5,
"a": 0.437,
"b": 0.433,
"cl": 68.0,
"cl_sys": 68.0,
"theta": 90.0,
"theta_sys": 90.0
"theta": 66.1
},
"ra": 350.793433,
"fluence": {
"unit": "Jy ms",
"value": 90.0
},
"fluence_err": {
"unit": "Jy ms",
"value": 15.0
},
"ra": 350.793504167,
"refs": [
"Marnoch2023"
],
Expand Down
6 changes: 3 additions & 3 deletions frb/data/FRBs/FRB20211127I.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 41.6861013151882
"value": 41.686101787288266
},
"DM_err": {
"unit": "pc / cm3",
"value": 1.0
},
"FRB": "FRB20211127I",
"cosmo": "Planck18",
"dec": -18.837911606,
"dec": -18.837911111,
"eellipse": {
"a": 0.51,
"b": 0.51,
Expand All @@ -28,7 +28,7 @@
"unit": "Jy ms",
"value": 1.0
},
"ra": 199.808807373,
"ra": 199.8088125,
"refs": [
"Shannon2024",
"Gordon2023"
Expand Down
4 changes: 2 additions & 2 deletions frb/data/FRBs/FRB20211203C.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
},
"DMISM": {
"unit": "pc / cm3",
"value": 61.42216783149751
"value": 61.42216883267918
},
"DM_err": {
"unit": "pc / cm3",
"value": 1.0
},
"FRB": "FRB20211203C",
"cosmo": "Planck18",
"dec": -31.38026619,
"dec": -31.380266667,
"eellipse": {
"a": 0.44,
"b": 0.44,
Expand Down
Loading
Loading