diff --git a/bilby/bilby_mcmc/sampler.py b/bilby/bilby_mcmc/sampler.py index 9aeaa731d035619fe58ba82fb6b98150a398e25b..c8ccf253f087fdd66f0a3cacf17a4ca92fc38f30 100644 --- a/bilby/bilby_mcmc/sampler.py +++ b/bilby/bilby_mcmc/sampler.py @@ -388,7 +388,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 a2fa4cfa9db63458731e6492a1aec60e500658c8..76e4dd1ebec11907cd3c90552ecfe2f188f9961d 100644 --- a/bilby/core/sampler/emcee.py +++ b/bilby/core/sampler/emcee.py @@ -312,9 +312,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 e3aef85abf0b17d5e6ab74bb4edbdf567fabb4ae..467751959013a7db6a7e5332bbd7c1044d55c91d 100644 --- a/bilby/core/sampler/kombine.py +++ b/bilby/core/sampler/kombine.py @@ -167,9 +167,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 5184734506c9f4c9fac6e81c510fe5cb8581614a..1d74a6f6adc1871eb2fb68d8ed4dbe1301639493 100644 --- a/bilby/core/sampler/ptemcee.py +++ b/bilby/core/sampler/ptemcee.py @@ -416,9 +416,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 @@ -517,7 +517,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,