diff --git a/bilby/bilby_mcmc/sampler.py b/bilby/bilby_mcmc/sampler.py index 453584270ab530fc2254800863e410146da5e73c..bddc797fd996d26e7b271f4877bee27d5672937a 100644 --- a/bilby/bilby_mcmc/sampler.py +++ b/bilby/bilby_mcmc/sampler.py @@ -382,7 +382,9 @@ class Bilby_MCMC(MCMCSampler): If true, resume file was successfully loaded, otherwise false """ - if os.path.isfile(self.resume_file) is False or not os.path.getsize(self.resume_file): + if os.path.isfile(self.resume_file) is False or not os.path.getsize( + self.resume_file + ): return False import dill diff --git a/bilby/core/sampler/emcee.py b/bilby/core/sampler/emcee.py index 78539b82605021bdee8b1f746c208ce1e6349571..603530550743b0a0d7c47b6827e2e665e21e7154 100644 --- a/bilby/core/sampler/emcee.py +++ b/bilby/core/sampler/emcee.py @@ -311,9 +311,9 @@ class Emcee(MCMCSampler): if hasattr(self, "_sampler"): pass elif ( - self.resume and - os.path.isfile(self.checkpoint_info.sampler_file) and - os.path.getsize(self.checkpoint_info.sampler_file) + self.resume + and os.path.isfile(self.checkpoint_info.sampler_file) + and os.path.getsize(self.checkpoint_info.sampler_file) ): import dill diff --git a/bilby/core/sampler/kombine.py b/bilby/core/sampler/kombine.py index b11a9cec4564015642ce65abeae19a2519b8fbf2..ee5f2069b0c967c92001a7b0503a5f7ad703ac17 100644 --- a/bilby/core/sampler/kombine.py +++ b/bilby/core/sampler/kombine.py @@ -166,9 +166,9 @@ class Kombine(Emcee): def check_resume(self): return ( - self.resume and - os.path.isfile(self.checkpoint_info.sampler_file) and - os.path.getsize(self.checkpoint_info.sampler_file) > 0 + self.resume + and os.path.isfile(self.checkpoint_info.sampler_file) + and os.path.getsize(self.checkpoint_info.sampler_file) > 0 ) @signal_wrapper diff --git a/bilby/core/sampler/ptemcee.py b/bilby/core/sampler/ptemcee.py index 013d37580f99c7715579f3b6ccbe151298f1a12d..d3e7fd1f45c9d2a820809a87271e58ac107a08cd 100644 --- a/bilby/core/sampler/ptemcee.py +++ b/bilby/core/sampler/ptemcee.py @@ -415,9 +415,9 @@ class Ptemcee(MCMCSampler): ptemcee.sampler.np.float = float if ( - os.path.isfile(self.resume_file) and - os.path.getsize(self.resume_file) and - self.resume is True + os.path.isfile(self.resume_file) + and os.path.getsize(self.resume_file) + and self.resume is True ): import dill @@ -516,7 +516,7 @@ class Ptemcee(MCMCSampler): logger.info("Starting to sample") while True: - for (pos0, log_posterior, log_likelihood) in sampler.sample( + for pos0, log_posterior, log_likelihood in sampler.sample( self.pos0, storechain=False, iterations=self.convergence_inputs.niterations_per_check,