reverted

Mu2e · Feb 25, 2022 · 01f6e85 · 01f6e85
1 parent 86c8811
commit 01f6e85
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 268 deletions.
diff --git a/Mu2eG4/geom/calorimeter_CsI.txt b/Mu2eG4/geom/calorimeter_CsI.txt
@@ -60,7 +60,16 @@ vector<double> calorimeter.pipeTorRadius       = {397,457,517,577,637};
 double calorimeter.pipeRadius                  = 4.75;    
 double calorimeter.pipeThickness               = 0.5; 
 double calorimeter.pipeInitSeparation          = 25.4;
-bool calorimeter.hasUpdatedSourceCalibrationSystem    = false;
+
+vector<double> calorimeter.largeTorPhi         = {161.34, 149.50, 139.50, 132.07, 125.39};//full angle of large torus
+vector<double> calorimeter.smallTorPhi         = {84.63, 85.28, 85.79, 86.20, 86.53}; // full angle of small torus
+vector<double> calorimeter.straightEndPhi        = {3.96, 10.53, 15.80, 20.16, 23.84};  // angle of the ending poing of the straight pipe
+vector<double> calorimeter.yposition           = {432.2, 480.5, 524.3, 564.7, 602.5}; // start y position of the strait pipe
+double calorimeter.radSmTor = 41.0;
+double calorimeter.xsmall = 71.0;
+double calorimeter.xdistance = 60.0;
+double calorimeter.rInnerManifold = 681.6; 
+
 int calorimeter.crateVersion                   = 2; 
 int calorimeter.numberOfCrates                 = 10;
 int calorimeter.numberOfBoards                 = 9;

diff --git a/Mu2eG4/geom/calorimeter_CsI_v02.txt b/Mu2eG4/geom/calorimeter_CsI_v02.txt
diff --git a/Mu2eG4/geom/geom_2021_PhaseI_v03.txt b/Mu2eG4/geom/geom_2021_PhaseI_v03.txt
diff --git a/Mu2eG4/geom/geom_common_current.txt b/Mu2eG4/geom/geom_common_current.txt
@@ -2,7 +2,7 @@
 // and features that will eventually become default -
 // the latest for testing..
 
-#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v03.txt"
+#include "Offline/Mu2eG4/geom/geom_2021_PhaseI_v02.txt"
 
 // This tells emacs to view this file in c++ mode.
 // Local Variables: