From c7aa87a3cf77c81c96386e987e1cb7ba07d801cb Mon Sep 17 00:00:00 2001 From: David Waterman Date: Sat, 16 Mar 2024 17:05:18 +0000 Subject: [PATCH] Change tactic slightly: rather than extend the single digit template, make a new template that includes the underscore character, as that appears to be part of the standard Rigaku CAP filename format. --- src/dxtbx/model/scan_helpers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dxtbx/model/scan_helpers.py b/src/dxtbx/model/scan_helpers.py index a08bafcc5..c1b2a3302 100644 --- a/src/dxtbx/model/scan_helpers.py +++ b/src/dxtbx/model/scan_helpers.py @@ -14,10 +14,11 @@ r"([0-9]{2,12})\.(.*)", r"(.*)\.([0-9]{2,12})_(.*)", r"(.*)\.([0-9]{2,12})(.*)", - r"(.*)\.([0-9]{1,12})(.*)", + r"(.*)\.([0-9]{1,12})_(.*)", + r"(.*)\.([0-9]{1})(.*)", ] -joiners = [".", "_", "", ""] +joiners = [".", "_", "", "_", ""] compiled_patterns = [re.compile(pattern) for pattern in patterns]