From 84a68cdcacc9505aa1df751410e7138a494f64c7 Mon Sep 17 00:00:00 2001
From: Bruce Edelman <bruce.edelman@ligo.org>
Date: Tue, 28 Jan 2020 18:26:20 -0600
Subject: [PATCH] generalized the JointPrior object structure from Matthew
Pitkin's MutlivariateGaussian prior formalism. TODO: add in the joint
MapPrior for HEALPix priors
---
.gitignore | 2 +-
bilby/core/prior/analytical.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index cac42814d..887178188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ MANIFEST
*.version
*.ipynb_checkpoints
outdir/*
-.idea/*
\ No newline at end of file
+.idea/*
diff --git a/bilby/core/prior/analytical.py b/bilby/core/prior/analytical.py
index 4de79a382..9b1d52898 100644
--- a/bilby/core/prior/analytical.py
+++ b/bilby/core/prior/analytical.py
@@ -991,15 +991,15 @@ class Beta(Prior):
- betaln(self.alpha, self.beta) - xlogy(self.alpha + self.beta - 1, self.maximum - self.minimum)
# deal with the fact that if alpha or beta are < 1 you get infinities at 0 and 1
- if isinstance(val, np.ndarray):
+ if isinstance(val, (float, int)):
+ if np.isfinite(_ln_prob) and self.minimum <= val <= self.maximum:
+ return _ln_prob
+ return -np.inf
+ else:
_ln_prob_sub = -np.inf * np.ones(len(val))
idx = np.isfinite(_ln_prob) & (val >= self.minimum) & (val <= self.maximum)
_ln_prob_sub[idx] = _ln_prob[idx]
return _ln_prob_sub
- else:
- if np.isfinite(_ln_prob) and val >= self.minimum and val <= self.maximum:
- return _ln_prob
- return -np.inf
def cdf(self, val):
if isinstance(val, (float, int)):
--
GitLab