Skip to content
Snippets Groups Projects
Commit 5216d198 authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Remove obsolete subtractions and style files from examples

parent 8d8c3853
Branches
Tags
No related merge requests found
...@@ -47,8 +47,8 @@ theta_prior = {'F0': {'type': 'unif', ...@@ -47,8 +47,8 @@ theta_prior = {'F0': {'type': 'unif',
'Delta': Delta 'Delta': Delta
} }
ntemps = 1 ntemps = 2
log10beta_min = -1 log10beta_min = -0.5
nwalkers = 100 nwalkers = 100
nsteps = [300, 300] nsteps = [300, 300]
...@@ -57,6 +57,9 @@ mcmc = pyfstat.MCMCSearch( ...@@ -57,6 +57,9 @@ mcmc = pyfstat.MCMCSearch(
sftfilepattern='{}/*{}*sft'.format(outdir, label), theta_prior=theta_prior, sftfilepattern='{}/*{}*sft'.format(outdir, label), theta_prior=theta_prior,
tref=tref, minStartTime=tstart, maxStartTime=tend, nsteps=nsteps, tref=tref, minStartTime=tstart, maxStartTime=tend, nsteps=nsteps,
nwalkers=nwalkers, ntemps=ntemps, log10beta_min=log10beta_min) nwalkers=nwalkers, ntemps=ntemps, log10beta_min=log10beta_min)
mcmc.run(subtractions=[F0, F1]) mcmc.transform_dictionary = dict(
F0=dict(subtractor=F0, symbol='$f-f^\mathrm{s}$'),
F1=dict(subtractor=F1, symbol='$\dot{f}-\dot{f}^\mathrm{s}$'))
mcmc.run()
mcmc.plot_corner(add_prior=True) mcmc.plot_corner(add_prior=True)
mcmc.print_summary() mcmc.print_summary()
...@@ -3,8 +3,6 @@ import numpy as np ...@@ -3,8 +3,6 @@ import numpy as np
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from projection_matrix import projection_matrix from projection_matrix import projection_matrix
plt.style.use('paper')
F0 = 30.0 F0 = 30.0
F1 = 1e-10 F1 = 1e-10
F2 = 0 F2 = 0
......
...@@ -2,8 +2,6 @@ import pyfstat ...@@ -2,8 +2,6 @@ import pyfstat
import numpy as np import numpy as np
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
plt.style.use('paper')
F0 = 30.0 F0 = 30.0
F1 = 0 F1 = 0
F2 = 0 F2 = 0
......
...@@ -56,7 +56,7 @@ mcmc = pyfstat.MCMCSearch( ...@@ -56,7 +56,7 @@ mcmc = pyfstat.MCMCSearch(
sftfilepattern='data/*'+data_label+'*sft', theta_prior=theta_prior, tref=tref, sftfilepattern='data/*'+data_label+'*sft', theta_prior=theta_prior, tref=tref,
minStartTime=tstart, maxStartTime=tend, nsteps=nsteps, nwalkers=nwalkers, minStartTime=tstart, maxStartTime=tend, nsteps=nsteps, nwalkers=nwalkers,
ntemps=ntemps, log10beta_min=log10beta_min) ntemps=ntemps, log10beta_min=log10beta_min)
mcmc.run(context='paper', subtractions=[30, -1e-10]) mcmc.run()
mcmc.plot_corner(add_prior=True) mcmc.plot_corner(add_prior=True)
mcmc.print_summary() mcmc.print_summary()
......
...@@ -2,8 +2,6 @@ import pyfstat ...@@ -2,8 +2,6 @@ import pyfstat
import numpy as np import numpy as np
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
plt.style.use('./paper-style.mplstyle')
F0 = 30.0 F0 = 30.0
F1 = -1e-10 F1 = -1e-10
F2 = 0 F2 = 0
...@@ -63,8 +61,8 @@ NstarMax = 1000 ...@@ -63,8 +61,8 @@ NstarMax = 1000
Nsegs0 = 100 Nsegs0 = 100
fig, axes = plt.subplots(nrows=2, figsize=(3.4, 3.5)) fig, axes = plt.subplots(nrows=2, figsize=(3.4, 3.5))
fig, axes = mcmc.run( fig, axes = mcmc.run(
NstarMax=NstarMax, Nsegs0=Nsegs0, subtractions=[F0, F1], labelpad=0.01, NstarMax=NstarMax, Nsegs0=Nsegs0, labelpad=0.01,
plot_det_stat=False, return_fig=True, context='paper', fig=fig, plot_det_stat=False, return_fig=True, fig=fig,
axes=axes) axes=axes)
for ax in axes: for ax in axes:
ax.grid() ax.grid()
......
...@@ -58,6 +58,9 @@ mcmc = pyfstat.MCMCSemiCoherentSearch( ...@@ -58,6 +58,9 @@ mcmc = pyfstat.MCMCSemiCoherentSearch(
theta_prior=theta_prior, tref=tref, minStartTime=tstart, maxStartTime=tend, theta_prior=theta_prior, tref=tref, minStartTime=tstart, maxStartTime=tend,
nsteps=nsteps, nwalkers=nwalkers, ntemps=ntemps, nsteps=nsteps, nwalkers=nwalkers, ntemps=ntemps,
log10beta_min=log10beta_min) log10beta_min=log10beta_min)
mcmc.transform_dictionary = dict(
F0=dict(subtractor=F0, symbol='$f-f^\mathrm{s}$'),
F1=dict(subtractor=F1, symbol='$\dot{f}-\dot{f}^\mathrm{s}$'))
mcmc.run() mcmc.run()
mcmc.plot_corner(add_prior=True) mcmc.plot_corner(add_prior=True)
mcmc.print_summary() mcmc.print_summary()
...@@ -59,6 +59,6 @@ mcmc = pyfstat.MCMCSearch( ...@@ -59,6 +59,6 @@ mcmc = pyfstat.MCMCSearch(
nsteps=nsteps, nwalkers=nwalkers, ntemps=ntemps, nsteps=nsteps, nwalkers=nwalkers, ntemps=ntemps,
log10beta_min=log10beta_min) log10beta_min=log10beta_min)
mcmc.setup_initialisation(100, scatter_val=1e-10) mcmc.setup_initialisation(100, scatter_val=1e-10)
mcmc.run(subtractions=[F0, F1]) mcmc.run()
mcmc.plot_corner(add_prior=True) mcmc.plot_corner(add_prior=True)
mcmc.print_summary() mcmc.print_summary()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment