Mawsons lensing code

zdm/MC_sample/loading.py

@@ -91,11 +91,15 @@ def set_state(alpha_method=1, cosmo=Planck18):
 
 
 def survey_and_grid(survey_name:str='CRAFT/CRACO_1_5000',
+            opdir='',
+            bPosNum=0,
             init_state=None,
             state_dict=None, iFRB:int=0,
                alpha_method=1, NFRB:int=100, 
                lum_func:int=2,sdir=None,nz=500,ndm=1400,
-               nbins=5,edir=''):
+               nbins=5, cluster=False,
+               clusterRedshift=np.nan, 
+               lensing=False):
     """ Load up a survey and grid for a CRACO mock dataset
 
     Args:
@@ -108,10 +112,7 @@ def survey_and_grid(survey_name:str='CRAFT/CRACO_1_5000',
             0=power-law, 1=gamma, 2=gamma+spline.  Defaults to 0.
         state_dict (dict, optional):
             Used to init state instead of alpha_method, lum_func parameters
-        sdir (string, optional): Directory containing surveys
-        edir (string, optional): 
-            Directory containing efficiency files if using FRB-specific responses
-
+
     Raises:
         IOError: [description]
 
@@ -139,18 +140,31 @@ def survey_and_grid(survey_name:str='CRAFT/CRACO_1_5000',
         datdir=resource_filename('zdm', 'GridData'),
         zlog=False,nz=nz,ndm=ndm)
 
+
     ############## Initialise surveys ##############
     if sdir is not None:
         print("Searching for survey in directory ",sdir)
     else:
         sdir = os.path.join(resource_filename('zdm', 'craco'), 'MC_Surveys')
-    isurvey = survey.load_survey(survey_name, state, dmvals,
-                                 NFRB=NFRB, sdir=sdir, nbins=nbins,
-                                 iFRB=iFRB, edir=edir)
+    isurvey = survey.load_survey(
+                survey_name = survey_name,
+                state = state, 
+                opdir = opdir,
+                bPosNum = bPosNum,
+                dmvals = dmvals, 
+                cluster = cluster,
+                clusterRedshift = clusterRedshift, 
+                zvals = zvals, 
+                lensing = lensing, 
+                NFRB=NFRB, 
+                sdir=sdir, 
+                nbins=nbins,
+                iFRB=iFRB
+    )
 
     # generates zdm grid
     grids = misc_functions.initialise_grids(
-        [isurvey], zDMgrid, zvals, dmvals, state, wdist=True)
+        [isurvey], opdir, bPosNum, zDMgrid, zvals, dmvals, state, wdist=True, cluster=cluster, clusterRedshift = clusterRedshift)
     print("Initialised grid")
 
     # Return Survey and Grid

zdm/data/Surveys/CHIME_SynthBeam.ecsv

@@ -0,0 +1,28 @@
+# %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": 0, "TOBS": 1, "MAX_DM": 7000},
+#                   "telescope": {"BMETHOD": 0, "DIAM": 80.0, "NBEAMS": 1,
+#                       "NBINS": 100, "THRESH":5.0, "TRES":1.0,
+#                       "FRES":0.025,"FBAR":600, "BTHRESH":0.001, "BW":400}}'}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z
+DUMMY 400 300 30.0 600  0.025  "" "" 8 8.    5.    1.0  1    1.0  ""   ""  0.3

zdm/data/Surveys/CHORD.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 1200,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 0.625,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD1_5.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 420.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 240,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 11.18,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD2_5.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 660.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 240,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 11.18,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD3_5.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 240,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 11.18,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD4_5.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 1140.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 240,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 11.18,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD5_5.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 1380.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 240,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 11.18,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORDSB1_4.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 6.0,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0019,\n  \
+#      \"BW\": 1200,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 5.0,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD_BeamPos_0.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 1200,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 5,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD_BeamPos_1.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 1200,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 5,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z

zdm/data/Surveys/CHORD_BeamPos_10.ecsv

@@ -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: "{\n    \"observing\": {\n        \"NORM_FRB\": 0,\n        \"TOBS\": 1\n    },\n \
+#   \"telescope\": {\n     \"BEAM\": \"IGNORE\",\n        \"DIAM\": 48,\n        \"BMETHOD\": 0,\n  \
+#      \"FBAR\": 900.0,\n        \"NBEAMS\": 1,\n        \"TRES\": 1.0,\n        \"FRES\": 0.0375,\n  \
+#      \"BW\": 1200,\n        \"BTHRESH\": 0.001,\n    \"THRESH\": 5,\n        \"NBINS\": 10\n    }\n}"}
+# schema: astropy-2.0
+TNS BW DM DMG FBAR FRES Gb Gl SNR SNRTHRESH THRESH TRES WIDTH XC XDec XRA Z