Commit 967e1f7d authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Makes the default scat val smaller and better printing of log files

parent ad4abc08
...@@ -310,9 +310,16 @@ class ComputeFstat(object): ...@@ -310,9 +310,16 @@ class ComputeFstat(object):
if self.BSGL: if self.BSGL:
if len(names) < 2: if len(names) < 2:
raise ValueError("Can't use BSGL with single detector data") raise ValueError("Can't use BSGL with single detector data")
logging.info('Initialising BSGL with prefactor {:2.2f} and floor ' if self.BSGL_FLOOR is None:
'{:2.2f}'.format(self.BSGL_PREFACTOR, self.BSGL_FLOOR) logging.info('Initialising BSGL with prefactor {:2.2f}'
) .format(self.BSGL_PREFACTOR)
)
else:
logging.info('Initialising BSGL with prefactor {:0.2f} and '
'floor {}'.format(self.BSGL_PREFACTOR,
self.BSGL_FLOOR)
)
# Tuning parameters - to be reviewed # Tuning parameters - to be reviewed
numDetectors = 2 numDetectors = 2
Fstar0sc = 15. Fstar0sc = 15.
...@@ -512,7 +519,7 @@ class MCMCSearch(BaseSearchClass): ...@@ -512,7 +519,7 @@ class MCMCSearch(BaseSearchClass):
@initializer @initializer
def __init__(self, label, outdir, sftfilepath, theta_prior, tref, def __init__(self, label, outdir, sftfilepath, theta_prior, tref,
tstart, tend, nsteps=[100, 100, 100], nwalkers=100, ntemps=1, tstart, tend, nsteps=[100, 100, 100], nwalkers=100, ntemps=1,
log10temperature_min=-5, theta_initial=None, scatter_val=1e-4, log10temperature_min=-5, theta_initial=None, scatter_val=1e-10,
binary=False, BSGL=False, minCoverFreq=None, binary=False, BSGL=False, minCoverFreq=None,
maxCoverFreq=None, detector=None, earth_ephem=None, maxCoverFreq=None, detector=None, earth_ephem=None,
sun_ephem=None, theta0_idx=0, sun_ephem=None, theta0_idx=0,
...@@ -1292,7 +1299,7 @@ class MCMCGlitchSearch(MCMCSearch): ...@@ -1292,7 +1299,7 @@ class MCMCGlitchSearch(MCMCSearch):
def __init__(self, label, outdir, sftfilepath, theta_prior, tref, def __init__(self, label, outdir, sftfilepath, theta_prior, tref,
tstart, tend, nglitch=1, nsteps=[100, 100, 100], nwalkers=100, tstart, tend, nglitch=1, nsteps=[100, 100, 100], nwalkers=100,
ntemps=1, log10temperature_min=-5, theta_initial=None, ntemps=1, log10temperature_min=-5, theta_initial=None,
scatter_val=1e-4, dtglitchmin=1*86400, theta0_idx=0, scatter_val=1e-10, dtglitchmin=1*86400, theta0_idx=0,
detector=None, BSGL=False, detector=None, BSGL=False,
minCoverFreq=None, maxCoverFreq=None, earth_ephem=None, minCoverFreq=None, maxCoverFreq=None, earth_ephem=None,
sun_ephem=None, BSGL_PREFACTOR=1, BSGL_FLOOR=None): sun_ephem=None, BSGL_PREFACTOR=1, BSGL_FLOOR=None):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment