]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Central and services mother volumes made consistenf for detailed and coarse geometry...
authorbarbera <barbera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 28 Mar 2001 06:40:21 +0000 (06:40 +0000)
committerbarbera <barbera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 28 Mar 2001 06:40:21 +0000 (06:40 +0000)
ITS/AliITSvPPRasymm.cxx
ITS/AliITSvPPRcoarseasymm.cxx
ITS/AliITSvPPRcoarseasymm.h
ITS/AliITSvPPRcoarsesymm.cxx
ITS/AliITSvPPRcoarsesymm.h
ITS/AliITSvPPRsymm.cxx
ITS/AliITSvPPRsymm.h

index 1e11ded1b8dc402f70af8a9f9c213cfd6e7def22..758a9ad52a6c1d488b719cf95f15b45e3bb3c05e 100644 (file)
@@ -917,16 +917,16 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[18] = -48;   
   dgh[19] = 6;
   dgh[20] = rlim+0.1;
-  dgh[21] = -28;   
+  dgh[21] = -28.6;   
   dgh[22] = 6;
   dgh[23] = rlim+0.1;    
-  dgh[24] = -26.2;  
+  dgh[24] = -27.6;  
   dgh[25] = 3.295;
   dgh[26] = rlim+0.1; 
-  dgh[27] = 26.2;   
+  dgh[27] = 27.6;   
   dgh[28] = 3.295;
   dgh[29] = rlim+0.1;
-  dgh[30] = 28;   
+  dgh[30] = 28.6;   
   dgh[31] = 6;
   dgh[32] = rlim+0.1;
   dgh[33] = 48;   
@@ -1846,22 +1846,22 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -34.6;
+  dits[3] = -34.6; 
   dits[4] = 23.49;
   dits[5] = 28;
-  dits[6] = -27.35; 
+  dits[6] = -23.65; 
   dits[7] = 23.49;
   dits[8] = 28;
-  dits[9] = -27.35;  
+  dits[9] = -23.65;  
   dits[10] = 14.59; 
   dits[11] = 28;
-  dits[12] = 27.35;   
+  dits[12] = 23.65;   
   dits[13] = 14.59;
   dits[14] = 28;
-  dits[15] = 27.35;    
+  dits[15] = 23.65;    
   dits[16] = 23.49;
   dits[17] = 28;
-  dits[18] = 34.6;
+  dits[18] = 34.6;  
   dits[19] = 23.49;
   dits[20] = 28;
   gMC->Gsvolu("IT34", "PCON", idtmed[209], dits, 21);  
@@ -2540,7 +2540,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   gMC->Gsvolu("IC01", "TUBE", idtmed[289], dits, 3);   
 
   dits[0] = 8.3;
-  dits[1] = 10;
+  dits[1] = 9.995;
   dits[2] = 17.5/2.;
   gMC->Gsvolu("IC02", "TUBE", idtmed[289], dits, 3);    
   
@@ -2594,7 +2594,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[30] = 34.65;
   dits[31] = 10;
   dits[32] = 28.6;
-  dits[33] = 42.6263;
+  dits[33] = 42.7;
   dits[34] = 10;
   dits[35] = 28.6;
   dits[36] = 59.7;
@@ -2610,9 +2610,9 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[5] = 12.25;      
   dits[6] = 40.15;
   dits[7] = 10.75;
-  dits[8] = 13.96;   //13.25
+  dits[8] = 13.96;   
   dits[9] = 40.15;
-  dits[10] = 12.46;  //12.46
+  dits[10] = 12.46;  
   dits[11] = 13.96;
   dits[12] = 55.75;
   dits[13] = 27;
@@ -2628,7 +2628,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 50;
   dits[2] = 3;
-  dits[3] = 35;  
+  dits[3] = 39;  
   dits[4] = 14;
   dits[5] = 18.75;
   dits[6] = 46.7-3;
@@ -2642,7 +2642,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 25;
   dits[2] = 3;
-  dits[3] = 40;
+  dits[3] = 49;
   dits[4] = 23.4;
   dits[5] = 26.4;
   dits[6] = 56.1-3;
@@ -4195,7 +4195,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    
-  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.7+dgh[0], 0, "ONLY");   
+  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
@@ -4425,7 +4425,7 @@ void AliITSvPPRasymm::CreateGeometry(){
   dgh[0] = 0.;        
   dgh[1] = 3.;         
   dgh[2] = 5.;  // 5. comes from the fact that the volume has to be 567.6/2 cm^3       
-  gMC->Gsvolu("ISR1", "TUBE", idtmed[210], dgh, 3);   
+  gMC->Gsvolu("ISR1", "TUBE", idtmed[284], dgh, 3);   
   gMC->Gspos("ISR1", 1, "ALIC", 54.9, 11., 79.5, 0, "ONLY");   
   gMC->Gspos("ISR1", 2, "ALIC", 54.9, -11., 79.5, 0, "ONLY");   
   gMC->Gspos("ISR1", 3, "ALIC", -54.9, 11., 79.5, 0, "ONLY"); 
@@ -4487,7 +4487,13 @@ void AliITSvPPRasymm::CreateMaterials(){
   
   Int_t  isxfld  = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
-  
+
+  // Freon
+  Float_t afre[2]  = { 12.011,18.9984032 };
+  Float_t zfre[2]  = { 6.,9. };
+  Float_t wfre[2]  = { 5.,12. };
+  Float_t densfre  = 1.5;  
+
   // --- Define the various materials and media for GEANT --- 
   
   AliMaterial(1,"SI$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
@@ -4523,6 +4529,9 @@ void AliITSvPPRasymm::CreateMaterials(){
   AliMaterial(12,"WATER$",0.14322E+02,0.72167E+01,0.10000E+01,0.35759E+02,0.94951E+02);
   AliMedium(12,"WATER$",12,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
+  AliMixture(13,"Freon$",afre,zfre,densfre,-2,wfre);
+  AliMedium(13,"Freon$",13,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
   AliMaterial(14,"COPPER$",0.63546E+02,0.29000E+02,0.89600E+01,0.14300E+01,0.99900E+03);
   AliMedium(14,"COPPER$",14,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
@@ -4577,7 +4586,7 @@ void AliITSvPPRasymm::CreateMaterials(){
   AliMaterial(65,"INOX$",0.55098E+02,0.2572E+02,0.7900E+01,0.17800E+01,0.99900E+03);
   AliMedium(65,"INOX$",65,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
-  AliMaterial(68,"ROHACELL$",0.12011E+02,0.60000E+01,0.500E-01,0.666500E+03,0.99900E+03);
+  AliMaterial(68,"ROHACELL$",0.123974E+02,0.62363E+01,0.500E-01,0.80986E+03,0.99900E+03);
   AliMedium(68,"ROHACELL$",68,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
   AliMaterial(69,"SDD C AL (M55J)$",0.138802E+02,0.71315E+01,0.19837E+01,0.176542E+02,0.99900E+03);
@@ -4628,6 +4637,10 @@ void AliITSvPPRasymm::CreateMaterials(){
   AliMaterial(84,"SDD/SSD rings$",0.123565E+02,0.64561E+01,0.18097E+01,0.229570E+02,0.99900E+03);
   AliMedium(84,"SDD/SSD rings$",84,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
+  AliMaterial(85,"inox/alum$",0.321502E+02,0.153383E+02,0.30705E+01,0.69197E+01,0.99900E+03);
+  AliMedium(85,"inox/alum$",85,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+
   // Special media
 
   AliMaterial(90,"SPD shield$", 12.011, 6., 1.93/10. , 22.1*10., 999);
index 0edcf06fdef0c801f7907a18f1abb9e17bb8e80d..42fca9ed0f1b5c5c2784128819006239d8d69ce8 100644 (file)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.19  2001/03/13 18:13:30  barbera
+Some mother volumes sligthly modified to eliminate an overlap with the absorber
+
 Revision 1.18  2001/02/19 09:44:16  barbera
 Copy no.2 of volume ICO2 re-inserted
 
@@ -263,10 +266,28 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
  
   Float_t dits[3], rlim, zmax;
   Float_t zpos;
-  Float_t pcits[15], xltpc;
-  Int_t idrotm[399], i;
-  Float_t dgh[50];
+  Float_t pcits[100], ztpc;
+  Int_t idrotm[1999], i;
+  Float_t dgh[100];
+  
+
+  Int_t rails = 1;       // flag for rails (1 --> rails in; 0 --> rails out)
   
+  rails = GetRails();
+  
+  if(rails != 0 && rails != 1) {
+     cout << "WARNING: the switch for rails is not set neither to 0 (rails out) nor to 1 (rails in)." 
+     " The default value of 1 (rails in) will be used." << endl;
+       
+  }  
+  
+  if(rails == 0 ) {
+     cout << "Rails are out." << endl; 
+  } else {
+     cout << "Rails are in." << endl;
+  }      
+    
+
   Int_t *idtmed = fIdtmed->GetArray()-199;
   
   //     CONVERT INTO CM (RL(SI)=9.36 CM) 
@@ -277,79 +298,102 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   //     FIELD CAGE HALF LENGTH 
   
   rlim  = 56.;
-  zmax  = 76.708;
-  xltpc = 284.;
+  zmax  = 74.;
+  ztpc = 284.;
   
   // --- Define ghost volume containing the whole ITS (including services) 
   //     and fill it with air 
   
   dgh[0] = 0.;
   dgh[1] = 360.;
-  dgh[2] = 12.;
-  dgh[3] = -xltpc-5.-0.1;
-  dgh[4] = 46;
+  dgh[2] = 16.;
+  dgh[3] = -ztpc-5.-0.1;
+  dgh[4] = 46;   
   dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 46;
+  dgh[6] = -ztpc;
+  dgh[7] = 46;   
   dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 46;
-  dgh[11] = 56.1;
-  dgh[12] = -100.7;
-  dgh[13] = 46;
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 46;
-  dgh[17] = 56.1;
-  dgh[18] = -40.;
-  dgh[19] = 3.295;
-  dgh[20] = 56.1; 
-  dgh[21] = 40.;
-  dgh[22] = 3.295;
-  dgh[23] = 56.1;
-  dgh[24] = 77.2;
-  dgh[25] = 46;
-  dgh[26] = 56.1;
-  dgh[27] = 100.7;
-  dgh[28] = 46;
-  dgh[29] = 56.1;
-  dgh[30] = xltpc;
-  dgh[31] = 62;
-  dgh[32] = 62+4.;
-  dgh[33] = xltpc;
-  dgh[34] = 62;
-  dgh[35] = 85.;
-  dgh[36] = xltpc+4.+0.1;
-  dgh[37] = 62.4;
-  dgh[38] = 85.;
-
-  gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 39);
+  dgh[9] = -ztpc;
+  dgh[10] = 46;  
+  dgh[11] = rlim+0.1;
+  dgh[12] = -97.5;
+  dgh[13] = 46;  
+  dgh[14] = rlim+0.1;
+  dgh[15] = -zmax;
+  dgh[16] = 46;  
+  dgh[17] = rlim+0.1;
+  dgh[18] = -48;   
+  dgh[19] = 6;
+  dgh[20] = rlim+0.1;
+  dgh[21] = -28.6;   
+  dgh[22] = 6;
+  dgh[23] = rlim+0.1;    
+  dgh[24] = -27.6;  
+  dgh[25] = 3.295;
+  dgh[26] = rlim+0.1; 
+  dgh[27] = 27.6;   
+  dgh[28] = 3.295;
+  dgh[29] = rlim+0.1;
+  dgh[30] = 28.6;   
+  dgh[31] = 6;
+  dgh[32] = rlim+0.1;
+  dgh[33] = 48;   
+  dgh[34] = 6;
+  dgh[35] = rlim+0.1;  
+  dgh[36] = zmax;
+  dgh[37] = 46;
+  dgh[38] = rlim+0.1;
+  dgh[39] = 97.5;
+  dgh[40] = 46;  
+  dgh[41] = rlim+0.1;
+  dgh[42] = ztpc;
+  dgh[43] = 62;     
+  dgh[44] = 62+4.;  
+  dgh[45] = ztpc;
+  dgh[46] = 62;     
+  dgh[47] = 85.;
+  dgh[48] = ztpc+4.+0.1;
+  dgh[49] = 62.4;
+  dgh[50] = 85.;
+  gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 51);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   //     invisible 
   
   gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "ONLY");
-  gMC->Gsatt("ITSV", "SEEN", 0); 
+  //gMC->Gsatt("ITSV", "SEEN", 0); 
 
 
   // --- Define ghost volume containing the six layers and fill it with air 
   
   dgh[0] = 0.;
   dgh[1] = 360.;
-  dgh[2] = 4.;
-  dgh[3] = -77.2;
+  dgh[2] = 8.;
+  dgh[3] = -zmax;  
   dgh[4] = 46.;
-  dgh[5] = 56.;
-  dgh[6] = -40.;     
-  dgh[7] = 3.3;
-  dgh[8] = 56.;
-  dgh[9] = 40.;
-  dgh[10] = 3.3;
-  dgh[11] = 56.;
-  dgh[12] = 77.2;
-  dgh[13] = 46.;
-  dgh[14] = 56.;
-  gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
+  dgh[5] = rlim;
+  dgh[6] = -47.5;    
+  dgh[7] = 6.005;
+  dgh[8] = rlim;
+  dgh[9] = -28.5;    
+  dgh[10] = 6.005;
+  dgh[11] = rlim;  
+  dgh[12] = -27.5;   
+  dgh[13] = 3.3;
+  dgh[14] = rlim;
+  dgh[15] = 27.5;    
+  dgh[16] = 3.3;
+  dgh[17] = rlim;
+  dgh[18] = 28.5;    
+  dgh[19] = 6.005;
+  dgh[20] = rlim;
+  dgh[21] = 47.5;    
+  dgh[22] = 6.005;
+  dgh[23] = rlim;
+  dgh[24] = zmax;    
+  dgh[25] = 46.;
+  dgh[26] = rlim;
+  gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 27);
   
   // --- Place the ghost volume in its mother volume (ITSV) and make it 
   //     invisible 
@@ -357,6 +401,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY");
   //gMC->Gsatt("ITSD", "SEEN", 0);
   
+
   //     ITS LAYERS (SILICON) 
   
   dits[0] = rl[0];
@@ -485,222 +530,226 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   gMC->Gsvolu("ICO2", "CONE", idtmed[264], pcits, 5);    
   gMC->Gspos("ICO2", 1, "ITSD", 0., 0., 59.+pcits[0], 0, "ONLY");
   gMC->Gspos("ICO2", 2, "ITSD", 0., 0., -(59.+pcits[0]), idrotm[200], "ONLY");
+  
     
-  // SERVICES
-    
+  // ****************************  SERVICES  *********************************
+  
+
+  
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
-  dgh[0] = 46.;
-  dgh[1] = 46.+1.0;
+  dgh[0] = 46.;    
+  dgh[1] = 46.+1.0;  
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  
-  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");
+  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
-  dgh[0] = 46.+1.0;
-  dgh[1] = 46.+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);  
-  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");  
+  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");  
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
-  dgh[0] = 46.;
+  dgh[0] = 46.;  
   dgh[1] = 56.;
   dgh[2] = 2.25;
   
   gMC->Gsvolu("IPAN", "TUBE", idtmed[285], dgh, 3);  
-  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 98.45, 0, "ONLY");  
-  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -98.45, idrotm[200], "ONLY"); 
+  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 95.25, 0, "ONLY");  
+  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); 
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
-  dgh[1] = 46.2;
-  dgh[2] = 46.2+1.0;
-  dgh[3] = 62.3;
-  dgh[4] = 62.3+1.0;
+  dgh[0] = (ztpc-97.5)/2.;
+  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);    
-  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");    
+  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
-  dgh[1] = 46.2;
-  dgh[2] = 46.2+1.0;
-  dgh[3] = 62.3;
-  dgh[4] = 62.3+1.0;
+  dgh[0] = (ztpc-97.5)/2.;
+  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);    
-  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+
 
    // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - CARBON PART
    //     UPPER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
-  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[0] = (ztpc-97.5)/2.;
+  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);    
-  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");   
+  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
-  dgh[1] = 46.2+1.0;
+  dgh[0] = (ztpc-97.5)/2.;
+  dgh[1] = 46.2+1.0;    
   dgh[2] = 46.2+1.0+1.5;
-  dgh[3] = 62.3+1.0;
+  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);    
-  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
    
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     UPPER PART
     
-  dgh[0] = 62.1;
+  dgh[0] = 62.1; 
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICU3", "TUBS", idtmed[279], dgh, 5);    
-  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - COPPER PART
   //     LOWER PART
   
-  dgh[0] = 62.1;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICU4", "TUBS", idtmed[279], dgh, 5);    
-  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");      
+  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");     
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     UPPER PART
 
-  dgh[0] = 62.1;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICC3", "TUBS", idtmed[274], dgh, 5);    
-  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");   
+  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");   
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON THE ABSORBER SIDE - CARBON PART
   //     LOWER PART
 
-  dgh[0] = 62.1;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICC4", "TUBS", idtmed[274], dgh, 5);    
-  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - UPPER PART
   
-  dgh[0] = 46.;
-  dgh[1] = 46.+1.0;
-  dgh[2] = (xltpc-100.7+1.5)/2.;
+  dgh[0] = 46.;      
+  dgh[1] = 46.+1.0;  
+  dgh[2] = (ztpc-97.5+1.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICU5", "TUBS", idtmed[279], dgh, 5);   
-  gMC->Gspos("ICU5", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU5", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY");  
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - COPPER PART - LOWER PART
   
-  dgh[0] = 46.;
-  dgh[1] = 46.+1.0;
-  dgh[2] = (xltpc-100.7+1.5)/2.;
+  dgh[0] = 46.;  
+  dgh[1] = 46.+1.0;  
+  dgh[2] = (ztpc-97.5+1.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   gMC->Gsvolu("ICU6", "TUBS", idtmed[279], dgh, 5);   
-  gMC->Gspos("ICU6", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY");    
+  gMC->Gspos("ICU6", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY");    
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - UPPER PART
   
-  dgh[0] = 46.+1.0;
-  dgh[1] = 46.+1.0+1.5;
-  dgh[2] = (xltpc-100.7)/2.;
+  dgh[0] = 46.+1.0;  
+  dgh[1] = 46.+1.0+1.5; 
+  dgh[2] = (ztpc-97.5)/2.;
   dgh[3] = 12.;
   dgh[4] = 168.;  
   gMC->Gsvolu("ICC5", "TUBS", idtmed[274], dgh, 5);   
-  gMC->Gspos("ICC5", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY");   
+  gMC->Gspos("ICC5", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC ON THE OTHER SIDE W.R.T.
   //     THE ABSORBER - CARBON PART - LOWER PART
   
-  dgh[0] = 46.+1.0;
-  dgh[1] = 46.+1.0+1.5;
-  dgh[2] = (xltpc-100.7)/2.;
+  dgh[0] = 46.+1.0;   
+  dgh[1] = 46.+1.0+1.5;  
+  dgh[2] = (ztpc-97.5)/2.;
   dgh[3] = 192.;
   dgh[4] = 348.;  
   gMC->Gsvolu("ICC6", "TUBS", idtmed[274], dgh, 5);   
-  gMC->Gspos("ICC6", 1, "ITSV", 0., 0., -100.7-dgh[2], 0, "ONLY");      
+  gMC->Gspos("ICC6", 1, "ITSV", 0., 0., -97.5-dgh[2], 0, "ONLY");      
 
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - UPPER PART
     
-  dgh[0] = 46.;
+  dgh[0] = 46.;   
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[4] = 168.;  
   gMC->Gsvolu("ICU7", "TUBS", idtmed[279], dgh, 5);   
-  gMC->Gspos("ICU7", 1, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), 0, "ONLY");  
+  gMC->Gspos("ICU7", 1, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), 0, "ONLY");  
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     COPPER PART - LOWER PART
     
-  dgh[0] = 46.;
+  dgh[0] = 46.; 
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[4] = 348.;   
   gMC->Gsvolu("ICU8", "TUBS", idtmed[279], dgh, 5);   
-  gMC->Gspos("ICU8", 1, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), 0, "ONLY");      
+  gMC->Gspos("ICU8", 1, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), 0, "ONLY");      
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - UPPER PART
   
-  dgh[0] = 46.+1.0;
+  dgh[0] = 46.+1.0;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 12.;
   dgh[4] = 168.;   
   gMC->Gsvolu("ICC7", "TUBS", idtmed[274], dgh, 5);   
-  gMC->Gspos("ICC7", 1, "ITSV", 0., 0., -(xltpc+dgh[2]), 0, "ONLY"); 
+  gMC->Gspos("ICC7", 1, "ITSV", 0., 0., -(ztpc+dgh[2]), 0, "ONLY"); 
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC ON OTHER SIDE W.R.T. THE ABSORBER
   //     CARBON PART - LOWER PART
   
-  dgh[0] = 46.+1.0;
+  dgh[0] = 46.+1.0;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   dgh[3] = 192.;
   dgh[4] = 348.;     
   gMC->Gsvolu("ICC8", "TUBS", idtmed[274], dgh, 5);   
-  gMC->Gspos("ICC8", 1, "ITSV", 0., 0., -(xltpc+dgh[2]), 0, "ONLY");        
+  gMC->Gspos("ICC8", 1, "ITSV", 0., 0., -(ztpc+dgh[2]), 0, "ONLY");        
     
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - UPPER PART
   
@@ -710,7 +759,7 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;    
   gMC->Gsvolu("IHK1", "TUBS", idtmed[284], dgh, 5);  
-  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");   
+  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");   
   
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - LOWER PART
   
@@ -720,26 +769,83 @@ void AliITSvPPRcoarseasymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;    
   gMC->Gsvolu("IHK2", "TUBS", idtmed[284], dgh, 5);  
-  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");      
+  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");      
   
   // --- DEFINE RAILS BETWEEN THE ITS AND THE TPC
   
-  //dgh[0] = 0.85;
-  //dgh[1] = 10.;
-  //dgh[2] = 190.;  
-  //gMC->Gsvolu("IRAI", "BOX ", idtmed[285], dgh, 3);   
-  //gMC->Gspos("IRAI", 1, "ITSV", 53., 0., -69.5, 0, "ONLY");
-  //gMC->Gspos("IRAI", 2, "ITSV", -53., 0., -69.5, 0, "ONLY");        
+  if (rails == 1) {
+  
+     dgh[0] = 2.;          
+     dgh[1] = 8.;           
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA1", "BOX ", idtmed[285], dgh, 3);
+     gMC->Gspos("IRA1", 1, "ITSV", 53.5, 0., -69.5, 0, "ONLY");   
+     gMC->Gsvolu("IRA2", "BOX ", idtmed[285], dgh, 3);    
+     gMC->Gspos("IRA2", 1, "ITSV", -53.5, 0., -69.5, 0, "ONLY");    
+
+     dgh[0] = 2.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2      
+     dgh[1] = 8.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2       
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA3", "BOX ", idtmed[275], dgh, 3);   
+     gMC->Gspos("IRA3", 1, "IRA1", 0., 0., 0., 0, "ONLY");   
+     gMC->Gsvolu("IRA4", "BOX ", idtmed[275], dgh, 3);     
+     gMC->Gspos("IRA4", 1, "IRA2", 0., 0., 0., 0, "ONLY");    
+
+  }
 
   // --- DEFINE CYLINDERS HOLDING RAILS BETWEEN THE ITS AND THE TPC
   
-  dgh[0] = 58.;
+  dgh[0] = 56.9;    
   dgh[1] = 59.;
   dgh[2] = 0.6;    
   gMC->Gsvolu("ICYL", "TUBE", idtmed[285], dgh, 3);   
-  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 74., 0, "ONLY");
-  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74., idrotm[200], "ONLY");     
-  
+  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 73.4, 0, "ONLY");       
+  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -73.4, idrotm[200], "ONLY");  
+
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE CYLINDERS
+
+  dgh[0] = 0.;        
+  dgh[1] = 3.;         
+  dgh[2] = 5.;  // 5. comes from the fact that the volume has to be 567.6/2 cm^3       
+  gMC->Gsvolu("ISR1", "TUBE", idtmed[286], dgh, 3);   
+  gMC->Gspos("ISR1", 1, "ALIC", 54.9, 11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 2, "ALIC", 54.9, -11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 3, "ALIC", -54.9, 11., 79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 4, "ALIC", -54.9, -11., 79.5, 0, "ONLY");  
+  gMC->Gspos("ISR1", 5, "ALIC", 54.9, 11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 6, "ALIC", 54.9, -11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 7, "ALIC", -54.9, 11., -79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 8, "ALIC", -54.9, -11., -79.5, 0, "ONLY");         
+  
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE ABSORBER
+
+  dgh[0] = 5.;        
+  dgh[1] = 12.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR2", "BOX ", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR2", 1, "ALIC", 53.5, 0., 125.5, 0, "ONLY");
+  gMC->Gsvolu("ISR3", "BOX ", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR3", 1, "ALIC", -53.5, 0., 125.5, 0, "ONLY");  
+  
+  dgh[0] = 5.-2.;        
+  dgh[1] = 12.-2.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR4", "BOX ", idtmed[275], dgh, 3);   
+  gMC->Gspos("ISR4", 1, "ISR2", 0., 0., 0., 0, "ONLY");     
+  gMC->Gsvolu("ISR5", "BOX ", idtmed[275], dgh, 3);   
+  gMC->Gspos("ISR5", 1, "ISR3", 0., 0., 0., 0, "ONLY");
+  
+  // --- DEFINE SUPPORTS TO ATTACH THE ITS TO THE TPC
+  
+  dgh[0] = 0.;        
+  dgh[1] = 5.;         
+  dgh[2] = 2.;         
+  gMC->Gsvolu("ISR6", "TUBE", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR6", 1, "ALIC", 0., 54., 77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 2, "ALIC", 0., 54., -77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 3, "ALIC", 0., -54., -77., 0, "ONLY");                   
+    
+    
   // --- Outputs the geometry tree in the EUCLID/CAD format 
   
   if (fEuclidOut) {
@@ -805,19 +911,19 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   
   //  200-224 --> Silicon Pixel Detectors (detectors, chips, buses, cooling,..)
   
-  AliMaterial(0, "SPD Si$",      28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(2, "SPD Si bus$",  28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(3, "SPD C$",       12.011,   6., 2.265,18.8, 999);
+  AliMaterial(0, "SPD Si$",      28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(2, "SPD Si bus$",  28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(3, "SPD C$",       12.011,   6., 2.265,18.8, 999.);
   // v. dens 
-  AliMaterial(4, "SPD Air$",    14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(4, "SPD Air$",    14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(5, "SPD Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  AliMaterial(6, "SPD Al$",     26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(6, "SPD Al$",     26.981539, 13., 2.6989, 8.9, 999.);
   AliMixture( 7, "SPD Water $", awat, zwat, denswat, -2, wwat);
   AliMixture( 8, "SPD Freon$",  afre, zfre, densfre, -2, wfre);
-  AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999); 
-  //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999);   
-  AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999);       // check !!!!
+  AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999.); 
+  //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999.);   
+  AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999.);       // check !!!!
   // ** 
   AliMedium(0, "SPD Si$",        0, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(1, "SPD Si chip$",   1, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -833,14 +939,14 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   
   //  225-249 --> Silicon Drift Detectors (detectors, chips, buses, cooling,..)
   
-  AliMaterial(25, "SDD Si$",      28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(27, "SDD Si bus$",  28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(28, "SDD C$",       12.011,   6., 2.265,18.8,  999);
+  AliMaterial(25, "SDD Si$",      28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(27, "SDD Si bus$",  28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(28, "SDD C$",       12.011,   6., 2.265,18.8,  999.);
   // v. dens 
-  AliMaterial(29, "SDD Air$",     14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(29, "SDD Air$",     14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(30, "SDD Vacuum$",  1e-16, 1e-16, 1e-16, 1e16,  1e16);
-  AliMaterial(31, "SDD Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(31, "SDD Al$",      26.981539, 13., 2.6989, 8.9, 999.);
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
@@ -852,13 +958,13 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   // positive 
   AliMixture( 33, "SDD Freon$", afre, zfre, densfre, 2, wfre);
   AliMixture( 34, "SDD PCB$",   apcb, zpcb, denspcb, 3, wpcb);
-  AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999);
+  AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999.);
   AliMixture( 36, "SDD Ceramics$", acer, zcer, denscer, -5, wcer);
-  AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999);
-  AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999); 
-  AliMaterial(39, "SDD cone$",63.546, 29., 1.15, 1.265, 999);       
-  //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999); 
-  //AliMaterial(39, "SDD cone$",63.546, 29., -1.15, -1.265, 999);       
+  AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999.);
+  AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999.); 
+  AliMaterial(39, "SDD cone$",63.546, 29., 1.15, 1.265, 999.);       
+  //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999.); 
+  //AliMaterial(39, "SDD cone$",63.546, 29., -1.15, -1.265, 999.);       
 
   // ** 
   // check A and Z 
@@ -885,9 +991,9 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   AliMaterial(52, "SSD Si bus$",  28.0855, 14., 2.33, 9.36, 999.);
   AliMaterial(53, "SSD C$",       12.011,   6., 2.265,18.8, 999.);
   // v. dens 
-  AliMaterial(54, "SSD Air$",     14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(54, "SSD Air$",     14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(55, "SSD Vacuum$",  1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  AliMaterial(56, "SSD Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(56, "SSD Al$",      26.981539, 13., 2.6989, 8.9, 999.);
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
@@ -904,14 +1010,14 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
   // positive 
-  AliMixture( 61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer);
+  AliMixture(61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer);
   AliMaterial(62, "SSD Kapton$", 12.011, 6., 1.3, 31.27, 999.);
   // check A and Z 
   AliMaterial(63, "SSD G10FR4$", 17.749, 8.875, 1.8, 21.822, 999.);
-  AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999); 
-  AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999);  
-  //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999); 
-  //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999);    
+  AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999.); 
+  AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999.);  
+  //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999.); 
+  //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999.);    
   // ** 
   AliMedium(50, "SSD Si$",        50, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(51, "SSD Si chip$",   51, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -934,7 +1040,7 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
   
   AliMaterial(75, "GEN C$", 12.011, 6., 2.265, 18.8, 999.);
   // verify density 
-  AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(77, "GEN Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
   AliMixture( 78, "GEN POLYETHYL$", apoly, zpoly, .95, -2, wpoly);
   AliMixture( 79, "GEN SERVICES$",  aserv, zserv, 4.68, 4, wserv);
@@ -948,7 +1054,8 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
 //  AliMaterial(83, "GEN patch pan$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
 //  AliMaterial(84, "GEN serv$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
   AliMixture(85, "GEN Inox$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMaterial(86, "GEN Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(86, "GEN Al$",      26.981539, 13., 2.6989, 8.9, 999.);
+  AliMaterial(87,"inox/alum$",    32.1502,15.3383,3.0705,6.9197,999.);
   // ** 
   AliMedium(75,"GEN C$",        75, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(76,"GEN Air$",      76, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -962,6 +1069,8 @@ void AliITSvPPRcoarseasymm::CreateMaterials(){
 //  AliMedium(84,"GEN serv$",     84, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(85,"GEN Inox$",     85, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(86, "GEN Al$",      86, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
+  AliMedium(87,"inox/alum$",    87, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
+
 }
 //_____________________________________________________________________________
 void AliITSvPPRcoarseasymm::Init(){
index e001e50a7049d569a0ff683620105f7eb1d66c82..d210ff97bdaa464d7e1940e5e7c7a47f4013a00d 100644 (file)
@@ -27,6 +27,12 @@ class AliITSvPPRcoarseasymm : public AliITS {
        return 6;}
     virtual void   DrawModule();
     virtual void   StepManager();
+    virtual void   SetRails(Int_t v=1){ 
+        // Set flag for rails
+        fRails = v;}       
+    virtual Int_t GetRails(){ 
+        // Get flag for rails
+        return fRails;}                  
     virtual Int_t GetMajorVersion(){// return Major Version Number
        return fMajorVersion;}
     virtual Int_t GetMinorVersion(){// return Major Version Number
@@ -36,7 +42,8 @@ class AliITSvPPRcoarseasymm : public AliITS {
  private:
     Int_t  fMajorVersion;     // Major version number == IsVersion
     Int_t  fMinorVersion;     // Minor version number
-
+    Int_t  fRails;            // flag to switch rails on (=1) and off (=0)
+    
     ClassDef(AliITSvPPRcoarseasymm,1)  //Hits manager for set:ITS version 6 
                                        // PPR coarse Geometry asymmetric
 };
index e02f9e53c88a7dcc0f330bf94775266249271c45..865aa7d5e69fb01b8451498396442828cbdfdd61 100644 (file)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.17  2001/03/13 18:13:30  barbera
+Some mother volumes sligthly modified to eliminate an overlap with the absorber
+
 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.
@@ -260,10 +263,26 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
  
   Float_t dits[3], rlim, zmax;
   Float_t zpos;
-  Float_t pcits[15], xltpc;
-  Int_t idrotm[399], i;
-  Float_t dgh[50];
+  Float_t pcits[100], ztpc;
+  Int_t idrotm[1999], i;
+  Float_t dgh[100];
+  
+  Int_t rails = 1;       // flag for rails (1 --> rails in; 0 --> rails out)
+  
+  rails = GetRails();
+  
+  if(rails != 0 && rails != 1) {
+     cout << "WARNING: the switch for rails is not set neither to 0 (rails out) nor to 1 (rails in)." 
+     " The default value of 1 (rails in) will be used." << endl;
+       
+  }  
   
+  if(rails == 0 ) {
+     cout << "Rails are out." << endl; 
+  } else {
+     cout << "Rails are in." << endl;
+  }        
+
   Int_t *idtmed = fIdtmed->GetArray()-199;
   
   //     CONVERT INTO CM (RL(SI)=9.36 CM) 
@@ -274,73 +293,64 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   //     FIELD CAGE HALF LENGTH 
   
   rlim  = 56.;
-  zmax  = 76.708;
-  xltpc = 284.;
+  zmax  = 74.;
+  ztpc = 284.;
     
   // --- Define ghost volume containing the whole ITS (including services) 
   //     and fill it with air 
   
   dgh[0] = 0.;
   dgh[1] = 360.;
-  dgh[2] = 12.;
-  dgh[3] = -xltpc-5.-0.1;
+  dgh[2] = 16.;
+  dgh[3] = -ztpc-5.-0.1;
   dgh[4] = 62.4;
   dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 61.5;
+  dgh[6] = -ztpc;
+  dgh[7] = 62;
   dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 61.5;
-  dgh[11] = 61.5+4.;
-  dgh[12] = -100.7;
-  dgh[13] = 44.9;
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 44.9;
-  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[25] = 44.9;
-  dgh[26] = 56.1;
-  dgh[27] = 100.7;
-  dgh[28] = 44.9;
-  dgh[29] = 56.1;
-  dgh[30] = xltpc;
-  dgh[31] = 61.5;
-  dgh[32] = 61.5+4.;
-  dgh[33] = xltpc;
-  dgh[34] = 61.5;
-  dgh[35] = 85.;
-  dgh[36] = xltpc+4.+0.1;
-  dgh[37] = 62.4;
-  dgh[38] = 85.;
-  gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 39);
+  dgh[9] = -ztpc;
+  dgh[10] = 62;
+  dgh[11] = 62+4.;
+  dgh[12] = -97.5;
+  dgh[13] = 46;
+  dgh[14] = rlim+0.1;
+  dgh[15] = -zmax;
+  dgh[16] = 46;
+  dgh[17] = rlim+0.1;
+  dgh[18] = -48;
+  dgh[19] = 6;
+  dgh[20] = rlim+0.1; 
+  dgh[21] = -28.6;
+  dgh[22] = 6;
+  dgh[23] = rlim+0.1;
+  dgh[24] = -27.6;
+  dgh[25] = 3.295;
+  dgh[26] = rlim+0.1;
+  dgh[27] = 27.6;
+  dgh[28] = 3.295;
+  dgh[29] = rlim+0.1;
+  dgh[30] = 28.6;
+  dgh[31] = 6;
+  dgh[32] = rlim+0.1;
+  dgh[33] = 48;
+  dgh[34] = 6;
+  dgh[35] = rlim+0.1;
+  dgh[36] = zmax;
+  dgh[37] = 46;
+  dgh[38] = rlim+0.1;
+  dgh[39] = 97.5;
+  dgh[40] = 46;
+  dgh[41] = rlim+0.1;
+  dgh[42] = ztpc;
+  dgh[43] = 62;
+  dgh[44] = 62+4.;
+  dgh[45] = ztpc;
+  dgh[46] = 62;
+  dgh[47] = 85.;
+  dgh[48] = ztpc+4.+0.1;
+  dgh[49] = 62.4;
+  dgh[50] = 85.;
+  gMC->Gsvolu("ITSV", "PCON", idtmed[275], dgh, 51);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   //     invisible 
@@ -350,29 +360,41 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
  
   
   // --- Define ghost volume containing the six layers and fill it with air 
-  
+
   dgh[0] = 0.;
   dgh[1] = 360.;
-  dgh[2] = 4.;
-  dgh[3] = -77.2;
+  dgh[2] = 8.;
+  dgh[3] = -zmax;  
   dgh[4] = 46.;
-  dgh[5] = 56.;
-  dgh[6] = -40.;     
-  dgh[7] = 3.3;
-  dgh[8] = 56.;
-  dgh[9] = 40.;
-  dgh[10] = 3.3;
-  dgh[11] = 56.;
-  dgh[12] = 77.2;
-  dgh[13] = 46.;
-  dgh[14] = 56.;
-  gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 15);
+  dgh[5] = rlim;
+  dgh[6] = -47.5;    
+  dgh[7] = 6.005;
+  dgh[8] = rlim;
+  dgh[9] = -28.5;    
+  dgh[10] = 6.005;
+  dgh[11] = rlim;  
+  dgh[12] = -27.5;   
+  dgh[13] = 3.3;
+  dgh[14] = rlim;
+  dgh[15] = 27.5;    
+  dgh[16] = 3.3;
+  dgh[17] = rlim;
+  dgh[18] = 28.5;    
+  dgh[19] = 6.005;
+  dgh[20] = rlim;
+  dgh[21] = 47.5;    
+  dgh[22] = 6.005;
+  dgh[23] = rlim;
+  dgh[24] = zmax;    
+  dgh[25] = 46.;
+  dgh[26] = rlim;
+    gMC->Gsvolu("ITSD", "PCON", idtmed[275], dgh, 27);
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   //     invisible 
   
   gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY");
-  //gMC->Gsatt("ITSV", "SEEN", 0);
+  //gMC->Gsatt("ITSD", "SEEN", 0);
   
   //     ITS LAYERS (SILICON) 
   
@@ -505,8 +527,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   gMC->Gspos("ICO2", 2, "ITSD", 0., 0., -(59.+pcits[0]), idrotm[200], "ONLY");
 
 
-  // SERVICES
-  
+  // ****************************  SERVICES  *********************************
+
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
   
@@ -515,8 +537,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[279], dgh, 3);  
-  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");
+  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
@@ -525,8 +547,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[274], dgh, 3);  
-  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");  
+  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");  
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
@@ -535,12 +557,12 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[2] = 2.25;
   
   gMC->Gsvolu("IPAN", "TUBE", idtmed[285], dgh, 3);  
-  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 98.45, 0, "ONLY");  
-  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -98.45, idrotm[200], "ONLY"); 
+  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 95.25, 0, "ONLY");  
+  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); 
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -548,12 +570,12 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[279], dgh, 7);    
-  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -561,12 +583,12 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[279], dgh, 7);    
-  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -574,12 +596,12 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[274], dgh, 7);    
-  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -587,8 +609,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[274], dgh, 7);    
-  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     
@@ -598,8 +620,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICU3", "TUBS", idtmed[279], dgh, 5);    
-  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   
@@ -609,8 +631,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICU4", "TUBS", idtmed[279], dgh, 5);    
-  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 
@@ -620,8 +642,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICC3", "TUBS", idtmed[274], dgh, 5);    
-  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 
@@ -631,8 +653,8 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICC4", "TUBS", idtmed[274], dgh, 5);    
-  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
 
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - UPPER PART
   
@@ -642,7 +664,7 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("IHK1", "TUBS", idtmed[284], dgh, 5);   
-  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");      
+  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");      
   
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - LOWER PART
   
@@ -652,27 +674,82 @@ void AliITSvPPRcoarsesymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("IHK2", "TUBS", idtmed[284], dgh, 5);   
-  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");        
+  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");        
   
   // --- DEFINE RAILS BETWEEN THE ITS AND THE TPC
   
-  //dgh[0] = 0.85;
-  //dgh[1] = 10.;
-  //dgh[2] = 190.;  
-  //gMC->Gsvolu("IRAI", "BOX ", idtmed[285], dgh, 3);   
-  //gMC->Gspos("IRAI", 1, "ITSV", 53., 0., -69.5, 0, "ONLY");
-  //gMC->Gspos("IRAI", 2, "ITSV", -53., 0., -69.5, 0, "ONLY");        
+  if (rails == 1) {
+  
+     dgh[0] = 2.;          
+     dgh[1] = 8.;           
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA1", "BOX ", idtmed[285], dgh, 3);
+     gMC->Gspos("IRA1", 1, "ITSV", 53.5, 0., -69.5, 0, "ONLY");   
+     gMC->Gsvolu("IRA2", "BOX ", idtmed[285], dgh, 3);    
+     gMC->Gspos("IRA2", 1, "ITSV", -53.5, 0., -69.5, 0, "ONLY");    
+
+     dgh[0] = 2.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2      
+     dgh[1] = 8.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2       
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA3", "BOX ", idtmed[275], dgh, 3);   
+     gMC->Gspos("IRA3", 1, "IRA1", 0., 0., 0., 0, "ONLY");   
+     gMC->Gsvolu("IRA4", "BOX ", idtmed[275], dgh, 3);     
+     gMC->Gspos("IRA4", 1, "IRA2", 0., 0., 0., 0, "ONLY");    
+
+  }
   
   // --- DEFINE CYLINDERS HOLDING RAILS BETWEEN THE ITS AND THE TPC
   
-
-  dgh[0] = 58.;
+  dgh[0] = 56.9;    
   dgh[1] = 59.;
-  dgh[2] = 0.6;   
+  dgh[2] = 0.6;    
   gMC->Gsvolu("ICYL", "TUBE", idtmed[285], dgh, 3);   
-  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 74., 0, "ONLY");
-  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74., idrotm[200], "ONLY");     
-  
+  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 73.4, 0, "ONLY");       
+  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -73.4, idrotm[200], "ONLY");  
+
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE CYLINDERS
+
+  dgh[0] = 0.;        
+  dgh[1] = 3.;         
+  dgh[2] = 5.;  // 5. comes from the fact that the volume has to be 567.6/2 cm^3       
+  gMC->Gsvolu("ISR1", "TUBE", idtmed[286], dgh, 3);   
+  gMC->Gspos("ISR1", 1, "ALIC", 54.9, 11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 2, "ALIC", 54.9, -11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 3, "ALIC", -54.9, 11., 79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 4, "ALIC", -54.9, -11., 79.5, 0, "ONLY");  
+  gMC->Gspos("ISR1", 5, "ALIC", 54.9, 11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 6, "ALIC", 54.9, -11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 7, "ALIC", -54.9, 11., -79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 8, "ALIC", -54.9, -11., -79.5, 0, "ONLY");         
+  
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE ABSORBER
+
+  dgh[0] = 5.;        
+  dgh[1] = 12.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR2", "BOX ", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR2", 1, "ALIC", 53.5, 0., 125.5, 0, "ONLY");
+  gMC->Gsvolu("ISR3", "BOX ", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR3", 1, "ALIC", -53.5, 0., 125.5, 0, "ONLY");  
+  
+  dgh[0] = 5.-2.;        
+  dgh[1] = 12.-2.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR4", "BOX ", idtmed[275], dgh, 3);   
+  gMC->Gspos("ISR4", 1, "ISR2", 0., 0., 0., 0, "ONLY");     
+  gMC->Gsvolu("ISR5", "BOX ", idtmed[275], dgh, 3);   
+  gMC->Gspos("ISR5", 1, "ISR3", 0., 0., 0., 0, "ONLY");
+  
+  // --- DEFINE SUPPORTS TO ATTACH THE ITS TO THE TPC
+  
+  dgh[0] = 0.;        
+  dgh[1] = 5.;         
+  dgh[2] = 2.;         
+  gMC->Gsvolu("ISR6", "TUBE", idtmed[285], dgh, 3);   
+  gMC->Gspos("ISR6", 1, "ALIC", 0., 54., 77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 2, "ALIC", 0., 54., -77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 3, "ALIC", 0., -54., -77., 0, "ONLY");       
+    
   // --- Outputs the geometry tree in the EUCLID/CAD format 
   
   if (fEuclidOut) {
@@ -686,7 +763,7 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   // Create ITS materials
   //     This function defines the default materials used in the Geant
   // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
-  // AliITSvPPRcoarsesymm, AliITSvPPRcoarseasymm.
+  // AliITSvPPRcoarseasymm.
   // In general it is automatically replaced by
   // the CreatMaterials routine defined in AliITSv?. Should the function
   // CreateMaterials not exist for the geometry version you are using this
@@ -738,19 +815,19 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   
   //  200-224 --> Silicon Pixel Detectors (detectors, chips, buses, cooling,..)
   
-  AliMaterial(0, "SPD Si$",      28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(2, "SPD Si bus$",  28.0855, 14., 2.33, 9.36, 999);
-  AliMaterial(3, "SPD C$",       12.011,   6., 2.265,18.8, 999);
+  AliMaterial(0, "SPD Si$",      28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(1, "SPD Si chip$", 28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(2, "SPD Si bus$",  28.0855, 14., 2.33, 9.36, 999.);
+  AliMaterial(3, "SPD C$",       12.011,   6., 2.265,18.8, 999.);
   // v. dens 
-  AliMaterial(4, "SPD Air$",    14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(4, "SPD Air$",    14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(5, "SPD Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  AliMaterial(6, "SPD Al$",     26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(6, "SPD Al$",     26.981539, 13., 2.6989, 8.9, 999.);
   AliMixture( 7, "SPD Water $", awat, zwat, denswat, -2, wwat);
   AliMixture( 8, "SPD Freon$",  afre, zfre, densfre, -2, wfre);
-  AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999); 
-  //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999); 
-  AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999);       // check !!!!
+  AliMaterial(9, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999.); 
+  //AliMaterial(9, "SPD End ladder$", 55.845, 26., -7.87/10., -1.76*10., 999.);   
+  AliMaterial(10, "SPD cone$",28.0855, 14., 2.33, 9.36, 999.);       // check !!!!
   // ** 
   AliMedium(0, "SPD Si$",        0, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(1, "SPD Si chip$",   1, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -766,14 +843,14 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   
   //  225-249 --> Silicon Drift Detectors (detectors, chips, buses, cooling,..)
   
-  AliMaterial(25, "SDD Si$",      28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(27, "SDD Si bus$",  28.0855, 14., 2.33,  9.36, 999);
-  AliMaterial(28, "SDD C$",       12.011,   6., 2.265,18.8,  999);
+  AliMaterial(25, "SDD Si$",      28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(26, "SDD Si chip$", 28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(27, "SDD Si bus$",  28.0855, 14., 2.33,  9.36, 999.);
+  AliMaterial(28, "SDD C$",       12.011,   6., 2.265,18.8,  999.);
   // v. dens 
-  AliMaterial(29, "SDD Air$",     14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(29, "SDD Air$",     14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(30, "SDD Vacuum$",  1e-16, 1e-16, 1e-16, 1e16,  1e16);
-  AliMaterial(31, "SDD Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(31, "SDD Al$",      26.981539, 13., 2.6989, 8.9, 999.);
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
@@ -785,13 +862,14 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   // positive 
   AliMixture( 33, "SDD Freon$", afre, zfre, densfre, 2, wfre);
   AliMixture( 34, "SDD PCB$",   apcb, zpcb, denspcb, 3, wpcb);
-  AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999);
+  AliMaterial(35, "SDD Copper$", 63.546, 29., 8.96, 1.43, 999.);
   AliMixture( 36, "SDD Ceramics$", acer, zcer, denscer, -5, wcer);
-  AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999);
-  AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999); 
-  AliMaterial(39, "SDD cone$", 63.546, 29., 1.15, 1.265, 999);  
-  //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999); 
-  //AliMaterial(39, "SDD cone$", 63.546, 29., -1.15, -1.265, 999);         
+  AliMaterial(37, "SDD Kapton$", 12.011, 6., 1.3, 31.27, 999.);
+  AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999.); 
+  AliMaterial(39, "SDD cone$",63.546, 29., 1.15, 1.265, 999.);       
+  //AliMaterial(38, "SDD End ladder$", 69.9298, 29.8246, -0.3824, -36.5103, 999.); 
+  //AliMaterial(39, "SDD cone$",63.546, 29., -1.15, -1.265, 999.);       
+
   // ** 
   // check A and Z 
   AliMedium(25, "SDD Si$",        25, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -817,9 +895,9 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   AliMaterial(52, "SSD Si bus$",  28.0855, 14., 2.33, 9.36, 999.);
   AliMaterial(53, "SSD C$",       12.011,   6., 2.265,18.8, 999.);
   // v. dens 
-  AliMaterial(54, "SSD Air$",     14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(54, "SSD Air$",     14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(55, "SSD Vacuum$",  1e-16, 1e-16, 1e-16, 1e16, 1e16);
-  AliMaterial(56, "SSD Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(56, "SSD Al$",      26.981539, 13., 2.6989, 8.9, 999.);
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
@@ -836,14 +914,14 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
   // positive 
-  AliMixture( 61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer);
+  AliMixture(61, "SSD Ceramics$", acer, zcer, denscer, 5, wcer);
   AliMaterial(62, "SSD Kapton$", 12.011, 6., 1.3, 31.27, 999.);
   // check A and Z 
   AliMaterial(63, "SSD G10FR4$", 17.749, 8.875, 1.8, 21.822, 999.);
-  AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999); 
-  AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999);   
-  //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999); 
-  //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999);     
+  AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999.); 
+  AliMaterial(65, "SSD cone$",63.546, 29., 1.15, 1.265, 999.);  
+  //AliMaterial(64, "SSD End ladder$", 32.0988, 15.4021, -0.68, -35.3238, 999.); 
+  //AliMaterial(65, "SSD cone$",63.546, 29., -1.15, -1.265, 999.);    
   // ** 
   AliMedium(50, "SSD Si$",        50, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(51, "SSD Si chip$",   51, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -861,26 +939,27 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   AliMedium(63, "SSD G10FR4$",    63, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(64, "SSD End ladder$",64, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(65, "SSD cone$",      65, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-  
+
   //     275-299 --> General (end-caps, frames, cooling, cables, etc.) 
   
   AliMaterial(75, "GEN C$", 12.011, 6., 2.265, 18.8, 999.);
   // verify density 
-  AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999);
+  AliMaterial(76, "GEN Air$", 14.61, 7.3, .001205, 30423., 999.);
   AliMaterial(77, "GEN Vacuum$", 1e-16, 1e-16, 1e-16, 1e16, 1e16);
   AliMixture( 78, "GEN POLYETHYL$", apoly, zpoly, .95, -2, wpoly);
   AliMixture( 79, "GEN SERVICES$",  aserv, zserv, 4.68, 4, wserv);
-  AliMaterial(80, "GEN Copper$", 63.546, 29., 8.96, 1.43, 999.);  
+  AliMaterial(80, "GEN Copper$", 63.546, 29., 8.96, 1.43, 999.);
   // After a call with ratios by number (negative number of elements), 
   // the ratio array is changed to the ratio by weight, so all successive 
   // calls with the same array must specify the number of elements as 
   // positive 
   AliMixture(81, "GEN Water $", awat, zwat, denswat, 2, wwat);
-  //AliMaterial(82, "GEN Cables$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!
-  //AliMaterial(83, "GEN patch pan$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
-  //AliMaterial(84, "GEN serv$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
+//  AliMaterial(82, "GEN Cables$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!
+//  AliMaterial(83, "GEN patch pan$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
+//  AliMaterial(84, "GEN serv$", 12.011, 6., 2.265, 18.8, 999.);  // check !!!  
   AliMixture(85, "GEN Inox$", asteel, zsteel, 7.88, 4, wsteel);
-  AliMaterial(86, "GEN Al$",      26.981539, 13., 2.6989, 8.9, 999);
+  AliMaterial(86, "GEN Al$",      26.981539, 13., 2.6989, 8.9, 999.);
+  AliMaterial(87,"inox/alum$",    32.1502,15.3383,3.0705,6.9197,999.);
   // ** 
   AliMedium(75,"GEN C$",        75, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(76,"GEN Air$",      76, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
@@ -889,11 +968,12 @@ void AliITSvPPRcoarsesymm::CreateMaterials(){
   AliMedium(79,"GEN SERVICES$", 79, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(80,"GEN Copper$",   80, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(81,"GEN Water $",   81, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-  //AliMedium(82,"GEN Cables$",   82, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-  //AliMedium(83,"GEN patch pan$",83, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);  
-  //AliMedium(84,"GEN serv$",     84, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
+//  AliMedium(82,"GEN Cables$",   82, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
+//  AliMedium(83,"GEN patch pan$",83, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);  
+//  AliMedium(84,"GEN serv$",     84, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(85,"GEN Inox$",     85, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
   AliMedium(86, "GEN Al$",      86, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
+  AliMedium(87,"inox/alum$",    87, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
 
 }
 //_____________________________________________________________________________
index b2c53c141cc3d9f05af9c106aa2aed74fc9f5e5f..fa942fdd4bae0ce16edfb95403029a83b8899b45 100644 (file)
@@ -29,6 +29,12 @@ class AliITSvPPRcoarsesymm : public AliITS {
     } 
     virtual void   DrawModule();
     virtual void   StepManager();
+    virtual void   SetRails(Int_t v=1){ 
+        // Set flag for rails
+        fRails = v;}       
+    virtual Int_t GetRails(){ 
+        // Get flag for rails
+        return fRails;}                    
     virtual Int_t GetMajorVersion(){// return Major Version Number
        return fMajorVersion;}
     virtual Int_t GetMinorVersion(){// return Major Version Number
@@ -38,7 +44,8 @@ class AliITSvPPRcoarsesymm : public AliITS {
  private:
     Int_t  fMajorVersion;     // Major version number == IsVersion
     Int_t  fMinorVersion;     // Minor version number
-
+    Int_t  fRails;            // flag to switch rails on (=1) and off (=0)
+    
     ClassDef(AliITSvPPRcoarsesymm,1)  //Hits manager for set:ITS version 7 
                                        // PPR coarse Geometry symmetric
 };
index bc6e7d31efc157f5c1bce8aacf9472a672193733..83478bfdce903abbcf0a80a8b7cf8918dd1849b7 100644 (file)
 
 /*
 $Log$
+Revision 1.11  2001/03/23 00:12:23  nilsen
+Set Reading of AliITSgeom data from Geant3 common blocks as the default and
+not a .det file. Removed redundent calls to BuildGeometry.
+
 Revision 1.10  2001/03/15 13:47:55  barbera
 Some service mother volumes modified
 
@@ -301,26 +305,23 @@ void AliITSvPPRsymm::CreateGeometry(){
 ////////////////////////////////////////////////////////////////////////
   
   //INNER RADII OF THE SILICON LAYERS 
-  //  Float_t rl[6]    = { 3.8095,7.,15.,24.,38.1,43.5765 };   
+  // Float_t rl[6]    = { 3.8095,7.,15.,24.,38.1,43.5765 };   
   //THICKNESSES OF LAYERS (in % radiation length)
   Float_t drl[6]   = { 1.03,1.03,0.94,0.95,0.91,0.87 };   
   //HALF LENGTHS OF LAYERS  
-  /*
-  Float_t dzl[6]   = { 14.35,14.35,25.1,32.1,49.405,55.27 };
+  // Float_t dzl[6]   = { 14.35,14.35,25.1,32.1,49.405,55.27 };
   //LENGTHS OF END-LADDER BOXES (ALL INCLUDED)
-  Float_t dzb[6]   = { 12.4,12.4,13.5,15.,7.5,7.5 };    
+  // Float_t dzb[6]   = { 12.4,12.4,13.5,15.,7.5,7.5 };   
   //THICKNESSES OF END-LADDER BOXES (ALL INCLUDED)
-  Float_t drb[6]   = { rl[1]-rl[0],0.2,5.,5.,4.,4. };         
-  */
-
+  // Float_t drb[6]   = { rl[1]-rl[0],0.2,5.,5.,4.,4. };        
 
  
-  Float_t dits[50], rlim, zmax;
+  Float_t dits[100], rlim, zmax;
   // Float_t zpos;
   // Float_t pcits[50]
-  Float_t xltpc;
+  Float_t ztpc;
   Int_t idrotm[1999], i;
-  Float_t dgh[50];
+  Float_t dgh[100];
 
 
   // Define some variables for SPD
@@ -344,36 +345,69 @@ void AliITSvPPRsymm::CreateGeometry(){
   dchip1 = GetThicknessChip1();
   dchip2 = GetThicknessChip2();    
 
-  
   if(ddet1 < 100. || ddet1 > 300.) {
-     cout << "The detector thickness for layer 1 is outside [100,300] microns."
+     cout << "WARNING: the detector thickness for layer 1 is outside the range of [100,300] microns."
          " The default value of 300 microns will be used." << endl;
          ddet1=300.;
   }
   
   if(ddet2 < 100. || ddet2 > 300.) {
-     cout << "The detector thickness for layer 2 is outside [100,300] microns."
+     cout << "WARNING: the detector thickness for layer 2 is outside the range of [100,300] microns."
          " The default value of 300 microns will be used." << endl;
          ddet2=300.;
   }
   
   if(dchip1 < 150. || dchip1 > 300.) {
-     cout << "The chip thickness for layer 1 is outside [150,300] microns."
+     cout << "WARNING: the chip thickness for layer 1 is outside the range of [150,300] microns."
          " The default value of 300 microns will be used." << endl;
          dchip1=300.;
   }
   
   if(dchip2 < 150. || dchip2 > 300.) {
-     cout << "The chip thickness for layer 2 is outside [150,300] microns."
+     cout << "WARNING: the chip thickness for layer 2 is outside the range of [150,300] microns."
          " The default value of 300 microns will be used." << endl;
          dchip2=300.;
   }      
+
+  Int_t rails = 1;       // flag for rails (1 --> rails in; 0 --> rails out)
+  
+  Int_t fluid = 1;       // flag for the cooling fluid (1 --> water; 0 --> freon)
+
+  rails = GetRails();
+
+  fluid = GetCoolingFluid();
+
+  if(rails != 0 && rails != 1) {
+     cout << "WARNING: the switch for rails is not set neither to 0 (rails out) nor to 1 (rails in)." 
+     " The default value of 1 (rails in) will be used." << endl;
+       
+  }  
   
+  if(fluid != 0 && fluid != 1) {
+     cout << "WARNING: the switch for cooling fluid is not set neither to 0 (freon) nor to 1 (water)." 
+     " The default value of 1 (water) will be used." << endl;  
+  }       
+   
+  cout << "Detector thickness on layer 1 is set to " << ddet1 << " microns." << endl;
+  cout << "Chip thickness on layer 1 is set to " << dchip1 << " microns." << endl;
+  cout << "Detector thickness on layer 2 is set to " << ddet2 << " microns." << endl;
+  cout << "Chip thickness on layer 2 is set to " << dchip2 << " microns." << endl;
+  if(rails == 0 ) {
+     cout << "Rails are out." << endl; 
+  } else {
+     cout << "Rails are in." << endl;
+  }   
+  if(fluid == 0 ) {
+     cout << "The cooling fluid is freon." << endl; 
+  } else {
+     cout << "The cooling fluid is water." << endl;
+  }   
+
   ddet1  = ddet1*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; 
 
@@ -891,107 +925,65 @@ void AliITSvPPRsymm::CreateGeometry(){
   //     FIELD CAGE HALF LENGTH 
   
   rlim  = 56.;
-  zmax  = 76.708;
-  xltpc = 284.;
+  zmax  = 74.;
+  ztpc = 284.;
   
   // --- Define ghost volume containing the whole ITS (including services) 
   //     and fill it with air 
   
-/*
   dgh[0] = 0.;
   dgh[1] = 360.;
   dgh[2] = 16.;
-  dgh[3] = -xltpc-5.-0.1;
-  dgh[4] = 46;   
+  dgh[3] = -ztpc-5.-0.1;
+  dgh[4] = 62.4;
   dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 46;   
+  dgh[6] = -ztpc;
+  dgh[7] = 62;
   dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 46;  
-  dgh[11] = 56.1;
-  dgh[12] = -100.7;
-  dgh[13] = 46;  
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 46;  
-  dgh[17] = 56.1;
-  dgh[18] = -42;   
+  dgh[9] = -ztpc;
+  dgh[10] = 62;
+  dgh[11] = 62+4.;
+  dgh[12] = -97.5;
+  dgh[13] = 46;
+  dgh[14] = rlim+0.1;
+  dgh[15] = -zmax;
+  dgh[16] = 46;
+  dgh[17] = rlim+0.1;
+  dgh[18] = -48;
   dgh[19] = 6;
-  dgh[20] = 56.1;
-  dgh[21] = -28;   
+  dgh[20] = rlim+0.1; 
+  dgh[21] = -28.6;
   dgh[22] = 6;
-  dgh[23] = 56.1;    
-  dgh[24] = -26.2;  
+  dgh[23] = rlim+0.1;
+  dgh[24] = -27.6;
   dgh[25] = 3.295;
-  dgh[26] = 56.1; 
-  dgh[27] = 26.2;   
+  dgh[26] = rlim+0.1;
+  dgh[27] = 27.6;
   dgh[28] = 3.295;
-  dgh[29] = 56.1;
-  dgh[30] = 28;   
+  dgh[29] = rlim+0.1;
+  dgh[30] = 28.6;
   dgh[31] = 6;
-  dgh[32] = 56.1;
-  dgh[33] = 42;   
+  dgh[32] = rlim+0.1;
+  dgh[33] = 48;
   dgh[34] = 6;
-  dgh[35] = 56.1;  
-  dgh[36] = 77.2;
+  dgh[35] = rlim+0.1;
+  dgh[36] = zmax;
   dgh[37] = 46;
-  dgh[38] = 56.1;
-  dgh[39] = 100.7;
-  dgh[40] = 46;  
-  dgh[41] = 56.1;
-  dgh[42] = xltpc;
-  dgh[43] = 62;     
-  dgh[44] = 62+4.;  
-  dgh[45] = xltpc;
-  dgh[46] = 62;     
+  dgh[38] = rlim+0.1;
+  dgh[39] = 97.5;
+  dgh[40] = 46;
+  dgh[41] = rlim+0.1;
+  dgh[42] = ztpc;
+  dgh[43] = 62;
+  dgh[44] = 62+4.;
+  dgh[45] = ztpc;
+  dgh[46] = 62;
   dgh[47] = 85.;
-  dgh[48] = xltpc+4.+0.1;
+  dgh[48] = ztpc+4.+0.1;
   dgh[49] = 62.4;
   dgh[50] = 85.;
   gMC->Gsvolu("ITSV", "PCON", idtmed[205], dgh, 51);
-*/
 
-  dgh[0] = 0.;
-  dgh[1] = 360.;
-  dgh[2] = 12.;
-  dgh[3] = -xltpc-5.-0.1;
-  dgh[4] = 46;   
-  dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 46;   
-  dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 46;  
-  dgh[11] = 56.1;
-  dgh[12] = -100.7;
-  dgh[13] = 46;  
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 46;  
-  dgh[17] = 56.1;
-  dgh[18] = -40.;
-  dgh[19] = 3.295;
-  dgh[20] = 56.1; 
-  dgh[21] = 40.;
-  dgh[22] = 3.295;
-  dgh[23] = 56.1;
-  dgh[24] = 77.2;
-  dgh[25] = 46;  
-  dgh[26] = 56.1;
-  dgh[27] = 100.7;
-  dgh[28] = 46;  
-  dgh[29] = 56.1;
-  dgh[30] = xltpc;
-  dgh[31] = 62;     
-  dgh[32] = 62+4.;  
-  dgh[33] = xltpc;
-  dgh[34] = 62;     
-  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 
@@ -1006,32 +998,31 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[0] = 0.;
   dgh[1] = 360.;
   dgh[2] = 8.;
-  dgh[3] = -77.2;
+  dgh[3] = -zmax;  
   dgh[4] = 46.;
-  dgh[5] = 56.;
-  dgh[6] = -42;    
+  dgh[5] = rlim;
+  dgh[6] = -47.5;    
   dgh[7] = 6.005;
-  dgh[8] = 56.;
-  dgh[9] = -28;    
+  dgh[8] = rlim;
+  dgh[9] = -28.5;    
   dgh[10] = 6.005;
-  dgh[11] = 56.;  
-  dgh[12] = -26.2;   
+  dgh[11] = rlim;  
+  dgh[12] = -27.5;   
   dgh[13] = 3.3;
-  dgh[14] = 56.;
-  dgh[15] = 26.2;    
+  dgh[14] = rlim;
+  dgh[15] = 27.5;    
   dgh[16] = 3.3;
-  dgh[17] = 56.;
-  dgh[18] = 28;    
+  dgh[17] = rlim;
+  dgh[18] = 28.5;    
   dgh[19] = 6.005;
-  dgh[20] = 56.;
-  dgh[21] = 42;    
+  dgh[20] = rlim;
+  dgh[21] = 47.5;    
   dgh[22] = 6.005;
-  dgh[23] = 56.;
-  dgh[24] = 77.2;
+  dgh[23] = rlim;
+  dgh[24] = zmax;    
   dgh[25] = 46.;
-  dgh[26] = 56.;
+  dgh[26] = rlim;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 27);
-
   
   // --- Place the ghost volume in its mother volume (ITSV) and make it 
   //     invisible 
@@ -1039,7 +1030,6 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY");
   //gMC->Gsatt("ITSD", "SEEN", 0);
 
-
   // --- Define SPD (option 'a') volumes ----------------------------
   
   // SPD - option 'a' 
@@ -1266,13 +1256,22 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[4] = 180;
      gMC->Gsvolu("I114", "TUBS", idtmed[264], dits, 5);  
 
-     dits[0] = 0;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 180;
-     gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);   
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5); // set water as cooling fluid   
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[212], dits, 5); // set freon as cooling fluid       
+     }
+     
      dits[0] = 0.063;
      dits[1] = 0.035;
      dits[2] = 24;
@@ -1298,10 +1297,17 @@ void AliITSvPPRsymm::CreateGeometry(){
      di1d1[2] = 3.536;
      gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);   // contains detector 
                                                            // layer 2
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
+     if (fluid == 1) {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3); // set water as cooling fuid
+     } else {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[212], dits, 3); // set freon as cooling fluid
+     }
 
      dits1[0] = 0.64;
      dits1[1] = ddet1;
@@ -1359,37 +1365,85 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[2] = 0.55;
      gMC->Gsvolu("I678", "TUBE", idtmed[263], dits, 3); // was I178 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.3;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // was I177 in old geom.
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I177 in old geom.
+     } else {
+         dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I177 in old geom.    
+     }
+     
      dits[0] = 0.07;
      dits[1] = 0.125;
      dits[2] = 0.3;
      gMC->Gsvolu("I675", "TUBE", idtmed[263], dits, 3); // was I175 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // was I174 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 3;
-     gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // was I172 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.0746;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // was I170 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I174 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I174 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I172 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I172 in old geom.        
+     }
+     
+     if (fluid == 1) {     
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I170 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I170 in old geom.     
+     }
+     
+     if (fluid == 1) {     
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // set water as cooling fluid
+                                                          // was I168 in old geom.
+     } else {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[212], dits, 5); // set freon as cooling fluid
+                                                          // was I168 in old geom.
+     }
 
-     dits[0] = 3.7;
-     dits[1] = 5.4;
-     dits[2] = 0.35;
-     dits[3] = 2;
-     dits[4] = 36;
-     gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // was I168 in old geom.
 
   }
 
@@ -1625,13 +1679,22 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[4] = 180;
      gMC->Gsvolu("I114", "TUBS", idtmed[264], dits, 5);  
 
-     dits[0] = 0;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 180;
-     gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);   
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);  // set water as cooling fluid   
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[212], dits, 5);  // set freon as cooling fluid
+     }
+     
      dits[0] = 0.063;
      dits[1] = 0.035;
      dits[2] = 24;
@@ -1657,10 +1720,18 @@ void AliITSvPPRsymm::CreateGeometry(){
      di1d1[2] = 3.536;
      gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);  // contains detector  
                                                           // layer 2
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
+   
+     if (fluid == 1) {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3); // set water as cooling fluid
+     } else {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[212], dits, 3); // set freon as cooling fluid
+     }
 
      dits1[0] = 0.64;
      dits1[1] = ddet1;
@@ -1718,37 +1789,85 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[2] = 0.55;
      gMC->Gsvolu("I678", "TUBE", idtmed[263], dits, 3); // was I178 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.3;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // was I177 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I177 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I177 in old geom.     
+     }
 
      dits[0] = 0.07;
      dits[1] = 0.125;
      dits[2] = 0.3;
      gMC->Gsvolu("I675", "TUBE", idtmed[263], dits, 3); // was I175 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // was I174 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 3;
-     gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // was I172 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.0746;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // was I170 in old geom.
-
-     dits[0] = 3.7;
-     dits[1] = 5.4;
-     dits[2] = 0.35;
-     dits[3] = 2;
-     dits[4] = 36;
-     gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // was I168 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I174 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I174 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I172 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I172 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I170 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I170 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); //set water as cooling fluid
+                                                          // was I168 in old geom.
+     } else {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[212], dits, 5); //set freon as cooling fluid
+                                                          // was I168 in old geom.     
+     }
+     
 
   }
 
@@ -1762,24 +1881,24 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -34.6;
-  dits[4] = 23.495;
-  dits[5] = 28.5;
-  dits[6] = -27.35; 
-  dits[7] = 23.495;
-  dits[8] = 28.5;
-  dits[9] = -27.35;  
-  dits[10] = 14.595
-  dits[11] = 28.5;
-  dits[12] = 27.35;   
-  dits[13] = 14.595;
-  dits[14] = 28.5;
-  dits[15] = 27.35;    
-  dits[16] = 23.495;
-  dits[17] = 28.5;
-  dits[18] = 34.65;
-  dits[19] = 23.495;
-  dits[20] = 28.5;
+  dits[3] = -34.6; 
+  dits[4] = 23.49;
+  dits[5] = 28;
+  dits[6] = -23.65; 
+  dits[7] = 23.49;
+  dits[8] = 28;
+  dits[9] = -23.65;  
+  dits[10] = 14.59; 
+  dits[11] = 28;
+  dits[12] = 23.65;   
+  dits[13] = 14.59;
+  dits[14] = 28;
+  dits[15] = 23.65;    
+  dits[16] = 23.49;
+  dits[17] = 28;
+  dits[18] = 34.6;  
+  dits[19] = 23.49;
+  dits[20] = 28;
   gMC->Gsvolu("IT34", "PCON", idtmed[209], dits, 21);  
 
   // block of the SDD electronics and related ladder frame 
@@ -1855,10 +1974,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("I420", "BOX ", idtmed[264], I420dits, 3);  
 
   // positioning-box #2 at SDD end-ladder - F.T. March,7-2001
-  I421dits[0] = 0.4400;
-  I421dits[1] = 0.4000;
-  I421dits[2] = 0.4400;
-  gMC->Gsvolu("I421", "BOX ", idtmed[209], I421dits, 3);  
+  I421dits[0] = 0.;
+  I421dits[1] = 0.25;
+  I421dits[2] = I420dits[1];
+  gMC->Gsvolu("I421", "TUBE", idtmed[209], I421dits, 3);  
 
   // reference ruby-sphere at SDD end-ladder - F.T. March,7-2001 
   I422dits[0] = 0.0000;
@@ -1872,7 +1991,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   // support for ruby-sphere (I422) - F.T. March,7-2001
   I423dits[0] = 0.0000;
   I423dits[1] = 0.1000;
-  I423dits[2] = (I421dits[1]-I422dits[1])/2.;
+  I423dits[2] = (I420dits[1]-I422dits[1])/2.;
   gMC->Gsvolu("I423", "TUBE", idtmed[264], I423dits, 3);  
 
   // passage for HV microcables - F.T. March,7-2001
@@ -1923,12 +2042,20 @@ void AliITSvPPRsymm::CreateGeometry(){
   I031dits[2] = I024dits[2];
   gMC->Gsvolu("I031", "TUBE", idtmed[264], I031dits, 3);  
 
-  // cooling water for the end ladder - F.T. March,7-2001
-  I032dits[0] = 0;
-  I032dits[1] = I031dits[0];
-  I032dits[2] = I024dits[2];
-  gMC->Gsvolu("I032", "TUBE", idtmed[211], I032dits, 3);  
-
+  if (fluid == 1) {
+     // cooling water for the end ladder - F.T. March,7-2001
+     I032dits[0] = 0;
+     I032dits[1] = I031dits[0];
+     I032dits[2] = I024dits[2];
+     gMC->Gsvolu("I032", "TUBE", idtmed[211], I032dits, 3);  
+  } else {
+     // cooling freon for the end ladder - R.B. March,21-2001
+     I032dits[0] = 0;
+     I032dits[1] = I031dits[0];
+     I032dits[2] = I024dits[2];
+     gMC->Gsvolu("I032", "TUBE", idtmed[212], I032dits, 3);    
+  }
+  
   // -- block of the SDD ladder frame holding the electronics
 
   // edge of the ladder frame - part 1
@@ -1996,12 +2123,19 @@ void AliITSvPPRsymm::CreateGeometry(){
   I037dits[2] = I018dits[2];
   gMC->Gsvolu("I037", "TUBE", idtmed[264], I037dits, 3);
 
-  // cooling water - F.T. March,7-2001
-  I038dits[0] = 0;
-  I038dits[1] = I037dits[0];
-  I038dits[2] = I018dits[2];
-  gMC->Gsvolu("I038", "TUBE", idtmed[211], I038dits, 3);  
-
+  if (fluid == 1) {
+     // cooling water - F.T. March,7-2001
+     I038dits[0] = 0;
+     I038dits[1] = I037dits[0];
+     I038dits[2] = I018dits[2];
+     gMC->Gsvolu("I038", "TUBE", idtmed[211], I038dits, 3);  
+  } else {
+     // cooling freon - R.B. March,21-2001
+     I038dits[0] = 0;
+     I038dits[1] = I037dits[0];
+     I038dits[2] = I018dits[2];
+     gMC->Gsvolu("I038", "TUBE", idtmed[212], I038dits, 3);    
+  }
   // -- block of the SDD electronics (heat bridge, chips, hybrid, anode microcable)
 
   // SDD heat bridge - F.T. March,7-2001
@@ -2047,7 +2181,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   I052dits[0] = 1.725000;
   I052dits[1] = 0.003743;
   I052dits[2] = I039dits[2];
-  gMC->Gsvolu("I052", "BOX ", idtmed[82], I052dits, 3);
+  gMC->Gsvolu("I052", "BOX ", idtmed[281], I052dits, 3);
 
   // SDD anode microcable : changed - F.T. March,7-2001
   I044dits[0] = I018dits[2];
@@ -2082,23 +2216,23 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -57.5;
-  dits[4] = 43.5;
+  dits[3] = -57.45;
+  dits[4] = 43.6;
   dits[5] = 48;  
-  dits[6] = -47.2
-  dits[7] = 43.5;
+  dits[6] = -49.15
+  dits[7] = 43.6;
   dits[8] = 48;  
-  dits[9] = -47.2;  
-  dits[10] = 36.7;
+  dits[9] = -49.15;  
+  dits[10] = 36.9;
   dits[11] = 48;  
-  dits[12] = 47.2;  
-  dits[13] = 36.7;
+  dits[12] = 50.55;  
+  dits[13] = 36.9;
   dits[14] = 48;  
-  dits[15] = 47.2;  
-  dits[16] = 43.5;
+  dits[15] = 50.55;  
+  dits[16] = 43.6;
   dits[17] = 48;  
-  dits[18] = 56.96;
-  dits[19] = 43.5;
+  dits[18] = 57.45;
+  dits[19] = 43.6;
   dits[20] = 48;   
   gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);   
   
@@ -2152,10 +2286,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 2.1;
   gMC->Gsvolu("I562", "BOX ", idtmed[206], dits, 3);   
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 3.15;
-  gMC->Gsvolu("I559", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I559", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I559", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2225,10 +2366,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 1.955;
   gMC->Gsvolu("I542", "TUBE", idtmed[210], dits, 3);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 1.955;
-  gMC->Gsvolu("I541", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I541", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid 
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I541", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.3;
   dits[1] = 0.15;
@@ -2277,10 +2425,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 2;
   gMC->Gsvolu("ITS6", "BOX ", idtmed[200], dits, 3);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 3.15;
-  gMC->Gsvolu("I550", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I550", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I550", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2382,10 +2537,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[3] = 0.08;
   gMC->Gsvolu("I517", "TRD1", idtmed[203], dits, 4);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 1.955;
-  gMC->Gsvolu("I531", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I531", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I531", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
      
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2403,7 +2565,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("ITS5", "BOX ", idtmed[200], dits, 3);  
 
 
-  // --- Define volumes of shield between SPD and SDD ----------------
+
+  // --- Define volumes of shield of SPD ----------------
 
 
   dits[0] = 8.37;
@@ -2412,20 +2575,24 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("IC01", "TUBE", idtmed[289], dits, 3);   
 
   dits[0] = 8.3;
-  dits[1] = 10;
+  dits[1] = 9.995;
   dits[2] = 17.5/2.;
   gMC->Gsvolu("IC02", "TUBE", idtmed[289], dits, 3);    
   
  
-   // --- Define volumes of cylinder between SDD and SSD --------------
-  
+  // --- Define volume of first cylinder between SPD and SDD --------------
   
-  dits[0] = (59.5-0.13/2.)/2.;
-  dits[1] = (59.5+0.13/2.)/2.;
-  dits[2] = 56.2;
-  gMC->Gsvolu("ICY2", "TUBE", idtmed[225], dits, 3);
+  dits[0] = (21.-0.128)/2.;      
+  dits[1] = 21./2.;
+  dits[2] = 39.4;      
+  gMC->Gsvolu("ICY1", "TUBE", idtmed[208], dits, 3);
          
+  // --- Define volume of second cylinder between SDD and SSD --------------
 
+  dits[0] = (59.5-0.128)/2.;      
+  dits[1] = 59.5/2.;
+  dits[2] = 56.2;      // was 57
+  gMC->Gsvolu("ICY2", "TUBE", idtmed[208], dits, 3);
 
   // --- Define volumes of SDD cone ---------------------------------- 
 
@@ -2434,13 +2601,13 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 12;
   dits[3] = -59.7;
   dits[4] = 27;
-  dits[5] = 28;
+  dits[5] = 28.6;
   dits[6] = -42.7;
   dits[7] = 10;
-  dits[8] = 28;
+  dits[8] = 28.6;
   dits[9] = -34.65;
   dits[10] = 10;
-  dits[11] = 28;
+  dits[11] = 28.6;
   dits[12] = -34.65;
   dits[13] = 10;
   dits[14] = 23.495;
@@ -2461,42 +2628,42 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[29] = 23.495;
   dits[30] = 34.65;
   dits[31] = 10;
-  dits[32] = 28;
-  dits[33] = 42.6263;
+  dits[32] = 28.6;
+  dits[33] = 42.7;
   dits[34] = 10;
-  dits[35] = 28;
+  dits[35] = 28.6;
   dits[36] = 59.7;
   dits[37] = 27.2637;
-  dits[38] = 28;             
+  dits[38] = 28.6;             
   gMC->Gsvolu("IS02", "PCON", idtmed[204], dits, 39);
   
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = 39.4;
-  dits[4] = 10.065;
-  dits[5] = 12.7;
-  dits[6] = 40.66;
-  dits[7] = 10.065;
-  dits[8] = 13.96;
-  dits[9] = 40.66;
-  dits[10] = 12.1781;
+  dits[3] = 38.65;
+  dits[4] = 10.75;    
+  dits[5] = 12.25;      
+  dits[6] = 40.15;
+  dits[7] = 10.75;
+  dits[8] = 13.96;   
+  dits[9] = 40.15;
+  dits[10] = 12.46;  
   dits[11] = 13.96;
-  dits[12] = 54.7;
-  dits[13] = 26.2181;
-  dits[14] = 28;
-  dits[15] = 55.2219;
-  dits[16] = 26.74;
-  dits[17] = 28;
-  dits[18] = 57.4;
-  dits[19] = 26.74;
-  dits[20] = 28;
+  dits[12] = 55.75;
+  dits[13] = 27;
+  dits[14] = 28.5;
+  dits[15] = 55.75;
+  dits[16] = 27;
+  dits[17] = 28.5;
+  dits[18] = 57.25;
+  dits[19] = 27;
+  dits[20] = 28.5;       
   gMC->Gsvolu("I093", "PCON", idtmed[272], dits, 21);  // SDD cone
 
   dits[0] = 0;
   dits[1] = 50;
   dits[2] = 3;
-  dits[3] = 27.35;  // 23.7
+  dits[3] = 39;  
   dits[4] = 14;
   dits[5] = 18.75;
   dits[6] = 46.7-3;
@@ -2505,12 +2672,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[9] = 51.45-3;
   dits[10] = 18.75;
   dits[11] = 18.75;
-  gMC->Gsvolu("I099", "PCON", idtmed[292], dits, 12); // SDD 3 end-ladder elect.
+  gMC->Gsvolu("I099", "PCON", idtmed[204], dits, 12); // SDD 3 cone hole
 
   dits[0] = 0;
   dits[1] = 25;
   dits[2] = 3;
-  dits[3] = 34.65;
+  dits[3] = 49;
   dits[4] = 23.4;
   dits[5] = 26.4;
   dits[6] = 56.1-3;
@@ -2519,27 +2686,22 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[9] = 59.1-3;
   dits[10] = 26.4;
   dits[11] = 26.4;
-  gMC->Gsvolu("I200", "PCON", idtmed[292], dits, 12); // SDD 4 end-ladder elect.
+  gMC->Gsvolu("I200", "PCON", idtmed[204], dits, 12); // SDD 4 cone hole
 
-  dits[0] = 10.065;
-  dits[1] = 11;
+  dits[0] = 10.0;
+  dits[1] = 10.5;
   dits[2] = 0.25;
-  gMC->Gsvolu("I090", "TUBE", idtmed[208], dits, 3);
-
-  dits[0] = 10.001;
-  dits[1] = 10.065;
-  dits[2] = 40;
-  gMC->Gsvolu("I089", "TUBE", idtmed[208], dits, 3);
+  gMC->Gsvolu("I090", "TUBE", idtmed[224], dits, 3);  // SDD cylinder flange
 
   dits[0] = 21.95;
-  dits[1] = 24.2;
+  dits[1] = 22.95;    
   dits[2] = 1;
-  gMC->Gsvolu("I098", "TUBE", idtmed[204], dits, 3);
+  gMC->Gsvolu("I098", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 4
 
-  dits[0] = 13.1;
-  dits[1] = 15.4;
+  dits[0] = 13.1;    
+  dits[1] = 14.1;    
   dits[2] = 1;
-  gMC->Gsvolu("I097", "TUBE", idtmed[204], dits, 3);
+  gMC->Gsvolu("I097", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 3
 
   dits[0] = 1;
   dits[1] = 1;
@@ -2574,153 +2736,143 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 12;
-  dits[3] = -77.2;
-  dits[4] = 46;
-  dits[5] = 47;
+  dits[3] = -zmax;
+  dits[4] = 46;         
+  dits[5] = 49.25;       
   dits[6] = -61.2;
-  dits[7] = 28.5;
-  dits[8] = 47;
+  dits[7] = 28.7;
+  dits[8] = 49.25;       
   dits[9] = -57.5;
-  dits[10] = 28.5;
-  dits[11] = 47;
+  dits[10] = 28.7;
+  dits[11] = 49.25;      
   dits[12] = -57.5;
-  dits[13] = 28.5;
+  dits[13] = 28.7;
   dits[14] = 43.5;
-  dits[15] = -51.365;
-  dits[16] = 28.5;
+  dits[15] = -49.2;
+  dits[16] = 28.7;
   dits[17] = 43.5;
-  dits[18] = -51.365;
-  dits[19] = 28.5;
-  dits[20] = 36.69;
-  dits[21] = 51.3651;
-  dits[22] = 28.5;
-  dits[23] = 36.69;
-  dits[24] = 51.3651;
-  dits[25] = 28.5;
+  dits[18] = -49.2;
+  dits[19] = 28.7;
+  dits[20] = 36.85;
+  dits[21] = 50.6;
+  dits[22] = 28.7;
+  dits[23] = 36.85;
+  dits[24] = 50.6;
+  dits[25] = 28.7;
   dits[26] = 43.5;
-  dits[27] = 56.96;
-  dits[28] = 28.5;
+  dits[27] = 57.5;
+  dits[28] = 28.7;
   dits[29] = 43.5;
-  dits[30] = 56.96;
-  dits[31] = 28.5;
-  dits[32] = 47;
-  dits[33] = 60.66;
-  dits[34] = 28.5;
-  dits[35] = 47;
-  dits[36] = 77.2;
-  dits[37] = 46;
-  dits[38] = 47;  
-  gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);
+  dits[30] = 57.5;
+  dits[31] = 28.7;
+  dits[32] = 49.25;      
+  dits[33] = 61.2;
+  dits[34] = 28.7;
+  dits[35] = 49.25;      
+  dits[36] = zmax;
+  dits[37] = 46;      
+  dits[38] = 49.25;      
+  gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);   // SSD cone mother volume
   
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -77.2;
-  dits[4] = 46; 
-  dits[5] = 48.5;   
-  dits[6] = -73.5;
-  dits[7] = 46;  
-  dits[8] = 47.5;   
-  dits[9] = -72.7819;
-  dits[10] = 46;   
-  dits[11] = 47.2819;
-  dits[12] = -59.5;
-  dits[13] = 31.2181;
-  dits[14] = 33;
-  dits[15] = -59.5;
-  dits[16] = 28;
-  dits[17] = 33;
-  dits[18] = -57;
-  dits[19] = 28;
-  dits[20] = 30.5;
+  dits[3] = -zmax;  
+  dits[4] = 47.75;  
+  dits[5] = 49.25;  
+  dits[6] = -zmax+2.;  
+  dits[7] = 47.75;  
+  dits[8] = 49.25;   
+  dits[9] = -71.2819;
+  dits[10] = 46.75;   
+  dits[11] = 49.0319;
+  dits[12] = -57.25;   // was 58.5 
+  dits[13] = 32.9681;
+  dits[14] = 34.75;
+  dits[15] = -57.25;   // was 58.5   
+  dits[16] = 30;
+  dits[17] = 34.75;
+  dits[18] = -55.75;   // was 57 
+  dits[19] = 30;     
+  dits[20] = 32.25;    // was 31.5 
   gMC->Gsvolu("I212", "PCON", idtmed[272], dits, 21);  // SSD cone
   
-  dits[0] = 28;
-  dits[1] = 29.82;
+  dits[0] = 28.75;          
+  dits[1] = 29.75;   
   dits[2] = 0.5;
-  gMC->Gsvolu("I211", "TUBE", idtmed[219], dits, 3);
-  
-  dits[0] = 37.35;
-  dits[1] = 38.25;
-  dits[2] = 1;
-  gMC->Gsvolu("I217", "TUBE", idtmed[224], dits, 3);
-  
-  dits[0] = 38.25;
-  dits[1] = 39.08;
-  dits[2] = 1;
-  gMC->Gsvolu("I218", "TUBE", idtmed[264], dits, 3);
+  gMC->Gsvolu("I211", "TUBE", idtmed[224], dits, 3);   // SSD cylinder flange
   
-  dits[0] = 41.85;
-  dits[1] = 42.75;
+  dits[0] = 35.8;   
+  dits[1] = 36.8;   
   dits[2] = 1;
-  gMC->Gsvolu("I219", "TUBE", idtmed[224], dits, 3);
+  gMC->Gsvolu("I217", "TUBE", idtmed[283], dits, 3);   // ladder support on layer 5 
   
-  dits[0] = 42.75;
-  dits[1] = 43.58;
+  dits[0] = 41.4;  
+  dits[1] = 42.4;  
   dits[2] = 1;
-  gMC->Gsvolu("I220", "TUBE", idtmed[264], dits, 3);
-      
-  dits[0] = 42.1;
-  dits[1] = 42.5;
+  gMC->Gsvolu("I219", "TUBE", idtmed[283], dits, 3);   // ladder support on layer 6
+        
+  dits[0] = 42.05+5.;       
+  dits[1] = 42.55+5.;     
   dits[2] = 1.25;
-  gMC->Gsvolu("I214", "TUBE", idtmed[224], dits, 3);
-    
-  dits[0] = 37.1;
-  dits[1] = 37.5;
+  gMC->Gsvolu("I214", "TUBE", idtmed[224], dits, 3);   // layer 6 electronic support
+                                                       // this will change after PPR
+  dits[0] = 37.05+5.;   
+  dits[1] = 37.55+5.;   
   dits[2] = 1.25;
-  gMC->Gsvolu("I213", "TUBE", idtmed[224], dits, 3);
-        
+  gMC->Gsvolu("I213", "TUBE", idtmed[224], dits, 3);   // layer 5 electronic support
+                                                       // this will change after PPR
   dits[0] = 0;
   dits[1] = 25;
   dits[2] = 5;
-  dits[3] = -77.2+3;
-  dits[4] = 44.5;
-  dits[5] = 44.5;
+  dits[3] = -zmax+3;
+  dits[4] = 45.5;
+  dits[5] = 45.5;
   dits[6] = -69.7+3;
   dits[7] = 37;
-  dits[8] = 44.5;
+  dits[8] = 45.5;
   dits[9] = -68.5+3;
   dits[10] = 37;
-  dits[11] = 44.5;
+  dits[11] = 45.5;
   dits[12] = -68.5+4.8;  
   dits[13] = 37;
-  dits[14] = 44.5; 
+  dits[14] = 45.5; 
   dits[15] = -63.5+4.8;
   dits[16] = 37;
-  dits[17] = 44.5;   
-  gMC->Gsvolu("I215", "PCON", idtmed[294], dits, 18);  // SSD end-ladder elect.  
+  dits[17] = 45.5;   
+  gMC->Gsvolu("I215", "PCON", idtmed[204], dits, 18);  // SSD cone hole 
  
   dits[0] = 0;
   dits[1] = 3.2;
   dits[2] = 9;
-  dits[3] = -16.45;
+  dits[3] = -14;
   dits[4] = 30.5;
   dits[5] = 33.5;
-  dits[6] = -7.85;
+  dits[6] = -9.85;
   dits[7] = 30.5;
   dits[8] = 33.5;
-  dits[9] = -7.85;
+  dits[9] = -9.85;
   dits[10] = 30.5;
-  dits[11] = 41.85;
-  dits[12] = -5.85;
+  dits[11] = 43.45;
+  dits[12] = -7.85;
   dits[13] = 30.5;
-  dits[14] = 41.85;
-  dits[15] = -5.85;
+  dits[14] = 43.45;
+  dits[15] = -7.85;
   dits[16] = 30.5;
   dits[17] = 36.5;
-  dits[18] = -5;
+  dits[18] = -7;
   dits[19] = 30.5;
   dits[20] = 36.5;
-  dits[21] = -2;
+  dits[21] = -4;
   dits[22] = 33.0173;
   dits[23] = 36.5;
-  dits[24] = -2;
+  dits[24] = -4;
   dits[25] = 33.0173;
-  dits[26] = 37.35;
-  dits[27] = 0;
+  dits[26] = 36.80;
+  dits[27] = -2;
   dits[28] = 34.6955;
-  dits[29] = 37.35;
-  gMC->Gsvolu("I216", "PCON", idtmed[272], dits, 30);
+  dits[29] = 36.80;
+  gMC->Gsvolu("I216", "PCON", idtmed[272], dits, 30); // supports (1-6) of the ladders
        
        
   // --- Place SPD (option 'a') volumes into their mother volume IT12
@@ -3263,8 +3415,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   xI424 = I028dits[0]/3.;
   yI424 = -I028dits[1]+I424dits[1];
   gMC->Gspos("I422", 1,"I421", 0.0, 0.0, 0.0, 0, "ONLY");
-  gMC->Gspos("I423", 1,"I421", 0.0, -I421dits[1]+I423dits[2], 0.0, idrotm[312], "ONLY");
-  gMC->Gspos("I421", 1,"I420", 0.0, 0.0, 0.0, 0, "ONLY");
+  gMC->Gspos("I423", 1,"I421", 0.0, 0.0, I421dits[2]-I423dits[2], 0, "ONLY");
+  gMC->Gspos("I421", 1,"I420", 0.0, 0.0, 0.0, idrotm[312], "ONLY");
   gMC->Gspos("I420", 1,"I028", -I028dits[0]/3., I028dits[1]-I420dits[1], 0.0, 0, "ONLY");
   gMC->Gspos("I424", 1,"I028", xI424, yI424, 0.0, 0, "ONLY");
   gMC->Gspos("I028", 1,"I024", 0.0, I028dits[1]-I024dits[1], I024dits[2]-I028dits[2], 0, "MANY");
@@ -3860,10 +4012,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   //gMC->Gspos("IC03",2,"ITSD",0.0,0.0,-25.-17.5-7.875,idrotm[200],"ONLY");   
   
   
-  // --- Place volumes of shield between SDD and SSD 
+  // --- Place volumes of cylinders between SPD and SDD and SDD and SSD 
   
-
-  gMC->Gspos("ICY2",1,"ITSD",0.0,0.0,-0.7,0,"ONLY");    
+  gMC->Gspos("ICY1",1,"ITSD",0.0,0.0,0.,0,"ONLY");    
+  gMC->Gspos("ICY2",1,"ITSD",0.0,0.0,0.,0,"ONLY");    
   
 
   // --- Place volumes of SDD cone ---------------------------------- 
@@ -3871,27 +4023,26 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   gMC->Gspos("I093",1,"IS02",0.0,0.0,0.0,0,"MANY");
   gMC->Gspos("I093",2,"IS02",0.0,0.0,0.0,idrotm[856],"MANY");
-  gMC->Gspos("I099",4,"IS02",0.0,0.0,0.0,idrotm[857],"ONLY");
-  gMC->Gspos("I099",3,"IS02",0.0,0.0,0.0,idrotm[858],"ONLY");
-  gMC->Gspos("I099",5,"IS02",0.0,0.0,0.0,idrotm[859],"ONLY");
-  gMC->Gspos("I099",6,"IS02",0.0,0.0,0.0,idrotm[860],"ONLY");
-  gMC->Gspos("I099",7,"IS02",0.0,0.0,0.0,idrotm[861],"ONLY");
-  gMC->Gspos("I099",2,"IS02",0.0,0.0,0.0,idrotm[862],"ONLY");
-  gMC->Gspos("I200",4,"IS02",0.0,0.0,0.0,idrotm[863],"ONLY");
-  gMC->Gspos("I200",3,"IS02",0.0,0.0,0.0,idrotm[864],"ONLY");
-  gMC->Gspos("I200",2,"IS02",0.0,0.0,0.0,idrotm[865],"ONLY");
-  gMC->Gspos("I200",13,"IS02",0.0,0.0,0.0,idrotm[867],"ONLY");
-  gMC->Gspos("I200",12,"IS02",0.0,0.0,0.0,idrotm[869],"ONLY");
-  gMC->Gspos("I200",11,"IS02",0.0,0.0,0.0,idrotm[870],"ONLY");
-  gMC->Gspos("I200",10,"IS02",0.0,0.0,0.0,idrotm[871],"ONLY");
-  gMC->Gspos("I200",9,"IS02",0.0,0.0,0.0,idrotm[872],"ONLY");
-  gMC->Gspos("I200",8,"IS02",0.0,0.0,0.0,idrotm[873],"ONLY");
-  gMC->Gspos("I200",7,"IS02",0.0,0.0,0.0,idrotm[874],"ONLY");
-  gMC->Gspos("I200",6,"IS02",0.0,0.0,0.0,idrotm[875],"ONLY");
-  gMC->Gspos("I200",5,"IS02",0.0,0.0,0.0,idrotm[876],"ONLY");
-  gMC->Gspos("I090",2,"IS02",0.0,0.0,-39.15,0,"ONLY");
-  //gMC->Gspos("I089",1,"IS02",0.0,0.0,0.0,0,"ONLY");   // old cylind. shield
-  gMC->Gspos("I090",1,"IS02",0.0,0.0,39.15,idrotm[856],"ONLY");
+  gMC->Gspos("I099",4,"IS02",0.0,0.0,0.0,idrotm[857],"MANY");
+  gMC->Gspos("I099",3,"IS02",0.0,0.0,0.0,idrotm[858],"MANY");
+  gMC->Gspos("I099",5,"IS02",0.0,0.0,0.0,idrotm[859],"MANY");
+  gMC->Gspos("I099",6,"IS02",0.0,0.0,0.0,idrotm[860],"MANY");
+  gMC->Gspos("I099",7,"IS02",0.0,0.0,0.0,idrotm[861],"MANY");
+  gMC->Gspos("I099",2,"IS02",0.0,0.0,0.0,idrotm[862],"MANY");
+  gMC->Gspos("I200",4,"IS02",0.0,0.0,0.0,idrotm[863],"MANY");
+  gMC->Gspos("I200",3,"IS02",0.0,0.0,0.0,idrotm[864],"MANY");
+  gMC->Gspos("I200",2,"IS02",0.0,0.0,0.0,idrotm[865],"MANY");
+  gMC->Gspos("I200",13,"IS02",0.0,0.0,0.0,idrotm[867],"MANY");
+  gMC->Gspos("I200",12,"IS02",0.0,0.0,0.0,idrotm[869],"MANY");
+  gMC->Gspos("I200",11,"IS02",0.0,0.0,0.0,idrotm[870],"MANY");
+  gMC->Gspos("I200",10,"IS02",0.0,0.0,0.0,idrotm[871],"MANY");
+  gMC->Gspos("I200",9,"IS02",0.0,0.0,0.0,idrotm[872],"MANY");
+  gMC->Gspos("I200",8,"IS02",0.0,0.0,0.0,idrotm[873],"MANY");
+  gMC->Gspos("I200",7,"IS02",0.0,0.0,0.0,idrotm[874],"MANY");
+  gMC->Gspos("I200",6,"IS02",0.0,0.0,0.0,idrotm[875],"MANY");
+  gMC->Gspos("I200",5,"IS02",0.0,0.0,0.0,idrotm[876],"MANY");
+  gMC->Gspos("I090",2,"IS02",0.0,0.0,-39.4,0,"ONLY");    
+  gMC->Gspos("I090",1,"IS02",0.0,0.0,39.4,idrotm[856],"ONLY");  
   gMC->Gspos("I099",9,"IS02",0.0,0.0,0.0,idrotm[877],"ONLY");
   gMC->Gspos("I099",8,"IS02",0.0,0.0,0.0,idrotm[879],"ONLY");
   gMC->Gspos("I099",1,"IS02",0.0,0.0,0.0,idrotm[880],"ONLY");
@@ -3910,10 +4061,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gspos("I200",21,"IS02",0.0,0.0,0.0,idrotm[892],"ONLY");
   gMC->Gspos("I200",20,"IS02",0.0,0.0,0.0,idrotm[868],"ONLY");
   gMC->Gspos("I200",19,"IS02",0.0,0.0,0.0,idrotm[893],"ONLY");
-  gMC->Gspos("I098",1,"IS02",0.0,0.0,32.1,0,"ONLY");
-  gMC->Gspos("I097",1,"IS02",0.0,0.0,25.1,0,"ONLY");
-  gMC->Gspos("I097",2,"IS02",0.0,0.0,-25.1,idrotm[856],"ONLY");
-  gMC->Gspos("I098",2,"IS02",0.0,0.0,-32.1,idrotm[856],"ONLY");
+  gMC->Gspos("I098",1,"IS02",0.0,0.0,33.6,0,"ONLY");    
+  gMC->Gspos("I097",1,"IS02",0.0,0.0,26.6,0,"ONLY");    
+  gMC->Gspos("I097",2,"IS02",0.0,0.0,-26.6,idrotm[856],"ONLY");  
+  gMC->Gspos("I098",2,"IS02",0.0,0.0,-33.6,idrotm[856],"ONLY");  
   gMC->Gspos("I202",1,"IS02",12.1,0.0,33.84,0,"ONLY");
   gMC->Gspos("I202",6,"IS02",-6.05,-10.4789,33.84,idrotm[930],"ONLY");
   gMC->Gspos("I202",5,"IS02",-6.05,10.4789,33.84,idrotm[929],"ONLY");
@@ -3975,59 +4126,54 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- Place volumes of SSD cone ----------------------------------    
 
     
-  gMC->Gspos("I212",2,"IS01",0.0,0.0,0.0,idrotm[701],"MANY"); // old z=-1.4
+  gMC->Gspos("I212",2,"IS01",0.0,0.0,0.0,idrotm[701],"MANY");
   gMC->Gspos("I212",1,"IS01",0.0,0.0,0.0,0,"MANY");
-  //gMC->Gspos("I210",1,"IS01",0.0,0.0,-0.7,0,"ONLY");  // old cylind. shield
   gMC->Gspos("I211",1,"IS01",0.0,0.0,-56.5,0,"ONLY");
-  gMC->Gspos("I217",1,"IS01",0.0,0.0,-47.75,0,"ONLY");
-  gMC->Gspos("I218",1,"IS01",0.0,0.0,-47.75,0,"ONLY");
-  gMC->Gspos("I219",1,"IS01",0.0,0.0,-53.6,0,"ONLY");
-  gMC->Gspos("I220",1,"IS01",0.0,0.0,-53.6,0,"ONLY");
-  gMC->Gspos("I211",2,"IS01",0.0,0.0,55.1,idrotm[701],"ONLY");
-  gMC->Gspos("I219",2,"IS01",0.0,0.0,52.2,idrotm[701],"ONLY");
-  gMC->Gspos("I220",2,"IS01",0.0,0.0,52.2,idrotm[701],"ONLY");
-  gMC->Gspos("I217",2,"IS01",0.0,0.0,46.35,idrotm[701],"ONLY");
-  gMC->Gspos("I218",2,"IS01",0.0,0.0,46.35,idrotm[701],"ONLY");
-  gMC->Gspos("I214",2,"IS01",0.0,0.0,65.85,idrotm[701],"ONLY");
-  gMC->Gspos("I213",2,"IS01",0.0,0.0,60.85,idrotm[701],"ONLY");
-  gMC->Gspos("I213",1,"IS01",0.0,0.0,-62.25,0,"ONLY");
-  gMC->Gspos("I214",1,"IS01",0.0,0.0,-67.25,0,"ONLY");
-  gMC->Gspos("I215",19,"IS01",0.0,0.0,-1.4,idrotm[702],"ONLY");
-  gMC->Gspos("I215",21,"IS01",0.0,0.0,-1.4,idrotm[703],"ONLY");
-  gMC->Gspos("I215",23,"IS01",0.0,0.0,-1.4,idrotm[704],"ONLY");
-  gMC->Gspos("I215",24,"IS01",0.0,0.0,-1.4,idrotm[705],"ONLY");
-  gMC->Gspos("I215",3,"IS01",0.0,0.0,-1.4,idrotm[706],"ONLY");
-  gMC->Gspos("I215",5,"IS01",0.0,0.0,-1.4,idrotm[707],"ONLY");
-  gMC->Gspos("I215",7,"IS01",0.0,0.0,-1.4,idrotm[708],"ONLY");
-  gMC->Gspos("I215",9,"IS01",0.0,0.0,-1.4,idrotm[709],"ONLY");
-  gMC->Gspos("I215",11,"IS01",0.0,0.0,-1.4,idrotm[710],"ONLY");
-  gMC->Gspos("I215",13,"IS01",0.0,0.0,-1.4,idrotm[711],"ONLY");
-  gMC->Gspos("I215",15,"IS01",0.0,0.0,-1.4,idrotm[712],"ONLY");
-  gMC->Gspos("I215",17,"IS01",0.0,0.0,-1.4,idrotm[713],"ONLY");
-  gMC->Gspos("I216",9,"IS01",0.0,0.0,45.35,idrotm[714],"ONLY");
-  gMC->Gspos("I216",11,"IS01",0.0,0.0,45.35,idrotm[715],"ONLY");
-  gMC->Gspos("I216",12,"IS01",0.0,0.0,45.35,idrotm[716],"ONLY");
-  gMC->Gspos("I216",3,"IS01",0.0,0.0,45.35,idrotm[717],"ONLY");
-  gMC->Gspos("I216",5,"IS01",0.0,0.0,45.35,idrotm[718],"ONLY");
-  gMC->Gspos("I216",7,"IS01",0.0,0.0,45.35,idrotm[719],"ONLY");
-  gMC->Gspos("I216",10,"IS01",0.0,0.0,-46.75,idrotm[720],"ONLY");
-  gMC->Gspos("I216",1,"IS01",0.0,0.0,-46.75,idrotm[721],"ONLY");
-  gMC->Gspos("I216",2,"IS01",0.0,0.0,-46.75,idrotm[722],"ONLY");
-  gMC->Gspos("I216",4,"IS01",0.0,0.0,-46.75,idrotm[723],"ONLY");
-  gMC->Gspos("I216",6,"IS01",0.0,0.0,-46.75,idrotm[724],"ONLY");
-  gMC->Gspos("I216",8,"IS01",0.0,0.0,-46.75,idrotm[725],"ONLY");
-  gMC->Gspos("I215",1,"IS01",0.0,0.0,0.0,idrotm[726],"ONLY");
-  gMC->Gspos("I215",2,"IS01",0.0,0.0,0.0,idrotm[727],"ONLY");
-  gMC->Gspos("I215",4,"IS01",0.0,0.0,0.0,idrotm[728],"ONLY");
-  gMC->Gspos("I215",6,"IS01",0.0,0.0,0.0,idrotm[729],"ONLY");
-  gMC->Gspos("I215",8,"IS01",0.0,0.0,0.0,idrotm[733],"ONLY");
-  gMC->Gspos("I215",10,"IS01",0.0,0.0,0.0,idrotm[730],"ONLY");
-  gMC->Gspos("I215",12,"IS01",0.0,0.0,0.0,idrotm[731],"ONLY");
-  gMC->Gspos("I215",14,"IS01",0.0,0.0,0.0,idrotm[768],"ONLY");
-  gMC->Gspos("I215",16,"IS01",0.0,0.0,0.0,idrotm[732],"ONLY");
-  gMC->Gspos("I215",18,"IS01",0.0,0.0,0.0,idrotm[734],"ONLY");
-  gMC->Gspos("I215",20,"IS01",0.0,0.0,0.0,idrotm[798],"ONLY");
-  gMC->Gspos("I215",22,"IS01",0.0,0.0,0.0,idrotm[735],"ONLY");
+  gMC->Gspos("I217",1,"IS01",0.0,0.0,-44.4,0,"ONLY");             // this will change after PPR to be symmetric
+  gMC->Gspos("I219",1,"IS01",0.0,0.0,-50.25,0,"ONLY");            // this will change after PPR to be symmetric
+  gMC->Gspos("I211",2,"IS01",0.0,0.0,56.5,idrotm[701],"ONLY");   
+  gMC->Gspos("I219",2,"IS01",0.0,0.0,51.65,idrotm[701],"ONLY");   // this will change after PPR to be symmetric
+  gMC->Gspos("I217",2,"IS01",0.0,0.0,45.8,idrotm[701],"ONLY");    // this will change after PPR to be symmetric
+  gMC->Gspos("I214",2,"IS01",0.0,0.0,67.25,idrotm[701],"ONLY");   
+  gMC->Gspos("I213",2,"IS01",0.0,0.0,62.25,idrotm[701],"ONLY");  
+  gMC->Gspos("I213",1,"IS01",0.0,0.0,-62.25,0,"ONLY");             
+  gMC->Gspos("I214",1,"IS01",0.0,0.0,-67.25,0,"ONLY");           
+  gMC->Gspos("I215",19,"IS01",0.0,0.0,0.0,idrotm[702],"MANY");
+  gMC->Gspos("I215",21,"IS01",0.0,0.0,0.0,idrotm[703],"MANY");
+  gMC->Gspos("I215",23,"IS01",0.0,0.0,0.0,idrotm[704],"MANY");
+  gMC->Gspos("I215",24,"IS01",0.0,0.0,0.0,idrotm[705],"MANY");
+  gMC->Gspos("I215",3,"IS01",0.0,0.0,0.0,idrotm[706],"MANY");
+  gMC->Gspos("I215",5,"IS01",0.0,0.0,0.0,idrotm[707],"MANY");
+  gMC->Gspos("I215",7,"IS01",0.0,0.0,0.0,idrotm[708],"MANY");
+  gMC->Gspos("I215",9,"IS01",0.0,0.0,0.0,idrotm[709],"MANY");
+  gMC->Gspos("I215",11,"IS01",0.0,0.0,0.0,idrotm[710],"MANY");
+  gMC->Gspos("I215",13,"IS01",0.0,0.0,0.0,idrotm[711],"MANY");
+  gMC->Gspos("I215",15,"IS01",0.0,0.0,0.0,idrotm[712],"MANY");
+  gMC->Gspos("I215",17,"IS01",0.0,0.0,0.0,idrotm[713],"MANY");
+  gMC->Gspos("I216",9,"IS01",0.0,0.0,45.5,idrotm[714],"ONLY");
+  gMC->Gspos("I216",11,"IS01",0.0,0.0,45.5,idrotm[715],"ONLY");
+  gMC->Gspos("I216",12,"IS01",0.0,0.0,45.5,idrotm[716],"ONLY");
+  gMC->Gspos("I216",3,"IS01",0.0,0.0,45.5,idrotm[717],"ONLY");
+  gMC->Gspos("I216",5,"IS01",0.0,0.0,45.5,idrotm[718],"ONLY");
+  gMC->Gspos("I216",7,"IS01",0.0,0.0,45.5,idrotm[719],"ONLY");
+  gMC->Gspos("I216",10,"IS01",0.0,0.0,-44,idrotm[720],"ONLY");
+  gMC->Gspos("I216",1,"IS01",0.0,0.0,-44,idrotm[721],"ONLY");
+  gMC->Gspos("I216",2,"IS01",0.0,0.0,-44,idrotm[722],"ONLY");
+  gMC->Gspos("I216",4,"IS01",0.0,0.0,-44,idrotm[723],"ONLY");
+  gMC->Gspos("I216",6,"IS01",0.0,0.0,-44,idrotm[724],"ONLY");
+  gMC->Gspos("I216",8,"IS01",0.0,0.0,-44,idrotm[725],"ONLY");
+  gMC->Gspos("I215",1,"IS01",0.0,0.0,0.0,idrotm[726],"MANY");
+  gMC->Gspos("I215",2,"IS01",0.0,0.0,0.0,idrotm[727],"MANY");
+  gMC->Gspos("I215",4,"IS01",0.0,0.0,0.0,idrotm[728],"MANY");
+  gMC->Gspos("I215",6,"IS01",0.0,0.0,0.0,idrotm[729],"MANY");
+  gMC->Gspos("I215",8,"IS01",0.0,0.0,0.0,idrotm[733],"MANY");
+  gMC->Gspos("I215",10,"IS01",0.0,0.0,0.0,idrotm[730],"MANY");
+  gMC->Gspos("I215",12,"IS01",0.0,0.0,0.0,idrotm[731],"MANY");
+  gMC->Gspos("I215",14,"IS01",0.0,0.0,0.0,idrotm[768],"MANY");
+  gMC->Gspos("I215",16,"IS01",0.0,0.0,0.0,idrotm[732],"MANY");
+  gMC->Gspos("I215",18,"IS01",0.0,0.0,0.0,idrotm[734],"MANY");
+  gMC->Gspos("I215",20,"IS01",0.0,0.0,0.0,idrotm[798],"MANY");
+  gMC->Gspos("I215",22,"IS01",0.0,0.0,0.0,idrotm[735],"MANY");
            
                    
   // --- Place subdetectors' mother volumes and supports' mother volumes
@@ -4050,8 +4196,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  
-  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");
+  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");
   
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
   
@@ -4060,8 +4206,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[2] = 9.5;
   
   gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  
-  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");  
+  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");  
   
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
   
@@ -4070,12 +4216,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[2] = 2.25;
   
   gMC->Gsvolu("IPAN", "TUBE", idtmed[210], dgh, 3);  
-  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 98.45, 0, "ONLY");  
-  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -98.45, idrotm[200], "ONLY"); 
+  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 95.25, 0, "ONLY");  
+  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); 
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - UPPER PART
  
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -4083,12 +4229,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    
-  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -4096,12 +4242,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    
-  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -4109,12 +4255,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    
-  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -4122,8 +4268,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    
-  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     
@@ -4133,8 +4279,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICU3", "TUBS", idtmed[213], dgh, 5);    
-  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   
@@ -4144,8 +4290,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICU4", "TUBS", idtmed[213], dgh, 5);    
-  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 
@@ -4155,8 +4301,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICC3", "TUBS", idtmed[225], dgh, 5);    
-  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 
@@ -4166,8 +4312,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICC4", "TUBS", idtmed[225], dgh, 5);    
-  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
 
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - UPPER PART
   
@@ -4177,7 +4323,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("IHK1", "TUBS", idtmed[264], dgh, 5);   
-  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");      
+  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");      
   
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - LOWER PART
   
@@ -4187,26 +4333,81 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("IHK2", "TUBS", idtmed[264], dgh, 5);   
-  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");        
+  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");        
   
   // --- DEFINE RAILS BETWEEN THE ITS AND THE TPC
   
-  //dgh[0] = 0.85;
-  //dgh[1] = 10.;
-  //dgh[2] = 190.;  
-  //gMC->Gsvolu("IRAI", "BOX ", idtmed[285], dgh, 3);   
-  //gMC->Gspos("IRAI", 1, "ITSV", 53., 0., -69.5, 0, "ONLY");
-  //gMC->Gspos("IRAI", 2, "ITSV", -53., 0., -69.5, 0, "ONLY");        
+  if (rails == 1) {
+  
+     dgh[0] = 2.;          
+     dgh[1] = 8.;           
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA1", "BOX ", idtmed[210], dgh, 3);
+     gMC->Gspos("IRA1", 1, "ITSV", 53.5, 0., -69.5, 0, "ONLY");   
+     gMC->Gsvolu("IRA2", "BOX ", idtmed[210], dgh, 3);    
+     gMC->Gspos("IRA2", 1, "ITSV", -53.5, 0., -69.5, 0, "ONLY");    
+
+     dgh[0] = 2.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2      
+     dgh[1] = 8.-0.5531;    // 0.5531 was determined in such a way that the aluminum area is 20.9 cm^2       
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA3", "BOX ", idtmed[205], dgh, 3);   
+     gMC->Gspos("IRA3", 1, "IRA1", 0., 0., 0., 0, "ONLY");   
+     gMC->Gsvolu("IRA4", "BOX ", idtmed[205], dgh, 3);     
+     gMC->Gspos("IRA4", 1, "IRA2", 0., 0., 0., 0, "ONLY");    
+
+  }
   
   // --- DEFINE CYLINDERS HOLDING RAILS BETWEEN THE ITS AND THE TPC
   
-
-  dgh[0] = 58.;
+  dgh[0] = 56.9;    
   dgh[1] = 59.;
-  dgh[2] = 0.6;   
+  dgh[2] = 0.6;    
   gMC->Gsvolu("ICYL", "TUBE", idtmed[210], dgh, 3);   
-  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 74., 0, "ONLY");
-  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74., idrotm[200], "ONLY");     
+  gMC->Gspos("ICYL", 1, "ALIC", 0., 0., 73.4, 0, "ONLY");       
+  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -73.4, idrotm[200], "ONLY");  
+
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE CYLINDERS
+
+  dgh[0] = 0.;        
+  dgh[1] = 3.;         
+  dgh[2] = 5.;  // 5. comes from the fact that the volume has to be 567.6/2 cm^3       
+  gMC->Gsvolu("ISR1", "TUBE", idtmed[284], dgh, 3);   
+  gMC->Gspos("ISR1", 1, "ALIC", 54.9, 11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 2, "ALIC", 54.9, -11., 79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 3, "ALIC", -54.9, 11., 79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 4, "ALIC", -54.9, -11., 79.5, 0, "ONLY");  
+  gMC->Gspos("ISR1", 5, "ALIC", 54.9, 11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 6, "ALIC", 54.9, -11., -79.5, 0, "ONLY");   
+  gMC->Gspos("ISR1", 7, "ALIC", -54.9, 11., -79.5, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 8, "ALIC", -54.9, -11., -79.5, 0, "ONLY");         
+  
+  // --- DEFINE SUPPORTS FOR RAILS ATTACHED TO THE ABSORBER
+
+  dgh[0] = 5.;        
+  dgh[1] = 12.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR2", "BOX ", idtmed[210], dgh, 3);   
+  gMC->Gspos("ISR2", 1, "ALIC", 53.5, 0., 125.5, 0, "ONLY");
+  gMC->Gsvolu("ISR3", "BOX ", idtmed[210], dgh, 3);   
+  gMC->Gspos("ISR3", 1, "ALIC", -53.5, 0., 125.5, 0, "ONLY");  
+  
+  dgh[0] = 5.-2.;        
+  dgh[1] = 12.-2.;         
+  dgh[2] = 5.;         
+  gMC->Gsvolu("ISR4", "BOX ", idtmed[205], dgh, 3);   
+  gMC->Gspos("ISR4", 1, "ISR2", 0., 0., 0., 0, "ONLY");     
+  gMC->Gsvolu("ISR5", "BOX ", idtmed[205], dgh, 3);   
+  gMC->Gspos("ISR5", 1, "ISR3", 0., 0., 0., 0, "ONLY");
+  
+  // --- DEFINE SUPPORTS TO ATTACH THE ITS TO THE TPC
+  
+  dgh[0] = 0.;        
+  dgh[1] = 5.;         
+  dgh[2] = 2.;         
+  gMC->Gsvolu("ISR6", "TUBE", idtmed[210], dgh, 3);   
+  gMC->Gspos("ISR6", 1, "ALIC", 0., 54., 77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 2, "ALIC", 0., 54., -77., 0, "ONLY"); 
+  gMC->Gspos("ISR6", 3, "ALIC", 0., -54., -77., 0, "ONLY");       
   
   // --- Outputs the geometry tree in the EUCLID/CAD format 
   
@@ -4228,10 +4429,16 @@ void AliITSvPPRsymm::CreateMaterials(){
   // one is used. See the definition found in AliITSv5 or the other routine
   // for a complete definition.
   //
-  
+    
   Int_t  isxfld  = gAlice->Field()->Integ();
   Float_t sxmgmx = gAlice->Field()->Max();
-  
+
+  // Freon
+  Float_t afre[2]  = { 12.011,18.9984032 };
+  Float_t zfre[2]  = { 6.,9. };
+  Float_t wfre[2]  = { 5.,12. };
+  Float_t densfre  = 1.5;  
+
   // --- Define the various materials and media for GEANT --- 
   
   AliMaterial(1,"SI$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
@@ -4267,6 +4474,9 @@ void AliITSvPPRsymm::CreateMaterials(){
   AliMaterial(12,"WATER$",0.14322E+02,0.72167E+01,0.10000E+01,0.35759E+02,0.94951E+02);
   AliMedium(12,"WATER$",12,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
+  AliMixture(13,"Freon$",afre,zfre,densfre,-2,wfre);
+  AliMedium(13,"Freon$",13,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
   AliMaterial(14,"COPPER$",0.63546E+02,0.29000E+02,0.89600E+01,0.14300E+01,0.99900E+03);
   AliMedium(14,"COPPER$",14,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
@@ -4321,7 +4531,7 @@ void AliITSvPPRsymm::CreateMaterials(){
   AliMaterial(65,"INOX$",0.55098E+02,0.2572E+02,0.7900E+01,0.17800E+01,0.99900E+03);
   AliMedium(65,"INOX$",65,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
-  AliMaterial(68,"ROHACELL$",0.12011E+02,0.60000E+01,0.9500E01,0.43600E+03,0.99900E+03);
+  AliMaterial(68,"ROHACELL$",0.123974E+02,0.62363E+01,0.500E-01,0.80986E+03,0.99900E+03);
   AliMedium(68,"ROHACELL$",68,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
   AliMaterial(69,"SDD C AL (M55J)$",0.138802E+02,0.71315E+01,0.19837E+01,0.176542E+02,0.99900E+03);
@@ -4369,6 +4579,13 @@ void AliITSvPPRsymm::CreateMaterials(){
   AliMaterial(83,"SDD anode microcab$",0.186438E+02,0.91193E+01,0.17854E+01,0.176451E+02,0.99900E+03);
   AliMedium(83,"SDD anode microcab$",83,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
+  AliMaterial(84,"SDD/SSD rings$",0.123565E+02,0.64561E+01,0.18097E+01,0.229570E+02,0.99900E+03);
+  AliMedium(84,"SDD/SSD rings$",84,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(85,"inox/alum$",0.321502E+02,0.153383E+02,0.30705E+01,0.69197E+01,0.99900E+03);
+  AliMedium(85,"inox/alum$",85,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+
   // Special media
 
   AliMaterial(90,"SPD shield$", 12.011, 6., 1.93/10. , 22.1*10., 999);
index a1636a171380adbd5a3adae5622da2db5235e2fe..cc9e3f1d09294b07ec8a54c3a51316900c46d9e0 100644 (file)
@@ -53,6 +53,12 @@ class AliITSvPPRsymm : public AliITS {
     virtual void   SetThicknessChip2(Float_t v=300.){ 
         // Set chip thickness in layer 2
         fChip2 = v;}
+    virtual void   SetRails(Int_t v=1){ 
+        // Set flag for rails
+        fRails = v;}    
+    virtual void   SetCoolingFluid(Int_t v=1){ 
+        // Set flag for cooling fluid
+        fFluid = v;}                    
     virtual Bool_t GetEUCLID(){return fEuclidOut;}// returns value Euclid flag.
     virtual const char  *GetEULIIDFileName() const{ // return .euc file name
                                       return fEuclidGeometry.Data();}
@@ -80,6 +86,13 @@ class AliITSvPPRsymm : public AliITS {
     virtual Float_t GetThicknessChip2(){ 
         // Get chip thickness in layer 2
         return fChip2;}
+    virtual Int_t GetRails(){ 
+        // Get flag for rails
+        return fRails;}         
+    virtual Int_t GetCoolingFluid(){ 
+        // Get flag for cooling fluid
+        return fFluid;}                         
+        
  private:
     void InitAliITSgeom();
 
@@ -92,11 +105,12 @@ class AliITSvPPRsymm : public AliITS {
     char   fEuclidGeomDet[60];// file where detector transormation are define.
     char   fRead[60];         //! file name to read .det file
     char   fWrite[60];        //! file name to write .det file
-        Float_t  fDet1;           // thickness of detector in SPD layer 1
-        Float_t  fDet2;           // thickness of detector in SPD layer 2
-        Float_t  fChip1;          // thickness of chip in SPD layer 1   
-        Float_t  fChip2;          // thickness of chip in SPD layer 2   
-
+    Float_t  fDet1;           // thickness of detector in SPD layer 1
+    Float_t  fDet2;           // thickness of detector in SPD layer 2
+    Float_t  fChip1;          // thickness of chip in SPD layer 1       
+    Float_t  fChip2;          // thickness of chip in SPD layer 2       
+    Int_t    fRails;          // flag to switch rails on (=1) and off (=0)
+    Int_t    fFluid;          // flag to switch between water (=1) and freon (=0)
     ClassDef(AliITSvPPRsymm,1)  //Hits manager for set:ITS version 9 
                                 // PPR detailed Geometry symmetric
 };