Repository : ssh://g18-sc-serv-04.diamond.ac.uk/cctbx
On branch : master
commit e32028fe3039cd80cd4cb5d1c0d3582f7118a658
Author: Lee James O'Riordan <[log in to unmask]>
Date: Fri Jun 23 15:22:57 2017 -0700
Fixed default directory path for CBFlib temp file redirect
e32028fe3039cd80cd4cb5d1c0d3582f7118a658
xfel/command_line/xtc_dump.py | 7 +++++--
xfel/command_line/xtc_process.py | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/xfel/command_line/xtc_dump.py b/xfel/command_line/xtc_dump.py
index 0dea2c2ae..d239d1b18 100644
--- a/xfel/command_line/xtc_dump.py
+++ b/xfel/command_line/xtc_dump.py
@@ -82,7 +82,7 @@ phil_scope = parse('''
output_dir = .
.type = str
.help = Directory output files will be placed
- tmp_output_dir = .
+ tmp_output_dir = None
.type = str
.help = Directory for CBFlib tmp output files
}
@@ -127,7 +127,10 @@ class Script(object):
#Environment variable redirect for CBFLib temporary CBF_TMP_XYZ file output
if params.format.file_format == "cbf":
- tmp_dir = os.path.join(params.output.tmp_output_dir, '.tmp')
+ if params.output.tmp_output_dir is None:
+ tmp_dir = os.path.join(params.output.output_dir, '.tmp')
+ else:
+ tmp_dir = os.path.join(params.output.tmp_output_dir, '.tmp')
if not os.path.exists(tmp_dir):
try:
os.makedirs(tmp_dir)
diff --git a/xfel/command_line/xtc_process.py b/xfel/command_line/xtc_process.py
index daabe5f3d..e8c174b7f 100644
--- a/xfel/command_line/xtc_process.py
+++ b/xfel/command_line/xtc_process.py
@@ -247,7 +247,7 @@ xtc_phil_str = '''
reindexedstrong_filename = %s_reindexedstrong.pickle
.type = str
.help = The file name for re-indexed strong reflections
- tmp_output_dir = .
+ tmp_output_dir = None
.type = str
.help = Directory for CBFlib temporary output files
}
@@ -390,7 +390,10 @@ class InMemScript(DialsProcessScript):
if params.format.file_format == "cbf":
#Environment variable redirect for CBFLib temporary CBF_TMP_XYZ file output
- tmp_dir = os.path.join(params.output.tmp_output_dir, '.tmp')
+ if params.output.tmp_output_dir is None:
+ tmp_dir = os.path.join(params.output.output_dir, '.tmp')
+ else:
+ tmp_dir = os.path.join(params.output.tmp_output_dir, '.tmp')
if not os.path.exists(tmp_dir):
try:
os.makedirs(tmp_dir)