From 274019b7039482a6c824a0a0a9763cae2e44a9a7 Mon Sep 17 00:00:00 2001
From: MoritzThomasHuebner <email@moritz-huebner.de>
Date: Mon, 15 Oct 2018 15:02:47 +1100
Subject: [PATCH] Renamed PriorSet -> PriorDict BBHPriorSet -> BBHPriorDict
BNSPriorSet -> BNSPriorDict CalibrationPriorSet -> CalibrationPriorDict
Introduced backports with deprecation warnings for the old classes
---
bilby/core/prior.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/bilby/core/prior.py b/bilby/core/prior.py
index 7378efc80..0cd8ff06d 100644
--- a/bilby/core/prior.py
+++ b/bilby/core/prior.py
@@ -15,7 +15,7 @@ import bilby # noqa
import inspect
-class PriorSet(OrderedDict):
+class PriorDict(OrderedDict):
def __init__(self, dictionary=None, filename=None):
""" A set of priors
@@ -238,6 +238,14 @@ class PriorSet(OrderedDict):
return False
+class PriorSet(PriorDict):
+
+ def __init__(self, dictionary=None, filename=None):
+ """ DEPRECATED: USE PriorDict INSTEAD"""
+ logger.warning("The name 'PriorSet' is deprecated use 'PriorDict' instead")
+ super(PriorSet, self).__init__(dictionary, filename)
+
+
def create_default_prior(name, default_priors_file=None):
"""Make a default prior for a parameter with a known name.
@@ -261,7 +269,7 @@ def create_default_prior(name, default_priors_file=None):
"No prior file given.")
prior = None
else:
- default_priors = PriorSet(filename=default_priors_file)
+ default_priors = PriorDict(filename=default_priors_file)
if name in default_priors.keys():
prior = default_priors[name]
else:
--
GitLab