Merge branch 'dev' into BUG/launch_bug

slac-lcls · Apr 10, 2024 · d3d3395 · d3d3395
2 parents 115c127 + 0a2df25
commit d3d3395
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/lute/io/models/sfx_index.py b/lute/io/models/sfx_index.py
@@ -391,7 +391,21 @@ def validate_in_file(cls, in_file: str, values: Dict[str, Any]) -> str:
             filename: Optional[str] = read_latest_db_entry(
                 f"{values['lute_config'].work_dir}", "FindPeaksPyAlgos", "out_file"
             )
-            if filename is not None:
+            if filename is None:
+                exp: str = values["lute_config"].experiment
+                run: int = int(values["lute_config"].run)
+                tag: Optional[str] = read_latest_db_entry(
+                    f"{values['lute_config'].work_dir}", "FindPeaksPsocake", "tag"
+                )
+                out_dir: Optional[str] = read_latest_db_entry(
+                    f"{values['lute_config'].work_dir}", "FindPeaksPsocake", "outDir"
+                )
+                if out_dir is not None:
+                    fname: str = f"{out_dir}/{exp}_{run:04d}"
+                    if tag is not None:
+                        fname = f"{fname}_{tag}"
+                    return f"{fname}.lst"
+            else:
                 return filename
         return in_file