Resolve "Follow-up from "Adding dnest4 Sampler""

Requires !888 (merged) Closes #533 (closed)

bilby/core/sampler/base_sampler.py

@@ -605,26 +605,27 @@ class NestedSampler(Sampler):
         else:
             return np.nan_to_num(-np.inf)
 
+    def _setup_run_directory(self):
+        """
+        If using a temporary directory, the output directory is moved to the
+        temporary directory.
+        Used for Dnest4 and Pymultinest.
+        """
+        if self.use_temporary_directory:
+            temporary_outputfiles_basename = tempfile.TemporaryDirectory().name
+            self.temporary_outputfiles_basename = temporary_outputfiles_basename
 
-def setup_run_directory(use_temporary_directory, outputfiles_basename):
-    """
-    Run directory setup for Dnest4 and Pymultinest.
+            if os.path.exists(self.outputfiles_basename):
+                distutils.dir_util.copy_tree(self.outputfiles_basename, self.temporary_outputfiles_basename)
+            check_directory_exists_and_if_not_mkdir(temporary_outputfiles_basename)
+
+            self.kwargs["outputfiles_basename"] = self.temporary_outputfiles_basename
+            logger.info("Using temporary file {}".format(temporary_outputfiles_basename))
+        else:
+            check_directory_exists_and_if_not_mkdir(self.outputfiles_basename)
+            self.kwargs["outputfiles_basename"] = self.outputfiles_basename
+            logger.info("Using output file {}".format(self.outputfiles_basename))
 
-    If using a temporary directory, the output directory is moved to the
-    temporary directory.
-    """
-    if use_temporary_directory:
-        temporary_outputfiles_basename = tempfile.TemporaryDirectory().name
-
-        if os.path.exists(outputfiles_basename):
-            distutils.dir_util.copy_tree(outputfiles_basename, temporary_outputfiles_basename)
-        check_directory_exists_and_if_not_mkdir(temporary_outputfiles_basename)
-        logger.info("Using temporary file {}".format(temporary_outputfiles_basename))
-        return temporary_outputfiles_basename
-    else:
-        check_directory_exists_and_if_not_mkdir(outputfiles_basename)
-        logger.info("Using output file {}".format(outputfiles_basename))
-        return outputfiles_basename
 
 
 class MCMCSampler(Sampler):