Avoid marking some metadata as SPA

Author: stephen-riggs

src/murfey/client/analyser.py

@@ -159,13 +159,17 @@ def _find_context(self, file_path: Path) -> bool:
                 return True
 
         # Tomography and SPA workflow checks
-        split_file_name = file_path.name.split("_")
-        if split_file_name:
-            if "gain" in split_file_name[-1]:
+        split_file_stem = file_path.stem.split("_")
+        if split_file_stem:
+            if split_file_stem[-1] == "gain":
                 return False
 
             # Files starting with "FoilHole" belong to the SPA workflow
-            if split_file_name[0].startswith("FoilHole"):
+            if split_file_stem[0].startswith("FoilHole") and split_file_stem[-1] in [
+                "Fractions",
+                "fractions",
+                "EER",
+            ]:
                 if not self._context:
                     logger.info("Acquisition software: EPU")
                     self._context = SPAModularContext("epu", self._basepath)
@@ -174,11 +178,8 @@ def _find_context(self, file_path: Path) -> bool:
 
             # Files starting with "Position" belong to the standard tomography workflow
             if (
-                split_file_name[0] == "Position"
-                or "[" in file_path.name
-                or "Fractions" in split_file_name[-1]
-                or "fractions" in split_file_name[-1]
-                or "EER" in split_file_name[-1]
+                split_file_stem[0] == "Position"
+                or split_file_stem[-1] in ["Fractions", "fractions", "EER"]
                 or file_path.suffix == ".mdoc"
             ):
                 if not self._context:

tests/client/test_analyser.py

@@ -45,6 +45,9 @@ def test_find_context(file_and_context, tmp_path):
     "visit/Position_1_gain.tiff",
     "visit/FoilHole_01234_gain.tiff",
     "visit/file_1.mrc",
+    "visit/FoilHole_01234.mrc",
+    "visit/FoilHole_01234.jpg",
+    "visit/FoilHole_01234.xml",
 ]
 
 
@@ -66,7 +69,7 @@ def test_analyser_setup_and_stopping(tmp_path):
 
 
 def test_analyser_tomo_determination(tmp_path):
-    tomo_file = tmp_path / "Position_1_[30.0].tiff"
+    tomo_file = tmp_path / "Position_1_[30.0]_fractions.tiff"
     analyser = Analyser(tmp_path)
     analyser.start()
     analyser.queue.put(tomo_file)
@@ -75,7 +78,7 @@ def test_analyser_tomo_determination(tmp_path):
 
 
 def test_analyser_epu_determination(tmp_path):
-    tomo_file = tmp_path / "FoilHole_12345_Data_6789.tiff"
+    tomo_file = tmp_path / "FoilHole_12345_Data_6789_Fractions.tiff"
     analyser = Analyser(tmp_path)
     analyser.start()
     analyser.queue.put(tomo_file)