Extra send components

Author: stephen-riggs

src/murfey/client/contexts/sxt.py

@@ -46,12 +46,9 @@ def register_sxt_data_collection(
             )
             return
         try:
-            metadata_source = (
-                self._basepath.parent / environment.visit / self._basepath.name
-            )
             ensure_dcg_exists(
                 collection_type="sxt",
-                metadata_source=metadata_source,
+                metadata_source=self._basepath,
                 environment=environment,
                 machine_config=self._machine_config,
                 token=self._token,
@@ -120,7 +117,11 @@ def post_transfer(
 
         data_suffixes = [".txrm"]
 
-        if transferred_file.suffix in data_suffixes and environment:
+        if (
+            transferred_file.name.startswith("tomo")
+            and transferred_file.suffix in data_suffixes
+            and environment
+        ):
             source = _get_source(transferred_file, environment)
             if not source:
                 logger.warning(f"No source found for file {transferred_file}")
@@ -197,7 +198,7 @@ def post_transfer(
                     strict=True,
                 )
                 if tilt_count_txrm:
-                    metadata["tilt_count"] = tilt_count_txrm[0]
+                    metadata["tilt_series_length"] = tilt_count_txrm[0]
 
             self.register_sxt_data_collection(
                 tilt_series=transferred_file.stem,
@@ -227,11 +228,13 @@ def post_transfer(
                 visit_name=environment.visit,
                 session_id=environment.murfey_session,
                 data={
-                    "session_id": environment.murfey_session,
                     "tag": transferred_file.stem,
                     "source": str(transferred_file.parent),
                     "pixel_size": metadata.get("pixel_size", 100),
                     "tilt_offset": midpoint(angles),
+                    "tilt_series_length": metadata.get(
+                        "tilt_series_length", len(angles)
+                    ),
                     "txrm": str(file_transferred_to),
                 },
             )

src/murfey/workflows/sxt/process_sxt_tilt_series.py

@@ -22,7 +22,6 @@
 
 
 class SXTTiltSeriesInfo(BaseModel):
-    session_id: int
     tag: str
     source: str
     txrm: str
@@ -39,7 +38,7 @@ def process_sxt_tilt_series_workflow(
 ):
     tilt_series_query = murfey_db.exec(
         select(TiltSeries)
-        .where(TiltSeries.session_id == tilt_series_info.session_id)
+        .where(TiltSeries.session_id == session_id)
         .where(TiltSeries.tag == tilt_series_info.tag)
         .where(TiltSeries.rsync_source == tilt_series_info.source)
     ).all()