From 19660ff6c470277f037c68208dcedfad4d2838a8 Mon Sep 17 00:00:00 2001
From: Gregory Ashton <gregory.ashton@ligo.org>
Date: Wed, 23 Jan 2019 03:24:09 -0600
Subject: [PATCH] Elevate the warning message to an error and do the same for
emcee
---
bilby/core/sampler/emcee.py | 6 +++++-
bilby/core/sampler/ptemcee.py | 7 +++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/bilby/core/sampler/emcee.py b/bilby/core/sampler/emcee.py
index 932462884..cec198d11 100644
--- a/bilby/core/sampler/emcee.py
+++ b/bilby/core/sampler/emcee.py
@@ -4,7 +4,7 @@ import numpy as np
from pandas import DataFrame
from ..utils import logger, get_progress_bar
-from .base_sampler import MCMCSampler
+from .base_sampler import MCMCSampler, SamplerError
class Emcee(MCMCSampler):
@@ -116,6 +116,10 @@ class Emcee(MCMCSampler):
self.calculate_autocorrelation(sampler.chain.reshape((-1, self.ndim)))
self.print_nburn_logging_info()
self.result.nburn = self.nburn
+ if self.result.nburn > self.nsteps:
+ raise SamplerError(
+ "The run has finished, but the chain is not burned in: "
+ "`nburn < nsteps`. Try increasing the number of steps.")
self.result.samples = sampler.chain[:, self.nburn:, :].reshape((-1, self.ndim))
self.result.walkers = sampler.chain
self.result.log_evidence = np.nan
diff --git a/bilby/core/sampler/ptemcee.py b/bilby/core/sampler/ptemcee.py
index ca2524710..ce1fa17b5 100644
--- a/bilby/core/sampler/ptemcee.py
+++ b/bilby/core/sampler/ptemcee.py
@@ -2,8 +2,9 @@ from __future__ import absolute_import, division, print_function
import numpy as np
-from ..utils import get_progress_bar, logger
+from ..utils import get_progress_bar
from . import Emcee
+from .base_sampler import SamplerError
class Ptemcee(Emcee):
@@ -74,7 +75,9 @@ class Ptemcee(Emcee):
self.print_nburn_logging_info()
self.result.nburn = self.nburn
if self.result.nburn > self.nsteps:
- logger.warning('Chain not burned in, no samples generated.')
+ raise SamplerError(
+ "The run has finished, but the chain is not burned in: "
+ "`nburn < nsteps`. Try increasing the number of steps.")
self.result.samples = sampler.chain[0, :, self.nburn:, :].reshape(
(-1, self.ndim))
self.result.betas = sampler.betas
--
GitLab