diff --git a/bilby/core/sampler/pymc3.py b/bilby/core/sampler/pymc3.py index a6e83cc936db564f1baccc0950d025b0d4239967..7b9d6e675d40b1f05ac4b70bcc17e7957a4ec4e5 100644 --- a/bilby/core/sampler/pymc3.py +++ b/bilby/core/sampler/pymc3.py @@ -57,8 +57,8 @@ class Pymc3(MCMCSampler): default_kwargs = dict( draws=500, step=None, init='auto', n_init=200000, start=None, trace=None, chain_idx=0, chains=2, cores=1, tune=500, nuts_kwargs=None, step_kwargs=None, progressbar=True, - model=None, random_seed=None, live_plot=False, discard_tuned_samples=True, - live_plot_kwargs=None, compute_convergence_checks=True) + model=None, random_seed=None, discard_tuned_samples=True, + compute_convergence_checks=True) def __init__(self, likelihood, priors, outdir='outdir', label='label', use_ratio=False, plot=False, diff --git a/bilby/gw/detector/strain_data.py b/bilby/gw/detector/strain_data.py index 84f763337c4beb7c56175b38487fe9b132d91878..d88b6330df34e14e840ddd244012b685b2024867 100644 --- a/bilby/gw/detector/strain_data.py +++ b/bilby/gw/detector/strain_data.py @@ -56,7 +56,7 @@ class InterferometerStrainData(object): self._times_and_frequencies = CoupledTimeAndFrequencySeries() - self._freq_mask_updated = False + self._frequency_mask_updated = False self._frequency_mask = None self._frequency_domain_strain = None self._time_domain_strain = None @@ -107,7 +107,7 @@ class InterferometerStrainData(object): @minimum_frequency.setter def minimum_frequency(self, minimum_frequency): self._minimum_frequency = minimum_frequency - self._freq_mask_updated = False + self._frequency_mask_updated = False @property def maximum_frequency(self): @@ -120,7 +120,7 @@ class InterferometerStrainData(object): @maximum_frequency.setter def maximum_frequency(self, maximum_frequency): self._maximum_frequency = maximum_frequency - self.__freq_mask_updated = False + self._frequency_mask_updated = False @property def frequency_mask(self): @@ -130,11 +130,12 @@ class InterferometerStrainData(object): ------- array_like: An array of boolean values """ - if not self.__freq_mask_updated: + if not self._frequency_mask_updated: frequency_array = self._times_and_frequencies.frequency_array mask = ((frequency_array >= self.minimum_frequency) & (frequency_array <= self.maximum_frequency)) self._frequency_mask = mask + self._frequency_mask_updated = True return self._frequency_mask @property diff --git a/test/sampler_test.py b/test/sampler_test.py index 8f58b70dca460ac46949e2d810b8f2847dc7719a..8053ff8c54164dde94a18b20829e9947b0a4c81a 100644 --- a/test/sampler_test.py +++ b/test/sampler_test.py @@ -370,16 +370,16 @@ class TestPyMC3(unittest.TestCase): expected = dict( draws=500, step=None, init='auto', n_init=200000, start=None, trace=None, chain_idx=0, chains=2, cores=1, tune=500, nuts_kwargs=None, step_kwargs=None, progressbar=True, - model=None, random_seed=None, live_plot=False, discard_tuned_samples=True, - live_plot_kwargs=None, compute_convergence_checks=True) + model=None, random_seed=None, discard_tuned_samples=True, + compute_convergence_checks=True) self.assertDictEqual(expected, self.sampler.kwargs) def test_translate_kwargs(self): expected = dict( draws=500, step=None, init='auto', n_init=200000, start=None, trace=None, chain_idx=0, chains=2, cores=1, tune=500, nuts_kwargs=None, step_kwargs=None, progressbar=True, - model=None, random_seed=None, live_plot=False, discard_tuned_samples=True, - live_plot_kwargs=None, compute_convergence_checks=True) + model=None, random_seed=None, discard_tuned_samples=True, + compute_convergence_checks=True) self.sampler.kwargs['draws'] = 123 for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs: new_kwargs = self.sampler.kwargs.copy()