Merge branch 'feed-parameter-optimizer' of...

Merge branch 'feed-parameter-optimizer' of ssh://git.xfel.eu:10022/calibration/calng into feed-parameter-optimizer

src/calng/CrystfelRunner.py

@@ -350,13 +350,15 @@ class CrystfelRunner(PythonDevice):
         self.KARABO_ON_INPUT("input", self.input_handler)
 
         # note: loading with cfelpyutils.geometry does not tell us peak_list value
+        # extra note: we need to avoid taking ';' and ' ' into the path!
+        # (Hence the large regexp on the right-hand side)
         self._geom_data_path = None
         self._geom_peak_path = None
         with open(self.get("crystfelArgs.geometryPath"), "rt") as fd:
             for line in fd:
-                if (match := re.match(r"data\s*=\s*(.*)$", line)):
+                if (match := re.match(r"data\s*=\s*([a-zA-Z0-9/\._]*)", line)):
                     self._geom_data_path = match.group(1)
-                elif (match := re.match(r"peak_list\s*=\s*(.*)$", line)):
+                elif (match := re.match(r"peak_list\s*=\s*([a-zA-Z0-9/\._]*)", line)):
                     self._geom_peak_path = match.group(1)
                 if None not in (self._geom_data_path, self._geom_peak_path):
                     break