Added AliL3Stopwatch.

[u/mrichter/AliRoot.git] / STRUCT / SHILConst.h

diff --git a/STRUCT/SHILConst.h b/STRUCT/SHILConst.h
index 03613e6bbe9e2a4065c7c07acb6a34f9422ec6fc..1971e798f7e445e65a3bc74d2ceaa454240b609a 100644 (file)
--- a/STRUCT/SHILConst.h
+++ b/STRUCT/SHILConst.h
@@ -6,18 +6,18 @@
 /* $Id$ */
 
 // angle of 2nd cone
-  const Float_t thetaOpen2 = 0.78*kDegrad;
+  const Float_t thetaOpen2   = 0.83*kDegrad;
 // angle of 3rd cone
-  const Float_t thetaOpen3 = 0.78*kDegrad;
+  const Float_t thetaOpen3   = 0.83*kDegrad;
 // angle of beam tube in second cone
-  const Float_t thetaOpenB = 0.83*kDegrad;
+  const Float_t thetaOpenB   = 0.83*kDegrad;
 //  const Float_t thetaOpenB = 0.84*kDegrad;
 // inner lead Cone opening angle
-  const Float_t thetaOpenPb = 0.6*kDegrad;
+  const Float_t thetaOpenPb  = 0.6*kDegrad;
 // Outer Pb Cone opening angle
   const Float_t thetaOpenPbO = 1.6*kDegrad;
 // Start of lead cone
-  const Float_t zPb     = 810.;   
+  const Float_t zPb = 810.;   
 // y-position of trigger wall
   const Float_t zFilterIn       = 1471.;
   const Float_t zFilterOut      = zFilterIn+120.;
@@ -26,11 +26,11 @@
   const Float_t zConeE    = 859.;
 //
 //
-  Float_t dTubeS=0.1;
-  const Float_t dInsuS=0.6;
+  Float_t dTubeS = 0.1;
+  const Float_t dInsuS=1.5;
   const Float_t dEnveS=0.1;
-  const Float_t dProtS=0.2;
-  const Float_t dFreeS=0.5;
+  const Float_t dProtS=0.1;
+  const Float_t dFreeS=0.00;
 
   Float_t dVacuS=dTubeS+dInsuS+dEnveS+dProtS+dFreeS;
 
@@ -39,20 +39,28 @@
 //
 // FIRST SECTION
 // delta_R for bellows
-  const Float_t dr11=1.8;
+//  const Float_t dr11=2.65;
+  const Float_t dr11=4.1;
 // delta_R for flange
-  const Float_t dr12=0.875;
+  const Float_t dr12=0.01;
 // delta_R to catch up with cone
-  const Float_t dr13=0.525;
+  const Float_t dr13=2.0;
 
 // flange length
   const Float_t dF1=2.*3.9;
 // bellow length
-  const Float_t dB1=18.482-dF1/2-dr11;
+//
+  const Float_t rB1=5.5;
+  const Float_t hB1=2.25;
+  const Float_t lB1=0.77;
+  const Float_t eB1=0.04;
+//
+
+  const Float_t dB1=12.*lB1/2.;
 // Flange position
-  const Float_t zvac2=518.;
-  const Float_t zvac1=zvac2-dF1/2-dB1-dr11-dr12;
-  const Float_t zvac3=zvac2+dF1/2+dB1+dr12+dr13;
+  const Float_t zvac2=507.;
+  const Float_t zvac1=zvac2-dB1-dr11/2.-dr12;
+  const Float_t zvac3=zvac2+dB1+dF1+dr13+6.;
   const Float_t zvac4=558.;
 // Outer shield dimensions
   const Float_t R11=15.45;
@@ -88,19 +96,14 @@
   const Float_t zvac12=1900.;
 
   const Float_t R41=35.;
-  const Float_t R42=50.;
+  const Float_t R42=49.9;
   const Float_t R43=110.;
 
 //
 // Vacuum System
 //
 
-// Bellow1
-//
-  const Float_t rB1=5.5;
-  const Float_t hB1=2.25;
-  const Float_t lB1=0.77;
-  const Float_t eB1=0.04;
+
 //
 // Flange1
 //
@@ -110,7 +113,7 @@
 //
 // Bellow2
 //
-  const Float_t rB2=15.85;
+  const Float_t rB2=16.35;
   const Float_t hB2=2.25;
   const Float_t lB2=2.32;
   const Float_t eB2=0.05;