diff --git a/Paper/AllSkyMC/AllSkyMC_repeat.sh b/Paper/AllSkyMC/AllSkyMC_repeat.sh index 0f98c59e2193363a0f61d499da7226571ab60008..badf6b84cc8d83c1f1d544ea548cb965a855135c 100755 --- a/Paper/AllSkyMC/AllSkyMC_repeat.sh +++ b/Paper/AllSkyMC/AllSkyMC_repeat.sh @@ -4,7 +4,7 @@ export PATH="/home/gregory.ashton/anaconda2/bin:$PATH" export MPLCONFIGDIR=/home/gregory.ashton/.config/matplotlib -for ((n=0;n<1;n++)) +for ((n=0;n<10;n++)) do /home/gregory.ashton/anaconda2/bin/python generate_data.py "$1" /local/user/gregory.ashton --no-template-counting --no-interactive done diff --git a/Paper/AllSkyMC/generate_data.py b/Paper/AllSkyMC/generate_data.py index 23c1589cf181030dd486d21642a4c37a7eff0b26..e5f93237d94cd692882007b31dbf59d093ae1af9 100644 --- a/Paper/AllSkyMC/generate_data.py +++ b/Paper/AllSkyMC/generate_data.py @@ -32,6 +32,7 @@ DeltaAlpha = 0.02 DeltaDelta = 0.02 depths = np.linspace(100, 400, 9) +depths = [118.75, 156.25] nsteps = 50 run_setup = [((nsteps, 0), 20, False), diff --git a/Paper/AllSkyMC/generate_table.py b/Paper/AllSkyMC/generate_table.py index 0cf34001a0895a36aec32785a6ef51cfcf0611a5..01ddfe5e1591981c8c9452a627875628b790107b 100644 --- a/Paper/AllSkyMC/generate_table.py +++ b/Paper/AllSkyMC/generate_table.py @@ -82,7 +82,7 @@ mcmc = pyfstat.MCMCFollowUpSearch( sftfilepath='{}/*{}*sft'.format(outdir, data_label), theta_prior=theta_prior, tref=tref, minStartTime=tstart, maxStartTime=tend, - nwalkers=nwalkers, ntemps=ntemps, nsteps=[nsteps, nsteps] + nwalkers=nwalkers, ntemps=ntemps, nsteps=[nsteps, nsteps], log10temperature_min=log10temperature_min) -#mcmc.run(Nsegs0=20, R=10) -mcmc.run(run_setup) +mcmc.run(Nsegs0=20, R=10) +#mcmc.run(run_setup) diff --git a/Paper/AllSkyMC/runTimeHist.png b/Paper/AllSkyMC/runTimeHist.png index 1335a76b9c0a12c3b73208e637c1d8b7dff68645..75e39cdc4303c0f3f6046c4a0a2ec08882b8feca 100644 Binary files a/Paper/AllSkyMC/runTimeHist.png and b/Paper/AllSkyMC/runTimeHist.png differ diff --git a/Paper/AllSkyMC/submitfile b/Paper/AllSkyMC/submitfile index 2354ed631ad6ac25fcaa1b7fd28994dc2e2cfffd..4be5e0c5217bd26e13796bafe6566b60c94ba99e 100644 --- a/Paper/AllSkyMC/submitfile +++ b/Paper/AllSkyMC/submitfile @@ -9,4 +9,4 @@ Log=CollectedOutput/log.$(Cluster).$(Process) request_cpus = 1 request_memory = 16 GB -Queue 70 +Queue 1 diff --git a/Paper/DirectedMC/DirectedMC_repeat.sh b/Paper/DirectedMC/DirectedMC_repeat.sh index 0f98c59e2193363a0f61d499da7226571ab60008..badf6b84cc8d83c1f1d544ea548cb965a855135c 100755 --- a/Paper/DirectedMC/DirectedMC_repeat.sh +++ b/Paper/DirectedMC/DirectedMC_repeat.sh @@ -4,7 +4,7 @@ export PATH="/home/gregory.ashton/anaconda2/bin:$PATH" export MPLCONFIGDIR=/home/gregory.ashton/.config/matplotlib -for ((n=0;n<1;n++)) +for ((n=0;n<10;n++)) do /home/gregory.ashton/anaconda2/bin/python generate_data.py "$1" /local/user/gregory.ashton --no-template-counting --no-interactive done diff --git a/Paper/DirectedMC/generate_data.py b/Paper/DirectedMC/generate_data.py index 2e4c7ef17d364cff68a3a424f1e3b1675521c4ae..3e57334a7f948f549c4b2c6f78c0b6fa71ddf2ea 100644 --- a/Paper/DirectedMC/generate_data.py +++ b/Paper/DirectedMC/generate_data.py @@ -31,6 +31,7 @@ DeltaF0 = VF0 * np.sqrt(3)/(np.pi*Tspan) DeltaF1 = VF1 * np.sqrt(45/4.)/(np.pi*Tspan**2) depths = np.linspace(100, 400, 9) +depths = [118.75, 156.25] nsteps = 25 run_setup = [((nsteps, 0), 20, False), diff --git a/Paper/DirectedMC/plot_data.py b/Paper/DirectedMC/plot_data.py index c87fc8fe77124ede20d8215cc29683e93b1bd40b..6f3e7aa5c25c157fb8355d449e37e569763a2129 100644 --- a/Paper/DirectedMC/plot_data.py +++ b/Paper/DirectedMC/plot_data.py @@ -33,10 +33,7 @@ for fn in filenames: df = pd.read_csv( fn, sep=' ', names=['depth', 'h0', 'dF0', 'dF1', 'twoF', 'runTime']) df['CLUSTER_ID'] = fn.split('_')[1] - if len(df) != 9: - print len(df), fn - else: - df_list.append(df) + df_list.append(df) df = pd.concat(df_list) twoFstar = 60 @@ -81,10 +78,9 @@ fig.tight_layout() fig.savefig('directed_recovery.png') -total_number_steps = 5*20. -df_clean = df[df.CLUSTER_ID == '969049'] # Hack due to a change in the code +total_number_steps = 5*25. fig, ax = plt.subplots() -ax.hist(df_clean.runTime/total_number_steps, bins=50) +ax.hist(df.runTime/total_number_steps, bins=50) ax.set_xlabel('run-time per step [s]') fig.tight_layout() fig.savefig('runTimeHist.png') diff --git a/Paper/DirectedMC/runTimeHist.png b/Paper/DirectedMC/runTimeHist.png index 38b0640185d0a10a7ee1148f0e85ccedcae5c62b..7cfbd5251a835709bcc34557513715c9e4916380 100644 Binary files a/Paper/DirectedMC/runTimeHist.png and b/Paper/DirectedMC/runTimeHist.png differ diff --git a/Paper/DirectedMC/submitfile b/Paper/DirectedMC/submitfile index e468d6d7b30eff9fdb725c4ef9719404bf2d3c71..50a1130d98f23c532f6b0f9c67085800940541cc 100644 --- a/Paper/DirectedMC/submitfile +++ b/Paper/DirectedMC/submitfile @@ -9,4 +9,4 @@ Log=CollectedOutput/log.$(Cluster).$(Process) request_cpus = 1 request_memory = 16 GB -Queue 6 +Queue 1 diff --git a/Paper/allsky_recovery.png b/Paper/allsky_recovery.png index f4ae8ed3c4c99982c8200ecfbf3b0eff02170b52..c85ac93bcff11bf9e9d8487171cbe221b6437787 100644 Binary files a/Paper/allsky_recovery.png and b/Paper/allsky_recovery.png differ diff --git a/Paper/directed_recovery.png b/Paper/directed_recovery.png index 6799cffed4b184a9851ce36d916929ab9d362687..5b0dfb25e6c479cb4ea7eea0c3fe4ab05e97ba75 100644 Binary files a/Paper/directed_recovery.png and b/Paper/directed_recovery.png differ