Pass around a different dcg tag for tomo multigrid

Author: stephen-riggs

src/murfey/client/contexts/tomo.py

@@ -93,6 +93,7 @@ def __init__(
         self._data_collection_stash: list = []
         self._processing_job_stash: dict = {}
         self._lock: RLock = RLock()
+        self._group_tag: str = str(self._basepath)
 
     def register_tomography_data_collections(
         self,
@@ -116,7 +117,13 @@ def register_tomography_data_collections(
                 / self._basepath.name.split("_")[-1]
             )
             if not metadata_source.exists() and multigrid_metadata_source.exists():
+                # If the multigrid path exists, tags need to replace the last _ with /
                 metadata_source = multigrid_metadata_source
+                self._group_tag = str(
+                    self._basepath.parent
+                    / "_".join(self._basepath.name.split("_")[:-1])
+                    / self._basepath.name.split("_")[-1]
+                )
             ensure_dcg_exists(
                 collection_type="tomo",
                 metadata_source=metadata_source,
@@ -133,7 +140,7 @@ def register_tomography_data_collections(
                         "acquisition_software": self._acquisition_software,
                         "image_directory": image_directory,
                         "data_collection_tag": tilt_series,
-                        "source": str(self._basepath),
+                        "source": self._group_tag,
                         "tag": tilt_series,
                     }
                     if (
@@ -186,7 +193,7 @@ def register_tomography_data_collections(
                                 session_id=environment.murfey_session,
                                 data={
                                     "tag": tilt_series,
-                                    "source": str(self._basepath),
+                                    "source": self._group_tag,
                                     "recipe": recipe,
                                     "experiment_type": "tomography",
                                 },
@@ -398,7 +405,7 @@ def _add_tilt(
                 "voltage": self.data_collection_parameters.get("voltage", 300),
                 "eer_fractionation_file": eer_fractionation_file,
                 "tag": tilt_series,
-                "group_tag": str(self._basepath),
+                "group_tag": self._group_tag,
             }
             capture_post(
                 base_url=str(environment.url.geturl()),
@@ -615,7 +622,7 @@ def gather_metadata(
                 environment.dose_per_frame if environment else None
             )
             mdoc_metadata["source"] = str(self._basepath)
-            mdoc_metadata["tag"] = str(self._basepath)
+            mdoc_metadata["tag"] = self._group_tag
             mdoc_metadata["tilt_series_tag"] = metadata_file.stem
             mdoc_metadata["exposure_time"] = float(mdoc_data_block["ExposureTime"])
             slit_width = mdoc_data_block["FilterSlitAndLoss"][0]

src/murfey/client/multigrid_control.py

@@ -520,7 +520,6 @@ def _start_dc(self, metadata_json):
                 k: None if v == "None" else v for k, v in metadata_json.items()
             }
         if isinstance(context, TomographyContext):
-            source = Path(metadata_json["source"])
             context.register_tomography_data_collections(
                 file_extension=metadata_json["file_extension"],
                 image_directory=str(self._environment.default_destinations[source]),
@@ -565,7 +564,7 @@ def _start_dc(self, metadata_json):
                 instrument_name=self._environment.instrument_name,
                 visit_name=self._environment.visit,
                 session_id=self._environment.murfey_session,
-                data={"rsync_source": str(source)},
+                data={"rsync_source": metadata_json.get("tag", "")},
             )
             log.info("Tomography processing flushed")