Load digitstree only once

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

diff --git a/STRUCT/SHILConst.h b/STRUCT/SHILConst.h
index f9a621626218c2e4086f418cd0e90bd89b8d77cc..b99355eac7fd4ff0a21936fecb209ed3b323f90c 100644 (file)
--- a/STRUCT/SHILConst.h
+++ b/STRUCT/SHILConst.h
@@ -6,17 +6,18 @@
 /* $Id$ */
 
 // angle of 2nd cone
-  const Float_t thetaOpen2 = 0.8*kDegrad;
+  const Float_t thetaOpen2   = 0.83*kDegrad;
 // angle of 3rd cone
-  const Float_t thetaOpen3 = 0.9*kDegrad;
+  const Float_t thetaOpen3   = 0.83*kDegrad;
 // angle of beam tube in second cone
-  const Float_t thetaOpenB = 0.84*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.;
@@ -25,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;
 
@@ -38,11 +39,12 @@
 //
 // 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;
@@ -71,7 +73,8 @@
 // 
   const Float_t zvac6=711.;
   const Float_t zvac8=1274.;
-  const Float_t dr21=2.263;
+//const Float_t dr21=2.263;
+  const Float_t dr21=.5;
   const Float_t dr22=1.3;
   const Float_t dr23=2.263;
   const Float_t dB2=24.118;
@@ -86,7 +89,7 @@
   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.;
 
 //
@@ -102,20 +105,20 @@
 //
 // Flange1
 //
-  const Float_t rF1=8.5;
+  const Float_t rF1=8.4;
   const Float_t dFlange=0.1;
 
 //
 // 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;
 //
 // Flange2
 //
-  const Float_t rF2=18.8;
+  const Float_t rF2=18.5;
 
 //
 // Chamber positions
@@ -123,10 +126,10 @@
 const Float_t zch1 =   530.0 ;
 const Float_t zch2 =   672.5 ;
 
-const Float_t zch11 =  522.5 ;
-const Float_t zch12 =  557.5 ;
-const Float_t zch21 =  662.5 ;
-const Float_t zch22 =  709.5 ;
+const Float_t zch11 =  526.2 ;
+const Float_t zch12 =  553.8 ;
+const Float_t zch21 =  670.25;
+const Float_t zch22 =  701.75;
 const Float_t zch31 =  946.  ;
 const Float_t zch32 = 1046.  ;
 const Float_t zch41 = 1238.16;