X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FSHILConst.h;h=b9646b4977ba785d4fa559c5627b956ea1edeae4;hb=555f5d5d402892e8acb115db94223d5381b25b67;hp=234a895c38861d74bff69db406db8fbb164e8456;hpb=6eecd1ca9ee43b523d6452af040ea27128d6c4b3;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/SHILConst.h b/STRUCT/SHILConst.h
index 234a895c388..b9646b4977b 100644
--- a/STRUCT/SHILConst.h
+++ b/STRUCT/SHILConst.h
@@ -6,127 +6,136 @@
 /* $Id$ */
 
 // angle of 2nd cone
-  const Float_t thetaOpen2 = 0.8*kDegrad;
+  const Float_t kThetaOpen2   = 0.83*kDegrad;
 // angle of 3rd cone
-  const Float_t thetaOpen3 = 0.9*kDegrad;
+  const Float_t kThetaOpen3   = 0.83*kDegrad;
 // angle of beam tube in second cone
-  const Float_t thetaOpenB = 0.84*kDegrad;
+  const Float_t kThetaOpenB   = 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 kThetaOpenPb  = 0.6*kDegrad;
 // Outer Pb Cone opening angle
-  const Float_t thetaOpenPbO = 1.6*kDegrad;
+  const Float_t kThetaOpenPbO = 1.6*kDegrad;
 // Start of lead cone
-  const Float_t zPb     = 810.;   
+  const Float_t kZPb = 810.;   
 // y-position of trigger wall
-  const Float_t zFilterIn       = 1471.;
-  const Float_t zFilterOut      = zFilterIn+120.;
+  const Float_t kZFilterIn       = 1471.;
+  const Float_t kZFilterOut      = kZFilterIn+120.;
 // end of 2-degree outer cone
 //  const Float_t zConeE    = 30./TMath::Tan(accMin);
-  const Float_t zConeE    = 859.;
+  const Float_t kZConeE    = 859.;
 //
 //
-  Float_t dTubeS=0.1;
-  const Float_t dInsuS=0.6;
-  const Float_t dEnveS=0.1;
-  const Float_t dProtS=0.2;
-  const Float_t dFreeS=0.5;
+  Float_t dTubeS = 0.1;
+  const Float_t kDInsuS=1.5;
+  const Float_t kDEnveS=0.1;
+  const Float_t kDProtS=0.1;
+  const Float_t kDFreeS=0.00;
 
-  Float_t dVacuS=dTubeS+dInsuS+dEnveS+dProtS+dFreeS;
+  Float_t dVacuS=dTubeS+kDInsuS+kDEnveS+kDProtS+kDFreeS;
 
 //
 // Radii and z-positions imposed by vacuum chamber layout
 //
 // FIRST SECTION
 // delta_R for bellows
-  const Float_t dr11=1.8;
+//  const Float_t dr11=2.65;
+  const Float_t kDr11=4.1;
 // delta_R for flange
-  const Float_t dr12=0.875;
+  const Float_t kDr12=0.01;
 // delta_R to catch up with cone
-  const Float_t dr13=0.525;
+  const Float_t kDr13=2.0;
 
 // flange length
-  const Float_t dF1=2.*3.9;
+  const Float_t kDF1=2.*3.9;
 // bellow length
-  const Float_t dB1=18.482-dF1/2-dr11;
+//
+  const Float_t kRB1=5.5;
+  const Float_t kHB1=2.25;
+  const Float_t kLB1=0.77;
+  const Float_t kEB1=0.04;
+//
+
+  const Float_t kDB1=12.*kLB1/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 zvac4=558.;
+  const Float_t kZvac2=507.;
+  const Float_t kZvac1=kZvac2-kDB1-kDr11/2.-kDr12;
+  const Float_t kZvac3=kZvac2+kDB1+kDF1+kDr13+6.;
+  const Float_t kZvac4=558.;
 // Outer shield dimensions
-  const Float_t R11=15.45;
+  const Float_t kR11=15.45;
 // Steel Envelope
-  const Float_t dRSteel1=2.;
-  const Float_t dRSteel2=4.;
+  const Float_t kDRSteel2=4.;
 //  According to design
 //  const Float_t R21=20.3;
 //  to avoid overlap with 2deg line
-  const Float_t R21=19.4;
+  const Float_t kR21=19.4;
 //
 // 2nd Section
 // 
-  const Float_t zvac5=zvac4+4.;
+//  const Float_t kZvac5=kZvac4+4.;
 //
 // 3rd Section
 // 
-  const Float_t zvac6=711.;
-  const Float_t zvac8=1274.;
-  const Float_t dr21=2.263;
-  const Float_t dr22=1.3;
-  const Float_t dr23=2.263;
-  const Float_t dB2=24.118;
-  const Float_t dF2=10.6;
-  const Float_t zvac7=zvac8-dF2/2-dB2-dr22-dr21;
-  const Float_t zvac9=zvac8+dF2/2+dB2+dr22+dr23;
+  const Float_t kZvac6=711.;
+  const Float_t kZvac8=1274.;
+//const Float_t kDr21=2.263;
+  const Float_t kDr21=.5;
+  const Float_t kDr22=1.3;
+  const Float_t kDr23=2.263;
+  const Float_t kDB2=24.118;
+  const Float_t kDF2=10.6;
+  const Float_t kZvac7=kZvac8-kDF2/2-kDB2-kDr22-kDr21;
+  const Float_t kZvac9=kZvac8+kDF2/2+kDB2+kDr22+kDr23;
 //
 // 4th Section
 // 
-  const Float_t zvac10=1466.;
-  const Float_t zvac11=1800.;
-  const Float_t zvac12=1900.;
+  const Float_t kZvac10=1466.;
+  const Float_t kZvac11=1800.;
+  const Float_t kZvac12=1900.;
 
-  const Float_t R41=35.;
-  const Float_t R42=50.;
-  const Float_t R43=110.;
+  const Float_t kR41=35.;
+  const Float_t kR42=49.9;
+  const Float_t kR43=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
 //
-  const Float_t rF1=8.5;
-  const Float_t dFlange=0.1;
+  const Float_t kRF1=8.4;
+  const Float_t kDFlange=0.1;
 
 //
 // Bellow2
 //
-  const Float_t rB2=15.85;
-  const Float_t hB2=2.25;
-  const Float_t lB2=2.32;
-  const Float_t eB2=0.05;
+  const Float_t kRB2=16.35;
+  const Float_t kHB2=2.25;
+  const Float_t kLB2=2.32;
+  const Float_t kEB2=0.05;
 //
 // Flange2
 //
-  const Float_t rF2=18.8;
+  const Float_t kRF2=18.5;
 
 //
 // Chamber positions
 //
-const Float_t dzch = 10.;
-const Float_t zch1 =   528.0;
-const Float_t zch2 =   690.;
-const Float_t zch31 =  945.5;
-const Float_t zch32 = 1004.5;
-const Float_t zch41 = 1237.66;
-const Float_t zch42 = 1296.66;
-const Float_t zch51 = 1398.5;
-const Float_t zch52 = 1457.5;
+//const Float_t kZch1 =   530.0 ;
+//const Float_t kZch2 =   672.5 ;
+
+const Float_t kZch11 =  526.2 ;
+const Float_t kZch12 =  553.8 ;
+const Float_t kZch21 =  670.25;
+const Float_t kZch22 =  701.75;
+const Float_t kZch31 =  946.  ;
+const Float_t kZch32 = 1046.  ;
+const Float_t kZch41 = 1238.16;
+const Float_t kZch42 = 1296.16;
+const Float_t kZch51 = 1399.0 ;
+const Float_t kZch52 = 1457.0 ;
 #endif
+