Some mother volumes sligthly modified to eliminate an overlap with the absorber

diff --git a/ITS/AliITSvPPRasymm.cxx b/ITS/AliITSvPPRasymm.cxx
index 43e43f3dc4e521311b140569f383fd5c1f8176ae..3901ebdf4b107c013de5511d0d90c19d3898ebcc 100644 (file)
--- a/ITS/AliITSvPPRasymm.cxx
+++ b/ITS/AliITSvPPRasymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.21  2001/03/13 08:36:23  hristov
+fabsf replaced by TMath::Abs
+

 Revision 1.20  2001/03/13 00:17:41  barbera
 New SDD geometry got grom F. Tosello and checked by the SDD engineers
 
 Revision 1.20  2001/03/13 00:17:41  barbera
 New SDD geometry got grom F. Tosello and checked by the SDD engineers
 


@@ -323,7 +326,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   ddet2  = ddet2*0.0001/2.; // conversion from tot length in um to half in cm  
   dchip1 = dchip1*0.0001/2.;// conversion from tot length in um to half in cm  
   dchip2 = dchip2*0.0001/2.;// conversion from tot length in um to half in cm  
   ddet2  = ddet2*0.0001/2.; // conversion from tot length in um to half in cm  
   dchip1 = dchip1*0.0001/2.;// conversion from tot length in um to half in cm  
   dchip2 = dchip2*0.0001/2.;// conversion from tot length in um to half in cm  

-  dbus   = dbus*0.0001/2.;      // conversion from tot length in um to half in cm       
+  dbus   = dbus*0.0001/2.;  // conversion from tot length in um to half in cm       

                
   Float_t deltax, deltay; 
 
                
   Float_t deltax, deltay; 
 


@@ -851,19 +854,19 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;

-  dgh[4] = 44.9;
+  dgh[4] = 46;   // 44.9

   dgh[5] = 85.;
   dgh[6] = -xltpc;
   dgh[5] = 85.;
   dgh[6] = -xltpc;

-  dgh[7] = 44.9;
+  dgh[7] = 46;   // 44.9

   dgh[8] = 85.;
   dgh[9] = -xltpc;
   dgh[8] = 85.;
   dgh[9] = -xltpc;

-  dgh[10] = 44.9;
+  dgh[10] = 46;  // 44.9

   dgh[11] = 56.1;
   dgh[12] = -100.7;
   dgh[11] = 56.1;
   dgh[12] = -100.7;

-  dgh[13] = 44.9;
+  dgh[13] = 46;  // 44.9

   dgh[14] = 56.1;
   dgh[15] = -77.2;
   dgh[14] = 56.1;
   dgh[15] = -77.2;

-  dgh[16] = 44.9;
+  dgh[16] = 46;  //44.9

   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;
   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;


@@ -872,16 +875,16 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;

-  dgh[25] = 44.9;
+  dgh[25] = 46;  // 44.9

   dgh[26] = 56.1;
   dgh[27] = 100.7;
   dgh[26] = 56.1;
   dgh[27] = 100.7;

-  dgh[28] = 44.9;
+  dgh[28] = 46;  //44.9

   dgh[29] = 56.1;
   dgh[30] = xltpc;
   dgh[29] = 56.1;
   dgh[30] = xltpc;

-  dgh[31] = 61.5;
-  dgh[32] = 61.5+4.;
+  dgh[31] = 62;     //61.5
+  dgh[32] = 62+4.;  //61.5

   dgh[33] = xltpc;
   dgh[33] = xltpc;

-  dgh[34] = 61.5;
+  dgh[34] = 62;     //62.4

   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;


@@ -902,7 +905,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;

-  dgh[4] = 45.;
+  dgh[4] = 46.;

   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;
   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;


@@ -911,7 +914,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;

-  dgh[13] = 45.;
+  dgh[13] = 46.;

   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 15);
   
   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 15);
   


@@ -931,7 +934,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   
      dits[0] = 3.7;
      dits[1] = 7.75;
   
      dits[0] = 3.7;
      dits[1] = 7.75;

-     dits[2] = 24;
+     dits[2] = 26.1;

      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;


@@ -1284,7 +1287,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   
      dits[0] = 3.7;
      dits[1] = 7.75;
   
      dits[0] = 3.7;
      dits[1] = 7.75;

-     dits[2] = 24;
+     dits[2] = 26.1;

      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;


@@ -2457,7 +2460,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[1] = 360;
   dits[2] = 12;
   dits[3] = -77.2;
   dits[1] = 360;
   dits[2] = 12;
   dits[3] = -77.2;

-  dits[4] = 44.9;
+  dits[4] = 46;

   dits[5] = 47;
   dits[6] = -61.2;
   dits[7] = 28.5;
   dits[5] = 47;
   dits[6] = -61.2;
   dits[7] = 28.5;


@@ -2490,7 +2493,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[34] = 28.5;
   dits[35] = 47;
   dits[36] = 77.2;
   dits[34] = 28.5;
   dits[35] = 47;
   dits[36] = 77.2;

-  dits[37] = 44.9;
+  dits[37] = 46;

   dits[38] = 47;  
   gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);
   
   dits[38] = 47;  
   gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);
   


@@ -3927,8 +3930,8 @@ void AliITSvPPRasymm::CreateGeometry(){
 
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
 
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;    //45
+  dgh[1] = 46.+1.0;  //45

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  


@@ -3937,8 +3940,8 @@ void AliITSvPPRasymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;  //45
+  dgh[1] = 46.+1.0+1.5;   //45

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  


@@ -3947,7 +3950,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   

-  dgh[0] = 45.;
+  dgh[0] = 46.;  //45

   dgh[1] = 56.;
   dgh[2] = 2.25;
   
   dgh[1] = 56.;
   dgh[2] = 2.25;
   


@@ -3959,10 +3962,10 @@ void AliITSvPPRasymm::CreateGeometry(){
   //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;     //45.2
+  dgh[2] = 46.2+1.0;  //45.2
+  dgh[3] = 62.3;     //61.8
+  dgh[4] = 62.3+1.0;   //61.8

   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    


@@ -3972,10 +3975,10 @@ void AliITSvPPRasymm::CreateGeometry(){
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;      //45.2
+  dgh[2] = 46.2+1.0;  //45.2
+  dgh[3] = 62.3;      //61.8
+  dgh[4] = 62.3+1.0;  //61.8

   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    


@@ -3986,10 +3989,10 @@ void AliITSvPPRasymm::CreateGeometry(){
    //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
    //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;      //45.2
+  dgh[2] = 46.2+1.0+1.5;  //45.2
+  dgh[3] = 62.3+1.0;      //61.8
+  dgh[4] = 62.3+1.0+1.5;  //61.8

   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    


@@ -3999,10 +4002,10 @@ void AliITSvPPRasymm::CreateGeometry(){
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;    //45.2
+  dgh[2] = 46.2+1.0+1.5; //45.2
+  dgh[3] = 62.3+1.0;     //61.8
+  dgh[4] = 62.3+1.0+1.5;  //61.8

   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    


@@ -4011,7 +4014,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
     

-  dgh[0] = 62.5;
+  dgh[0] = 62.1; //62.5

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -4022,7 +4025,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;  //62.5

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -4033,7 +4036,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     UPPER PART
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     UPPER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;  //62.5

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -4044,7 +4047,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;  //62.5

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;


@@ -4055,8 +4058,8 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - UPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;      //45
+  dgh[1] = 46.+1.0;  //45

   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;
   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;


@@ -4066,8 +4069,8 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - LOWER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;  //45
+  dgh[1] = 46.+1.0;  //45

   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  


@@ -4077,8 +4080,8 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - UPPER PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;  //45
+  dgh[1] = 46.+1.0+1.5; //45

   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;  
   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;  


@@ -4088,8 +4091,8 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - LOWER PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;   //45
+  dgh[1] = 46.+1.0+1.5;  //45

   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  


@@ -4099,7 +4102,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - UPPER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - UPPER PART
     

-  dgh[0] = 45.;
+  dgh[0] = 46.;   //45

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -4110,7 +4113,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - LOWER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - LOWER PART
     

-  dgh[0] = 45.;
+  dgh[0] = 46.; //45

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -4121,7 +4124,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - UPPER PART
   

-  dgh[0] = 45.+1.0;
+  dgh[0] = 46.+1.0;  //45

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -4132,7 +4135,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - LOWER PART
   

-  dgh[0] = 45.+1.0;
+  dgh[0] = 46.+1.0;  //45

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;

diff --git a/ITS/AliITSvPPRcoarseasymm.cxx b/ITS/AliITSvPPRcoarseasymm.cxx
index f4d4c67e0bc06862d6378169c1465941ce4606bd..0edcf06fdef0c801f7907a18f1abb9e17bb8e80d 100644 (file)
--- a/ITS/AliITSvPPRcoarseasymm.cxx
+++ b/ITS/AliITSvPPRcoarseasymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.18  2001/02/19 09:44:16  barbera
+Copy no.2 of volume ICO2 re-inserted
+

 Revision 1.17  2001/02/09 00:05:31  nilsen
 Added fMajor/MinorVersion variables and made other changes to better make
 use of the new code changes in AliITSgeom related classes.
 Revision 1.17  2001/02/09 00:05:31  nilsen
 Added fMajor/MinorVersion variables and made other changes to better make
 use of the new code changes in AliITSgeom related classes.


@@ -284,19 +287,19 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;

-  dgh[4] = 44.9;
+  dgh[4] = 46;

   dgh[5] = 85.;
   dgh[6] = -xltpc;
   dgh[5] = 85.;
   dgh[6] = -xltpc;

-  dgh[7] = 44.9;
+  dgh[7] = 46;

   dgh[8] = 85.;
   dgh[9] = -xltpc;
   dgh[8] = 85.;
   dgh[9] = -xltpc;

-  dgh[10] = 44.9;
+  dgh[10] = 46;

   dgh[11] = 56.1;
   dgh[12] = -100.7;
   dgh[11] = 56.1;
   dgh[12] = -100.7;

-  dgh[13] = 44.9;
+  dgh[13] = 46;

   dgh[14] = 56.1;
   dgh[15] = -77.2;
   dgh[14] = 56.1;
   dgh[15] = -77.2;

-  dgh[16] = 44.9;
+  dgh[16] = 46;

   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;
   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;


@@ -305,16 +308,16 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;

-  dgh[25] = 44.9;
+  dgh[25] = 46;

   dgh[26] = 56.1;
   dgh[27] = 100.7;
   dgh[26] = 56.1;
   dgh[27] = 100.7;

-  dgh[28] = 44.9;
+  dgh[28] = 46;

   dgh[29] = 56.1;
   dgh[30] = xltpc;
   dgh[29] = 56.1;
   dgh[30] = xltpc;

-  dgh[31] = 61.5;
-  dgh[32] = 61.5+4.;
+  dgh[31] = 62;
+  dgh[32] = 62+4.;

   dgh[33] = xltpc;
   dgh[33] = xltpc;

-  dgh[34] = 61.5;
+  dgh[34] = 62;

   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;


@@ -335,7 +338,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;

-  dgh[4] = 45.;
+  dgh[4] = 46.;

   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;
   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;


@@ -344,7 +347,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;

-  dgh[13] = 45.;
+  dgh[13] = 46.;

   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
   
   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
   


@@ -487,8 +490,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
     
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
     
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;
+  dgh[1] = 46.+1.0;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  


@@ -497,8 +500,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;
+  dgh[1] = 46.+1.0+1.5;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3);  


@@ -507,7 +510,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   

-  dgh[0] = 45.;
+  dgh[0] = 46.;

   dgh[1] = 56.;
   dgh[2] = 2.25;
   
   dgh[1] = 56.;
   dgh[2] = 2.25;
   


@@ -519,10 +522,10 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7);    


@@ -532,10 +535,10 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7);    


@@ -545,10 +548,10 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
    //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
    //     UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7);    


@@ -558,10 +561,10 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   //     LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7);    


@@ -570,7 +573,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
     

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -581,7 +584,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -592,7 +595,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     UPPER PART
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     UPPER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -603,7 +606,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;


@@ -614,8 +617,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - UPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;
+  dgh[1] = 46.+1.0;

   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;
   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;


@@ -625,8 +628,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - LOWER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;
+  dgh[1] = 46.+1.0;

   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   dgh[2] = (xltpc-100.7+1.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  


@@ -636,8 +639,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - UPPER PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;
+  dgh[1] = 46.+1.0+1.5;

   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;  
   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;  


@@ -647,8 +650,8 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - LOWER PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;
+  dgh[1] = 46.+1.0+1.5;

   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   dgh[2] = (xltpc-100.7)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  


@@ -658,7 +661,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - UPPER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - UPPER PART
     

-  dgh[0] = 45.;
+  dgh[0] = 46.;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -669,7 +672,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - LOWER PART
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - LOWER PART
     

-  dgh[0] = 45.;
+  dgh[0] = 46.;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -680,7 +683,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - UPPER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - UPPER PART
   

-  dgh[0] = 45.+1.0;
+  dgh[0] = 46.+1.0;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -691,7 +694,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - LOWER PART
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - LOWER PART
   

-  dgh[0] = 45.+1.0;
+  dgh[0] = 46.+1.0;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;

diff --git a/ITS/AliITSvPPRcoarsesymm.cxx b/ITS/AliITSvPPRcoarsesymm.cxx
index ec4a36ffe68018b98378115048b60de6da3a9ea0..e02f9e53c88a7dcc0f330bf94775266249271c45 100644 (file)
--- a/ITS/AliITSvPPRcoarsesymm.cxx
+++ b/ITS/AliITSvPPRcoarsesymm.cxx
@@ -15,6 +15,10 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.16  2001/02/09 00:05:31  nilsen
+Added fMajor/MinorVersion variables and made other changes to better make
+use of the new code changes in AliITSgeom related classes.
+

 Revision 1.15  2001/01/30 09:23:13  hristov
 Streamers removed (R.Brun)
 
 Revision 1.15  2001/01/30 09:23:13  hristov
 Streamers removed (R.Brun)
 


@@ -336,7 +340,6 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[38] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[38] = 85.;

-

   gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 39);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 39);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 


@@ -352,7 +355,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;

-  dgh[4] = 45.;
+  dgh[4] = 46.;

   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;
   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;


@@ -361,7 +364,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;

-  dgh[13] = 45.;
+  dgh[13] = 46.;

   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
   
   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
   


@@ -507,8 +510,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;
+  dgh[1] = 46.+1.0;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  


@@ -517,8 +520,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;
+  dgh[1] = 46.+1.0+1.5;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3);  


@@ -527,7 +530,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   

-  dgh[0] = 45.;
+  dgh[0] = 46.;

   dgh[1] = 56.;
   dgh[2] = 2.25;
   
   dgh[1] = 56.;
   dgh[2] = 2.25;
   


@@ -538,10 +541,10 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7);    


@@ -551,10 +554,10 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7);    


@@ -564,10 +567,10 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7);    


@@ -577,10 +580,10 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7);    


@@ -589,7 +592,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -600,7 +603,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -611,7 +614,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -622,7 +625,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;

diff --git a/ITS/AliITSvPPRsymm.cxx b/ITS/AliITSvPPRsymm.cxx
index 99e3be26a2f915ba11d40cf811c0f66995c598ac..c15de5e38e04815202aad2584932e2fccaa0e795 100644 (file)
--- a/ITS/AliITSvPPRsymm.cxx
+++ b/ITS/AliITSvPPRsymm.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.8  2001/03/13 08:36:24  hristov
+fabsf replaced by TMath::Abs
+

 Revision 1.7  2001/03/13 00:43:43  barbera
 Updated version of the PPR detailed geometry with symmetric services. Of course, the central part of the detector (volume ITSD and its daughters) is the same of AliITSvPPRasymm.cxx
 
 Revision 1.7  2001/03/13 00:43:43  barbera
 Updated version of the PPR detailed geometry with symmetric services. Of course, the central part of the detector (volume ITSD and its daughters) is the same of AliITSvPPRasymm.cxx
 


@@ -892,42 +895,61 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;
   dgh[1] = 360.;
   dgh[2] = 12.;
   dgh[3] = -xltpc-5.-0.1;

-  dgh[4] = 44.9;
+  dgh[4] = 62.4;

   dgh[5] = 85.;
   dgh[6] = -xltpc;
   dgh[5] = 85.;
   dgh[6] = -xltpc;

-  dgh[7] = 44.9;
+  dgh[7] = 62;

   dgh[8] = 85.;
   dgh[9] = -xltpc;
   dgh[8] = 85.;
   dgh[9] = -xltpc;

-  dgh[10] = 44.9;
-  dgh[11] = 56.1;
+  dgh[10] = 62;
+  dgh[11] = 62+4.;

   dgh[12] = -100.7;
   dgh[12] = -100.7;

-  dgh[13] = 44.9;
+  dgh[13] = 46;

   dgh[14] = 56.1;
   dgh[15] = -77.2;
   dgh[14] = 56.1;
   dgh[15] = -77.2;

-  dgh[16] = 44.9;
+  dgh[16] = 46;

   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;
   dgh[20] = 56.1; 
   dgh[17] = 56.1;
   dgh[18] = -40.;
   dgh[19] = 3.295;
   dgh[20] = 56.1; 

+
+/*
+  dgh[21] = -35.;
+  dgh[22] = 3.295;
+  dgh[23] = 56.1;
+
+  dgh[24] = -35.;
+  dgh[25] = 5.;
+  dgh[26] = 56.1;
+
+  dgh[27] = -29.;
+  dgh[28] = 5.;
+  dgh[29] = 56.1;
+  
+  dgh[30] = -29.;
+  dgh[31] = 3.295;
+  dgh[32] = 56.1;
+
+*/
+

   dgh[21] = 40.;
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;
   dgh[21] = 40.;
   dgh[22] = 3.295;
   dgh[23] = 56.1;
   dgh[24] = 77.2;

-  dgh[25] = 44.9;
+  dgh[25] = 46;

   dgh[26] = 56.1;
   dgh[27] = 100.7;
   dgh[26] = 56.1;
   dgh[27] = 100.7;

-  dgh[28] = 44.9;
+  dgh[28] = 46;

   dgh[29] = 56.1;
   dgh[30] = xltpc;
   dgh[29] = 56.1;
   dgh[30] = xltpc;

-  dgh[31] = 61.5;
-  dgh[32] = 61.5+4.;
+  dgh[31] = 62;
+  dgh[32] = 62+4.;

   dgh[33] = xltpc;
   dgh[33] = xltpc;

-  dgh[34] = 61.5;
+  dgh[34] = 62;

   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[38] = 85.;
   dgh[35] = 85.;
   dgh[36] = xltpc+4.+0.1;
   dgh[37] = 62.4;
   dgh[38] = 85.;

-

   gMC->Gsvolu("ITSV", "PCON", idtmed[205], dgh, 39);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   gMC->Gsvolu("ITSV", "PCON", idtmed[205], dgh, 39);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 


@@ -943,7 +965,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;
   dgh[1] = 360.;
   dgh[2] = 4.;
   dgh[3] = -77.2;

-  dgh[4] = 45.;
+  dgh[4] = 46.;

   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;
   dgh[5] = 56.;
   dgh[6] = -40.;     
   dgh[7] = 3.3;


@@ -952,7 +974,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;
   dgh[10] = 3.3;
   dgh[11] = 56.;
   dgh[12] = 77.2;

-  dgh[13] = 45.;
+  dgh[13] = 46.;

   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 15);
   
   dgh[14] = 56.;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 15);
   


@@ -972,7 +994,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   
      dits[0] = 3.7;
      dits[1] = 7.75;
   
      dits[0] = 3.7;
      dits[1] = 7.75;

-     dits[2] = 24;
+     dits[2] = 26.1;

      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;


@@ -1325,7 +1347,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   
      dits[0] = 3.7;
      dits[1] = 7.75;
   
      dits[0] = 3.7;
      dits[1] = 7.75;

-     dits[2] = 24;
+     dits[2] = 26.1;

      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;


@@ -3968,8 +3990,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   

-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  dgh[0] = 46.;
+  dgh[1] = 46.+1.0;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  


@@ -3978,8 +4000,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   

-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;
+  dgh[1] = 46.+1.0+1.5;

   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  


@@ -3988,7 +4010,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   

-  dgh[0] = 45.;
+  dgh[0] = 46.;

   dgh[1] = 56.;
   dgh[2] = 2.25;
   
   dgh[1] = 56.;
   dgh[2] = 2.25;
   


@@ -3999,10 +4021,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    


@@ -4012,10 +4034,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+1.0;
+  dgh[1] = 46.2;
+  dgh[2] = 46.2+1.0;
+  dgh[3] = 62.3;
+  dgh[4] = 62.3+1.0;

   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    


@@ -4025,10 +4047,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    


@@ -4038,10 +4060,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
   dgh[0] = (xltpc-100.7)/2.;

-  dgh[1] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[1] = 46.2+1.0;
+  dgh[2] = 46.2+1.0+1.5;
+  dgh[3] = 62.3+1.0;
+  dgh[4] = 62.3+1.0+1.5;

   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    


@@ -4050,7 +4072,7 @@ void AliITSvPPRsymm::CreateGeometry(){
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;


@@ -4061,7 +4083,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;


@@ -4072,7 +4094,7 @@ void AliITSvPPRsymm::CreateGeometry(){
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;


@@ -4083,7 +4105,7 @@ void AliITSvPPRsymm::CreateGeometry(){
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 

-  dgh[0] = 62.5;
+  dgh[0] = 62.1;

   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;