Merge pull request #165 from rhbob/fixPbarWindowWedge

fixPbarWindowAndWedgeAtTS3
Mu2e · Apr 20, 2020 · 97ae56c · 97ae56c
2 parents 0eab688 + 78b756c
commit 97ae56c
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 7 deletions.
diff --git a/BeamlineGeom/inc/PbarWindow.hh b/BeamlineGeom/inc/PbarWindow.hh
@@ -25,7 +25,7 @@ namespace mu2e {
     CLHEP::Hep3Vector const& getLocal() const { return _origin; }
     std::string material() const { return _material; }
     int         version()  const { return _version; }
-
+    std::string wedgeMaterial() const { return _wedgeMaterial; }
     // The following are primarily for version 1 and 2
     double rOut()   const  { return _rOut; }
     double getY0()  const  { return _y0 ; };
@@ -54,6 +54,7 @@ namespace mu2e {
 
     std::string _shape;
     std::string _material;
+    std::string _wedgeMaterial;
 
     double _rOut;
     double _halfZ;

diff --git a/GeometryService/src/BeamlineMaker.cc b/GeometryService/src/BeamlineMaker.cc
@@ -664,10 +664,12 @@ namespace mu2e {
     if ( pbarWindow._nStrips > 0 ) {
       c.getVectorDouble("pbarwedge.stripHeights",pbarWindow._stripHeights,pbarWindow._nStrips);
     }
-      // for version 4 (variable thickness strips)
-      if (pbarWindow._nStrips > 0 && pbarWindow._version == 4) {
-	c.getVectorDouble("pbarwedge.stripThicknesses",pbarWindow._stripThicknesses,pbarWindow._nStrips);
+    // for version 4 (variable thickness strips)
+    if (pbarWindow._nStrips > 0 && pbarWindow._version == 4) {
+      c.getVectorDouble("pbarwedge.stripThicknesses",pbarWindow._stripThicknesses,pbarWindow._nStrips);
     }
+    // allow for the wedge and window to have different materials
+    pbarWindow._wedgeMaterial = c.getString("pbarwedge.wedgeMaterial",pbarWindow._material); //default to window material
   }
 
 } // namespace mu2e

diff --git a/Mu2eG4/geom/TransportSolenoid_v06.txt b/Mu2eG4/geom/TransportSolenoid_v06.txt
@@ -0,0 +1,18 @@
+// Correct the pbar window used in TS5
+#include "Mu2eG4/geom/TransportSolenoid_v05.txt"
+
+// Pbar Absorber
+int    pbar.version        = 4;
+double pbar.halfLength     = 0.127; 
+string pbar.materialName   = "A1100";
+
+int    pbarwedge.nStrips              = 3;
+double pbarwedge.stripThickness       = 0.127; // mm
+vector<double> pbarwedge.stripThicknesses = {0.0635,0.0635,0.0635}; // mm
+vector<double> pbarwedge.stripHeights = {23, 69, 115}; // mm
+
+// This tells emacs to view this file in c++ mode.
+// Local Variables:
+// mode:c++
+// End:
+
diff --git a/Mu2eG4/geom/TransportSolenoid_v07.txt b/Mu2eG4/geom/TransportSolenoid_v07.txt
@@ -0,0 +1,17 @@
+
+//titanium pbar window and updated wedge to match
+#include "Mu2eG4/geom/TransportSolenoid_v06.txt"
+
+// Pbar Absorber
+double pbar.halfLength     = 0.0254; //thin
+string pbar.materialName   = "G4_Ti";
+string pbarwedge.wedgeMaterial   = "A1100";
+int    pbarwedge.nStrips              = 4;
+vector<double> pbarwedge.stripThicknesses = {0.0635,0.0635,0.0635,0.0635}; // mm
+vector<double> pbarwedge.stripHeights = {48, 88, 128,168}; // mm
+
+// This tells emacs to view this file in c++ mode.
+// Local Variables:
+// mode:c++
+// End:
+
diff --git a/Mu2eG4/geom/geom_2019_PhaseI_hayman_v2.txt b/Mu2eG4/geom/geom_2019_PhaseI_hayman_v2.txt
@@ -45,7 +45,7 @@ double mu2e.detectorSystemZ0 = 10171.;   // mm  G4BL: (17730-7292=9801 mm)
 #include "Mu2eG4/geom/psEnclosure_v04.txt"
 #include "Mu2eG4/geom/PSShield_v06.txt"
 #include "Mu2eG4/geom/PSExternalShielding_v01.txt"
-#include "Mu2eG4/geom/TransportSolenoid_v05.txt"
+#include "Mu2eG4/geom/TransportSolenoid_v07.txt"
 
 // External Shielding
 #include "Mu2eG4/geom/ExtShieldUpstream_v06.txt"

diff --git a/Mu2eG4/geom/geom_common_hayman_v2_TS06.txt b/Mu2eG4/geom/geom_common_hayman_v2_TS06.txt
@@ -0,0 +1,10 @@
+// Top level geometry, using the hayman_v2 production target geometry file and a correcteted TS3 pbar window
+#include "Mu2eG4/geom/geom_common_hayman_v2.txt"
+#include "Mu2eG4/geom/TransportSolenoid_v06.txt"
+
+
+
+// This tells emacs to view this file in c++ mode.
+// Local Variables:
+// mode:c++
+// End:
diff --git a/Mu2eG4/src/constructTS.cc b/Mu2eG4/src/constructTS.cc
@@ -1877,9 +1877,9 @@ namespace mu2e {
 	    G4cout << "pbarWedgeTrans = " << pbarWedgeTrans << G4endl;
 	  }
 	  pbarWedgeInfo.solid = stairCase;
-
+	  G4Material* wedgeMaterial  = findMaterialOrThrow(pbarWindow.wedgeMaterial()); //defaults to window material if not specified
 	  finishNesting(pbarWedgeInfo,
-			pbarMaterial,
+			wedgeMaterial,
 			pbarWedgeRot,
 			pbarWedgeTrans,
 			parent.logical,