From 21d68d6ca56bd8057594537ed0a1c3313ce49467 Mon Sep 17 00:00:00 2001
From: simonge <simon.gardner@glasgow.ac.uk>
Date: Wed, 9 Oct 2024 12:19:57 +0100
Subject: [PATCH] Added track killing to beamline to speed up beam electron
 simulation from 3Hz to 500Hz

---
 compact/far_backward/beamline_extension_electron.xml | 3 ++-
 src/BeamPipeChain_geo.cpp                            | 4 ++++
 templates/epic.xml.jinja2                            | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compact/far_backward/beamline_extension_electron.xml b/compact/far_backward/beamline_extension_electron.xml
index 9a47d3f38..e1346df24 100644
--- a/compact/far_backward/beamline_extension_electron.xml
+++ b/compact/far_backward/beamline_extension_electron.xml
@@ -25,7 +25,8 @@
       <pipe id="2" name="Pipe_in_Q4eR"
         xcenter="Q4eR_CenterX" zcenter="Q4eR_CenterZ"
         length="Q4eR_Length" theta="Q4eR_Theta"
-        rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius">
+        rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius"
+        limits="kill_limits">
       </pipe>
       <pipe id="3" name="Pipe_Q4eR_to_B3eR"/>
       <pipe id="4" name="Pipe_in_B3eR"
diff --git a/src/BeamPipeChain_geo.cpp b/src/BeamPipeChain_geo.cpp
index 706c7e810..c17da3632 100644
--- a/src/BeamPipeChain_geo.cpp
+++ b/src/BeamPipeChain_geo.cpp
@@ -38,6 +38,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector /
   vector<double> thetas;
   vector<double> rOuters1;
   vector<double> rOuters2;
+  vector<string> limits;
 
   // Grab info for beamline magnets
   for (xml_coll_t pipe_coll(x_det, _Unicode(pipe)); pipe_coll; pipe_coll++) { // pipes
@@ -54,6 +55,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector /
     thetas.push_back(getAttrOrDefault<double>(pipe, _Unicode(theta), 0));
     rOuters1.push_back(getAttrOrDefault<double>(pipe, _Unicode(rout1), 0));
     rOuters2.push_back(getAttrOrDefault<double>(pipe, _Unicode(rout2), 0));
+    limits.push_back(getAttrOrDefault<std::string>(pipe, _Unicode(limits), "world_limits"));
+  
   }
 
   // Calculate parameters for connecting pipes in between magnets
@@ -107,6 +110,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector /
     Volume v_vacuum("v_vacuum_" + names[pipeN], s_vacuum, m_Vacuum);
 
     v_tube.setVisAttributes(description.visAttributes(vis_name));
+    v_vacuum.setLimitSet(description,limits[pipeN]);
 
     assembly.placeVolume(v_tube, Transform3D(RotationY(thetas[pipeN]),
                                              Position(xCenters[pipeN], 0, zCenters[pipeN])));
diff --git a/templates/epic.xml.jinja2 b/templates/epic.xml.jinja2
index 0472526f2..c3729f8f5 100644
--- a/templates/epic.xml.jinja2
+++ b/templates/epic.xml.jinja2
@@ -71,6 +71,9 @@
       <limit name="ekin_min" particles="*" value="0.001" unit="MeV" />
       <limit name="range_min" particles="*" value="0.1" unit="mm" />
     </limitset>
+    <limitset name="kill_limits">
+      <limit name="time_max" particles="*" value="0.0" unit="ns"/>
+    </limitset>
     <limitset name="cal_limits">
       <limit name="step_length_max" particles="*" value="5.0" unit="mm"/>
     </limitset>