**kwargs input and anesthetic.NestedSamples output

Python_Functions/run_pypolychord_eggbox.py

@@ -1,6 +1,5 @@
 from numpy import log, prod, cos
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 #EGGBOX 
@@ -28,15 +27,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived)
-settings.file_root = functionName
-settings.do_clustering = True
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName,
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_gaussian.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -31,15 +30,16 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_gaussian_shell.py

@@ -1,7 +1,6 @@
 from numpy import pi, log, sqrt, zeros
 from scipy.special import loggamma
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -48,15 +47,16 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_gaussian_shells.py

@@ -1,7 +1,7 @@
+from xml.dom.expatbuilder import parseFragmentString
 from numpy import pi, log, sqrt, logaddexp, exp, zeros
 from scipy.special import loggamma
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -41,7 +41,7 @@ def likelihood(theta):
     r2 = 0
 
 
-    def logincexp(loga,logb,logx=None):
+    def logincexp(loga,logb,logc=None):
         if (loga>logb):
             loga = loga + log(exp(logb-loga) + 1)
         else:
@@ -70,15 +70,16 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True, 
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_half_gaussian.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -33,15 +32,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True, 
+    "read_resume": False,
+    "paramnmames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_himmelblau.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -27,15 +26,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_pyramidal.py

@@ -1,7 +1,6 @@
 from numpy import log, exp, sqrt, pi
 from scipy.special import loggamma
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 #EGGBOX 
@@ -43,15 +42,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived)
-settings.file_root = functionName
-settings.do_clustering = True
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName,
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_random_gaussian.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -31,15 +30,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_rastrigin.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt, cos
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -30,15 +29,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_rosenbrock.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -36,15 +35,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

Python_Functions/run_pypolychord_twin_gaussian.py

@@ -1,6 +1,5 @@
 from numpy import pi, log, sqrt, logaddexp, exp
 import pypolychord
-from pypolychord.settings import PolyChordSettings
 from pypolychord.priors import UniformPrior
 
 nDims = 3
@@ -56,15 +55,17 @@ def prior(hypercube):
 def dumper(live, dead, logweights, logZ, logZerr):
     print("Last dead point:", dead[-1]) # prints last element of dead (wich is an array)
 
-settings = PolyChordSettings(nDims, nDerived) #settings is an object
-settings.file_root = functionName #string
-settings.do_clustering = True 
-settings.read_resume = False
-
-output = pypolychord.run_polychord(likelihood, nDims, nDerived, settings, prior, dumper)
 paramnames = [('p%i' % i, r'\theta_%i' % i) for i in range(nDims)]
 paramnames += [('r*', 'r')]
-output.make_paramnames_files(paramnames)
+
+kwargs = {
+    "file_root": functionName, #string
+    "do_clustering": True,
+    "read_resume": False,
+    "paramnames": paramnames,
+}
+
+output = pypolychord.run_polychord(likelihood, nDims, nDerived, prior, dumper, **kwargs)
 
 try:
     import getdist.plots

pypolychord/__init__.py

@@ -1,3 +1,2 @@
 __version__ = "1.20.1"
-from pypolychord.settings import PolyChordSettings
 from pypolychord.polychord import run_polychord