pass labels argument through when reading chains (#232)

* labels kwarg passed through correctly like params/columns * consistent use of "columns" instead of "params" * change to single quotes * updated getdist to match * one more set of double quotes Co-authored-by: Lukas Hergt <[email protected]> Co-authored-by: Will Handley <[email protected]>
handley-lab · Jan 17, 2023 · 9f57446 · 9f57446
1 parent fffa42e
commit 9f57446
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/anesthetic/read/cobaya.py b/anesthetic/read/cobaya.py
@@ -59,8 +59,9 @@ def read_cobaya(root, *args, **kwargs):
     if not chains_files:
         raise FileNotFoundError(dirname + '/' + regex + " not found.")
 
-    params, labels = read_paramnames(root)
-    columns = kwargs.pop('columns', params)
+    columns, labels = read_paramnames(root)
+    columns = kwargs.pop('columns', columns)
+    labels = kwargs.pop('labels', labels)
     kwargs['label'] = kwargs.get('label', os.path.basename(root))
 
     samples = []

diff --git a/anesthetic/read/getdist.py b/anesthetic/read/getdist.py
@@ -68,8 +68,9 @@ def read_getdist(root, *args, **kwargs):
     if not chains_files:
         raise FileNotFoundError(dirname + '/' + regex + " not found.")
 
-    params, labels = read_paramnames(root)
-    columns = kwargs.pop('columns', params)
+    columns, labels = read_paramnames(root)
+    columns = kwargs.pop('columns', columns)
+    labels = kwargs.pop('labels', labels)
     kwargs['label'] = kwargs.get('label', os.path.basename(root))
 
     samples = []

diff --git a/anesthetic/read/multinest.py b/anesthetic/read/multinest.py
@@ -38,6 +38,8 @@ def read_multinest(root, *args, **kwargs):
 
     kwargs['label'] = kwargs.get('label', os.path.basename(root))
     columns, labels = read_paramnames(root)
+    columns = kwargs.pop('columns', columns)
+    labels = kwargs.pop('labels', labels)
     data = samples
 
     return NestedSamples(data=data, logL=logL, logL_birth=logL_birth,

diff --git a/anesthetic/read/polychord.py b/anesthetic/read/polychord.py
@@ -21,9 +21,10 @@ def read_polychord(root, *args, **kwargs):
     except IOError:
         pass
     data, logL, logL_birth = np.split(data, [-2, -1], axis=1)
-    params, labels = read_paramnames(root)
+    columns, labels = read_paramnames(root)
 
-    columns = kwargs.pop('columns', params)
+    columns = kwargs.pop('columns', columns)
+    labels = kwargs.pop('labels', labels)
     kwargs['label'] = kwargs.get('label', os.path.basename(root))
 
     return NestedSamples(data=data, columns=columns,