fix overlaps

diff --git a/T0/AliT0v1.cxx b/T0/AliT0v1.cxx
index bf3a542432836283c4720d9db4849ef383c7287d..6d286e64110b7c62dbde157469e132927511d84e 100644 (file)
--- a/T0/AliT0v1.cxx
+++ b/T0/AliT0v1.cxx
@@ -129,7 +129,7 @@ void AliT0v1::CreateGeometry()
                       6.8 , 5.1, 10.};  //-62.9+0.00+69.7
   
   Float_t pstart[3]={4., 12.5,6.8};
-  Float_t pinstart[3]={0.,1.6,6.5};
+  Float_t pinstart[3]={0.,1.51,6.5};
   Float_t ppmt[3]={0.,1.5,3.5};
   Float_t ptop[3]={0.,1.,1.0};
   Float_t preg[3]={0., 1.0, 0.005}; //photcathode dobavil bogdanov
@@ -138,12 +138,12 @@ void AliT0v1::CreateGeometry()
   Float_t pglass[3]={1.2,1.3,2.};
   Float_t pcer[3]={0.9,1.1,1.35};
   Float_t psteel[3]={0.9,1.1,0.15};
-  Float_t psupport1[3] = {4.51,4.6,4.0};//C kozhuh vnutri
+  Float_t psupport1[3] = {4.51,4.52,3.9};//C kozhuh vnutri
   Float_t psupport2[3] = {9.4,9.5,4.0};// snaruzhi  C
   Float_t psupport3[3] = {4.51,9.5,0.05};//kryshki  C
-  Float_t psupport5[3] = {1.44,1.5,6.5}; // stakanchik dlai feu  C
+  Float_t psupport5[3] = {1.44,1.49,6.5}; // stakanchik dlai feu  C
   Float_t psupport6[3] = {0,1.4,0.04}; //kryshechka stakanchika  Al
-  Float_t psupport7[3] = {1.5,1.6,0.4}; //kolechko snaruzhu stakanchika Al
+  Float_t psupport7[3] = {1.,1.51,0.4}; //kolechko snaruzhu stakanchika Al
    
   // Mother Volume katushka dlia krepezha vokrug truby k Absorbru
     AliMatrix(idrotm[901], 90., 0., 90., 90., 180., 0.);
@@ -265,10 +265,10 @@ void AliT0v1::CreateGeometry()
     Char_t nameTr[40];
     for (Int_t itr=0; itr<12; itr++) {
       sprintf (nameTr,"tr%i",itr+1);
-      x = 6.5 * TMath::Sin(itr * angle);
+       x = 6.5 * TMath::Sin(itr * angle);
       y = 6.5 * TMath::Cos(itr * angle);
       tr[itr] = new TGeoTranslation(nameTr,x,y,6.5);
-      tr[itr]->RegisterYourself();
+     tr[itr]->RegisterYourself();
        stlin->AddNode(ins,itr+13,tr[itr]);
     }
     TGeoCompositeShape *supsh = new TGeoCompositeShape("supsh","supPgon:trPgon-(hole:tr1+hole:tr2+hole:tr3+hole:tr4+hole:tr5+hole:tr6+hole:tr7+hole:tr8+hole:tr9+hole:tr10+hole:tr11+hole:tr12)");
@@ -284,13 +284,15 @@ void AliT0v1::CreateGeometry()
 
     //T0C 
 // first ring: 12 units of Scintillator+PMT+divider
-  Float_t  theta  = (180 / TMath::Pi()) * TMath::ATan(6.5 / zdetC);
+  Float_t  theta  = (180 / TMath::Pi()) * TMath::ATan(6.6 / zdetC);
   Float_t phi[3];
    for (is=0; is<12; is++)
       {  
 
-       x = 6.5 * TMath::Sin(is * angle);
-       y = 6.5 * TMath::Cos(is * angle);
+       //      x = 6.52 * TMath::Sin(is * angle);
+       //      y = 6.52 * TMath::Cos(is * angle);
+       x = 6.6 * TMath::Sin(is * angle);
+       y = 6.6 * TMath::Cos(is * angle);
        
        phi[0] = -30 * is;
        phi[1] = 90 - is * 30;
@@ -343,7 +345,7 @@ void AliT0v1::CreateGeometry()
    z=-pstart[2]+psupport1[2]+0.1;
    gMC->Gspos("0SU1",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh snaruzhi
    gMC->Gspos("0SU2",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh vnutri
-   z=-pstart[2]+psupport3[2]+0.1;
+   z=-pstart[2]+psupport3[2]+0.5;
    gMC->Gspos("0SU3",1,"0STR",0,0,z,0,"ONLY"); //peredniaia kryshka
    z=-pstart[2]+2.*psupport1[2]-0.05;//+0.1;
    gMC->Gspos("0SU4",1,"0STR",0,0,z,0,"MANY"); //zadnaiai kryshka