Merge remote-tracking branch 'origin/master'

tupak/result.py

@@ -37,7 +37,12 @@ class Result(dict):
             os.rename(file_name, file_name + '.old')
 
         logging.info("Saving result to {}".format(file_name))
-        deepdish.io.save(file_name, self)
+        try:
+            deepdish.io.save(file_name, self)
+        except Exception as e:
+            logging.error(
+                "\n\n Saving the data has failed with the following message:\n {} \n\n"
+                .format(e))
 
     def plot_corner(self, save=True, **kwargs):
         """ Plot a corner-plot using chain-consumer

tupak/sampler.py

@@ -401,7 +401,7 @@ def run_sampler(likelihood, priors=None, label='label', outdir='outdir',
             result.log_bayes_factor = result.logz - result.noise_logz
         result.injection_parameters = injection_parameters
         result.fixed_parameter_keys = [key for key in priors if isinstance(key, prior.DeltaFunction)]
-        result.prior = priors
+        # result.prior = prior  # Removed as this breaks the saving of the data
         result.samples_to_data_frame()
         result.save_to_file(outdir=outdir, label=label)
         return result