Merge pull request #1164 from mhedges/ProdTgtFix

Production target geometry fixes
Mu2e · Dec 14, 2023 · 15c45d3 · 15c45d3
2 parents 1634245 + 1fb176c
commit 15c45d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Mu2eG4/geom/ProductionTarget_Hayman_v2_0.txt b/Mu2eG4/geom/ProductionTarget_Hayman_v2_0.txt
@@ -33,7 +33,7 @@ vector<double> targetPS_heightOfRectangularGapPerSection = {12.135,12.135,12.640
 vector<double> targetPS_thicknessOfGapPerSection                 = {2.0,2.0,1.0}; //mm
 
 int targetPS_nHaymanFins                        = 4;
-vector<double> targetPS_finAngles                        = {30.,120.,210.,300.}; //degrees
+vector<double> targetPS_finAngles                        = {-30.,-120.,-210.,-300.}; //degrees
 double targetPS_finOuterRadius             = 16.15;
 double targetPS_finThickness               = 1.0; //                                                                                                                                                              full thickness
 double targetPS_supportRingLength          = 8.0; // full length in mm

diff --git a/Mu2eG4/geom/ProductionTarget_Hayman_v2_1.txt b/Mu2eG4/geom/ProductionTarget_Hayman_v2_1.txt
@@ -21,20 +21,20 @@ string targetPS.supports.wheel.material   =  "G4_Al";
 
 int  targetPS.supports.nSpokes = 3;
 //features on the wheel
-vector<double> targetPS.supports.features.angles = {-30.,  90., 210.}; //degrees
+vector<double> targetPS.supports.features.angles = {-46.62.,  79.38., 194.38.}; //degrees
 vector<double> targetPS.supports.features.arcs   = { 28.,  28.,  28.}; //degrees
 vector<double> targetPS.supports.features.rIns   = {158.75, 158.75, 158.75}; //mm
 //support rods in the wheel that the wires connect to
-vector<double> targetPS.supports.rods.angles       = {-23, 97, 217}; //degrees
+vector<double> targetPS.supports.rods.angles       = {-54., 71.5, 186.0}; //degrees
 vector<double> targetPS.supports.rods.halfLength   = {70., 70., 70.}; //mm
-vector<double> targetPS.supports.rods.offset       = {-40., 10., 40.}; //mm
+vector<double> targetPS.supports.rods.offset       = {-40., -10., 40.}; //mm
 vector<double> targetPS.supports.rods.radius       = {9., 9., 9.}; //mm
 vector<double> targetPS.supports.rods.radialOffset = {177.8, 177.8, 177.8}; //mm
 vector<double> targetPS.supports.rods.wireOffset.downstream = {10., 10., 10.}; //mm
 vector<double> targetPS.supports.rods.wireOffset.upstream   = {10., 10., 10.}; //mm
 //spokes connecting the target to the wheel rods
-vector<double> targetPS.supports.spokes.targetAngles.downstream = {-23, 97, 217}; //degrees
-vector<double> targetPS.supports.spokes.targetAngles.upstream   = {-23, 97, 217}; //degrees
+vector<double> targetPS.supports.spokes.targetAngles.downstream = {-54., 71.5, 186.0}; //degrees
+vector<double> targetPS.supports.spokes.targetAngles.upstream   = {-54., 71.5, 186.0}; //degrees
 double targetPS.supports.spokes.diameter = 2.;
 string targetPS.supports.spokes.material = "ProductionTargetTungstenLa2_O3";