Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MCMC paper #51

Merged
merged 35 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
bba4311
Initial commit for implementing repeaters
JordanHoffmann3 Dec 14, 2023
c67de3e
Debugged repetition
JordanHoffmann3 Jan 8, 2024
d66852b
Changed real_loading to loading. Fixed bug in uDMG.
JordanHoffmann3 Jan 10, 2024
9bad92d
Merge branch 'main' into repeaters
JordanHoffmann3 Jan 10, 2024
29bb663
Merge branch 'main' into repeaters
JordanHoffmann3 Jan 12, 2024
02b7ede
Added MCMC2 which initialises on every step
JordanHoffmann3 Jan 22, 2024
4722924
Bugfixed to recalc efficiencies with DMhalo change and lEmin error
JordanHoffmann3 Feb 27, 2024
1ed18d2
Include sigmaDMhalo
JordanHoffmann3 Mar 6, 2024
e260884
Fixed bugs: Fth not included, normalisation with uDMG, included uHalo
JordanHoffmann3 May 1, 2024
a4aed27
Changed to incorporate max_dm for P(N)
JordanHoffmann3 May 2, 2024
a7254ed
Added max DM search for Pn calc
JordanHoffmann3 May 6, 2024
2e9b0cb
Changed Eths in P(SNR) to evaluate at DMobs exactly
JordanHoffmann3 May 9, 2024
765da6d
Scripts and final commit for MCMC paper
JordanHoffmann3 May 20, 2024
c441e44
Modified plotting scripts
JordanHoffmann3 May 30, 2024
171656d
remove 3.9
profxj May 30, 2024
eaad162
Cleaning up MCMC methods
JordanHoffmann3 Jun 4, 2024
7c85448
Cleaning up files for publication
JordanHoffmann3 Jun 4, 2024
948e601
Tidy up and bugfixes
JordanHoffmann3 Jun 5, 2024
24b1a3b
Added option for directional dependent halo and cleanup
JordanHoffmann3 Jun 6, 2024
8791e89
Merge
JordanHoffmann3 Jun 6, 2024
45e5dee
Merging
JordanHoffmann3 Jun 6, 2024
f09abec
Merging...
JordanHoffmann3 Jun 6, 2024
5d8f8b2
Temp
JordanHoffmann3 Jun 7, 2024
5c572f4
Merging
JordanHoffmann3 Jun 7, 2024
15d4894
Merge branch 'main' into MCMCreps
JordanHoffmann3 Jun 7, 2024
1447f34
Bugfixed halo_method and created notebooks folder
JordanHoffmann3 Jun 10, 2024
e3877b6
Added example params file
JordanHoffmann3 Jun 10, 2024
b5f1a21
updated tests
JordanHoffmann3 Jun 10, 2024
42eab15
Publish CRAFT surveys
JordanHoffmann3 Jun 10, 2024
1f8b036
Added comments on notebook and updated tests
JordanHoffmann3 Jun 10, 2024
250ea08
Bugfixed oldsurvey issue
JordanHoffmann3 Jun 10, 2024
983362f
Updated tests
JordanHoffmann3 Jun 10, 2024
4047a6c
Added comments on scripts
JordanHoffmann3 Jun 10, 2024
9053cff
Updated 1272 to 1300
JordanHoffmann3 Jun 12, 2024
cb2c746
Fixed imports for update test
JordanHoffmann3 Jun 12, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python: ['3.9','3.10']
python: ['3.10', '3.11']
toxenv: [test, test-alldeps, test-astropydev]
steps:
- name: Check out repository
Expand Down
39 changes: 39 additions & 0 deletions papers/MCMC/Surveys/CRAFT_ICS_1300_14.ecsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# %ECSV 1.0
# ---
# datatype:
# - {name: TNS, datatype: string}
# - {name: BW, datatype: float64}
# - {name: DM, datatype: float64}
# - {name: DMG, datatype: float64}
# - {name: FBAR, datatype: float64}
# - {name: FRES, datatype: float64}
# - {name: Gb, datatype: string, subtype: 'float64[null]'}
# - {name: Gl, datatype: string, subtype: 'float64[null]'}
# - {name: SNR, datatype: float64}
# - {name: SNRTHRESH, datatype: float64}
# - {name: THRESH, datatype: float64}
# - {name: TRES, datatype: float64}
# - {name: WIDTH, datatype: float64}
# - {name: XDec, datatype: string}
# - {name: XRA, datatype: string}
# - {name: Z, datatype: float64}
# meta: !!omap
# - {survey_data: '{"observing": {"NORM_FRB": 5, "TOBS": 165.506756761, "MAX_IDT": 4096},
# "telescope": {"BEAM": "ASKAP_1300", "DIAM": 12.0, "NBEAMS": 36, "NBINS": 5}}'}
# schema: astropy-2.0
TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XDec XRA Z
20180924B 336.0 362.4 40.5 1297.5 1.0 "" "" 21.1 14.0 6.8 0.864 1.76 -40:54:00.1 21:44:25.255 0.3214
20181112A 336.0 589.0 40.2 1297.5 1.0 "" "" 19.3 14.0 6.8 0.864 2.1 -52:58:15.39 21:49:23.630 0.4755
20190102C 336.0 364.5 57.3 1271.5 1.0 "" "" 14.0 14.0 6.8 0.864 1.7 -79:28:32.2845 21:29:39.70836 0.291
20190608B 336.0 339.5 37.2 1271.5 1.0 "" "" 16.1 14.0 6.8 1.728 6.0 -07:53:53.6 22:16:04.7472s 0.1178
20190711A 336.0 594.6 56.6 1271.5 1.0 "" "" 23.8 14.0 6.8 1.728 6.5 -80:21:28.18 21:57:40.012 0.522
20190714A 336.0 504.7 38.5 1271.5 1.0 "" "" 10.7 14.0 6.8 1.728 2.9 -13:01:14.36 12:15:55.081 0.2365
20191228A 336.0 297.5 32.9 1271.5 1.0 "" "" 22.9 14.0 6.8 1.728 2.3 -29:35:37.85 22:57:43.269 0.243
20210117A 336.0 730.0 34.4 1271.5 1.0 "" "" 27.1 14.0 6.8 1.182 3.4 -16:11:25.2 22:39:36.0 0.214
20210407 336.0 1785.3 154.0 1271.5 1.0 "" "" 19.1 14.0 6.8 1.182 8.0 27:03:30.24 05:14:36.202 -1.0
20210912 336.0 1234.5 30.9 1271.5 1.0 "" "" 31.7 14.0 6.8 1.182 5.5 -30:29:33.1 23:24:40.3 -1.0
20211127 336.0 234.83 42.5 1271.5 1.0 "" "" 37.9 14.0 6.8 1.182 1.41 -18:49:28.4 13:19:09.5 0.046946
20220610A 336.0 1458.1 31 1271.5 1.0 "" "" 29.8 14.0 6.8 1.182 5.6 -33:30:49.87 23:24:17.559 1.016
20220918A 336.0 656.8 40.7 1271.5 1.0 "" "" 26.4 14.0 6.8 1.182 7.1 -70:48:40.5 01:10:22.1 0.45
20230526A 336.0 316.4 50 1271.5 1.0 "" "" 22.1 14.0 6.8 1.182 2.6 "" "" 0.157
20230731A 336.0 701.1 547 1271.5 1.0 "" "" 16.6 14.0 6.8 1.182 3.3 "" "" -1
27 changes: 27 additions & 0 deletions papers/MCMC/Surveys/CRAFT_ICS_1632_14.ecsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# %ECSV 1.0
# ---
# datatype:
# - {name: TNS, datatype: string}
# - {name: BW, datatype: float64}
# - {name: DM, datatype: float64}
# - {name: DMG, datatype: float64}
# - {name: FBAR, datatype: float64}
# - {name: FRES, datatype: float64}
# - {name: Gb, datatype: string, subtype: 'float64[null]'}
# - {name: Gl, datatype: string, subtype: 'float64[null]'}
# - {name: SNR, datatype: float64}
# - {name: SNRTHRESH, datatype: float64}
# - {name: THRESH, datatype: float64}
# - {name: TRES, datatype: float64}
# - {name: WIDTH, datatype: float64}
# - {name: XC, datatype: string}
# - {name: XDec, datatype: string}
# - {name: XRA, datatype: string}
# - {name: Z, datatype: float64}
# meta: !!omap
# - {survey_data: '{"observing": {"NORM_FRB": 1, "TOBS": 50.866971336, "MAX_IDT": 4096},
# "telescope": {"BEAM": "ASKAP_1632", "DIAM": 12.0, "NBEAMS": 1, "NBINS": 5}}'}
# schema: astropy-2.0
TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z
20221106 336.0 343.8 34.8 1631.5 1.0 "" "" 19.5 14.0 6.8 1.182 5.7 closepack36/45/0.9 -25:34:10.5166 03:46:49.0982 0.204

37 changes: 37 additions & 0 deletions papers/MCMC/Surveys/CRAFT_ICS_892_14.ecsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# %ECSV 1.0
# ---
# datatype:
# - {name: TNS, datatype: string}
# - {name: BW, datatype: float64}
# - {name: DM, datatype: float64}
# - {name: DMG, datatype: float64}
# - {name: FBAR, datatype: float64}
# - {name: FRES, datatype: float64}
# - {name: Gb, datatype: string, subtype: 'float64[null]'}
# - {name: Gl, datatype: string, subtype: 'float64[null]'}
# - {name: SNR, datatype: float64}
# - {name: SNRTHRESH, datatype: float64}
# - {name: THRESH, datatype: float64}
# - {name: TRES, datatype: float64}
# - {name: WIDTH, datatype: float64}
# - {name: XC, datatype: string}
# - {name: XDec, datatype: string}
# - {name: XRA, datatype: string}
# - {name: Z, datatype: float64}
# meta: !!omap
# - {survey_data: '{"observing": {"NORM_FRB": 11, "TOBS": 317.293429793, "MAX_IDT": 4096},
# "telescope": {"BEAM": "ASKAP_892", "DIAM": 12.0, "NBEAMS": 1, "NBINS": 5}}'}
# schema: astropy-2.0
TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z
20191001A 336.0 506.92 44.2 919.5 1.0 "" "" 62.0 14.0 6.8 1.728 4.2 closepack36/45 -54:44:54 21:33:24 0.23
20200430A 336.0 380.1 27.0 864.5 1.0 "" "" 16.0 14.0 6.8 1.728 6.5 square_6x6 12:22:34.007 15:18:49.581 0.161
20200906A 336.0 577.8 35.9 864.5 1.0 "" "" 19.2 14.0 6.8 1.728 6.0 closepack36 -14:04:59.9136 03:33:58.9364 0.36879
20210320 336.0 384.8 42.2 864.5 1.0 "" "" 15.3 14.0 6.8 1.728 5.4 square_6x6/45/1.05 -16:09:05.1 13:37:50.08605 0.28
20210807 336.0 251.9 121.2 920.5 1.0 "" "" 47.1 14.0 6.8 1.182 10.0 square6x6/45/0.9 -00:45:44.5 19:56:53.144 0.12969
20210809 336.0 651.5 190.1 920.5 1.0 "" "" 16.8 14.0 6.8 1.182 14.2 square6x6/45/0.9 01:19:43.5 18:04:37.7 -1.0
20211203 336.0 636.2 63.4 920.5 1.0 "" "" 14.2 14.0 6.8 1.182 9.6 closepack36/45/0.9 -31:22:04.0 13:37:52.8 0.34386
20220501C 336.0 449.5 30.6 863.5 1.0 "" "" 16.1 14.0 6.8 1.182 6.5 square6x6/45/1.05 "" "" 0.381
20230521A 336.0 640.2 41.8 831.5 1.0 "" "" 15.2 14.0 6.8 1.182 11 square6x6/45/1.05 "" "" -1
20230708A 336.0 411.5 50.2 920.5 1.0 "" "" 31.5 14.0 6.8 1.182 2.7 closepack36/45/0.9 "" "" 0.105
20231006 336.0 509.7 67.5 863.5 1.0 "" "" 15.2 14.0 6.8 1.182 6.5 square6x6/45/1.05 -64:38:56.2 19:44:00.8 -1
20231226 336.0 329.9 38.0 863.5 1.0 "" "" 17.8 14.0 6.8 1.182 7.1 square6x6/45/1.05 06:07:45.9 10:21:07.6 -1
101 changes: 101 additions & 0 deletions papers/MCMC/params.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"cube": {
"parameter_order": ["lC", "sfr_n", "alpha", "lmean", "lsigma", "lEmax", "gamma", "H0"]
},
"mcmc": {
"parameter_order": ["sfr_n", "alpha", "lmean", "lsigma", "lEmax", "lEmin", "gamma", "DMhalo", "H0"]
},
"mcmc_full": {
"parameter_order": ["logF", "sfr_n", "alpha", "lmean", "lsigma", "lEmax", "lEmin", "gamma", "H0", "DMhalo", "lRmin", "lRmax", "Rgamma", "sigmaDMG"]
},
"config": {
"luminosity_function": 2,
"alpha_method": 1
},
"logF": {
"DC": "cosmo",
"min": -2.0,
"max": 0.0
},
"lEmax": {
"DC": "energy",
"min": 40.5,
"max": 45.0,
"n": 10
},
"lEmin": {
"DC": "energy",
"min": 36.0,
"max": 40.5
},
"DMhalo": {
"DC": "MW",
"min": 30.0,
"max": 180.0
},
"sigmaDMG": {
"DC": "MW",
"min": 0.1,
"max": 0.5
},
"H0": {
"DC": "cosmo",
"min": 35.0,
"max": 110.0,
"n": 10
},
"alpha": {
"DC": "energy",
"min": -2.0,
"max": 5.0,
"n": 3
},
"gamma": {
"DC": "energy",
"min": -4.0,
"max": 1.0,
"n": 4
},
"sfr_n": {
"DC": "FRBdemo",
"min": -2.0,
"max": 6.0,
"n": 10
},
"lmean": {
"DC": "host",
"min": 1.0,
"max": 3.0,
"n": 4
},
"lsigma": {
"DC": "host",
"min": 0.1,
"max": 1.5,
"n": 4
},
"lRmin": {
"DC": "rep",
"min": -2.0,
"max": 1.0,
"n": 4
},
"lRmax": {
"DC": "rep",
"min": 0.0,
"max": 4.0,
"n": 4
},
"Rgamma": {
"DC": "rep",
"min": -3.0,
"max": -0.5,
"n": 4
},
"lC": {
"DC": "FRBdemo",
"min": -1.0,
"max": -0.9,
"n": -1
}
}
Loading
Loading