From 89adb332cd29cd705081f86a9351d439a2598164 Mon Sep 17 00:00:00 2001
From: Danilo Ferreira de Lima <danilo.enoque.ferreira.de.lima@xfel.de>
Date: Wed, 30 Aug 2023 17:16:40 +0200
Subject: [PATCH] Prevent bugfix from messing -j option.
---
src/calng/CrystfelRunner.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/calng/CrystfelRunner.py b/src/calng/CrystfelRunner.py
index 15baa405..9238fde5 100644
--- a/src/calng/CrystfelRunner.py
+++ b/src/calng/CrystfelRunner.py
@@ -68,7 +68,10 @@ def reparse_fix_comma_mess(l):
final = list()
current_group = list()
for current in res:
- if re.match(r"(\d+)", current):
+ if (len(current_group) > 0
+ and re.match(r"(\d+)", current)
+ and re.match(r".*(\d+)$", current_group[-1])
+ ):
current_group += [current]
else:
# flush what was there first
@@ -303,6 +306,7 @@ class CrystfelRunner(PythonDevice):
.defaultValue(
[
"--pdb=/gpfs/exfel/exp/XMPL/201750/p700000/proc/r0030/hewl.cell",
+ "-j", "40",
"--highres=1.6",
"--peaks=peakfinder8",
"--threshold=200",
--
GitLab