From 0370df3c99d99e46c1d6e2b170a8c4f1e6741a68 Mon Sep 17 00:00:00 2001
From: Prakash <fku2vr@virginia.edu>
Date: Wed, 27 Sep 2023 15:47:49 -0400
Subject: [PATCH] Modify the Driftpipe end geometry

---
 geometry/hybrid/hybridDaughter_unified.gdml | 12 +++---------
 geometry/mollerParallel.gdml                | 17 +++--------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/geometry/hybrid/hybridDaughter_unified.gdml b/geometry/hybrid/hybridDaughter_unified.gdml
index 6e049aeff..bc7162e99 100644
--- a/geometry/hybrid/hybridDaughter_unified.gdml
+++ b/geometry/hybrid/hybridDaughter_unified.gdml
@@ -142,13 +142,7 @@
         startphi="0" deltaphi="360" aunit="deg"
         rmin="723.9" rmax="730.25" z="118.5672" lunit="mm"/>     
 
-        <!-- RR adding Drift Pipe End -->
-        <polycone aunit="deg" startphi="0" deltaphi="360" lunit="mm" name="Driftpipe_end">
-        <zplane rmin="730.25" rmax="730.25" z="0"/>
-        <zplane rmin="730.25" rmax="730.25+25.4" z="25.4"/>
-        <zplane rmin="1270-25.4" rmax="1270" z="423.9-76.2"/> 
-        <zplane rmin="1270-25.4" rmax="1270" z="423.9"/>
-        </polycone>
+        <tube aunit="deg" startphi="0" deltaphi="360" lunit="mm" name="Driftpipe_end" rmin="730.25" rmax="1270" z="3*25.4"/>
 
 
         <!--add bellows -->
@@ -193,7 +187,7 @@
         
         <!-- drift pipe -->
         <polycone aunit="deg" startphi="0" deltaphi="360" lunit="mm" name="solid_Driftpipe">
-            <zplane rmin="1247.775" rmax="1270" z="0.0"/>
+            <zplane rmin="1247.775" rmax="1270" z="-423.9+3*25.4"/>
             <zplane rmin="1247.775" rmax="1270" z="22.098"/>
             <zplane rmin="1247.775" rmax="1270" z="22.098"/>
             <zplane rmin="1247.775" rmax="1270" z="5672.9-12.7"/>   
@@ -3046,7 +3040,7 @@
       
            <physvol name="Driftpipe_endphys">
                <volumeref ref="logicDriftpipe_end"/>
-               <position unit="mm" name="Driftpipeend_pos" x="0" y="0.01" z="(501.453*25.4)-11287.5"/>
+               <position unit="mm" name="Driftpipeend_pos" x="0" y="0.01" z="(501.453*25.4)-11287.5+(3*25.4)/2"/>
            </physvol>
 
  
diff --git a/geometry/mollerParallel.gdml b/geometry/mollerParallel.gdml
index 46e9112fc..12346f4e2 100644
--- a/geometry/mollerParallel.gdml
+++ b/geometry/mollerParallel.gdml
@@ -94,16 +94,6 @@
         startphi="0" deltaphi="360" aunit="deg"
         rmin="723.9" rmax="730.25" z="118.5672" lunit="mm"/>
 
-       <polycone aunit="deg" startphi="0" deltaphi="360" lunit="mm" name="Driftpipeend_Virtualsolid">
-        <zplane rmin="730.25" rmax="730.25" z="0"/>
-        <zplane rmin="730.25" rmax="730.25+25.4" z="25.4"/>
-        <zplane rmin="1270-25.4" rmax="1270" z="423.9-76.2"/>
-        <zplane rmin="1270-25.4" rmax="1270" z="423.9"/>
-        </polycone>
-
-
-
-
 
 </solids>
 
@@ -446,10 +436,9 @@
       <auxiliary auxtype="DetNo" auxvalue="448"/>
    </volume>
 
-
-  <volume name="Driftpipeend_Virtuallog">
-      <materialref ref="G4_Galactic"/>
-     <solidref ref="Driftpipeend_Virtualsolid"/>
+   <volume name="Driftpipeend_Virtuallog">
+     <materialref ref="G4_Galactic"/>
+     <solidref ref="largeVirtualPlane_solid"/>
      <auxiliary auxtype="SensDet" auxvlaue="planeDet"/>
      <auxiliary auxtype="DetNo" auxvalue="449"/>
    </volume>