From 2da21754fe64587f40e8553234b10bd6e9718ed3 Mon Sep 17 00:00:00 2001
From: Colm Talbot <colm.talbot@ligo.org>
Date: Mon, 17 Sep 2018 22:29:13 +1000
Subject: [PATCH] bug fixes
---
tupak/core/likelihood.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tupak/core/likelihood.py b/tupak/core/likelihood.py
index e7338ec0..a244bd9f 100644
--- a/tupak/core/likelihood.py
+++ b/tupak/core/likelihood.py
@@ -155,7 +155,7 @@ class GaussianLikelihood(Analytical1DLikelihood):
def log_likelihood(self):
log_l = np.sum(- (self.residual / self.sigma)**2 / 2
- - np.log(2 * np.pi * self.sigma) / 2)
+ - np.log(2 * np.pi * self.sigma**2) / 2)
return log_l
def __repr__(self):
@@ -174,7 +174,11 @@ class GaussianLikelihood(Analytical1DLikelihood):
@sigma.setter
def sigma(self, sigma):
- if isinstance(sigma, float) or len(sigma) == self.n:
+ if sigma is None:
+ self._sigma = sigma
+ elif isinstance(sigma, float) or isinstance(sigma, int):
+ self._sigma = sigma
+ elif len(sigma) == self.n:
self._sigma = sigma
else:
raise ValueError('Sigma must be either float or array-like x.')
--
GitLab