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

Merge branch 'add-progress-bars' into 'master'

add progress bars to post-processing

See merge request !606
parents b7915477 8b42354d
No related branches found
No related tags found
1 merge request!606add progress bars to post-processing
Pipeline #81362 passed
from __future__ import division from __future__ import division
import sys
from tqdm import tqdm
import numpy as np import numpy as np
from pandas import DataFrame from pandas import DataFrame
...@@ -969,13 +971,13 @@ def compute_snrs(sample, likelihood): ...@@ -969,13 +971,13 @@ def compute_snrs(sample, likelihood):
else: else:
logger.info( logger.info(
'Computing SNRs for every sample, this may take some time.') 'Computing SNRs for every sample.')
matched_filter_snrs = { matched_filter_snrs = {
ifo.name: [] for ifo in likelihood.interferometers} ifo.name: [] for ifo in likelihood.interferometers}
optimal_snrs = {ifo.name: [] for ifo in likelihood.interferometers} optimal_snrs = {ifo.name: [] for ifo in likelihood.interferometers}
for ii in range(len(sample)): for ii in tqdm(range(len(sample)), file=sys.stdout):
signal_polarizations =\ signal_polarizations =\
likelihood.waveform_generator.frequency_domain_strain( likelihood.waveform_generator.frequency_domain_strain(
dict(sample.iloc[ii])) dict(sample.iloc[ii]))
...@@ -1030,7 +1032,7 @@ def generate_posterior_samples_from_marginalized_likelihood( ...@@ -1030,7 +1032,7 @@ def generate_posterior_samples_from_marginalized_likelihood(
new_time_samples = list() new_time_samples = list()
new_distance_samples = list() new_distance_samples = list()
new_phase_samples = list() new_phase_samples = list()
for ii in range(len(samples)): for ii in tqdm(range(len(samples)), file=sys.stdout):
sample = dict(samples.iloc[ii]).copy() sample = dict(samples.iloc[ii]).copy()
likelihood.parameters.update(sample) likelihood.parameters.update(sample)
new_sample = likelihood.generate_posterior_sample_from_marginalized_likelihood() new_sample = likelihood.generate_posterior_sample_from_marginalized_likelihood()
......
...@@ -7,3 +7,4 @@ scipy>=0.16 ...@@ -7,3 +7,4 @@ scipy>=0.16
pandas pandas
mock mock
dill dill
tqdm
...@@ -84,7 +84,8 @@ setup(name='bilby', ...@@ -84,7 +84,8 @@ setup(name='bilby',
'numpy>=1.9', 'numpy>=1.9',
'matplotlib>=2.0', 'matplotlib>=2.0',
'pandas', 'pandas',
'scipy'], 'scipy',
'tqdm'],
entry_points={'console_scripts': entry_points={'console_scripts':
['bilby_plot=cli_bilby.plot_multiple_posteriors:main', ['bilby_plot=cli_bilby.plot_multiple_posteriors:main',
'bilby_result=cli_bilby.bilby_result:main', 'bilby_result=cli_bilby.bilby_result:main',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment