Skip to content

Commit

Permalink
[WF] - Fix for issue mxcube#689 : decrease length of autprocessing di…
Browse files Browse the repository at this point in the history
…rectory name
  • Loading branch information
olofsvensson authored and marcus-oscarsson committed Sep 20, 2024
1 parent 89107bb commit 84968cc
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions mxcubecore/HardwareObjects/ESRF/ESRFMultiCollect.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,28 +323,26 @@ def reset_detector(self):
def prepare_input_files(
self, files_directory, prefix, run_number, process_directory
):
i = 1

while True:
xds_input_file_dirname = "xds_%s_run%s_%d" % (prefix, run_number, i)
autoprocessing_input_file_dirname = "autoprocessing_%s_run%s_%d" % (
prefix,
run_number,
i,
)
autoprocessing_input_file_dirname = "autoprocessing"
autoprocessing_directory = os.path.join(
process_directory, autoprocessing_input_file_dirname
)
xds_input_file_dirname = "xds_%s_run%s" % (prefix, run_number,)
mosflm_input_file_dirname = "mosflm_%s_run%s" % (prefix, run_number)
hkl2000_dirname = "hkl2000_%s_run%s" % (prefix, run_number)

i = 1
while os.path.exists(autoprocessing_directory):
autoprocessing_input_file_dirname = "autoprocessing_%d" % i
autoprocessing_directory = os.path.join(
process_directory, autoprocessing_input_file_dirname
)

if not os.path.exists(autoprocessing_directory):
break

xds_input_file_dirname = "xds_%s_run%s_%d" % (prefix, run_number, i)
mosflm_input_file_dirname = "mosflm_%s_run%s_%d" % (prefix, run_number, i)
hkl2000_dirname = "hkl2000_%s_run%s_%d" % (prefix, run_number, i)
i += 1

mosflm_input_file_dirname = "mosflm_%s_run%s_%d" % (prefix, run_number, i)

hkl2000_dirname = "hkl2000_%s_run%s_%d" % (prefix, run_number, i)

self.raw_data_input_file_dir = os.path.join(
files_directory, "process", xds_input_file_dirname
)
Expand Down

0 comments on commit 84968cc

Please sign in to comment.