#1192 rationalise tagging btw ispyb super/subclass

DiamondLightSource · Mar 1, 2024 · 22f3f66 · 22f3f66
1 parent 88a0dba
commit 22f3f66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/hyperion/external_interaction/callbacks/ispyb_callback_base.py b/src/hyperion/external_interaction/callbacks/ispyb_callback_base.py
@@ -60,9 +60,6 @@ def __init__(
         self.log = ISPYB_LOGGER
 
     def activity_gated_start(self, doc: RunStart):
-        ISPYB_LOGGER.debug("ISPyB Callback Start Triggered")
-        if self.uid_to_finalize_on is None:
-            self.uid_to_finalize_on = doc.get("uid")
         return self._tag_doc(doc)
 
     def activity_gated_descriptor(self, doc: EventDescriptor):

diff --git a/src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py b/src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py
@@ -91,12 +91,12 @@ def activity_gated_start(self, doc: RunStart):
         ISPYB_LOGGER.info("ISPYB handler received start document.")
         if doc.get("subplan_name") == ROTATION_PLAN_MAIN:
             self.uid_to_finalize_on = doc.get("uid")
-        return self._tag_doc(doc)
+        return super().activity_gated_start(doc)
 
     def activity_gated_event(self, doc: Event):
         doc = super().activity_gated_event(doc)
         set_dcgid_tag(self.ispyb_ids.data_collection_group_id)
-        return self._tag_doc(doc)
+        return doc
 
     def activity_gated_stop(self, doc: RunStop):
         if doc.get("run_start") == self.uid_to_finalize_on:

diff --git a/src/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py b/src/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py
@@ -120,7 +120,7 @@ def activity_gated_event(self, doc: Event):
             )
 
         set_dcgid_tag(self.ispyb_ids.data_collection_group_id)
-        return self._tag_doc(doc)
+        return doc
 
     def activity_gated_stop(self, doc: RunStop):
         if doc.get("run_start") == self._start_of_fgs_uid: