add tracking action callback to output schemes

legend-exp · Aug 17, 2024 · eab669f · eab669f
1 parent d5689ba
commit eab669f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/include/RMGTrackingAction.hh b/include/RMGTrackingAction.hh
@@ -18,12 +18,12 @@
 
 #include "G4UserTrackingAction.hh"
 
-class RMGEventAction;
+class RMGRunAction;
 class RMGTrackingAction : public G4UserTrackingAction {
 
   public:
 
-    RMGTrackingAction(RMGEventAction*);
+    RMGTrackingAction(RMGRunAction*);
     ~RMGTrackingAction() = default;
 
     RMGTrackingAction(RMGTrackingAction const&) = delete;
@@ -39,7 +39,7 @@ class RMGTrackingAction : public G4UserTrackingAction {
 
   private:
 
-    RMGEventAction* fEventAction = nullptr;
+    RMGRunAction* fRunAction = nullptr;
 };
 
 #endif

diff --git a/include/RMGVOutputScheme.hh b/include/RMGVOutputScheme.hh
@@ -48,6 +48,9 @@ class RMGVOutputScheme {
     }
     virtual inline std::optional<bool> StackingActionNewStage(const int) { return std::nullopt; }
 
+    // hook into G4TrackingAction
+    virtual inline void TrackingActionPre(const G4Track* aTrack) {};
+
     inline void SetNtuplePerDetector(bool ntuple_per_det) { fNtuplePerDetector = ntuple_per_det; }
 
   protected:

diff --git a/src/RMGTrackingAction.cc b/src/RMGTrackingAction.cc
@@ -17,11 +17,14 @@
 
 #include "G4Track.hh"
 
-#include "RMGEventAction.hh"
+#include "RMGRunAction.hh"
 
-RMGTrackingAction::RMGTrackingAction(RMGEventAction* eventaction) : fEventAction(eventaction) {}
+RMGTrackingAction::RMGTrackingAction(RMGRunAction* run_action) : fRunAction(run_action) {}
 
-void RMGTrackingAction::PreUserTrackingAction(const G4Track* /*aTrack*/) {}
+void RMGTrackingAction::PreUserTrackingAction(const G4Track* aTrack) {
+
+  for (auto& el : fRunAction->GetAllOutputDataFields()) { el->TrackingActionPre(aTrack); }
+}
 
 void RMGTrackingAction::PostUserTrackingAction(const G4Track* /*aTrack*/) {}
 

diff --git a/src/RMGUserAction.cc b/src/RMGUserAction.cc
@@ -56,7 +56,7 @@ void RMGUserAction::Build() const {
 
   // Add the remage-internal tracking action and optional user-specified custom stepping actions.
   const auto user_tracking_actions = RMGManager::Instance()->GetUserInit()->GetTrackingActions();
-  G4UserTrackingAction* tracking_action = new RMGTrackingAction(event_action);
+  G4UserTrackingAction* tracking_action = new RMGTrackingAction(run_action);
   if (!user_tracking_actions.empty()) {
     auto multi_tracking_action = new G4MultiTrackingAction();
     multi_tracking_action->push_back(std::unique_ptr<G4UserTrackingAction>(tracking_action));