Remove some path construction that is specific to DLS directory structure

Author: d-j-hatton

src/murfey/server/__init__.py

@@ -2813,7 +2813,7 @@ def feedback_callback(header: dict, message: dict) -> None:
                     dose_per_frame=message["dose_per_frame"],
                     gain_ref=(
                         str(machine_config.rsync_basepath / message["gain_ref"])
-                        if message["gain_ref"]
+                        if message["gain_ref"] and machine_config.data_transfer_enabled
                         else message["gain_ref"]
                     ),
                     voltage=message["voltage"],

src/murfey/server/api/__init__.py

@@ -1232,7 +1232,7 @@ async def request_tomography_preprocessing(
                 "fm_dose": proc_file.dose_per_frame,
                 "gain_ref": (
                     str(machine_config.rsync_basepath / proc_file.gain_ref)
-                    if proc_file.gain_ref
+                    if proc_file.gain_ref and machine_config.data_transfer_enabled
                     else proc_file.gain_ref
                 ),
                 "fm_int_file": proc_file.eer_fractionation_file,
@@ -1509,14 +1509,22 @@ async def write_eer_fractionation_file(
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    file_path = (
-        Path(machine_config.rsync_basepath)
-        / (machine_config.rsync_module or "data")
-        / str(datetime.datetime.now().year)
-        / secure_filename(visit_name)
-        / "processing"
-        / secure_filename(fractionation_params.fractionation_file_name)
-    )
+    if machine_config.eer_fractionation_file_template:
+        file_path = Path(
+            machine_config.eer_fractionation_file_template.format(
+                visit=secure_filename(visit_name),
+                year=str(datetime.datetime.now().year),
+            )
+        ) / secure_filename(fractionation_params.fractionation_file_name)
+    else:
+        file_path = (
+            Path(machine_config.rsync_basepath)
+            / (machine_config.rsync_module or "data")
+            / str(datetime.datetime.now().year)
+            / secure_filename(visit_name)
+            / "processing"
+            / secure_filename(fractionation_params.fractionation_file_name)
+        )
     if file_path.is_file():
         return {"eer_fractionation_file": str(file_path)}
 

src/murfey/util/config.py

@@ -27,6 +27,7 @@ class MachineConfig(BaseModel):
     create_directories: Dict[str, str] = {"atlas": "atlas"}
     analyse_created_directories: List[str] = []
     gain_reference_directory: Optional[Path] = None
+    eer_fractionation_file_template: str = ""
     processed_directory_name: str = "processed"
     gain_directory_name: str = "processing"
     node_creator_queue: str = "node_creator"