v0.7.6 - fit_catalogue bugfix

ACCarnall · Jan 7, 2019 · 5155a65 · 5155a65
1 parent 794a5e6
commit 5155a65
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/bagpipes/catalogue/merge_catalogue.py b/bagpipes/catalogue/merge_catalogue.py
@@ -4,6 +4,7 @@
 import glob
 import pandas as pd
 import os
+import time
 
 from subprocess import call
 
@@ -31,7 +32,8 @@ def merge(run, mode="merge"):
                                           names=header, skiprows=1))
 
                 if isinstance(cats[-1].loc[0, "#ID"], float):
-                    cats[-1].loc[:, "#ID"] = cats[-1].loc[:, "#ID"].astype(int)
+                    m = np.invert(np.isnan(cats[-1].loc[:, "#ID"]))
+                    cats[-1].loc[m, "#ID"] = cats[-1].loc[m, "#ID"].astype(int)
 
                 cats[-1].index = cats[-1]["#ID"].astype(str)
                 break

diff --git a/bagpipes/plotting/general.py b/bagpipes/plotting/general.py
@@ -135,8 +135,11 @@ def hist1d(samples, ax, smooth=False, label=None, color="orange",
         x_label = fix_param_names([label])
         ax.set_xlabel(x_label)
 
-    y, x = np.histogram(samples, bins=bins, density=True,
-                        range=(np.max([samples.min(), -99.]), samples.max()))
+    width = samples.max() - np.max([samples.min(), -99.])
+    range = (np.max([samples.min(), -99.]) - width/10.,
+             samples.max() + width/10.)
+
+    y, x = np.histogram(samples, bins=bins, density=True, range=range)
 
     y = gaussian_filter(y, 1.5)
 
@@ -161,7 +164,7 @@ def hist1d(samples, ax, smooth=False, label=None, color="orange",
                        color="black", zorder=zorder, lw=3)
 
     ax.set_ylim(bottom=0)
-    ax.set_xlim(np.max([samples.min(), -99.]), samples.max())
+    ax.set_xlim(range)
     auto_x_ticks(ax, nticks=3.)
     plt.setp(ax.get_yticklabels(), visible=False)
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.7.5'
+version = u'0.7.6'
 # The full version, including alpha/beta/rc tags.
-release = u'0.7.5'
+release = u'0.7.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/rtd-environment.yml b/rtd-environment.yml
@@ -6,12 +6,12 @@ dependencies:
     - scipy
     - matplotlib>=2.2.2
     - numpy>=1.14.2
+    - pybind11
     - pip:
       - corner
       - pymultinest
       - msgpack
       - deepdish
       - pandas
       - sphinx_navtree
-      - pybind11
       - george
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 setup(
     name='bagpipes',
 
-    version='0.7.5',
+    version='0.7.6',
 
     description='Galaxy spectral fitting',