Merge pull request #195 from fmi-faim/zmb

Make date optional when parsing imagexpress data
fmi-faim · Nov 14, 2024 · 02a43e9 · 02a43e9
2 parents ca2c7ac + c79f7a0
commit 02a43e9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/faim_ipa/hcs/imagexpress/acquisition.py b/src/faim_ipa/hcs/imagexpress/acquisition.py
@@ -259,7 +259,7 @@ def __init__(
 
     def _get_root_re(self) -> re.Pattern:
         return re.compile(
-            r".*[\/\\](?P<date>\d{4}-\d{2}-\d{2})[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?"
+            r".*(?:[\/\\](?P<date>\d{4}-\d{2}-\d{2}))?[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?"
         )
 
     def _get_filename_re(self) -> re.Pattern:
@@ -320,7 +320,7 @@ def _parse_files(self) -> pd.DataFrame:
 
     def _get_root_re(self) -> re.Pattern:
         return re.compile(
-            r".*[\/\\](?P<date>\d{4}-\d{2}-\d{2})[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?(?:[\/\\]ZStep_(?P<z>\d+))"
+            r".*(?:[\/\\](?P<date>\d{4}-\d{2}-\d{2}))?[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?(?:[\/\\]ZStep_(?P<z>\d+))"
         )
 
     def _get_filename_re(self) -> re.Pattern:
@@ -422,7 +422,7 @@ def _filter_mips(self, files: pd.DataFrame) -> pd.DataFrame:
 
     def _get_root_re(self) -> re.Pattern:
         return re.compile(
-            r".*[\/\\](?P<date>\d{4}-\d{2}-\d{2})[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?(?:[\/\\]ZStep_(?P<z>\d+))?.*"
+            r".*(?:[\/\\](?P<date>\d{4}-\d{2}-\d{2}))?[\/\\](?P<acq_id>\d+)(?:[\/\\]TimePoint_(?P<t>\d+))?(?:[\/\\]ZStep_(?P<z>\d+))?.*"
         )
 
     def _get_filename_re(self) -> re.Pattern: