Merge remote-tracking branch 'origin/master' into sampling-frame

bilby/core/utils.py

@@ -1202,6 +1202,7 @@ def latex_plot_format(func):
 
 
 def safe_save_figure(fig, filename, **kwargs):
+    check_directory_exists_and_if_not_mkdir(os.path.dirname(filename))
     from matplotlib import rcParams
     try:
         fig.savefig(fname=filename, **kwargs)

bilby/gw/result.py

@@ -867,7 +867,7 @@ class CompactBinaryCoalescenceResult(CoreResult):
                               deg2perpix).astype(int)
                 for i, p in zip(ii, pp):
                     text.append(
-                        u'{:d}% area: {:d} deg$^2$'.format(p, i, grouping=True))
+                        u'{:d}% area: {:d} deg$^2$'.format(p, i))
             ax.text(1, 1, '\n'.join(text), transform=ax.transAxes, ha='right')
 
         filename = os.path.join(self.outdir, "{}_skymap.png".format(self.label))

examples/core_examples/occam_factor_example.py

@@ -109,8 +109,8 @@ log_evidences = []
 log_evidences_err = []
 log_occam_factors = []
 ns = range(1, 11)
-for l in ns:
-    e, e_err, o = fit(l)
+for ll in ns:
+    e, e_err, o = fit(ll)
     log_evidences.append(e)
     log_evidences_err.append(e_err)
     log_occam_factors.append(o)

test/result_test.py

@@ -399,7 +399,7 @@ class TestResult(unittest.TestCase):
         self.assertEqual(len(self.result.posterior), len(self.result.prior_values))
 
     def test_plot_multiple(self):
-        filename = "multiple.png".format(self.result.outdir)
+        filename = "{}/multiple.png".format(self.result.outdir)
         bilby.core.result.plot_multiple([self.result, self.result], filename=filename)
         self.assertTrue(os.path.isfile(filename))
         os.remove(filename)