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

Minor improvements to the logging output

parent 095ecdd1
Branches
No related tags found
No related merge requests found
...@@ -88,7 +88,7 @@ def read_par(label, outdir): ...@@ -88,7 +88,7 @@ def read_par(label, outdir):
if len(line.split('=')) > 1: if len(line.split('=')) > 1:
key, val = line.rstrip('\n').split(' = ') key, val = line.rstrip('\n').split(' = ')
key = key.strip() key = key.strip()
d[key] = np.float64(val.rstrip('; ')) d[key] = np.float64(eval(val.rstrip('; ')))
return d return d
...@@ -215,11 +215,14 @@ class ComputeFstat(object): ...@@ -215,11 +215,14 @@ class ComputeFstat(object):
constraints.maxStartTime = lal.LIGOTimeGPS(self.maxStartTime) constraints.maxStartTime = lal.LIGOTimeGPS(self.maxStartTime)
self.sft_filepath = self.sftdir+'/*_'+self.sftlabel+"*sft" self.sft_filepath = self.sftdir+'/*_'+self.sftlabel+"*sft"
logging.info('Loading data matching pattern {}'.format(
self.sft_filepath))
SFTCatalog = lalpulsar.SFTdataFind(self.sft_filepath, constraints) SFTCatalog = lalpulsar.SFTdataFind(self.sft_filepath, constraints)
names = list(set([d.header.name for d in SFTCatalog.data])) names = list(set([d.header.name for d in SFTCatalog.data]))
epochs = [d.header.epoch for d in SFTCatalog.data]
logging.info( logging.info(
'Loaded data from detectors {} matching pattern {}'.format( 'Loaded {} data files from detectors {} spanning {} to {}'.format(
names, self.sft_filepath)) len(epochs), names, int(epochs[0]), int(epochs[-1])))
logging.info('Initialising ephems') logging.info('Initialising ephems')
ephems = lalpulsar.InitBarycenter(self.earth_ephem, self.sun_ephem) ephems = lalpulsar.InitBarycenter(self.earth_ephem, self.sun_ephem)
...@@ -545,7 +548,7 @@ class MCMCSearch(BaseSearchClass): ...@@ -545,7 +548,7 @@ class MCMCSearch(BaseSearchClass):
self.log_input() self.log_input()
def log_input(self): def log_input(self):
logging.info('Input prior dictionary: {}'.format(self.theta_prior)) logging.info('theta_prior = {}'.format(self.theta_prior))
logging.info('nwalkers={}'.format(self.nwalkers)) logging.info('nwalkers={}'.format(self.nwalkers))
logging.info('scatter_val = {}'.format(self.scatter_val)) logging.info('scatter_val = {}'.format(self.scatter_val))
logging.info('nsteps = {}'.format(self.nsteps)) logging.info('nsteps = {}'.format(self.nsteps))
...@@ -680,7 +683,7 @@ class MCMCSearch(BaseSearchClass): ...@@ -680,7 +683,7 @@ class MCMCSearch(BaseSearchClass):
ninit_steps = len(self.nsteps) - 2 ninit_steps = len(self.nsteps) - 2
for j, n in enumerate(self.nsteps[:-2]): for j, n in enumerate(self.nsteps[:-2]):
logging.info('Running {}/{} initialisation with {} steps'.format( logging.info('Running {}/{} initialisation with {} steps'.format(
j, ninit_steps, n)) j+1, ninit_steps, n))
sampler.run_mcmc(p0, n) sampler.run_mcmc(p0, n)
logging.info("Mean acceptance fraction: {0:.3f}" logging.info("Mean acceptance fraction: {0:.3f}"
.format(np.mean(sampler.acceptance_fraction))) .format(np.mean(sampler.acceptance_fraction)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment