]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSvPPRasymm.cxx
Bug fixed in the StepManager to account for the difference in the geometry tree for...
[u/mrichter/AliRoot.git] / ITS / AliITSvPPRasymm.cxx
index a667eaa73caa194d66269609cb0efc20bc039300..71f02a5283f376be7cc36350dfc29ae2083b503c 100644 (file)
 
 /*
 $Log$
+Revision 1.37  2001/05/10 00:12:59  nilsen
+Finished fixing up the default segmentation for the PPR geometry.
+
+Revision 1.36  2001/05/09 01:02:21  nilsen
+Finished fixing SetDefaults for the segmentation of SPD, SDD, and SSD.
+
+Revision 1.35  2001/05/03 08:40:15  barbera
+Volume ITSD slightly modified to be consistent with v5. Some improvement in the printouts. The last commit did not complete successfully.
+
+Revision 1.33  2001/05/01 22:40:42  nilsen
+Partical update of SetDefault.
+
+Revision 1.32  2001/04/22 13:48:09  barbera
+New values of media parameters and thickness of SPD end-ladder electronics as given by Fabio Formenti
+
+Revision 1.31  2001/04/04 07:02:16  barbera
+Position of the cylinders holding rails corrected
+
+Revision 1.30  2001/03/29 22:02:30  barbera
+Some changes to the services due to the new drawings from the engineers.
+
+Revision 1.29  2001/03/29 05:28:56  barbera
+Rails material changed from aluminum to carbon fiber according with the decision of the last Technical Board
+
+Revision 1.28  2001/03/28 06:40:20  barbera
+Central and services mother volumes made consistenf for detailed and coarse geometry. Switch for rails added to the coarse geometries
+
+Revision 1.26  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.25  2001/03/20 19:22:51  barbera
+Flags for the rails and the cooling fluid added. Some changes in the volumes of the SSD cones after the meeting with the engineers in Torino.
+
+Revision 1.23  2001/03/13 21:18:44  barbera
+Some misleading comments removed
+
+Revision 1.22  2001/03/13 18:13:30  barbera
+Some mother volumes sligthly modified to eliminate an overlap with the absorber
+
+Revision 1.21  2001/03/13 08:36:23  hristov
+fabsf replaced by TMath::Abs
+
+Revision 1.20  2001/03/13 00:17:41  barbera
+New SDD geometry got grom F. Tosello and checked by the SDD engineers
+
+Revision 1.19  2001/02/28 18:23:13  barbera
+Setters and getters to set/get the detector and chip thickness on SPD layers added
+
+Revision 1.18  2001/02/27 23:18:24  barbera
+Full parameterization of detector and chip thicknesses for layer 1 and layer 2 of SPD as requested by the project leader
+
+Revision 1.17  2001/02/19 22:14:55  nilsen
+Fix for all 4 versions 11, 12, 21, and 22.
+
+Revision 1.16  2001/02/19 20:10:34  barbera
+Set option=2 and thickness=2 as default values --> SetMinorVersion=22
+
+Revision 1.15  2001/02/19 19:44:00  barbera
+Air density parameter corrected
+
 Revision 1.14  2001/02/13 16:53:35  nilsen
 Fixed a but when trying to use GEANT4. Needed to replace
 if(!((TGeant3*)gMC)) with if(!(dynamic_casst<TGeant3*>(gMC)))
@@ -104,6 +165,16 @@ New ITS detailed geometry to be used for the PPR
 #include "AliITSgeomSPD.h"
 #include "AliITSgeomSDD.h"
 #include "AliITSgeomSSD.h"
+#include "AliITSDetType.h"
+#include "AliITSresponseSPD.h"
+#include "AliITSresponseSDD.h"
+#include "AliITSresponseSSD.h"
+#include "AliITSsegmentationSPD.h"
+#include "AliITSsegmentationSDD.h"
+#include "AliITSsegmentationSSD.h"
+#include "AliITSClusterFinderSPD.h"
+#include "AliITSClusterFinderSDD.h"
+#include "AliITSClusterFinderSSD.h"
 
 
 ClassImp(AliITSvPPRasymm)
@@ -120,7 +191,7 @@ AliITSvPPRasymm::AliITSvPPRasymm() {
     fIdSens       = 0;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kTRUE; // Read .det file
+    fGeomDetIn    = kFALSE; // Don't Read .det file
     fMajorVersion = IsVersion();
     fMinorVersion = -1;
     for(i=0;i<60;i++) fRead[i] = '\0';
@@ -145,13 +216,17 @@ AliITSvPPRasymm::AliITSvPPRasymm(const char *name, const char *title) : AliITS(n
     fIdSens    = new Int_t[fIdN];
     for(i=0;i<fIdN;i++) fIdSens[i] = 0;
     fMajorVersion = IsVersion();
-    fMinorVersion = 21;
+    fMinorVersion = 2;
     fEuclidOut    = kFALSE; // Don't write Euclide file
     fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kTRUE; // Read .det file
-
-    fEuclidGeometry="$ALICE_ROOT/ITS/ITSgeometry_PPRasymm21.euc";
-    strncpy(fEuclidGeomDet,"$ALICE_ROOT/ITS/ITSgeometry_PPRasymm21.det",60);
+    fGeomDetIn    = kFALSE; // Don't Read .det file
+    SetThicknessDet1();
+    SetThicknessDet2();
+    SetThicknessChip1();
+    SetThicknessChip2();                        
+
+    fEuclidGeometry="$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.euc";
+    strncpy(fEuclidGeomDet,"$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det",60);
     strncpy(fRead,fEuclidGeomDet,60);
     strncpy(fWrite,fEuclidGeomDet,60);
 }
@@ -243,26 +318,153 @@ void AliITSvPPRasymm::CreateGeometry(){
   // 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
+
+  Float_t dits1[3], di101[3], di107[3], di10b[3], di106[3];  // for layer 1 
+  Float_t di103[3], di10a[3], di102[3];                      // for layer 1
+  Float_t dits2[3], di1d1[3], di1d7[3], di20b[3], di1d6[3];  // for layer 2
+  Float_t di1d3[3], di20a[3], di1d2[3];                      // for layer 2  
+  Float_t di108[3], di104[3];                                // for both layers  
 
+  Float_t ddet1=300.;     // total detector thickness on layer 1 (micron)
+  Float_t dchip1=300.;    // total chip thickness on layer 1 (micron)
+  
+  Float_t ddet2=300.;     // total detector thickness on layer 2 (micron)                         
+  Float_t dchip2=300.;    // total chip thickness on layer 2 (micron)
+  
+  Float_t dbus=200.;      // total bus thickness on both layers (micron)
+
+  ddet1 = GetThicknessDet1();
+  ddet2 = GetThicknessDet2();
+  dchip1 = GetThicknessChip1();
+  dchip2 = GetThicknessChip2();    
+
+  if(ddet1 < 100. || ddet1 > 300.) {
+     cout << "ITS - 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 << "ITS - 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 << "ITS - 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 << "ITS - 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.;
+  }      
 
-  // Default values
+  Int_t rails = 1;       // flag for rails (1 --> rails in; 0 --> rails out)
   
-  Int_t thickness=2;  // detector thickness = 300 um - chip thickness = 300 um
-  Int_t option=2;     // option 'b' for det/chip/bus stacking
+  Int_t fluid = 1;       // flag for the cooling fluid (1 --> water; 0 --> freon)
+
+  rails = GetRails();
+
+  fluid = GetCoolingFluid();
+
+  if(rails != 0 && rails != 1) {
+     cout << "ITS - 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;
+       
+  }  
   
-  // These values are NOT the default ones so leave them commented !
+  if(fluid != 0 && fluid != 1) {
+     cout << "ITS - 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 << "ITS: Detector thickness on layer 1 is set to " << ddet1 << " microns." << endl;
+  cout << "ITS: Chip thickness on layer 1 is set to " << dchip1 << " microns." << endl;
+  cout << "ITS: Detector thickness on layer 2 is set to " << ddet2 << " microns." << endl;
+  cout << "ITS: Chip thickness on layer 2 is set to " << dchip2 << " microns." << endl;
+  if(rails == 0 ) {
+     cout << "ITS: Rails are out." << endl; 
+  } else {
+     cout << "ITS: Rails are in." << endl;
+  }   
+  if(fluid == 0 ) {
+     cout << "ITS: The cooling fluid is freon." << endl; 
+  } else {
+     cout << "ITS: 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       
+               
+  Float_t deltax, deltay; 
+
+  Int_t thickness = fMinorVersion/10;
+  Int_t option    = fMinorVersion - 10*thickness;
+
+
+  // Define some variables for SDD
+
+
+  Float_t sin30, cos30;
+
+  // SDD electronics+services main volumes
+  Float_t I018dits[3], I024dits[3], I047dits[3], I048dits[3];
+
+  // SDD detector ladder
 
-//  Int_t thickness=1; // detector thickness = 100 um - chip thickness = 150 um
-//  Int_t option=1;    // option 'a' for det/chip/bus stacking
+  Float_t I302dits[3], I402dits[3], I004dits[3], I005dits[3];
+  Float_t Y_SDD_sep = 0.20;
+  Float_t ySDD;
+  Int_t   iSDD;
+  Float_t Z_SDD_lay3[6] = {18.55, 10.95, 3.70, -3.70, -11.20, -18.35};
+  Float_t Z_SDD_lay4[8] = {25.75, 18.60, 11.00, 3.70, -3.70, -11.20, -18.45, -26.05};
 
-  thickness = fMinorVersion/10;
-  option    = fMinorVersion - 10*thickness;
+  // ladder foot and end-ladder (frame and cooling)
+  Float_t I028dits[3], I420dits[3], I421dits[3], I422dits[6], I423dits[3];
+  Float_t I424dits[3], xI424, yI424;
+  Float_t I425dits[3];
+  Int_t    indI425;
+  Float_t I029dits[4], I030dits[4], I031dits[3], I032dits[3];
+
+  // SDD ladder frame and cooling
+  Float_t SDD_CoolPipe[3] = {1.7000, -0.5500, 0.0000};
+  Float_t I035dits[3], I037dits[3], I038dits[3];
+  Float_t I039dits[3], xI039, yI039;
+  Float_t I041dits[5];
+
+  // SDD hybrid, chips and capacitors
+  Float_t I050dits[3], xI050, yI050;
+  Float_t I052dits[3], xI052, yI052;
+  Float_t I042dits[3], xI042, yI042;
+  Float_t xI042space = 0.17;
+  Float_t I043dits[3], xI043, yI043;
+  Float_t xI043space = 0.17;
+  Float_t zchip, zChipSpace;
+  Float_t I051dits[3], xI051, yI051, zI051, yI051space, xcap;
+  Int_t     ichip, icap;
+
+  // SDD microcables
+  Float_t I044dits[4], xI044, yI044, volI044;
+  Float_t xHV, yHV, zHV, xLV, yLV, zLV;
+  Char_t   HVname[5], LVname[5];
+
+
+  // Define media off-set
   
   Int_t *idtmed = fIdtmed->GetArray()-199;
 
@@ -724,54 +926,66 @@ void AliITSvPPRasymm::CreateGeometry(){
     
   //     FIELD CAGE HALF LENGTH 
   
-  rlim  = 56.;
-  zmax  = 76.708;
-  xltpc = 284.;
+  rlim  = 50.;
+  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] = 44.9;
+  dgh[2] = 16.;
+  dgh[3] = -ztpc-5.-0.1;
+  dgh[4] = 46;   
   dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 44.9;
+  dgh[6] = -ztpc;
+  dgh[7] = 46;   
   dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 44.9;
-  dgh[11] = 56.1;
-  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] = 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[205], dgh, 39);
+  dgh[9] = -ztpc;
+  dgh[10] = 46;  
+  dgh[11] = rlim+6;
+  dgh[12] = -97.5;
+  dgh[13] = 46;  
+  dgh[14] = rlim+6;
+  dgh[15] = -zmax;
+  dgh[16] = 46;  
+  dgh[17] = rlim+6;
+  dgh[18] = -48;   
+  dgh[19] = 6;
+  dgh[20] = rlim+6;
+  dgh[21] = -28.6;   
+  dgh[22] = 6;
+  dgh[23] = rlim+6;    
+  dgh[24] = -27.6;  
+  dgh[25] = 3.295;
+  dgh[26] = rlim+6; 
+  dgh[27] = 27.6;   
+  dgh[28] = 3.295;
+  dgh[29] = rlim+6;
+  dgh[30] = 28.6;   
+  dgh[31] = 6;
+  dgh[32] = rlim+6;
+  dgh[33] = 48;   
+  dgh[34] = 6;
+  dgh[35] = rlim+6;  
+  dgh[36] = zmax;
+  dgh[37] = 46;
+  dgh[38] = rlim+6;
+  dgh[39] = 97.5;
+  dgh[40] = 46;  
+  dgh[41] = rlim+6;
+  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[205], dgh, 51);
+
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
   //     invisible 
@@ -784,20 +998,32 @@ void AliITSvPPRasymm::CreateGeometry(){
   
   dgh[0] = 0.;
   dgh[1] = 360.;
-  dgh[2] = 4.;
-  dgh[3] = -77.2;
-  dgh[4] = 45.;
-  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] = 45.;
-  dgh[14] = 56.;
-  gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 15);
+  dgh[2] = 8.;
+  dgh[3] = -zmax;  
+  dgh[4] = 46.;
+  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[205], dgh, 27);
   
   // --- Place the ghost volume in its mother volume (ITSV) and make it 
   //     invisible 
@@ -806,19 +1032,16 @@ void AliITSvPPRasymm::CreateGeometry(){
   //gMC->Gsatt("ITSD", "SEEN", 0);
 
 
-
   // --- Define SPD (option 'a') volumes ----------------------------
   
   // SPD - option 'a' 
-  // detector thickness = 100 microns
-  // chip thickness = 150 microns
   // (this is NOT the default)
 
-  if (option == 1 && thickness == 1) {
-
+  if (option == 1) {
+  
      dits[0] = 3.7;
      dits[1] = 7.75;
-     dits[2] = 24;
+     dits[2] = 26.1;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
@@ -826,18 +1049,18 @@ void AliITSvPPRasymm::CreateGeometry(){
      dits[2] = 24;
      dits[3] = 57;
      dits[4] = 100;
-     gMC->Gsvolu("I12A", "TUBS", idtmed[254], dits, 5); 
-
-     dits[0] = 0.843;
-     dits[1] = 0.025;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I10A", "BOX ", idtmed[254], dits, 3);  
-
-     dits[0] = 0.843;
-     dits[1] = 0.025;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I20A", "BOX ", idtmed[254], dits, 3);  
+     gMC->Gsvolu("I12A", "TUBS", idtmed[254], dits, 5);    // sector
 
+     di10a[0] = 0.843;
+     di10a[1] = ddet1+dchip1+dbus+0.0025;
+     di10a[2] = 19.344;
+     gMC->Gsvolu("I10A", "BOX ", idtmed[254], di10a, 3);    // mother volume
+                                                            // on layer 1
+     di20a[0] = 0.843;
+     di20a[1] = ddet2+dchip2+dbus+0.0025;
+     di20a[2] = 19.344;
+     gMC->Gsvolu("I20A", "BOX ", idtmed[254], di20a, 3);    // mother volume
+                                                            // on layer 2
      dits[0] = 1.3673;
      dits[1] = 0.01;
      dits[2] = 24;
@@ -983,26 +1206,27 @@ void AliITSvPPRasymm::CreateGeometry(){
      dits[4] = 42.883;
      gMC->Gsvolu("I124", "TUBS", idtmed[253], dits, 5);  
 
+     di103[0] = 0.793;
+     di103[1] = ddet1+dchip1;
+     di103[2] = 3.536;
+     gMC->Gsvolu("I103", "BOX ", idtmed[254], di103, 3); // contains det and chip  
+                                                         // layer 1
      dits[0] = 0.793;
-     dits[1] = 0.0125;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I103", "BOX ", idtmed[254], dits, 3);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.015 ;
+     dits[1] = 0.475;  //0.685; 0.015
      dits[2] = 2.5;
-     gMC->Gsvolu("I105", "BOX ", idtmed[201], dits, 3);  
-
-     dits[0] = 0.843;
-     dits[1] = 0.01;
-     dits[2] = 14.344;
-     gMC->Gsvolu("I104", "BOX ", idtmed[275], dits, 3);  // bus
-
+     gMC->Gsvolu("I105", "BOX ", idtmed[290], dits, 3);  // end-ladder electr.
+
+     di104[0] = 0.843;
+     di104[1] = dbus;
+     di104[2] = 14.344;
+     gMC->Gsvolu("I104", "BOX ", idtmed[275], di104, 3);  // bus for both layers
+
+     di1d3[0] = 0.793;
+     di1d3[1] = ddet2+dchip2;
+     di1d3[2] = 3.536;
+     gMC->Gsvolu("I1D3", "BOX ", idtmed[254], di1d3, 3); // contains det and chip
+                                                         // layer 2
      dits[0] = 0.793;
-     dits[1] = 0.0125;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D3", "BOX ", idtmed[254], dits, 3);
-
      dits[0] = 0.06;
      dits[1] = 0.08;
      dits[2] = 24;
@@ -1034,47 +1258,68 @@ void AliITSvPPRasymm::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;
      gMC->Gsvolu("I116", "BOX ", idtmed[264], dits, 3); 
 
-     dits[0] = 0.705;
-     dits[1] = 0.005;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I101", "BOX ", idtmed[250], dits, 3);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.0075;
-     dits[2] = 0.68;
-     gMC->Gsvolu("I102", "BOX ", idtmed[201], dits, 3);   // chip
-
-     dits[0] = 0.705;
-     dits[1] = 0.005;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], dits, 3);
-
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
-
-     dits[0] = 0.64;
-     dits[1] = 0.005;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits, 3);   // detector
-
-     dits[0] = 0.64;
-     dits[1] = 0.005;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits, 3);   // detector  
+     di102[0] = 0.793;
+     di102[1] = dchip1;
+     di102[2] = 0.68;
+     gMC->Gsvolu("I102", "BOX ", idtmed[201], di102, 3);   // chip layer 1
+         
+     di1d2[0] = 0.793;
+     di1d2[1] = dchip2;
+     di1d2[2] = 0.68;
+     gMC->Gsvolu("I1D2", "BOX ", idtmed[201], di1d2, 3);   // chip     layer 2
+
+     di101[0] = 0.705;
+     di101[1] = ddet1;
+     di101[2] = 3.536;
+     gMC->Gsvolu("I101", "BOX ", idtmed[250], di101, 3);   // contains detector 
+                                                           // layer 1
+     di1d1[0] = 0.705;
+     di1d1[1] = ddet2;
+     di1d1[2] = 3.536;
+     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);   // contains detector 
+                                                           // layer 2
+     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;
+     dits1[2] = 3.48;
+     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits1, 3);   // detector layer 1
+
+     dits2[0] = 0.64;
+     dits2[1] = ddet2;
+     dits2[2] = 3.48;
+     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits2, 3);   // detector layer 2
 
      dits[0] = 3.701;
      dits[1] = 7.699;
@@ -1122,53 +1367,98 @@ void AliITSvPPRasymm::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.
 
   }
 
-
   // --- Define SPD (option 'b') volumes ----------------------------
   
   // SPD - option 'b' 
-  // detector thickness = 100 microns
-  // chip thickness = 150 microns
-  // (this is NOT the default)
-
-  if (option == 2 && thickness == 1) {
+  // (this is the default)
 
+  if (option == 2) {
+  
      dits[0] = 3.7;
      dits[1] = 7.75;
-     dits[2] = 24;
+     dits[2] = 26.1;
      gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
 
      dits[0] = 3.7;
@@ -1176,17 +1466,19 @@ void AliITSvPPRasymm::CreateGeometry(){
      dits[2] = 24;
      dits[3] = 57;
      dits[4] = 100;
-     gMC->Gsvolu("I12B", "TUBS", idtmed[254], dits, 5); 
+     gMC->Gsvolu("I12B", "TUBS", idtmed[254], dits, 5);   // sector
 
-     dits[0] = 0.843;
-     dits[1] = 0.025;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I10B", "BOX ", idtmed[254], dits, 3);  
+     di10b[0] = 0.843;
+     di10b[1] = ddet1+dchip1+dbus+0.0025;  
+     di10b[2] = 19.344;
+     gMC->Gsvolu("I10B", "BOX ", idtmed[254], di10b, 3);   // mother volume 
+                                                               // on layer 1
 
-     dits[0] = 0.843;
-     dits[1] = 0.025;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I20B", "BOX ", idtmed[254], dits, 3);  
+     di20b[0] = 0.843;
+     di20b[1] = ddet2+dchip2+dbus+0.0025;   
+     di20b[2] = 19.344;
+     gMC->Gsvolu("I20B", "BOX ", idtmed[254], di20b, 3);   // mother volume
+                                                               // layer 2
 
      dits[0] = 1.3673;
      dits[1] = 0.01;
@@ -1334,30 +1626,30 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gsvolu("I124", "TUBS", idtmed[253], dits, 5);  
 
      dits[0] = 0.793;
-     dits[1] = 0.015 ;
+     dits[1] = 0.475 ;  //0.685; 0.015
      dits[2] = 2.5;
-     gMC->Gsvolu("I105", "BOX ", idtmed[201], dits, 3);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.0125;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I107", "BOX ", idtmed[254], dits, 3);    
+     gMC->Gsvolu("I105", "BOX ", idtmed[290], dits, 3);  
 
+     di107[0] = 0.793;
+     di107[1] = ddet1+dchip1;
+     di107[2] = 3.536;
+     gMC->Gsvolu("I107", "BOX ", idtmed[254], di107, 3); // contains det and chip   
+                                                         // layer 1
      dits[0] = 0.705;
      dits[1] = 0.01;
      dits[2] = 2.5;
      gMC->Gsvolu("I109", "BOX ", idtmed[275], dits, 3);  
 
-     dits[0] = 0.705;
-     dits[1] = 0.01;
-     dits[2] = 14.344;
-     gMC->Gsvolu("I108", "BOX ", idtmed[275], dits, 3);    // bus
-
-     dits[0] = 0.7975;
-     dits[1] = 0.0125;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D7", "BOX ", idtmed[254], dits, 3);
+     di108[0] = 0.705;
+     di108[1] = dbus;
+     di108[2] = 14.344;
+     gMC->Gsvolu("I108", "BOX ", idtmed[275], di108, 3); // bus for both layers 
 
+     di1d7[0] = 0.7975;
+     di1d7[1] = ddet2+dchip2;   
+     di1d7[2] = 3.536;
+     gMC->Gsvolu("I1D7", "BOX ", idtmed[254], di1d7, 3); // contains det and chip
+                                                         // layer 2
      dits[0] = 0.06;
      dits[1] = 0.08;
      dits[2] = 24;
@@ -1389,47 +1681,69 @@ void AliITSvPPRasymm::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;
      gMC->Gsvolu("I116", "BOX ", idtmed[264], dits, 3); 
 
-     dits[0] = 0.7975;
-     dits[1] = 0.0075;
-     dits[2] = 0.68;
-     gMC->Gsvolu("I106", "BOX ", idtmed[203], dits, 3);   // chip
-
-     dits[0] = 0.705;
-     dits[1] = 0.005;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I101", "BOX ", idtmed[250], dits, 3);  
-
-     dits[0] = 0.705;
-     dits[1] = 0.005;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], dits, 3);    
-
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
-
-     dits[0] = 0.64;
-     dits[1] = 0.005;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits, 3);   // detector
-
-     dits[0] = 0.64;
-     dits[1] = 0.005;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits, 3);   // detector 
+     di106[0] = 0.7975;
+     di106[1] = dchip1;   
+     di106[2] = 0.68;
+     gMC->Gsvolu("I106", "BOX ", idtmed[201], di106, 3);   // chip layer 1
+
+     di1d6[0] = 0.7975;
+     di1d6[1] = dchip2;   
+     di1d6[2] = 0.68;
+     gMC->Gsvolu("I1D6", "BOX ", idtmed[201], di1d6, 3);   // chip layer 2
+
+     di101[0] = 0.705;
+     di101[1] = ddet1;
+     di101[2] = 3.536;
+     gMC->Gsvolu("I101", "BOX ", idtmed[250], di101, 3);  // contains detector  
+                                                          // layer 1
+     di1d1[0] = 0.705;
+     di1d1[1] = ddet2;   
+     di1d1[2] = 3.536;
+     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);  // contains detector  
+                                                          // layer 2
+   
+     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;
+     dits1[2] = 3.48;
+     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits1, 3);   // detector layer 1
+
+     dits2[0] = 0.64;
+     dits2[1] = ddet2;  
+     dits2[2] = 3.48;
+     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits2, 3);   // detector layer 2
 
      dits[0] = 3.701;
      dits[1] = 7.699;
@@ -1477,1029 +1791,457 @@ void AliITSvPPRasymm::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.
+     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] = 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.
+  // --- Define SDD volumes ------------------------------------------
 
-     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.
+  
+  cos30 = cos(30.*3.14159/180.);
+  sin30 = sin(30.*3.14159/180.);
+
+  
+  dits[0] = 0;
+  dits[1] = 360;
+  dits[2] = 6;
+  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 
+  I018dits[0] = 3.2;
+  I018dits[1] = 2;
+  I018dits[2] = 3.65;
+  gMC->Gsvolu("I018", "BOX ", idtmed[209], I018dits, 3);  
+
+  // block of the SDD end ladder 
+  I024dits[0] = 3.2;
+  I024dits[1] = 2;
+  I024dits[2] = 2.725;
+  gMC->Gsvolu("I024", "BOX ", idtmed[209], I024dits, 3);  
+
+  // ladder frame of layer 3 - F.T. March,7-2001
+  I047dits[0] = I018dits[0];
+  I047dits[1] = I018dits[1];
+  I047dits[2] = 6*I018dits[2] + 2*I024dits[2]; 
+  gMC->Gsvolu("I047", "BOX ", idtmed[209], I047dits, 3);  
+
+  // ladder frame of layer 4 - F.T. March,7-2001
+  I048dits[0] = I018dits[0];
+  I048dits[1] = I018dits[1];
+  I048dits[2] = 8*I018dits[2] + 2*I024dits[2]; 
+  gMC->Gsvolu("I048", "BOX ", idtmed[209], I048dits, 3);  
+
+
+  // global SDD volume (sensitive + insensitive) 
+  I302dits[0] = 3.6250;
+  I302dits[1] = 0.0150;
+  I302dits[2] = 4.3794;
+  gMC->Gsvolu("I302", "BOX ", idtmed[278], I302dits, 3);
+
+  // Like for I302 - F.T. March,7-2001
+  I402dits[0] = 3.6250;
+  I402dits[1] = 0.0150;
+  I402dits[2] = 4.3794;
+  gMC->Gsvolu("I402", "BOX ", idtmed[278], I402dits, 3);  
+
+  // SDD ladder of layer 3 - F.T. March,7-2001
+  I004dits[0] = I302dits[0]+0.005;
+  I004dits[1] = 2*I302dits[1]+Y_SDD_sep/2.;
+  I004dits[2] = TMath::Abs(Z_SDD_lay3[0]);
+  if (I004dits[2] < TMath::Abs(Z_SDD_lay3[5])) {
+    I004dits[2] = TMath::Abs(Z_SDD_lay3[5]);
+  }
+  I004dits[2] = I004dits[2] + I302dits[2];
+  gMC->Gsvolu("I004", "BOX ", idtmed[209], I004dits, 3);  
+
+  // SDD ladder of layer 4 - F.T. March,7-2001
+  I005dits[0] = I402dits[0]+0.005;
+  I005dits[1] = 2*I402dits[1]+Y_SDD_sep/2.;
+  I005dits[2] = TMath::Abs(Z_SDD_lay4[0]);
+  if (I005dits[2] < TMath::Abs(Z_SDD_lay4[7])) {
+    I005dits[2] = TMath::Abs(Z_SDD_lay4[7]);
   }
+  I005dits[2] = I005dits[2] + I402dits[2];
+  gMC->Gsvolu("I005", "BOX ", idtmed[209], I005dits, 3);  
+
+
+  // -- block of the SDD ladder foot and end ladder
+
+  // ladder foot mother volume
+  I028dits[0] = 3.0000;
+  I028dits[1] = 0.4000;
+  I028dits[2] = 0.9000;
+  gMC->Gsvolu("I028", "BOX ", idtmed[224], I028dits, 3);  
+
+  // positioning-box #1 at SDD end-ladder - F.T. March,7-2001
+  I420dits[0] = 0.4500;
+  I420dits[1] = 0.4000;
+  I420dits[2] = 0.4500;
+  gMC->Gsvolu("I420", "BOX ", idtmed[264], I420dits, 3);  
+
+  // positioning-box #2 at SDD end-ladder - F.T. March,7-2001
+  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;
+  I422dits[1] = 0.2000;
+  I422dits[2] = 0.0000;
+  I422dits[3] = 180.00;
+  I422dits[4] = 0.0000;
+  I422dits[5] = 360.00;
+  gMC->Gsvolu("I422", "SPHE", idtmed[277], I422dits, 6);  
+
+  // support for ruby-sphere (I422) - F.T. March,7-2001
+  I423dits[0] = 0.0000;
+  I423dits[1] = 0.1000;
+  I423dits[2] = (I420dits[1]-I422dits[1])/2.;
+  gMC->Gsvolu("I423", "TUBE", idtmed[264], I423dits, 3);  
+
+  // passage for HV microcables - F.T. March,7-2001
+  I424dits[0] = 1.5000;
+  I424dits[1] = 0.1500;
+  I424dits[2] = I421dits[2];
+  gMC->Gsvolu("I424", "BOX ", idtmed[209], I424dits, 3);  
+
+  // HV microcables segment at the end ladder - F.T. March,7-2001
+  I425dits[0] = 1.350000;
+  I425dits[1] = 0.015250;
+  I425dits[2] = I024dits[2];
+  gMC->Gsvolu("I425", "BOX ", idtmed[279], I425dits, 3);  
+
+  // lower edge of SDD ladder frame at end-ladder - part 1
+  dits[0] = 0.2;
+  dits[1] = 0.1815;
+  dits[2] = I024dits[2];
+  dits[3] = 0.015;
+  gMC->Gsvolu("I025", "TRD1", idtmed[208], dits, 4);  
 
-  // --- Define SPD (option 'a') volumes ----------------------------
-  
-  // SPD - option 'a' 
-  // detector thickness = 300 microns
-  // chip thickness = 300 microns
-  // (this is NOT the default)
+  // lower edge of SDD ladder frame at end-ladder - part 2
+  dits[0] = 0.183;
+  dits[1] = 0.165;
+  dits[2] = I024dits[2];
+  dits[3] = 0.015;
+  gMC->Gsvolu("I026", "TRD1", idtmed[208], dits, 4);  
 
-  if (option == 1 && thickness == 2) {
+  // new: for the 1st top rod of the structure 
+  // at the end-ladder - F.T. March,7-2001
+  I029dits[0] = 0.2;
+  I029dits[1] = 0.1815;
+  I029dits[2] = 1.0100;
+  I029dits[3] = 0.015;
+  gMC->Gsvolu("I029", "TRD1", idtmed[208], I029dits, 4);  
+
+  // new: for the 2nd top rod of the structure 
+  // at the end-ladder - F.T. March,7-2001
+  I030dits[0] = 0.1830;
+  I030dits[1] = 0.1650;
+  I030dits[2] = 1.0100;
+  I030dits[3] = 0.0150;
+  gMC->Gsvolu("I030", "TRD1", idtmed[208], I030dits, 4);  
+
+  // inox cooling tubes for the end ladder - F.T. March,7-2001
+  I031dits[0] = 0.093;
+  I031dits[1] = 0.1;
+  I031dits[2] = I024dits[2];
+  gMC->Gsvolu("I031", "TUBE", idtmed[264], I031dits, 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);    
+  }
   
-     dits[0] = 3.7;
-     dits[1] = 7.75;
-     dits[2] = 24;
-     gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
+  // -- block of the SDD ladder frame holding the electronics
 
-     dits[0] = 3.7;
-     dits[1] = 7.7;
-     dits[2] = 24;
-     dits[3] = 57;
-     dits[4] = 100;
-     gMC->Gsvolu("I12A", "TUBS", idtmed[254], dits, 5);    // sector
+  // edge of the ladder frame - part 1
+  dits[0] = 0.2;
+  dits[1] = 0.182;
+  dits[2] = 3.65;
+  dits[3] = 0.015;
+  gMC->Gsvolu("I019", "TRD1", idtmed[208], dits, 4);  
 
-     dits[0] = 0.843;
-     dits[1] = 0.0425;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I10A", "BOX ", idtmed[254], dits, 3);    // lower ladder
+  // edge of the ladder frame - part 2
+  dits[0] = 0.183;
+  dits[1] = 0.165;
+  dits[2] = 3.65;
+  dits[3] = 0.015;
+  gMC->Gsvolu("I020", "TRD1", idtmed[208], dits, 4);  
 
-     dits[0] = 0.843;
-     dits[1] = 0.0425;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I20A", "BOX ", idtmed[254], dits, 3);    // upper ladder
+  // inclined segments of the ladder frame
+  dits[0] = 2.23;
+  dits[1] = 2.1;
+  dits[2] = 0.05;
+  dits[3] = 0.03;
+  gMC->Gsvolu("I021", "TRD1", idtmed[208], dits, 4);  
 
-     dits[0] = 1.3673;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I123", "BOX ", idtmed[253], dits, 3);
+  // horiz.segments of the ladders, normal to ladder edges
+  dits[0] = 2.1;
+  dits[1] = 2;
+  dits[2] = 0.06;
+  dits[3] = 0.04;
+  gMC->Gsvolu("I022", "TRD1", idtmed[208], dits, 4);  
 
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = -36.79;
-     dits[4] = 21.834;
-     gMC->Gsvolu("I121", "TUBS", idtmed[253], dits, 5);  
+  // horiz.segments of the ladders, at 45 deg. to ladder edges
+  dits[0] = 2.615;
+  dits[1] = 2.465;
+  dits[2] = 0.06;
+  dits[3] = 0.04;
+  gMC->Gsvolu("I023", "TRD1", idtmed[208], dits, 4);  
 
-     dits[0] = 0.1253;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I122", "BOX ", idtmed[253], dits, 3);  
+  // supports of the ceramic pins holding the detectors
+  dits[0] = 0.3;
+  dits[1] = 0.05;
+  dits[2] = 0.15;
+  gMC->Gsvolu("I033", "BOX ", idtmed[208], dits, 3);  
 
-     dits[0] = 0.04;
-     dits[1] = 0.06 ;
-     dits[2] = 24;
-     dits[3] = 126.79;
-     dits[4] = 270;
-     gMC->Gsvolu("I120", "TUBS", idtmed[253], dits, 5);  
+  // ceramic pins holding the detectors
+  dits[0] = 0;
+  dits[1] = 0.05;
+  dits[2] = 0.225;
+  gMC->Gsvolu("I034", "TUBE", idtmed[277], dits, 3);  
 
-     dits[0] = 0.1134;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I144", "BOX ", idtmed[253], dits, 3);  
+  // holders of cooling tubes
+  I035dits[0] = 0.1;
+  I035dits[1] = 0.15;
+  I035dits[2] = 0.2;
+  gMC->Gsvolu("I035", "TUBE", idtmed[208], I035dits, 3);
 
-     dits[0] = 0.25;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     gMC->Gsvolu("I113", "BOX ", idtmed[254], dits, 3);  
+  // top holders of microcables
+  dits[0] = 0.2;
+  dits[1] = 0.01;
+  dits[2] = 0.05;
+  gMC->Gsvolu("I036", "BOX ", idtmed[208], dits, 3);  
 
-     dits[0] = 0.077;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I143", "BOX ", idtmed[253], dits, 3);   
+  // inox cooling tubes - F.T. March,7-2001
+  I037dits[0] = 0.093;
+  I037dits[1] = 0.1;
+  I037dits[2] = I018dits[2];
+  gMC->Gsvolu("I037", "TUBE", idtmed[264], I037dits, 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)
 
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 90;
-     gMC->Gsvolu("I142", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.0695;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I141", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 108;
-     gMC->Gsvolu("I140", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1835;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I139", "BOX ", idtmed[253], dits, 3);
-
-     dits[0] = 0.1894 ;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I138", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 75.261;
-     gMC->Gsvolu("I137", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 1.3401;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I136", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.05;
-     dits[1] = 0.07;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 72.739;
-     gMC->Gsvolu("I135", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1193;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I134", "BOX ", idtmed[253], dits, 3);    
-
-     dits[0] = 0.163;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I133", "BOX ", idtmed[253], dits, 3);   
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 157.633;
-     gMC->Gsvolu("I132", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.2497;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I131", "BOX ", idtmed[253], dits, 3); 
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 148.633;
-     gMC->Gsvolu("I130", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.292;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I129", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.163;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I128", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 161.297;
-     gMC->Gsvolu("I126", "TUBS", idtmed[253], dits, 5);
-
-     dits[0] = 0.2433;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I125", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 42.883;
-     gMC->Gsvolu("I124", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.03;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I103", "BOX ", idtmed[254], dits, 3); // contains det and chip  
-
-     dits[0] = 0.793;
-     dits[1] = 0.015;
-     dits[2] = 2.5;
-     gMC->Gsvolu("I105", "BOX ", idtmed[201], dits, 3);  
-
-     dits[0] = 0.843;
-     dits[1] = 0.01;
-     dits[2] = 14.344;
-     gMC->Gsvolu("I104", "BOX ", idtmed[275], dits, 3);  // bus
-
-     dits[0] = 0.793;
-     dits[1] = 0.03;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D3", "BOX ", idtmed[254], dits, 3); // contains det and chip
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 80;
-     gMC->Gsvolu("I112", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 80;
-     gMC->Gsvolu("I111", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.15;
-     dits[1] = 0.0146;
-     dits[2] = 24;
-     gMC->Gsvolu("I118", "BOX ", idtmed[273], dits, 3);  
-
-     dits[0] = 0.1315;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I110", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.025;
-     dits[1] = 0.035;
-     dits[2] = 24;
-     dits[3] = 0;
-     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);   
-
-     dits[0] = 0.063;
-     dits[1] = 0.035;
-     dits[2] = 24;
-     gMC->Gsvolu("I116", "BOX ", idtmed[264], dits, 3); 
-
-     dits[0] = 0.705;
-     dits[1] = 0.015;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I101", "BOX ", idtmed[250], dits, 3);   // contains detector 
-
-     dits[0] = 0.793;
-     dits[1] = 0.015;
-     dits[2] = 0.68;
-     gMC->Gsvolu("I102", "BOX ", idtmed[201], dits, 3);   // chip
-
-     dits[0] = 0.705;
-     dits[1] = 0.015;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], dits, 3);   // contains detector 
-
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
-
-     dits[0] = 0.64;
-     dits[1] = 0.015;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits, 3);   // detector
-
-     dits[0] = 0.64;
-     dits[1] = 0.015;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits, 3);   // detector  
-
-     dits[0] = 3.701;
-     dits[1] = 7.699;
-     dits[2] = 4;
-     dits[3] = 57.1;
-     dits[4] = 99.9;  
-     gMC->Gsvolu("I650", "TUBS", idtmed[254], dits, 5);  // was I150 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.5;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I676", "TUBE", idtmed[274], dits, 3); // was I176 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.18;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I673", "TUBE", idtmed[274], dits, 3); // was I173 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.18;
-     dits[2] = 3;
-     gMC->Gsvolu("I671", "TUBE", idtmed[274], dits, 3); // was I171 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.075;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I669", "TUBE", idtmed[264], dits, 3); // was I169 in old geom.
-
-     dits[0] = 3.5;
-     dits[1] = 5.6;
-     dits[2] = 0.55;
-     dits[3] = 0;
-     dits[4] = 38;
-     gMC->Gsvolu("I667", "TUBS", idtmed[263], dits, 5); // was I167 in old geom.
-
-     dits[0] = 6.6;
-     dits[1] = 7.6;
-     dits[2] = 0.5;
-     dits[3] = 0;
-     dits[4] = 9;
-     gMC->Gsvolu("I666", "TUBS", idtmed[263], dits, 5); // was I166 in old geom.
-
-     dits[0] = 0.26;
-     dits[1] = 0.32;
-     dits[2] = 0.55;
-     gMC->Gsvolu("I678", "TUBE", idtmed[263], dits, 3); // was I178 in old geom.
+  // SDD heat bridge - F.T. March,7-2001
+  I039dits[0] = 1.1000;
+  I039dits[1] = 0.0087;
+  I039dits[2] = 3.2500;
+  gMC->Gsvolu("I039", "BOX ", idtmed[268], I039dits, 3);  
 
-     dits[0] = 0;
-     dits[1] = 0.3;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // 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.
+  // SDD clip part 1
+  dits[0] = 0.25;
+  dits[1] = 0.01;
+  dits[2] = I039dits[2];
+  gMC->Gsvolu("I040", "BOX ", idtmed[268], dits, 3);  
 
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 3;
-     gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // was I172 in old geom.
+  // SDD clip part 2
+  I041dits[0] = 0.1;
+  I041dits[1] = 0.12;
+  I041dits[2] = I039dits[2];
+  I041dits[3] = 90;
+  I041dits[4] = 320;
+  gMC->Gsvolu("I041", "TUBS", idtmed[268], I041dits, 5);  
+
+
+  // SDD PASCAL - F.T. March,7-2001
+  I042dits[0] = 0.5000;
+  I042dits[1] = 0.0175;
+  I042dits[2] = 0.5000;
+  gMC->Gsvolu("I042", "BOX ", idtmed[206], I042dits, 3);  
+
+  // SDD AMBRA - F.T. March,7-2001
+  I043dits[0] = 0.3500;
+  I043dits[1] = 0.0175;
+  I043dits[2] = 0.5000;
+  gMC->Gsvolu("I043", "BOX ", idtmed[206], I043dits, 3);  
+
+  // SDD capacitors - F.T. March,7-2001
+  I051dits[0] = 0.1400;
+  I051dits[1] = 0.0350;
+  I051dits[2] = 0.0625;
+  gMC->Gsvolu("I051", "BOX ", idtmed[276], I051dits, 3);  
+
+  // SDD hybrid circuit - F.T. March,7-2001
+  I052dits[0] = 1.725000;
+  I052dits[1] = 0.003743;
+  I052dits[2] = I039dits[2];
+  gMC->Gsvolu("I052", "BOX ", idtmed[281], I052dits, 3);
+
+  // SDD anode microcable : changed - F.T. March,7-2001
+  I044dits[0] = I018dits[2];
+  I044dits[1] = I039dits[2];
+  I044dits[2] = 0.00084;
+  I044dits[3] = (15.189149/(I044dits[0]+I044dits[1]))/2;
+  gMC->Gsvolu("I044", "TRD1", idtmed[282], I044dits, 4);  
+  volI044 = ((2*I044dits[0] + 2*I044dits[1]) * 2*I044dits[2])/2 * 2*I044dits[3];
+
+  // SDD electronics box - F.T. March,7-2001
+  I050dits[1] = I039dits[1]+I052dits[1]+I051dits[1]+I044dits[2];
+  I050dits[0] = I018dits[1]/cos(30.*3.14159/180.)-I050dits[1]*sin(30.*3.14159/180.);
+  I050dits[2] = I018dits[2];
+  gMC->Gsvolu("I050", "BOX ", idtmed[209], I050dits, 3);
+
+  // SDD sensitive volume
+  dits[0] = 3.50850;
+  dits[1] = 0.01499; // not 0.015 because it is included into I302 which is 0.015
+  dits[2] = 3.76320;
+  gMC->Gsvolu("ITS3", "BOX ", idtmed[200], dits, 3);  
 
-     dits[0] = 0;
-     dits[1] = 0.0746;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // was I170 in old geom.
+  // Like for ITS3 - F.T. March,7-2001
+  dits[0] = 3.50850;
+  dits[1] = 0.01499; // not 0.015 because it is included into I402 which is 0.015
+  dits[2] = 3.76320;
+  gMC->Gsvolu("ITS4", "BOX ", idtmed[200], dits, 3);  
 
-     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.
 
-  }
+  // --- Define SSD volumes ------------------------------------------
 
-  // --- Define SPD (option 'b') volumes ----------------------------
+    
+  dits[0] = 0;
+  dits[1] = 360;
+  dits[2] = 6;
+  dits[3] = -57.45;
+  dits[4] = 43.6;
+  dits[5] = 48;  
+  dits[6] = -49.15; 
+  dits[7] = 43.6;
+  dits[8] = 48;  
+  dits[9] = -49.15;  
+  dits[10] = 36.9;
+  dits[11] = 48;  
+  dits[12] = 50.55;  
+  dits[13] = 36.9;
+  dits[14] = 48;  
+  dits[15] = 50.55;  
+  dits[16] = 43.6;
+  dits[17] = 48;  
+  dits[18] = 57.45;
+  dits[19] = 43.6;
+  dits[20] = 48;   
+  gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);   
   
-  // SPD - option 'b' 
-  // detector thickness = 300 microns
-  // chip thickness = 300 microns
-  // (this is the default)
-
-  if (option == 2 && thickness == 2) {
-  
-     dits[0] = 3.7;
-     dits[1] = 7.75;
-     dits[2] = 24;
-     gMC->Gsvolu("IT12", "TUBE", idtmed[254], dits, 3);   
-
-     dits[0] = 3.7;
-     dits[1] = 7.7;
-     dits[2] = 24;
-     dits[3] = 57;
-     dits[4] = 100;
-     gMC->Gsvolu("I12B", "TUBS", idtmed[254], dits, 5);   // sector
-
-     dits[0] = 0.843;
-     dits[1] = 0.0425;
-     dits[2] = 19.344;
-     gMC->Gsvolu("I10B", "BOX ", idtmed[254], dits, 3);   // lower ladder
-
-     dits[0] = 0.843;
-     dits[1] = 0.0425;   
-     dits[2] = 19.344;
-     gMC->Gsvolu("I20B", "BOX ", idtmed[254], dits, 3);   // upper ladder
-
-     dits[0] = 1.3673;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I123", "BOX ", idtmed[253], dits, 3);
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = -36.79;
-     dits[4] = 21.834;
-     gMC->Gsvolu("I121", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1253;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I122", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06 ;
-     dits[2] = 24;
-     dits[3] = 126.79;
-     dits[4] = 270;
-     gMC->Gsvolu("I120", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1134;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I144", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.25;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     gMC->Gsvolu("I113", "BOX ", idtmed[254], dits, 3);  
-
-     dits[0] = 0.077;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I143", "BOX ", idtmed[253], dits, 3);   
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 90;
-     gMC->Gsvolu("I142", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.0695;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I141", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 108;
-     gMC->Gsvolu("I140", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1835;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I139", "BOX ", idtmed[253], dits, 3);
-
-     dits[0] = 0.1894 ;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I138", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 75.261;
-     gMC->Gsvolu("I137", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 1.3401;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I136", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.05;
-     dits[1] = 0.07;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 72.739;
-     gMC->Gsvolu("I135", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.1193;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I134", "BOX ", idtmed[253], dits, 3);    
-
-     dits[0] = 0.163;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I133", "BOX ", idtmed[253], dits, 3);   
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 157.633;
-     gMC->Gsvolu("I132", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.2497;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I131", "BOX ", idtmed[253], dits, 3); 
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 148.633;
-     gMC->Gsvolu("I130", "TUBS", idtmed[253], dits, 5); 
-
-     dits[0] = 0.292;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I129", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.163;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I128", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 161.297;
-     gMC->Gsvolu("I126", "TUBS", idtmed[253], dits, 5);
-
-     dits[0] = 0.2433;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I125", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 42.883;
-     gMC->Gsvolu("I124", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.015 ;
-     dits[2] = 2.5;
-     gMC->Gsvolu("I105", "BOX ", idtmed[201], dits, 3);  
-
-     dits[0] = 0.793;
-     dits[1] = 0.03;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I107", "BOX ", idtmed[254], dits, 3); // contains det and chip   
-
-     dits[0] = 0.705;
-     dits[1] = 0.01;
-     dits[2] = 2.5;
-     gMC->Gsvolu("I109", "BOX ", idtmed[275], dits, 3);  
-
-     dits[0] = 0.705;
-     dits[1] = 0.01;
-     dits[2] = 14.344;
-     gMC->Gsvolu("I108", "BOX ", idtmed[275], dits, 3); // bus 
-
-     dits[0] = 0.7975;
-     dits[1] = 0.03;   
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D7", "BOX ", idtmed[254], dits, 3); // contains det and chip
-
-     dits[0] = 0.06;
-     dits[1] = 0.08;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 80;
-     gMC->Gsvolu("I112", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.04;
-     dits[1] = 0.06;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 80;
-     gMC->Gsvolu("I111", "TUBS", idtmed[253], dits, 5);  
-
-     dits[0] = 0.15;
-     dits[1] = 0.0146;
-     dits[2] = 24;
-     gMC->Gsvolu("I118", "BOX ", idtmed[273], dits, 3);  
-
-     dits[0] = 0.1315;
-     dits[1] = 0.01;
-     dits[2] = 24;
-     gMC->Gsvolu("I110", "BOX ", idtmed[253], dits, 3);  
-
-     dits[0] = 0.025;
-     dits[1] = 0.035;
-     dits[2] = 24;
-     dits[3] = 0;
-     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);   
-
-     dits[0] = 0.063;
-     dits[1] = 0.035;
-     dits[2] = 24;
-     gMC->Gsvolu("I116", "BOX ", idtmed[264], dits, 3); 
-
-     dits[0] = 0.7975;
-     dits[1] = 0.015;   
-     dits[2] = 0.68;
-     gMC->Gsvolu("I106", "BOX ", idtmed[203], dits, 3);   // chip
-
-     dits[0] = 0.705;
-     dits[1] = 0.015;
-     dits[2] = 3.536;
-     gMC->Gsvolu("I101", "BOX ", idtmed[250], dits, 3);  // contains detector  
-
-     dits[0] = 0.705;
-     dits[1] = 0.015;   
-     dits[2] = 3.536;
-     gMC->Gsvolu("I1D1", "BOX ", idtmed[250], dits, 3);  // contains detector  
-
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
-
-     dits[0] = 0.64;
-     dits[1] = 0.015;
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS1", "BOX ", idtmed[200], dits, 3);   // detector
-
-     dits[0] = 0.64;
-     dits[1] = 0.015;  
-     dits[2] = 3.48;
-     gMC->Gsvolu("ITS2", "BOX ", idtmed[200], dits, 3);   // detector 
-
-     dits[0] = 3.701;
-     dits[1] = 7.699;
-     dits[2] = 4;
-     dits[3] = 57.1;
-     dits[4] = 99.9;  
-     gMC->Gsvolu("I650", "TUBS", idtmed[254], dits, 5);  // was I150 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.5;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I676", "TUBE", idtmed[274], dits, 3); // was I176 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.18;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I673", "TUBE", idtmed[274], dits, 3); // was I173 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.18;
-     dits[2] = 3;
-     gMC->Gsvolu("I671", "TUBE", idtmed[274], dits, 3); // was I171 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.075;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I669", "TUBE", idtmed[264], dits, 3); // was I169 in old geom.
-
-     dits[0] = 3.5;
-     dits[1] = 5.6;
-     dits[2] = 0.55;
-     dits[3] = 0;
-     dits[4] = 38;
-     gMC->Gsvolu("I667", "TUBS", idtmed[263], dits, 5); // was I167 in old geom.
-
-     dits[0] = 6.6;
-     dits[1] = 7.6;
-     dits[2] = 0.5;
-     dits[3] = 0;
-     dits[4] = 9;
-     gMC->Gsvolu("I666", "TUBS", idtmed[263], dits, 5); // was I166 in old geom.
-
-     dits[0] = 0.26;
-     dits[1] = 0.32;
-     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.
-
-     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.
-
-  }
-
-  // --- Define SDD volumes ------------------------------------------
-
-  
-  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;
-  gMC->Gsvolu("IT34", "PCON", idtmed[209], dits, 21);  
-
-  dits[0] = 3.2;
-  dits[1] = 2;
-  dits[2] = 34.65;
-  gMC->Gsvolu("I048", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.63;
-  dits[1] = 0.135;
-  dits[2] = 30.385;
-  gMC->Gsvolu("I005", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.2;
-  dits[1] = 2;
-  dits[2] = 27.35; 
-  gMC->Gsvolu("I047", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.63;
-  dits[1] = 0.135;
-  dits[2] = 23.05;
-  gMC->Gsvolu("I004", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.2;
-  dits[1] = 2;
-  dits[2] = 2.725;
-  gMC->Gsvolu("I024", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.2;
-  dits[1] = 2;
-  dits[2] = 3.65;
-  gMC->Gsvolu("I018", "BOX ", idtmed[209], dits, 3);  
-
-  dits[0] = 3.625;
-  dits[1] = 0.015;
-  dits[2] = 4.382;
-  gMC->Gsvolu("I302", "BOX ", idtmed[206], dits, 3);  
-
-  dits[0] = 3.625;
-  dits[1] = 0.015;
-  dits[2] = 4.382;
-  gMC->Gsvolu("I402", "BOX ", idtmed[206], dits, 3);  
-
-  dits[0] = 0.2;
-  dits[1] = 0.1815;
-  dits[2] = 2.725;
-  dits[3] = 0.015;
-  gMC->Gsvolu("I025", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 0.183;
-  dits[1] = 0.165;
-  dits[2] = 2.725;
-  dits[3] = 0.015;
-  gMC->Gsvolu("I026", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 2.23;
-  dits[1] = 2.1;
-  dits[2] = 0.05;
-  dits[3] = 0.03;
-  gMC->Gsvolu("I021", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 2.615;
-  dits[1] = 2.465;
-  dits[2] = 0.06;
-  dits[3] = 0.04;
-  gMC->Gsvolu("I023", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 2.1;
-  dits[1] = 2;
-  dits[2] = 0.06;
-  dits[3] = 0.04;
-  gMC->Gsvolu("I022", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 2.15;
-  dits[1] = 0.2;
-  dits[2] = 0.85;
-  gMC->Gsvolu("I028", "BOX ", idtmed[263], dits, 3);  
-
-  dits[0] = 1.25;
-  dits[1] = 0.6;
-  dits[2] = 0.075;
-  gMC->Gsvolu("I029", "BOX ", idtmed[263], dits, 3);  
-
-  dits[0] = 1.25;
-  dits[1] = 0.1;
-  dits[2] = 0.075;
-  dits[3] = 1;
-  gMC->Gsvolu("I030", "TRD1", idtmed[263], dits, 4);  
-
-  dits[0] = 1.6;
-  dits[1] = 7;
-  dits[2] = 0;
-  dits[3] = 0.075;
-  dits[4] = 0.775;
-  dits[5] = 0.775;
-  dits[6] = 0;
-  dits[7] = 0.075;
-  dits[8] = 0.376;
-  dits[9] = 0.376;
-  dits[10] = 0;
-  gMC->Gsvolu("I027", "TRAP", idtmed[263], dits, 11);  
-
-  dits[0] = 0;
-  dits[1] = 0.093;
-  dits[2] = 2.725;
-  gMC->Gsvolu("I032", "TUBE", idtmed[211], dits, 3);  
-
-  dits[0] = 0.093;
-  dits[1] = 0.1;
-  dits[2] = 2.725;
-  gMC->Gsvolu("I031", "TUBE", idtmed[264], dits, 3);  
-
-  dits[0] = 0.7;
-  dits[1] = 0.002;
-  dits[2] = 2.725;
-  gMC->Gsvolu("I046", "BOX ", idtmed[269], dits, 3);  
-
-  dits[0] = 0.2;
-  dits[1] = 0.182;
-  dits[2] = 3.65;
-  dits[3] = 0.015;
-  gMC->Gsvolu("I019", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 0.183;
-  dits[1] = 0.165;
-  dits[2] = 3.65;
-  dits[3] = 0.015;
-  gMC->Gsvolu("I020", "TRD1", idtmed[208], dits, 4);  
-
-  dits[0] = 0.3;
-  dits[1] = 0.05;
-  dits[2] = 0.15;
-  gMC->Gsvolu("I033", "BOX ", idtmed[208], dits, 3);  
-
-  dits[0] = 0.2;
-  dits[1] = 0.01;
-  dits[2] = 0.05;
-  gMC->Gsvolu("I036", "BOX ", idtmed[208], dits, 3);  
-
-  dits[0] = 0;
-  dits[1] = 0.05;
-  dits[2] = 0.225;
-  gMC->Gsvolu("I034", "TUBE", idtmed[208], dits, 3);  
-
-  dits[0] = 0.1;
-  dits[1] = 0.15;
-  dits[2] = 0.2;
-  gMC->Gsvolu("I035", "TUBE", idtmed[208], dits, 3);
-
-  dits[0] = 0.7;
-  dits[1] = 0.002;
-  dits[2] = 3.65;
-  gMC->Gsvolu("I045", "BOX ", idtmed[269], dits, 3);  
-
-  dits[0] = 0;
-  dits[1] = 0.093;
-  dits[2] = 3.65;
-  gMC->Gsvolu("I038", "TUBE", idtmed[211], dits, 3);  
-
-  dits[0] = 0.093;
-  dits[1] = 0.1;
-  dits[2] = 3.65;
-  gMC->Gsvolu("I037", "TUBE", idtmed[264], dits, 3);
-  
-  dits[0] = 1;
-  dits[1] = 0.01;
-  dits[2] = 3.6;
-  gMC->Gsvolu("I039", "BOX ", idtmed[268], dits, 3);  
-
-  dits[0] = 0.25;
-  dits[1] = 0.01;
-  dits[2] = 3.4;
-  gMC->Gsvolu("I040", "BOX ", idtmed[268], dits, 3);  
-
-  dits[0] = 0.1;
-  dits[1] = 0.12;
-  dits[2] = 3.4;
-  dits[3] = 90;
-  dits[4] = 320;
-  gMC->Gsvolu("I041", "TUBS", idtmed[268], dits, 5);  
-
-  dits[0] = 0.4;
-  dits[1] = 0.015;
-  dits[2] = 0.4;
-  gMC->Gsvolu("I042", "BOX ", idtmed[206], dits, 3);  
-
-  dits[0] = 0.25;
-  dits[1] = 0.015;
-  dits[2] = 0.25;
-  gMC->Gsvolu("I043", "BOX ", idtmed[206], dits, 3);  
-
-  dits[0] = 0.75;
-  dits[1] = 0.002;
-  dits[2] = 3.4;
-  gMC->Gsvolu("I044", "BOX ", idtmed[269], dits, 3);  
-
-  dits[0] = 1.8125;
-  dits[1] = 3.81;
-  dits[2] = 0;
-  dits[3] = 0.015;
-  dits[4] = 0.242;
-  dits[5] = 0.242;
-  dits[6] = 0;
-  dits[7] = 0.015;
-  dits[8] = 1E-03;
-  dits[9] = 1E-03;
-  dits[10] = 0;
-  gMC->Gsvolu("I303", "TRAP", idtmed[206], dits, 11);  
-
-  dits[0] = 1.8125;
-  dits[1] = 3.81;
-  dits[2] = 0;
-  dits[3] = 0.015;
-  dits[4] = 0.242;
-  dits[5] = 0.242;
-  dits[6] = 0;
-  dits[7] = 0.015;
-  dits[8] = 1E-03;
-  dits[9] = 1E-03;
-  dits[10] = 0;
-  gMC->Gsvolu("I403", "TRAP", idtmed[206], dits, 11);  
-
-  dits[0] = 3.5;
-  dits[1] = 0.01499; // not 0.015 because it is included into I302 which is 0.015
-  dits[2] = 3.763;
-  gMC->Gsvolu("ITS3", "BOX ", idtmed[200], dits, 3);  
-
-  dits[0] = 3.5;
-  dits[1] = 0.01499; // not 0.015 because it is included into I402 which is 0.015
-  dits[2] = 3.763;
-  gMC->Gsvolu("ITS4", "BOX ", idtmed[200], dits, 3);  
-
-
-  // --- Define SSD volumes ------------------------------------------
-
-    
-  dits[0] = 0;
-  dits[1] = 360;
-  dits[2] = 6;
-  dits[3] = -57.5;
-  dits[4] = 43.5;
-  dits[5] = 48;  
-  dits[6] = -47.2; 
-  dits[7] = 43.5;
-  dits[8] = 48;  
-  dits[9] = -47.2;  
-  dits[10] = 36.7;
-  dits[11] = 48;  
-  dits[12] = 47.2;  
-  dits[13] = 36.7;
-  dits[14] = 48;  
-  dits[15] = 47.2;  
-  dits[16] = 43.5;
-  dits[17] = 48;  
-  dits[18] = 56.96;
-  dits[19] = 43.5;
-  dits[20] = 48;   
-  gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);   
-  
-  dits[0] =  3.4;
-  dits[1] = 1.955;
-  dits[2] = 56.5; 
-  gMC->Gsvolu("I570", "BOX ", idtmed[204], dits, 3);  
+  dits[0] =  3.4;
+  dits[1] = 1.955;
+  dits[2] = 56.5; 
+  gMC->Gsvolu("I570", "BOX ", idtmed[204], dits, 3);  
   
   dits[0] = 3.75;
   dits[1] = 0.045;
@@ -2546,10 +2288,17 @@ void AliITSvPPRasymm::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;
@@ -2619,10 +2368,17 @@ void AliITSvPPRasymm::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;
@@ -2671,10 +2427,17 @@ void AliITSvPPRasymm::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;
@@ -2776,10 +2539,17 @@ void AliITSvPPRasymm::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;
@@ -2789,659 +2559,330 @@ void AliITSvPPRasymm::CreateGeometry(){
   dits[0] = 0.3;
   dits[1] = 0.15;
   dits[2] = 0.15;
-  gMC->Gsvolu("I533", "BOX ", idtmed[203], dits, 3);  
-  
-  dits[0] = 3.65;
-  dits[1] = 0.015;
-  dits[2] = 2;
-  gMC->Gsvolu("ITS5", "BOX ", idtmed[200], dits, 3);  
-
-
-  // --- Define volumes of shield between SPD and SDD ----------------
-
-
-  dits[0] = 8.37;
-  dits[1] = 9.93;
-  dits[2] = 25;
-  gMC->Gsvolu("IC01", "TUBE", idtmed[289], dits, 3);   
-
-  dits[0] = 8.3;
-  dits[1] = 10;
-  dits[2] = 17.5/2.;
-  gMC->Gsvolu("IC02", "TUBE", idtmed[289], dits, 3);    
-  
-   // --- Define volumes of cylinder between SDD and SSD --------------
-  
-  
-  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);
-         
-
-
-  // --- Define volumes of SDD cone ---------------------------------- 
-
-  dits[0] = 0;
-  dits[1] = 360;
-  dits[2] = 12;
-  dits[3] = -59.7;
-  dits[4] = 27;
-  dits[5] = 28;
-  dits[6] = -42.7;
-  dits[7] = 10;
-  dits[8] = 28;
-  dits[9] = -34.65;
-  dits[10] = 10;
-  dits[11] = 28;
-  dits[12] = -34.65;
-  dits[13] = 10;
-  dits[14] = 23.495;
-  dits[15] = -23.7;
-  dits[16] = 10;
-  dits[17] = 23.495;
-  dits[18] = -23.7;
-  dits[19] = 10;
-  dits[20] = 14.595;
-  dits[21] = 23.7;
-  dits[22] = 10;
-  dits[23] = 14.595;
-  dits[24] = 23.7;
-  dits[25] = 10;
-  dits[26] = 23.495;
-  dits[27] = 34.65;
-  dits[28] = 10;
-  dits[29] = 23.495;
-  dits[30] = 34.65;
-  dits[31] = 10;
-  dits[32] = 28;
-  dits[33] = 42.6263;
-  dits[34] = 10;
-  dits[35] = 28;
-  dits[36] = 59.7;
-  dits[37] = 27.2637;
-  dits[38] = 28;             
-  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[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;
-  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[4] = 14;
-  dits[5] = 18.75;
-  dits[6] = 46.7-3;
-  dits[7] = 14;
-  dits[8] = 18.75;
-  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.
-
-  dits[0] = 0;
-  dits[1] = 25;
-  dits[2] = 3;
-  dits[3] = 34.65;
-  dits[4] = 23.4;
-  dits[5] = 26.4;
-  dits[6] = 56.1-3;
-  dits[7] = 23.4;
-  dits[8] = 26.4;
-  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.
-
-  dits[0] = 10.065;
-  dits[1] = 11;
-  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);
-
-  dits[0] = 21.95;
-  dits[1] = 24.2;
-  dits[2] = 1;
-  gMC->Gsvolu("I098", "TUBE", idtmed[204], dits, 3);
-
-  dits[0] = 13.1;
-  dits[1] = 15.4;
-  dits[2] = 1;
-  gMC->Gsvolu("I097", "TUBE", idtmed[204], dits, 3);
-
-  dits[0] = 1;
-  dits[1] = 1;
-  dits[2] = 7.74;
-  gMC->Gsvolu("I202", "BOX ", idtmed[272], dits, 3);
-
-  dits[0] = 1;
-  dits[1] = 1;
-  dits[2] = 9.14;
-  gMC->Gsvolu("I203", "BOX ", idtmed[272], dits, 3);
-
-  dits[0] = 21.95;
-  dits[1] = 22.95;
-  dits[2] = 1;
-  gMC->Gsvolu("I095", "TUBE", idtmed[224], dits, 3);
-
-  dits[0] = 3;
-  dits[1] = 2.7;
-  dits[2] = 1;
-  dits[3] = 0.63;
-  gMC->Gsvolu("I096", "TRD1", idtmed[264], dits, 4);
-
-  dits[0] = 13.1;
-  dits[1] = 14.1;
-  dits[2] = 1;
-  gMC->Gsvolu("I094", "TUBE", idtmed[224], dits, 3);
-  
-  
-  // --- Define volumes of SSD cone ----------------------------------    
-            
-
-  dits[0] = 0;
-  dits[1] = 360;
-  dits[2] = 12;
-  dits[3] = -77.2;
-  dits[4] = 44.9;
-  dits[5] = 47;
-  dits[6] = -61.2;
-  dits[7] = 28.5;
-  dits[8] = 47;
-  dits[9] = -57.5;
-  dits[10] = 28.5;
-  dits[11] = 47;
-  dits[12] = -57.5;
-  dits[13] = 28.5;
-  dits[14] = 43.5;
-  dits[15] = -51.365;
-  dits[16] = 28.5;
-  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[26] = 43.5;
-  dits[27] = 56.96;
-  dits[28] = 28.5;
-  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] = 44.9;
-  dits[38] = 47;  
-  gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);
-  
-  dits[0] = 0;
-  dits[1] = 360;
-  dits[2] = 6;
-  dits[3] = -77.2;
-  dits[4] = 45; 
-  dits[5] = 47.5;   
-  dits[6] = -73.5;
-  dits[7] = 45;  
-  dits[8] = 47.5;   
-  dits[9] = -72.7819;
-  dits[10] = 45;   
-  dits[11] = 46.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;
-  gMC->Gsvolu("I212", "PCON", idtmed[272], dits, 21);  // SSD cone
-  
-  dits[0] = 28;
-  dits[1] = 29.82;
-  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);
-  
-  dits[0] = 41.85;
-  dits[1] = 42.75;
-  dits[2] = 1;
-  gMC->Gsvolu("I219", "TUBE", idtmed[224], dits, 3);
-  
-  dits[0] = 42.75;
-  dits[1] = 43.58;
-  dits[2] = 1;
-  gMC->Gsvolu("I220", "TUBE", idtmed[264], dits, 3);
-      
-  dits[0] = 42.1;
-  dits[1] = 42.5;
-  dits[2] = 1.25;
-  gMC->Gsvolu("I214", "TUBE", idtmed[224], dits, 3);
-    
-  dits[0] = 37.1;
-  dits[1] = 37.5;
-  dits[2] = 1.25;
-  gMC->Gsvolu("I213", "TUBE", idtmed[224], dits, 3);
-        
-  dits[0] = 0;
-  dits[1] = 25;
-  dits[2] = 5;
-  dits[3] = -77.2+3;
-  dits[4] = 44.5;
-  dits[5] = 44.5;
-  dits[6] = -69.7+3;
-  dits[7] = 37;
-  dits[8] = 44.5;
-  dits[9] = -68.5+3;
-  dits[10] = 37;
-  dits[11] = 44.5;
-  dits[12] = -68.5+4.8;  
-  dits[13] = 37;
-  dits[14] = 44.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[0] = 0;
-  dits[1] = 3.2;
-  dits[2] = 9;
-  dits[3] = -16.45;
-  dits[4] = 30.5;
-  dits[5] = 33.5;
-  dits[6] = -7.85;
-  dits[7] = 30.5;
-  dits[8] = 33.5;
-  dits[9] = -7.85;
-  dits[10] = 30.5;
-  dits[11] = 41.85;
-  dits[12] = -5.85;
-  dits[13] = 30.5;
-  dits[14] = 41.85;
-  dits[15] = -5.85;
-  dits[16] = 30.5;
-  dits[17] = 36.5;
-  dits[18] = -5;
-  dits[19] = 30.5;
-  dits[20] = 36.5;
-  dits[21] = -2;
-  dits[22] = 33.0173;
-  dits[23] = 36.5;
-  dits[24] = -2;
-  dits[25] = 33.0173;
-  dits[26] = 37.35;
-  dits[27] = 0;
-  dits[28] = 34.6955;
-  dits[29] = 37.35;
-  gMC->Gsvolu("I216", "PCON", idtmed[272], dits, 30);
-       
-       
-  // --- Place SPD (option 'a') volumes into their mother volume IT12
-  
-  // SPD - option 'a' 
-  // detector thickness = 100 microns
-  // chip thickness = 150 microns
-  // (this is NOT the default)
-
-  if (option == 1 && thickness == 1) {
+  gMC->Gsvolu("I533", "BOX ", idtmed[203], dits, 3);  
   
-     gMC->Gspos("I12A",5,"IT12",0.0,0.0,0.0,idrotm[238],"MANY");
-     gMC->Gspos("I12A",6,"IT12",0.0,0.0,0.0,idrotm[236],"MANY");
-     gMC->Gspos("I12A",7,"IT12",0.0,0.0,0.0,idrotm[239],"MANY");
-     gMC->Gspos("I12A",8,"IT12",0.0,0.0,0.0,idrotm[233],"MANY");
-     gMC->Gspos("I12A",9,"IT12",0.0,0.0,0.0,idrotm[240],"MANY");
-     gMC->Gspos("I12A",10,"IT12",0.0,0.0,0.0,idrotm[241],"MANY");
-     gMC->Gspos("I12A",2,"IT12",0.0,0.0,0.0,idrotm[242],"MANY");
-     gMC->Gspos("I12A",3,"IT12",0.0,0.0,0.0,idrotm[234],"MANY");
-     gMC->Gspos("I12A",4,"IT12",0.0,0.0,0.0,idrotm[243],"MANY");
-     gMC->Gspos("I12A",1,"IT12",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I10A",2,"I12A",0.203,3.8206,0.0,idrotm[244],"ONLY");
-     gMC->Gspos("I10A",1,"I12A",1.4531,3.8152,0.0,idrotm[245],"ONLY");
-     gMC->Gspos("I20A",1,"I12A",3.0174,6.5143,0.0,idrotm[246],"ONLY");
-     gMC->Gspos("I20A",2,"I12A",1.9612,6.9062,0.0,idrotm[247],"ONLY");
-     gMC->Gspos("I20A",3,"I12A",0.8567,7.1279,0.0,idrotm[248],"ONLY");
-     gMC->Gspos("I20A",4,"I12A",-0.2689,7.1742,0.0,idrotm[249],"ONLY");
-     gMC->Gspos("I123",2,"I12A",-0.2978,5.5196,0.0,idrotm[214],"ONLY");
-     gMC->Gspos("I121",2,"I12A",-0.2385,4.1518,0.0,idrotm[213],"ONLY");
-     gMC->Gspos("I122",2,"I12A",-0.2968,4.0207,0.0,idrotm[212],"ONLY");
-     gMC->Gspos("I120",2,"I12A",-0.3672,3.9056,0.0,0,"ONLY");
-     gMC->Gspos("I144",1,"I12A",-0.2538,3.8556,0.0,0,"ONLY");
-     gMC->Gspos("I113",3,"I12A",0.1095,3.9056,0.0,0,"ONLY");
-     gMC->Gspos("I143",1,"I12A",0.4365,3.8556,0.0,idrotm[236],"ONLY");
-     gMC->Gspos("I142",1,"I12A",0.5136,3.9056,0.0,idrotm[235],"ONLY");
-     gMC->Gspos("I141",1,"I12A",0.5636,3.9752,0.0,idrotm[201],"ONLY");
-     gMC->Gspos("I140",1,"I12A",0.6336,4.0447,0.0,idrotm[234],"ONLY");
-     gMC->Gspos("I139",1,"I12A",0.8297,4.0545,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I113",5,"I12A",1.2575,3.9681,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I138",1,"I12A",1.66,3.7848,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I137",1,"I12A",1.8556,3.7738,0.0,idrotm[233],"ONLY");
-     gMC->Gspos("I136",1,"I12A",2.6224,4.874,0.0,idrotm[232],"ONLY");
-     gMC->Gspos("I135",1,"I12A",3.2967,6.0337,0.0,idrotm[231],"ONLY");
-     gMC->Gspos("I134",1,"I12A",3.266,6.1636,0.0,idrotm[230],"ONLY");
-     gMC->Gspos("I113",1,"I12A",2.9903,6.4144,0.0,idrotm[211],"ONLY");
-     gMC->Gspos("I133",3,"I12A",2.7631,6.7627,0.0,idrotm[230],"ONLY");
-     gMC->Gspos("I132",3,"I12A",2.62,6.8555,0.0,idrotm[229],"ONLY");
-     gMC->Gspos("I131",3,"I12A",2.648,6.6023,0.0,idrotm[228],"ONLY");
-     gMC->Gspos("I130",3,"I12A",2.6569,6.3431,0.0,idrotm[227],"ONLY");
-     gMC->Gspos("I129",3,"I12A",2.3906,6.4819,0.0,idrotm[226],"ONLY");
-     gMC->Gspos("I113",2,"I12A",1.9488,6.7998,0.0,idrotm[210],"ONLY");
-     gMC->Gspos("I133",2,"I12A",1.6699,7.1085,0.0,idrotm[226],"ONLY");
-     gMC->Gspos("I132",2,"I12A",1.5142,7.1777,0.0,idrotm[225],"ONLY");
-     gMC->Gspos("I131",2,"I12A",1.5814,6.932,0.0,idrotm[224],"ONLY");
-     gMC->Gspos("I130",2,"I12A",1.6308,6.6774,0.0,idrotm[223],"ONLY");
-     gMC->Gspos("I129",2,"I12A",1.346,6.7728,0.0,idrotm[222],"ONLY");
-     gMC->Gspos("I113",6,"I12A",0.8599,7.0176,0.0,idrotm[209],"ONLY");
-     gMC->Gspos("I133",1,"I12A",0.5362,7.2789,0.0,idrotm[222],"ONLY");
-     gMC->Gspos("I132",1,"I12A",0.3715,7.3228,0.0,idrotm[221],"ONLY");
-     gMC->Gspos("I131",1,"I12A",0.4763,7.0907,0.0,idrotm[220],"ONLY");
-     gMC->Gspos("I130",1,"I12A",0.5649,6.8469,0.0,idrotm[219],"ONLY");
-     gMC->Gspos("I129",1,"I12A",0.2688,6.8966,0.0,idrotm[218],"ONLY");
-     gMC->Gspos("I113",4,"I12A",-0.2497,7.0624,0.0,idrotm[208],"ONLY");
-     gMC->Gspos("I128",1,"I12A",-0.6103,7.2698,0.0,idrotm[218],"ONLY");
-     gMC->Gspos("I126",2,"I12A",-0.7799,7.2874,0.0,idrotm[217],"ONLY");
-     gMC->Gspos("I125",2,"I12A",-0.6315,7.0883,0.0,idrotm[216],"ONLY");
-     gMC->Gspos("I124",2,"I12A",-0.4965,6.8742,0.0,idrotm[215],"ONLY");
-     gMC->Gspos("I103",3,"I10A",-0.05,0.0075,-3.536,idrotm[237],"ONLY");
-     gMC->Gspos("I103",4,"I10A",-0.05,0.0075,-10.708,idrotm[237],"ONLY");
-     gMC->Gspos("I103",1,"I10A",-0.05,0.0075,10.708,0,"ONLY");
-     gMC->Gspos("I103",2,"I10A",-0.05,0.0075,3.536,0,"ONLY");
-     gMC->Gspos("I105",1,"I10A",-0.05,0.01,-16.844,idrotm[237],"ONLY");
-     gMC->Gspos("I105",2,"I10A",-0.05,0.01,16.844,0,"ONLY");
-     gMC->Gspos("I104",1,"I10A",0.0,-0.015,0.0,0,"ONLY");
-     gMC->Gspos("I1D3",3,"I20A",-0.05,0.0075,-3.536,idrotm[237],"ONLY");
-     gMC->Gspos("I1D3",4,"I20A",-0.05,0.0075,-10.708,idrotm[237],"ONLY");
-     gMC->Gspos("I1D3",1,"I20A",-0.05,0.0075,10.708,0,"ONLY");
-     gMC->Gspos("I1D3",2,"I20A",-0.05,0.0075,3.536,0,"ONLY");
-     gMC->Gspos("I105",3,"I20A",-0.05,0.01,-16.844,idrotm[237],"ONLY");
-     gMC->Gspos("I105",4,"I20A",-0.05,0.01,16.844,0,"ONLY");
-     gMC->Gspos("I104",2,"I20A",0.0,-0.015,0.0,0,"ONLY");
-     gMC->Gspos("I112",2,"I113",0.25,0.02,0.0,idrotm[206],"ONLY");
-     gMC->Gspos("I111",2,"I113",0.1318,-0.0008,0.0,idrotm[205],"ONLY");
-     gMC->Gspos("I118",1,"I113",0.0,-0.0454,0.0,0,"ONLY");
-     gMC->Gspos("I110",1,"I113",0.0,0.0492,0.0,0,"ONLY");
-     gMC->Gspos("I114",1,"I113",0.063,0.0042,0.0,idrotm[202],"ONLY");
-     gMC->Gspos("I115",1,"I113",0.063,0.0042,0.0,idrotm[202],"ONLY");
-     gMC->Gspos("I115",2,"I113",-0.063,0.0042,0.0,idrotm[201],"ONLY");
-     gMC->Gspos("I114",2,"I113",-0.063,0.0042,0.0,idrotm[201],"ONLY");
-     gMC->Gspos("I116",1,"I113",0.0,0.0042,0.0,0,"ONLY");
-     gMC->Gspos("I111",1,"I113",-0.1318,-0.0008,0.0,idrotm[204],"ONLY");
-     gMC->Gspos("I112",1,"I113",-0.25,0.02,0.0,idrotm[203],"ONLY");
-     gMC->Gspos("I101",1,"I103",-0.088,0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I102",1,"I103",0.0,-0.005,-2.8,0,"ONLY");
-     gMC->Gspos("I102",2,"I103",0.0,-0.005,-1.4,0,"ONLY");
-     gMC->Gspos("I102",3,"I103",0.0,-0.005,0.0,0,"ONLY");
-     gMC->Gspos("I102",4,"I103",0.0,-0.005,1.4,0,"ONLY");
-     gMC->Gspos("I102",5,"I103",0.0,-0.005,2.8,0,"ONLY");
-     gMC->Gspos("I1D1",1,"I1D3",-0.088,0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I102",6,"I1D3",0.0,-0.005,-2.8,0,"ONLY");
-     gMC->Gspos("I102",7,"I1D3",0.0,-0.005,-1.4,0,"ONLY");
-     gMC->Gspos("I102",8,"I1D3",0.0,-0.005,0.0,0,"ONLY");
-     gMC->Gspos("I102",9,"I1D3",0.0,-0.005,1.4,0,"ONLY");
-     gMC->Gspos("I102",10,"I1D3",0.0,-0.005,2.8,0,"ONLY");
-     gMC->Gspos("I117",1,"I116",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("ITS1",1,"I101",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("ITS2",1,"I1D1",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I650",16,"IT12",0.0,0.0,22.0,idrotm[1104],"MANY");
-     gMC->Gspos("I650",20,"IT12",0.0,0.0,22.0,idrotm[1130],"MANY");
-     gMC->Gspos("I650",18,"IT12",0.0,0.0,22.0,idrotm[1117],"MANY");
-     gMC->Gspos("I650",1,"IT12",0.0,0.0,22.0,0,"MANY");
-     gMC->Gspos("I650",4,"IT12",0.0,0.0,22.0,idrotm[1106],"MANY");
-     gMC->Gspos("I650",6,"IT12",0.0,0.0,22.0,idrotm[1039],"MANY");
-     gMC->Gspos("I650",8,"IT12",0.0,0.0,22.0,idrotm[1107],"MANY");
-     gMC->Gspos("I650",10,"IT12",0.0,0.0,22.0,idrotm[1065],"MANY");
-     gMC->Gspos("I650",12,"IT12",0.0,0.0,22.0,idrotm[1078],"MANY");
-     gMC->Gspos("I650",14,"IT12",0.0,0.0,22.0,idrotm[1091],"MANY");
-     gMC->Gspos("I650",19,"IT12",0.0,0.0,-22.0,idrotm[1108],"MANY");
-     gMC->Gspos("I650",2,"IT12",0.0,0.0,-22.0,idrotm[1109],"MANY");
-     gMC->Gspos("I650",3,"IT12",0.0,0.0,-22.0,idrotm[1110],"MANY");
-     gMC->Gspos("I650",5,"IT12",0.0,0.0,-22.0,idrotm[1111],"MANY");
-     gMC->Gspos("I650",7,"IT12",0.0,0.0,-22.0,idrotm[1112],"MANY");
-     gMC->Gspos("I650",9,"IT12",0.0,0.0,-22.0,idrotm[1113],"MANY");
-     gMC->Gspos("I650",11,"IT12",0.0,0.0,-22.0,idrotm[1114],"MANY");
-     gMC->Gspos("I650",13,"IT12",0.0,0.0,-22.0,idrotm[1115],"MANY");
-     gMC->Gspos("I650",15,"IT12",0.0,0.0,-22.0,idrotm[1116],"MANY");
-     gMC->Gspos("I650",17,"IT12",0.0,0.0,-22.0,idrotm[1118],"MANY");
-     gMC->Gspos("I666",1,"I650",0.0,0.0,0.25,idrotm[1003],"MANY");
-     gMC->Gspos("I667",1,"I650",0.1102,0.9945,0.45,idrotm[1088],"ONLY");
-     gMC->Gspos("I669",3,"I650",0.1883,4.0372,-3.2,0,"ONLY");
-     gMC->Gspos("I671",3,"I650",0.1883,4.0372,0.6,0,"ONLY");
-     gMC->Gspos("I669",2,"I650",1.3343,4.0609,-3.2,0,"ONLY");
-     gMC->Gspos("I671",2,"I650",1.3343,4.0609,0.6,0,"ONLY");
-     gMC->Gspos("I669",6,"I650",2.9567,6.1959,-3.2,idrotm[1089],"ONLY");
-     gMC->Gspos("I671",6,"I650",2.9567,6.1959,0.6,idrotm[1089],"ONLY");
-     gMC->Gspos("I669",5,"I650",1.9511,6.5822,-3.2,idrotm[1011],"ONLY");
-     gMC->Gspos("I671",5,"I650",1.9511,6.5822,0.6,idrotm[1011],"ONLY");
-     gMC->Gspos("I669",4,"I650",0.8974,6.8064,-3.2,idrotm[1090],"ONLY");
-     gMC->Gspos("I671",4,"I650",0.8974,6.8064,0.6,idrotm[1090],"ONLY");
-     gMC->Gspos("I669",1,"I650",-0.1784,6.863,-3.2,0,"ONLY");
-     gMC->Gspos("I671",1,"I650",-0.1784,6.863,0.6,0,"ONLY");
-     gMC->Gspos("I673",1,"I650",0.2173,4.8037,1.8,0,"ONLY");
-     gMC->Gspos("I673",6,"I650",1.5093,4.5605,1.8,0,"ONLY");
-     gMC->Gspos("I673",4,"I650",-0.173,6.2531,1.8,idrotm[1092],"ONLY");
-     gMC->Gspos("I673",3,"I650",0.8073,6.2032,1.8,idrotm[1093],"ONLY");
-     gMC->Gspos("I673",2,"I650",1.7678,6.0005,1.8,idrotm[1094],"ONLY");
-     gMC->Gspos("I673",5,"I650",2.6847,5.6501,1.8,0,"ONLY");
-     gMC->Gspos("I676",2,"I650",1.7618,5.2269,2.5,0,"ONLY");
-     gMC->Gspos("I676",1,"I650",0.4018,5.5869,2.5,0,"ONLY");
-     gMC->Gspos("I668",1,"I667",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I670",1,"I669",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I672",1,"I671",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I674",1,"I673",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I675",1,"I673",0.0,0.0,-0.5,0,"ONLY");
-     gMC->Gspos("I677",1,"I676",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I678",1,"I676",0.0,0.0,-0.95,0,"ONLY");  
+  dits[0] = 3.65;
+  dits[1] = 0.015;
+  dits[2] = 2;
+  gMC->Gsvolu("ITS5", "BOX ", idtmed[200], dits, 3);  
 
-  }
 
 
-  // --- Place SPD (option 'b') volumes into their mother volume IT12
-  
-  // SPD - option 'b' 
-  // detector thickness = 100 microns
-  // chip thickness = 150 microns
-  // (this is NOT the default)
+  // --- Define volumes of shield of SPD ----------------
 
-  if (option == 2 && thickness == 1) {
-  
-     gMC->Gspos("I12B",1,"IT12",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I12B",8,"IT12",0.0,0.0,0.0,idrotm[233],"MANY");
-     gMC->Gspos("I12B",7,"IT12",0.0,0.0,0.0,idrotm[244],"MANY");
-     gMC->Gspos("I12B",6,"IT12",0.0,0.0,0.0,idrotm[236],"MANY");
-     gMC->Gspos("I12B",2,"IT12",0.0,0.0,0.0,idrotm[245],"MANY");
-     gMC->Gspos("I12B",3,"IT12",0.0,0.0,0.0,idrotm[234],"MANY");
-     gMC->Gspos("I12B",4,"IT12",0.0,0.0,0.0,idrotm[246],"MANY");
-     gMC->Gspos("I12B",5,"IT12",0.0,0.0,0.0,idrotm[247],"MANY");
-     gMC->Gspos("I12B",9,"IT12",0.0,0.0,0.0,idrotm[248],"MANY");
-     gMC->Gspos("I12B",10,"IT12",0.0,0.0,0.0,idrotm[249],"MANY");
-     gMC->Gspos("I10B",2,"I12B",0.203,3.8206,0.0,idrotm[238],"ONLY");
-     gMC->Gspos("I10B",1,"I12B",1.4531,3.8152,0.0,idrotm[239],"ONLY");
-     gMC->Gspos("I20B",1,"I12B",3.0174,6.5143,0.0,idrotm[240],"ONLY");
-     gMC->Gspos("I20B",2,"I12B",1.9612,6.9062,0.0,idrotm[241],"ONLY");
-     gMC->Gspos("I20B",3,"I12B",0.8567,7.1279,0.0,idrotm[242],"ONLY");
-     gMC->Gspos("I20B",4,"I12B",-0.2689,7.1742,0.0,idrotm[243],"ONLY");
-     gMC->Gspos("I123",1,"I12B",-0.2978,5.5196,0.0,idrotm[214],"ONLY");
-     gMC->Gspos("I121",1,"I12B",-0.2385,4.1518,0.0,idrotm[213],"ONLY");
-     gMC->Gspos("I122",1,"I12B",-0.2968,4.0207,0.0,idrotm[212],"ONLY");
-     gMC->Gspos("I120",1,"I12B",-0.3672,3.9056,0.0,0,"ONLY");
-     gMC->Gspos("I144",1,"I12B",-0.2538,3.8556,0.0,0,"ONLY");
-     gMC->Gspos("I113",3,"I12B",0.1095,3.9056,0.0,0,"ONLY");
-     gMC->Gspos("I143",1,"I12B",0.4365,3.8556,0.0,idrotm[236],"ONLY");
-     gMC->Gspos("I142",1,"I12B",0.5136,3.9056,0.0,idrotm[235],"ONLY");
-     gMC->Gspos("I141",1,"I12B",0.5636,3.9752,0.0,idrotm[237],"ONLY");
-     gMC->Gspos("I140",1,"I12B",0.6336,4.0447,0.0,idrotm[234],"ONLY");
-     gMC->Gspos("I139",1,"I12B",0.8297,4.0545,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I113",5,"I12B",1.2575,3.9681,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I138",1,"I12B",1.66,3.7848,0.0,idrotm[207],"ONLY");
-     gMC->Gspos("I137",1,"I12B",1.8556,3.7738,0.0,idrotm[233],"ONLY");
-     gMC->Gspos("I136",1,"I12B",2.6224,4.874,0.0,idrotm[232],"ONLY");
-     gMC->Gspos("I135",1,"I12B",3.2967,6.0337,0.0,idrotm[231],"ONLY");
-     gMC->Gspos("I134",1,"I12B",3.266,6.1636,0.0,idrotm[230],"ONLY");
-     gMC->Gspos("I113",1,"I12B",2.9903,6.4144,0.0,idrotm[211],"ONLY");
-     gMC->Gspos("I133",3,"I12B",2.7631,6.7627,0.0,idrotm[230],"ONLY");
-     gMC->Gspos("I132",3,"I12B",2.62,6.8555,0.0,idrotm[229],"ONLY");
-     gMC->Gspos("I131",3,"I12B",2.648,6.6023,0.0,idrotm[228],"ONLY");
-     gMC->Gspos("I130",3,"I12B",2.6569,6.3431,0.0,idrotm[227],"ONLY");
-     gMC->Gspos("I129",3,"I12B",2.3906,6.4819,0.0,idrotm[226],"ONLY");
-     gMC->Gspos("I113",2,"I12B",1.9488,6.7998,0.0,idrotm[210],"ONLY");
-     gMC->Gspos("I133",2,"I12B",1.6699,7.1085,0.0,idrotm[226],"ONLY");
-     gMC->Gspos("I132",2,"I12B",1.5142,7.1777,0.0,idrotm[225],"ONLY");
-     gMC->Gspos("I131",2,"I12B",1.5814,6.932,0.0,idrotm[224],"ONLY");
-     gMC->Gspos("I130",2,"I12B",1.6308,6.6774,0.0,idrotm[223],"ONLY");
-     gMC->Gspos("I129",2,"I12B",1.346,6.7728,0.0,idrotm[222],"ONLY");
-     gMC->Gspos("I113",6,"I12B",0.8599,7.0176,0.0,idrotm[209],"ONLY");
-     gMC->Gspos("I133",1,"I12B",0.5362,7.2789,0.0,idrotm[222],"ONLY");
-     gMC->Gspos("I132",1,"I12B",0.3715,7.3228,0.0,idrotm[221],"ONLY");
-     gMC->Gspos("I131",1,"I12B",0.4763,7.0907,0.0,idrotm[220],"ONLY");
-     gMC->Gspos("I130",1,"I12B",0.5649,6.8469,0.0,idrotm[219],"ONLY");
-     gMC->Gspos("I129",1,"I12B",0.2688,6.8966,0.0,idrotm[218],"ONLY");
-     gMC->Gspos("I113",4,"I12B",-0.2497,7.0624,0.0,idrotm[208],"ONLY");
-     gMC->Gspos("I128",1,"I12B",-0.6103,7.2698,0.0,idrotm[218],"ONLY");
-     gMC->Gspos("I126",1,"I12B",-0.7799,7.2874,0.0,idrotm[217],"ONLY");
-     gMC->Gspos("I125",1,"I12B",-0.6315,7.0883,0.0,idrotm[216],"ONLY");
-     gMC->Gspos("I124",1,"I12B",-0.4965,6.8742,0.0,idrotm[215],"ONLY");
-     gMC->Gspos("I105",3,"I10B",-0.05,-0.01,-16.844,idrotm[201],"ONLY");
-     gMC->Gspos("I105",4,"I10B",-0.05,-0.01,16.844,0,"ONLY");
-     gMC->Gspos("I107",2,"I10B",-0.0455,-0.0125,3.536,0,"ONLY");
-     gMC->Gspos("I107",1,"I10B",-0.0455,-0.0125,10.708,0,"ONLY");
-     gMC->Gspos("I107",4,"I10B",-0.0455,-0.0125,-10.708,idrotm[201],"ONLY");
-     gMC->Gspos("I107",3,"I10B",-0.0455,-0.0125,-3.536,idrotm[201],"ONLY");
-     gMC->Gspos("I109",1,"I10B",-0.138,0.015,-16.844,idrotm[201],"ONLY");
-     gMC->Gspos("I109",2,"I10B",-0.138,0.015,16.844,0,"ONLY");
-     gMC->Gspos("I108",1,"I10B",-0.138,0.01,0.0,0,"ONLY");
-     gMC->Gspos("I105",1,"I20B",-0.05,-0.01,-16.844,idrotm[201],"ONLY");
-     gMC->Gspos("I105",2,"I20B",-0.05,-0.01,16.844,0,"ONLY");
-     gMC->Gspos("I1D7",2,"I20B",-0.0455,-0.0125,3.536,0,"ONLY");
-     gMC->Gspos("I1D7",1,"I20B",-0.0455,-0.0125,10.708,0,"ONLY");
-     gMC->Gspos("I1D7",4,"I20B",-0.0455,-0.0125,-10.708,idrotm[201],"ONLY");
-     gMC->Gspos("I1D7",3,"I20B",-0.0455,-0.0125,-3.536,idrotm[201],"ONLY");
-     gMC->Gspos("I109",3,"I20B",-0.138,0.015,-16.844,idrotm[201],"ONLY");
-     gMC->Gspos("I109",4,"I20B",-0.138,0.015,16.844,0,"ONLY");
-     gMC->Gspos("I108",2,"I20B",-0.138,0.01,0.0,0,"ONLY");
-     gMC->Gspos("I112",2,"I113",0.25,0.02,0.0,idrotm[206],"ONLY");
-     gMC->Gspos("I111",2,"I113",0.1318,-0.0008,0.0,idrotm[205],"ONLY");
-     gMC->Gspos("I118",1,"I113",0.0,-0.0454,0.0,0,"ONLY");
-     gMC->Gspos("I110",1,"I113",0.0,0.0492,0.0,0,"ONLY");
-     gMC->Gspos("I114",1,"I113",0.063,0.0042,0.0,idrotm[202],"ONLY");
-     gMC->Gspos("I115",1,"I113",0.063,0.0042,0.0,idrotm[202],"ONLY");
-     gMC->Gspos("I115",2,"I113",-0.063,0.0042,0.0,idrotm[237],"ONLY");
-     gMC->Gspos("I114",2,"I113",-0.063,0.0042,0.0,idrotm[237],"ONLY");
-     gMC->Gspos("I116",1,"I113",0.0,0.0042,0.0,0,"ONLY");
-     gMC->Gspos("I111",1,"I113",-0.1318,-0.0008,0.0,idrotm[204],"ONLY");
-     gMC->Gspos("I112",1,"I113",-0.25,0.02,0.0,idrotm[203],"ONLY");
-     gMC->Gspos("I106",1,"I107",0.0,-0.005,-1.4,0,"ONLY");
-     gMC->Gspos("I106",2,"I107",0.0,-0.005,0.0,0,"ONLY");
-     gMC->Gspos("I106",3,"I107",0.0,-0.005,1.4,0,"ONLY");
-     gMC->Gspos("I106",4,"I107",0.0,-0.005,2.8,0,"ONLY");
-     gMC->Gspos("I106",5,"I107",0.0,-0.005,-2.8,0,"ONLY");
-     gMC->Gspos("I101",1,"I107",0.0,0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I106",6,"I1D7",0.0,-0.005,-1.4,0,"ONLY");
-     gMC->Gspos("I106",7,"I1D7",0.0,-0.005,0.0,0,"ONLY");
-     gMC->Gspos("I106",8,"I1D7",0.0,-0.005,1.4,0,"ONLY");
-     gMC->Gspos("I106",9,"I1D7",0.0,-0.005,2.8,0,"ONLY");
-     gMC->Gspos("I106",10,"I1D7",0.0,-0.005,-2.8,0,"ONLY");
-     gMC->Gspos("I1D1",1,"I1D7",0.0,0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I117",1,"I116",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("ITS1",1,"I101",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("ITS2",1,"I1D1",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I650",16,"IT12",0.0,0.0,22.0,idrotm[1104],"MANY");
-     gMC->Gspos("I650",20,"IT12",0.0,0.0,22.0,idrotm[1130],"MANY");
-     gMC->Gspos("I650",18,"IT12",0.0,0.0,22.0,idrotm[1117],"MANY");
-     gMC->Gspos("I650",1,"IT12",0.0,0.0,22.0,0,"MANY");
-     gMC->Gspos("I650",4,"IT12",0.0,0.0,22.0,idrotm[1106],"MANY");
-     gMC->Gspos("I650",6,"IT12",0.0,0.0,22.0,idrotm[1039],"MANY");
-     gMC->Gspos("I650",8,"IT12",0.0,0.0,22.0,idrotm[1107],"MANY");
-     gMC->Gspos("I650",10,"IT12",0.0,0.0,22.0,idrotm[1065],"MANY");
-     gMC->Gspos("I650",12,"IT12",0.0,0.0,22.0,idrotm[1078],"MANY");
-     gMC->Gspos("I650",14,"IT12",0.0,0.0,22.0,idrotm[1091],"MANY");
-     gMC->Gspos("I650",19,"IT12",0.0,0.0,-22.0,idrotm[1108],"MANY");
-     gMC->Gspos("I650",2,"IT12",0.0,0.0,-22.0,idrotm[1109],"MANY");
-     gMC->Gspos("I650",3,"IT12",0.0,0.0,-22.0,idrotm[1110],"MANY");
-     gMC->Gspos("I650",5,"IT12",0.0,0.0,-22.0,idrotm[1111],"MANY");
-     gMC->Gspos("I650",7,"IT12",0.0,0.0,-22.0,idrotm[1112],"MANY");
-     gMC->Gspos("I650",9,"IT12",0.0,0.0,-22.0,idrotm[1113],"MANY");
-     gMC->Gspos("I650",11,"IT12",0.0,0.0,-22.0,idrotm[1114],"MANY");
-     gMC->Gspos("I650",13,"IT12",0.0,0.0,-22.0,idrotm[1115],"MANY");
-     gMC->Gspos("I650",15,"IT12",0.0,0.0,-22.0,idrotm[1116],"MANY");
-     gMC->Gspos("I650",17,"IT12",0.0,0.0,-22.0,idrotm[1118],"MANY");
-     gMC->Gspos("I666",1,"I650",0.0,0.0,0.25,idrotm[1003],"MANY");
-     gMC->Gspos("I667",1,"I650",0.1102,0.9945,0.45,idrotm[1088],"ONLY");
-     gMC->Gspos("I669",3,"I650",0.1883,4.0372,-3.2,0,"ONLY");
-     gMC->Gspos("I671",3,"I650",0.1883,4.0372,0.6,0,"ONLY");
-     gMC->Gspos("I669",2,"I650",1.3343,4.0609,-3.2,0,"ONLY");
-     gMC->Gspos("I671",2,"I650",1.3343,4.0609,0.6,0,"ONLY");
-     gMC->Gspos("I669",6,"I650",2.9567,6.1959,-3.2,idrotm[1089],"ONLY");
-     gMC->Gspos("I671",6,"I650",2.9567,6.1959,0.6,idrotm[1089],"ONLY");
-     gMC->Gspos("I669",5,"I650",1.9511,6.5822,-3.2,idrotm[1011],"ONLY");
-     gMC->Gspos("I671",5,"I650",1.9511,6.5822,0.6,idrotm[1011],"ONLY");
-     gMC->Gspos("I669",4,"I650",0.8974,6.8064,-3.2,idrotm[1090],"ONLY");
-     gMC->Gspos("I671",4,"I650",0.8974,6.8064,0.6,idrotm[1090],"ONLY");
-     gMC->Gspos("I669",1,"I650",-0.1784,6.863,-3.2,0,"ONLY");
-     gMC->Gspos("I671",1,"I650",-0.1784,6.863,0.6,0,"ONLY");
-     gMC->Gspos("I673",1,"I650",0.2173,4.8037,1.8,0,"ONLY");
-     gMC->Gspos("I673",6,"I650",1.5093,4.5605,1.8,0,"ONLY");
-     gMC->Gspos("I673",4,"I650",-0.173,6.2531,1.8,idrotm[1092],"ONLY");
-     gMC->Gspos("I673",3,"I650",0.8073,6.2032,1.8,idrotm[1093],"ONLY");
-     gMC->Gspos("I673",2,"I650",1.7678,6.0005,1.8,idrotm[1094],"ONLY");
-     gMC->Gspos("I673",5,"I650",2.6847,5.6501,1.8,0,"ONLY");
-     gMC->Gspos("I676",2,"I650",1.7618,5.2269,2.5,0,"ONLY");
-     gMC->Gspos("I676",1,"I650",0.4018,5.5869,2.5,0,"ONLY");
-     gMC->Gspos("I668",1,"I667",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I670",1,"I669",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I672",1,"I671",0.0,0.0,0.0,0,"ONLY");
-     gMC->Gspos("I674",1,"I673",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I675",1,"I673",0.0,0.0,-0.5,0,"ONLY");
-     gMC->Gspos("I677",1,"I676",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I678",1,"I676",0.0,0.0,-0.95,0,"ONLY");  
 
-  }
+  dits[0] = 8.37;
+  dits[1] = 9.93;
+  dits[2] = 25;
+  gMC->Gsvolu("IC01", "TUBE", idtmed[289], dits, 3);   
+
+  dits[0] = 8.3;
+  dits[1] = 9.995;
+  dits[2] = 17.5/2.;
+  gMC->Gsvolu("IC02", "TUBE", idtmed[289], dits, 3);    
+  
+  // --- Define volume of first cylinder between SPD and SDD --------------
+  
+  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 ---------------------------------- 
+
+  dits[0] = 0;
+  dits[1] = 360;
+  dits[2] = 12;
+  dits[3] = -59.7;
+  dits[4] = 27;
+  dits[5] = 28.6;
+  dits[6] = -42.7;
+  dits[7] = 10;
+  dits[8] = 28.6;
+  dits[9] = -34.65;
+  dits[10] = 10;
+  dits[11] = 28.6;
+  dits[12] = -34.65;
+  dits[13] = 10;
+  dits[14] = 23.495;
+  dits[15] = -23.7;
+  dits[16] = 10;
+  dits[17] = 23.495;
+  dits[18] = -23.7;
+  dits[19] = 10;
+  dits[20] = 14.595;
+  dits[21] = 23.7;
+  dits[22] = 10;
+  dits[23] = 14.595;
+  dits[24] = 23.7;
+  dits[25] = 10;
+  dits[26] = 23.495;
+  dits[27] = 34.65;
+  dits[28] = 10;
+  dits[29] = 23.495;
+  dits[30] = 34.65;
+  dits[31] = 10;
+  dits[32] = 28.6;
+  dits[33] = 42.7;
+  dits[34] = 10;
+  dits[35] = 28.6;
+  dits[36] = 59.7;
+  dits[37] = 27.2637;
+  dits[38] = 28.6;             
+  gMC->Gsvolu("IS02", "PCON", idtmed[204], dits, 39);
+  
+  dits[0] = 0;
+  dits[1] = 360;
+  dits[2] = 6;
+  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] = 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] = 39;  
+  dits[4] = 14;
+  dits[5] = 18.75;
+  dits[6] = 46.7-3;
+  dits[7] = 14;
+  dits[8] = 18.75;
+  dits[9] = 51.45-3;
+  dits[10] = 18.75;
+  dits[11] = 18.75;
+  gMC->Gsvolu("I099", "PCON", idtmed[204], dits, 12); // SDD 3 cone hole
+
+  dits[0] = 0;
+  dits[1] = 25;
+  dits[2] = 3;
+  dits[3] = 49;
+  dits[4] = 23.4;
+  dits[5] = 26.4;
+  dits[6] = 56.1-3;
+  dits[7] = 23.4;
+  dits[8] = 26.4;
+  dits[9] = 59.1-3;
+  dits[10] = 26.4;
+  dits[11] = 26.4;
+  gMC->Gsvolu("I200", "PCON", idtmed[204], dits, 12); // SDD 4 cone hole
+
+  dits[0] = 10.0;
+  dits[1] = 10.5;
+  dits[2] = 0.25;
+  gMC->Gsvolu("I090", "TUBE", idtmed[224], dits, 3);  // SDD cylinder flange
+
+  dits[0] = 21.95;
+  dits[1] = 22.95;    
+  dits[2] = 1;
+  gMC->Gsvolu("I098", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 4
+
+  dits[0] = 13.1;    
+  dits[1] = 14.1;    
+  dits[2] = 1;
+  gMC->Gsvolu("I097", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 3
+
+  dits[0] = 1;
+  dits[1] = 1;
+  dits[2] = 7.74;
+  gMC->Gsvolu("I202", "BOX ", idtmed[272], dits, 3);
+
+  dits[0] = 1;
+  dits[1] = 1;
+  dits[2] = 9.14;
+  gMC->Gsvolu("I203", "BOX ", idtmed[272], dits, 3);
+
+  dits[0] = 21.95;
+  dits[1] = 22.95;
+  dits[2] = 1;
+  gMC->Gsvolu("I095", "TUBE", idtmed[224], dits, 3);
+
+  dits[0] = 3;
+  dits[1] = 2.7;
+  dits[2] = 1;
+  dits[3] = 0.63;
+  gMC->Gsvolu("I096", "TRD1", idtmed[264], dits, 4);
+
+  dits[0] = 13.1;
+  dits[1] = 14.1;
+  dits[2] = 1;
+  gMC->Gsvolu("I094", "TUBE", idtmed[224], dits, 3);
+  
+  
+  // --- Define volumes of SSD cone ----------------------------------    
+            
 
+  dits[0] = 0;
+  dits[1] = 360;
+  dits[2] = 12;
+  dits[3] = -zmax;
+  dits[4] = 46;         
+  dits[5] = 49.25;       
+  dits[6] = -61.2;
+  dits[7] = 28.7;
+  dits[8] = 49.25;       
+  dits[9] = -57.5;
+  dits[10] = 28.7;
+  dits[11] = 49.25;      
+  dits[12] = -57.5;
+  dits[13] = 28.7;
+  dits[14] = 43.5;
+  dits[15] = -49.2;
+  dits[16] = 28.7;
+  dits[17] = 43.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] = 57.5;
+  dits[28] = 28.7;
+  dits[29] = 43.5;
+  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] = -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.75;          
+  dits[1] = 29.75;   
+  dits[2] = 0.5;
+  gMC->Gsvolu("I211", "TUBE", idtmed[224], dits, 3);   // SSD cylinder flange
+  
+  dits[0] = 35.8;   
+  dits[1] = 36.8;   
+  dits[2] = 1;
+  gMC->Gsvolu("I217", "TUBE", idtmed[283], dits, 3);   // ladder support on layer 5 
+  
+  dits[0] = 41.4;  
+  dits[1] = 42.4;  
+  dits[2] = 1;
+  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);   // 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);   // layer 5 electronic support
+                                                       // this will change after PPR
+  dits[0] = 0;
+  dits[1] = 25;
+  dits[2] = 5;
+  dits[3] = -zmax+3;
+  dits[4] = 45.5;
+  dits[5] = 45.5;
+  dits[6] = -69.7+3;
+  dits[7] = 37;
+  dits[8] = 45.5;
+  dits[9] = -68.5+3;
+  dits[10] = 37;
+  dits[11] = 45.5;
+  dits[12] = -68.5+4.8;  
+  dits[13] = 37;
+  dits[14] = 45.5; 
+  dits[15] = -63.5+4.8;
+  dits[16] = 37;
+  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] = -14;
+  dits[4] = 30.5;
+  dits[5] = 33.5;
+  dits[6] = -9.85;
+  dits[7] = 30.5;
+  dits[8] = 33.5;
+  dits[9] = -9.85;
+  dits[10] = 30.5;
+  dits[11] = 43.45;
+  dits[12] = -7.85;
+  dits[13] = 30.5;
+  dits[14] = 43.45;
+  dits[15] = -7.85;
+  dits[16] = 30.5;
+  dits[17] = 36.5;
+  dits[18] = -7;
+  dits[19] = 30.5;
+  dits[20] = 36.5;
+  dits[21] = -4;
+  dits[22] = 33.0173;
+  dits[23] = 36.5;
+  dits[24] = -4;
+  dits[25] = 33.0173;
+  dits[26] = 36.80;
+  dits[27] = -2;
+  dits[28] = 34.6955;
+  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
+  
   // SPD - option 'a' 
-  // detector thickness = 300 microns
-  // chip thickness = 300 microns
   // (this is NOT the default)
 
-  if (option == 1 && thickness == 2) {
+  if (option == 1) {
 
      gMC->Gspos("I12A",5,"IT12",0.0,0.0,0.0,idrotm[238],"MANY");
      gMC->Gspos("I12A",6,"IT12",0.0,0.0,0.0,idrotm[236],"MANY");
@@ -3453,12 +2894,24 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I12A",3,"IT12",0.0,0.0,0.0,idrotm[234],"MANY");
      gMC->Gspos("I12A",4,"IT12",0.0,0.0,0.0,idrotm[243],"MANY");
      gMC->Gspos("I12A",1,"IT12",0.0,0.0,0.0,0,"MANY");
-     gMC->Gspos("I10A",2,"I12A",0.203-0.0009,3.8206-0.0175,0.0,idrotm[244],"ONLY");
-     gMC->Gspos("I10A",1,"I12A",1.4531-0.0063,3.8152-0.0164,0.0,idrotm[245],"ONLY");
-     gMC->Gspos("I20A",1,"I12A",3.0174+0.0074,6.5143+0.0159,0.0,idrotm[246],"ONLY");
-     gMC->Gspos("I20A",2,"I12A",1.9612+0.0048,6.9062+0.0168,0.0,idrotm[247],"ONLY");
-     gMC->Gspos("I20A",3,"I12A",0.8567+0.0021,7.1279+0.0174,0.0,idrotm[248],"ONLY");
-     gMC->Gspos("I20A",4,"I12A",-0.2689-0.0006,7.1742+0.0175,0.0,idrotm[249],"ONLY");
+     deltax=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Cos(270.*TMath::Pi()/180.);  // see definition of idrotm[244]
+         deltay=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Sin(270.*TMath::Pi()/180.);  // see definition of idrotm[244]
+     gMC->Gspos("I10A",2,"I12A",0.203+deltax,3.8206+deltay,0.0,idrotm[244],"ONLY");      
+     deltax=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Cos(252.*TMath::Pi()/180.);  // see definition of idrotm[245]
+         deltay=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Sin(252.*TMath::Pi()/180.);  // see definition of idrotm[245]  
+     gMC->Gspos("I10A",1,"I12A",1.4531+deltax,3.8152+deltay,0.0,idrotm[245],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(40.*TMath::Pi()/180.);  // see definition of idrotm[246]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(40.*TMath::Pi()/180.);  // see definition of idrotm[246]  
+     gMC->Gspos("I20A",1,"I12A",3.0174+deltax,6.5143+deltay,0.0,idrotm[246],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(49.*TMath::Pi()/180.);  // see definition of idrotm[247]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(49.*TMath::Pi()/180.);  // see definition of idrotm[247] 
+     gMC->Gspos("I20A",2,"I12A",1.9612+deltax,6.9062+deltay,0.0,idrotm[247],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(58.*TMath::Pi()/180.);  // see definition of idrotm[248]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(58.*TMath::Pi()/180.);  // see definition of idrotm[248] 
+     gMC->Gspos("I20A",3,"I12A",0.8567+deltax,7.1279+deltay,0.0,idrotm[248],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(67.*TMath::Pi()/180.);  // see definition of idrotm[249]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(67.*TMath::Pi()/180.);  // see definition of idrotm[249] 
+     gMC->Gspos("I20A",4,"I12A",-0.2689+deltax,7.1742+deltay,0.0,idrotm[249],"ONLY");
      gMC->Gspos("I123",2,"I12A",-0.2978,5.5196,0.0,idrotm[214],"ONLY");
      gMC->Gspos("I121",2,"I12A",-0.2385,4.1518,0.0,idrotm[213],"ONLY");
      gMC->Gspos("I122",2,"I12A",-0.2968,4.0207,0.0,idrotm[212],"ONLY");
@@ -3499,20 +2952,20 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I126",2,"I12A",-0.7799,7.2874,0.0,idrotm[217],"ONLY");
      gMC->Gspos("I125",2,"I12A",-0.6315,7.0883,0.0,idrotm[216],"ONLY");
      gMC->Gspos("I124",2,"I12A",-0.4965,6.8742,0.0,idrotm[215],"ONLY");
-     gMC->Gspos("I103",3,"I10A",-0.05,0.0075,-3.536,idrotm[237],"ONLY");
-     gMC->Gspos("I103",4,"I10A",-0.05,0.0075,-10.708,idrotm[237],"ONLY");
-     gMC->Gspos("I103",1,"I10A",-0.05,0.0075,10.708,0,"ONLY");
-     gMC->Gspos("I103",2,"I10A",-0.05,0.0075,3.536,0,"ONLY");
+     gMC->Gspos("I103",3,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],-3.536,idrotm[237],"ONLY");
+     gMC->Gspos("I103",4,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],-10.708,idrotm[237],"ONLY");
+     gMC->Gspos("I103",1,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],10.708,0,"ONLY");
+     gMC->Gspos("I103",2,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],3.536,0,"ONLY");
      gMC->Gspos("I105",1,"I10A",-0.05,0.01,-16.844,idrotm[237],"ONLY");
      gMC->Gspos("I105",2,"I10A",-0.05,0.01,16.844,0,"ONLY");
-     gMC->Gspos("I104",1,"I10A",0.0,-0.015-0.0175,0.0,0,"ONLY");
-     gMC->Gspos("I1D3",3,"I20A",-0.05,0.0075,-3.536,idrotm[237],"ONLY");
-     gMC->Gspos("I1D3",4,"I20A",-0.05,0.0075,-10.708,idrotm[237],"ONLY");
-     gMC->Gspos("I1D3",1,"I20A",-0.05,0.0075,10.708,0,"ONLY");
-     gMC->Gspos("I1D3",2,"I20A",-0.05,0.0075,3.536,0,"ONLY");
+     gMC->Gspos("I104",1,"I10A",0.0,-di10a[1]+di104[1],0.0,0,"ONLY");
+     gMC->Gspos("I1D3",3,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],-3.536,idrotm[237],"ONLY");
+     gMC->Gspos("I1D3",4,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],-10.708,idrotm[237],"ONLY");
+     gMC->Gspos("I1D3",1,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],10.708,0,"ONLY");
+     gMC->Gspos("I1D3",2,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],3.536,0,"ONLY");
      gMC->Gspos("I105",3,"I20A",-0.05,0.01,-16.844,idrotm[237],"ONLY");
      gMC->Gspos("I105",4,"I20A",-0.05,0.01,16.844,0,"ONLY");
-     gMC->Gspos("I104",2,"I20A",0.0,-0.015-0.0175,0.0,0,"ONLY");
+     gMC->Gspos("I104",2,"I20A",0.0,-di20a[1]+di104[1],0.0,0,"ONLY");
      gMC->Gspos("I112",2,"I113",0.25,0.02,0.0,idrotm[206],"ONLY");
      gMC->Gspos("I111",2,"I113",0.1318,-0.0008,0.0,idrotm[205],"ONLY");
      gMC->Gspos("I118",1,"I113",0.0,-0.0454,0.0,0,"ONLY");
@@ -3524,18 +2977,18 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I116",1,"I113",0.0,0.0042,0.0,0,"ONLY");
      gMC->Gspos("I111",1,"I113",-0.1318,-0.0008,0.0,idrotm[204],"ONLY");
      gMC->Gspos("I112",1,"I113",-0.25,0.02,0.0,idrotm[203],"ONLY");
-     gMC->Gspos("I101",1,"I103",-0.088,0.0075+0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I102",1,"I103",0.0,-0.005-0.01,-2.8,0,"ONLY");
-     gMC->Gspos("I102",2,"I103",0.0,-0.005-0.01,-1.4,0,"ONLY");
-     gMC->Gspos("I102",3,"I103",0.0,-0.005-0.01,0.0,0,"ONLY");
-     gMC->Gspos("I102",4,"I103",0.0,-0.005-0.01,1.4,0,"ONLY");
-     gMC->Gspos("I102",5,"I103",0.0,-0.005-0.01,2.8,0,"ONLY");
-     gMC->Gspos("I1D1",1,"I1D3",-0.088,0.0075+0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I102",6,"I1D3",0.0,-0.005-0.01,-2.8,0,"ONLY");
-     gMC->Gspos("I102",7,"I1D3",0.0,-0.005-0.01,-1.4,0,"ONLY");
-     gMC->Gspos("I102",8,"I1D3",0.0,-0.005-0.01,0.0,0,"ONLY");
-     gMC->Gspos("I102",9,"I1D3",0.0,-0.005-0.01,1.4,0,"ONLY");
-     gMC->Gspos("I102",10,"I1D3",0.0,-0.005-0.01,2.8,0,"ONLY");
+     gMC->Gspos("I101",1,"I103",-0.088,ddet1,0.0,0,"ONLY");
+     gMC->Gspos("I102",1,"I103",0.0,-dchip1,-2.8,0,"ONLY");
+     gMC->Gspos("I102",2,"I103",0.0,-dchip1,-1.4,0,"ONLY");
+     gMC->Gspos("I102",3,"I103",0.0,-dchip1,0.0,0,"ONLY");
+     gMC->Gspos("I102",4,"I103",0.0,-dchip1,1.4,0,"ONLY");
+     gMC->Gspos("I102",5,"I103",0.0,-dchip1,2.8,0,"ONLY");
+     gMC->Gspos("I1D1",1,"I1D3",-0.088,ddet2,0.0,0,"ONLY");
+     gMC->Gspos("I1D2",1,"I1D3",0.0,-dchip2,-2.8,0,"ONLY");
+     gMC->Gspos("I1D2",2,"I1D3",0.0,-dchip2,-1.4,0,"ONLY");
+     gMC->Gspos("I1D2",3,"I1D3",0.0,-dchip2,0.0,0,"ONLY");
+     gMC->Gspos("I1D2",4,"I1D3",0.0,-dchip2,1.4,0,"ONLY");
+     gMC->Gspos("I1D2",5,"I1D3",0.0,-dchip2,2.8,0,"ONLY");
      gMC->Gspos("I117",1,"I116",0.0,0.0,0.0,0,"ONLY");
      gMC->Gspos("ITS1",1,"I101",0.0,0.0,0.0,0,"ONLY");
      gMC->Gspos("ITS2",1,"I1D1",0.0,0.0,0.0,0,"ONLY");
@@ -3595,11 +3048,9 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- Place SPD (option 'b') volumes into their mother volume IT12
   
   // SPD - option 'b' 
-  // detector thickness = 300 microns
-  // chip thickness = 300 microns
   // (this is the default)
 
-  if (option == 2 && thickness == 2) {
+  if (option == 2) {
 
      gMC->Gspos("I12B",1,"IT12",0.0,0.0,0.0,0,"MANY");
      gMC->Gspos("I12B",8,"IT12",0.0,0.0,0.0,idrotm[233],"MANY");
@@ -3611,12 +3062,24 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I12B",5,"IT12",0.0,0.0,0.0,idrotm[247],"MANY");
      gMC->Gspos("I12B",9,"IT12",0.0,0.0,0.0,idrotm[248],"MANY");
      gMC->Gspos("I12B",10,"IT12",0.0,0.0,0.0,idrotm[249],"MANY");
-     gMC->Gspos("I10B",2,"I12B",0.203-0.0009,3.8206-0.0175,0.0,idrotm[238],"ONLY");
-     gMC->Gspos("I10B",1,"I12B",1.4531-0.0063,3.8152-0.0164,0.0,idrotm[239],"ONLY");
-     gMC->Gspos("I20B",1,"I12B",3.0174+0.0074,6.5143+0.0159,0.0,idrotm[240],"ONLY");
-     gMC->Gspos("I20B",2,"I12B",1.9612+0.0048,6.9062+0.0168,0.0,idrotm[241],"ONLY");
-     gMC->Gspos("I20B",3,"I12B",0.8567+0.0021,7.1279+0.0174,0.0,idrotm[242],"ONLY");
-     gMC->Gspos("I20B",4,"I12B",-0.2689-0.0006,7.1742+0.0175,0.0,idrotm[243],"ONLY");
+     deltax=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Cos(270.*TMath::Pi()/180.);  // see definition of idrotm[238]
+         deltay=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Sin(270.*TMath::Pi()/180.);  // see definition of idrotm[238]
+     gMC->Gspos("I10B",2,"I12B",0.203+deltax,3.8206+deltay,0.0,idrotm[238],"ONLY");      
+     deltax=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Cos(252.*TMath::Pi()/180.);  // see definition of idrotm[239]
+         deltay=((ddet1-0.01/2.)+(dchip1-0.015/2.))*TMath::Sin(252.*TMath::Pi()/180.);  // see definition of idrotm[239]  
+     gMC->Gspos("I10B",1,"I12B",1.4531+deltax,3.8152+deltay,0.0,idrotm[239],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(40.*TMath::Pi()/180.);  // see definition of idrotm[240]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(40.*TMath::Pi()/180.);  // see definition of idrotm[240]  
+     gMC->Gspos("I20B",1,"I12B",3.0174+deltax,6.5143+deltay,0.0,idrotm[240],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(49.*TMath::Pi()/180.);  // see definition of idrotm[241]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(49.*TMath::Pi()/180.);  // see definition of idrotm[241] 
+     gMC->Gspos("I20B",2,"I12B",1.9612+deltax,6.9062+deltay,0.0,idrotm[241],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(58.*TMath::Pi()/180.);  // see definition of idrotm[242]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(58.*TMath::Pi()/180.);  // see definition of idrotm[242] 
+     gMC->Gspos("I20B",3,"I12B",0.8567+deltax,7.1279+deltay,0.0,idrotm[242],"ONLY");
+     deltax=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Cos(67.*TMath::Pi()/180.);  // see definition of idrotm[243]
+         deltay=((ddet2-0.01/2.)+(dchip2-0.015/2.))*TMath::Sin(67.*TMath::Pi()/180.);  // see definition of idrotm[243] 
+     gMC->Gspos("I20B",4,"I12B",-0.2689+deltax,7.1742+deltay,0.0,idrotm[243],"ONLY");
      gMC->Gspos("I123",1,"I12B",-0.2978,5.5196,0.0,idrotm[214],"ONLY");
      gMC->Gspos("I121",1,"I12B",-0.2385,4.1518,0.0,idrotm[213],"ONLY");
      gMC->Gspos("I122",1,"I12B",-0.2968,4.0207,0.0,idrotm[212],"ONLY");
@@ -3659,22 +3122,22 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I124",1,"I12B",-0.4965,6.8742,0.0,idrotm[215],"ONLY");
      gMC->Gspos("I105",3,"I10B",-0.05,-0.01,-16.844,idrotm[201],"ONLY");
      gMC->Gspos("I105",4,"I10B",-0.05,-0.01,16.844,0,"ONLY");
-     gMC->Gspos("I107",2,"I10B",-0.0455,-0.0125,3.536,0,"ONLY");
-     gMC->Gspos("I107",1,"I10B",-0.0455,-0.0125,10.708,0,"ONLY");
-     gMC->Gspos("I107",4,"I10B",-0.0455,-0.0125,-10.708,idrotm[201],"ONLY");
-     gMC->Gspos("I107",3,"I10B",-0.0455,-0.0125,-3.536,idrotm[201],"ONLY");
+     gMC->Gspos("I107",2,"I10B",-0.0455,-di10b[1]+di107[1],3.536,0,"ONLY");
+     gMC->Gspos("I107",1,"I10B",-0.0455,-di10b[1]+di107[1],10.708,0,"ONLY");
+     gMC->Gspos("I107",4,"I10B",-0.0455,-di10b[1]+di107[1],-10.708,idrotm[201],"ONLY");
+     gMC->Gspos("I107",3,"I10B",-0.0455,-di10b[1]+di107[1],-3.536,idrotm[201],"ONLY");
      gMC->Gspos("I109",1,"I10B",-0.138,0.015,-16.844,idrotm[201],"ONLY");
      gMC->Gspos("I109",2,"I10B",-0.138,0.015,16.844,0,"ONLY");
-     gMC->Gspos("I108",1,"I10B",-0.138,0.01+0.0175,0.0,0,"ONLY");
+     gMC->Gspos("I108",1,"I10B",-0.138,-di10b[1]+2.*di107[1]+di108[1],0.0,0,"ONLY");
      gMC->Gspos("I105",1,"I20B",-0.05,-0.01,-16.844,idrotm[201],"ONLY");
      gMC->Gspos("I105",2,"I20B",-0.05,-0.01,16.844,0,"ONLY");
-     gMC->Gspos("I1D7",2,"I20B",-0.0455,-0.0125,3.536,0,"ONLY");
-     gMC->Gspos("I1D7",1,"I20B",-0.0455,-0.0125,10.708,0,"ONLY");
-     gMC->Gspos("I1D7",4,"I20B",-0.0455,-0.0125,-10.708,idrotm[201],"ONLY");
-     gMC->Gspos("I1D7",3,"I20B",-0.0455,-0.0125,-3.536,idrotm[201],"ONLY");
+     gMC->Gspos("I1D7",2,"I20B",-0.0455,-di20b[1]+di1d7[1],3.536,0,"ONLY");
+     gMC->Gspos("I1D7",1,"I20B",-0.0455,-di20b[1]+di1d7[1],10.708,0,"ONLY");
+     gMC->Gspos("I1D7",4,"I20B",-0.0455,-di20b[1]+di1d7[1],-10.708,idrotm[201],"ONLY");
+     gMC->Gspos("I1D7",3,"I20B",-0.0455,-di20b[1]+di1d7[1],-3.536,idrotm[201],"ONLY");
      gMC->Gspos("I109",3,"I20B",-0.138,0.015,-16.844,idrotm[201],"ONLY");
      gMC->Gspos("I109",4,"I20B",-0.138,0.015,16.844,0,"ONLY");
-     gMC->Gspos("I108",2,"I20B",-0.138,0.01+0.0175,0.0,0,"ONLY");
+     gMC->Gspos("I108",2,"I20B",-0.138,-di20b[1]+2.*di1d7[1]+di108[1],0.0,0,"ONLY");
      gMC->Gspos("I112",2,"I113",0.25,0.02,0.0,idrotm[206],"ONLY");
      gMC->Gspos("I111",2,"I113",0.1318,-0.0008,0.0,idrotm[205],"ONLY");
      gMC->Gspos("I118",1,"I113",0.0,-0.0454,0.0,0,"ONLY");
@@ -3686,18 +3149,18 @@ void AliITSvPPRasymm::CreateGeometry(){
      gMC->Gspos("I116",1,"I113",0.0,0.0042,0.0,0,"ONLY");
      gMC->Gspos("I111",1,"I113",-0.1318,-0.0008,0.0,idrotm[204],"ONLY");
      gMC->Gspos("I112",1,"I113",-0.25,0.02,0.0,idrotm[203],"ONLY");
-     gMC->Gspos("I106",1,"I107",0.0,-0.005-0.01,-1.4,0,"ONLY");
-     gMC->Gspos("I106",2,"I107",0.0,-0.005-0.01,0.0,0,"ONLY");
-     gMC->Gspos("I106",3,"I107",0.0,-0.005-0.01,1.4,0,"ONLY");
-     gMC->Gspos("I106",4,"I107",0.0,-0.005-0.01,2.8,0,"ONLY");
-     gMC->Gspos("I106",5,"I107",0.0,-0.005-0.01,-2.8,0,"ONLY");
-     gMC->Gspos("I101",1,"I107",0.0,0.0075+0.0075,0.0,0,"ONLY");
-     gMC->Gspos("I106",6,"I1D7",0.0,-0.005-0.01,-1.4,0,"ONLY");
-     gMC->Gspos("I106",7,"I1D7",0.0,-0.005-0.01,0.0,0,"ONLY");
-     gMC->Gspos("I106",8,"I1D7",0.0,-0.005-0.01,1.4,0,"ONLY");
-     gMC->Gspos("I106",9,"I1D7",0.0,-0.005-0.01,2.8,0,"ONLY");
-     gMC->Gspos("I106",10,"I1D7",0.0,-0.005-0.01,-2.8,0,"ONLY");
-     gMC->Gspos("I1D1",1,"I1D7",0.0,0.0075+0.0075,0.0,0,"ONLY");
+     gMC->Gspos("I106",1,"I107",0.0,-dchip1,-1.4,0,"ONLY");
+     gMC->Gspos("I106",2,"I107",0.0,-dchip1,0.0,0,"ONLY");
+     gMC->Gspos("I106",3,"I107",0.0,-dchip1,1.4,0,"ONLY");
+     gMC->Gspos("I106",4,"I107",0.0,-dchip1,2.8,0,"ONLY");
+     gMC->Gspos("I106",5,"I107",0.0,-dchip1,-2.8,0,"ONLY");
+     gMC->Gspos("I101",1,"I107",0.0,ddet1,0.0,0,"ONLY");
+     gMC->Gspos("I1D6",1,"I1D7",0.0,-dchip2,-1.4,0,"ONLY");
+     gMC->Gspos("I1D6",2,"I1D7",0.0,-dchip2,0.0,0,"ONLY");
+     gMC->Gspos("I1D6",3,"I1D7",0.0,-dchip2,1.4,0,"ONLY");
+     gMC->Gspos("I1D6",4,"I1D7",0.0,-dchip2,2.8,0,"ONLY");
+     gMC->Gspos("I1D6",5,"I1D7",0.0,-dchip2,-2.8,0,"ONLY");
+     gMC->Gspos("I1D1",1,"I1D7",0.0,ddet2,0.0,0,"ONLY");
      gMC->Gspos("I117",1,"I116",0.0,0.0,0.0,0,"ONLY");
      gMC->Gspos("ITS1",1,"I101",0.0,0.0,0.0,0,"ONLY");
      gMC->Gspos("ITS2",1,"I1D1",0.0,0.0,0.0,0,"ONLY");
@@ -3756,228 +3219,354 @@ void AliITSvPPRasymm::CreateGeometry(){
   // --- Place SDD volumes into their mother volume IT34
 
   
-  gMC->Gspos("I048",8,"IT34",-22.1376,-14.227,0.0,idrotm[328],"ONLY");
-  gMC->Gspos("I048",7,"IT34",-24.7213,-7.2588,0.0,idrotm[329],"ONLY");
-  gMC->Gspos("I048",6,"IT34",-26.315,0.0,0.0,idrotm[350],"ONLY");
-  gMC->Gspos("I048",5,"IT34",-24.7213,7.2588,0.0,idrotm[330],"ONLY");
-  gMC->Gspos("I048",4,"IT34",-22.1376,14.227,0.0,idrotm[366],"ONLY");
-  gMC->Gspos("I048",3,"IT34",-16.8725,19.4719,0.0,idrotm[331],"ONLY");
-  gMC->Gspos("I048",2,"IT34",-10.9317,23.937,0.0,idrotm[332],"ONLY");
-  gMC->Gspos("I048",1,"IT34",-3.6667,25.5027,0.0,idrotm[335],"ONLY");
-  gMC->Gspos("I048",22,"IT34",3.745,26.0472,0.0,idrotm[334],"ONLY");
-  gMC->Gspos("I048",21,"IT34",10.7032,23.4367,0.0,idrotm[314],"ONLY");
-  gMC->Gspos("I048",20,"IT34",17.2327,19.8876,0.0,idrotm[315],"ONLY");
-  gMC->Gspos("I048",19,"IT34",21.6749,13.9296,0.0,idrotm[316],"ONLY");
-  gMC->Gspos("I048",18,"IT34",25.2491,7.4138,0.0,idrotm[317],"ONLY");
-  gMC->Gspos("I048",17,"IT34",25.765,0.0,0.0,idrotm[318],"ONLY");
-  gMC->Gspos("I048",16,"IT34",25.2491,-7.4138,0.0,idrotm[319],"ONLY");
-  gMC->Gspos("I048",15,"IT34",21.6749,-13.9296,0.0,idrotm[320],"ONLY");
-  gMC->Gspos("I048",14,"IT34",17.2327,-19.8876,0.0,idrotm[322],"ONLY");
-  gMC->Gspos("I048",13,"IT34",10.7032,-23.4367,0.0,idrotm[323],"ONLY");
-  gMC->Gspos("I048",12,"IT34",3.745,-26.0472,0.0,idrotm[324],"ONLY");
-  gMC->Gspos("I048",11,"IT34",-3.6667,-25.5027,0.0,idrotm[325],"ONLY");
-  gMC->Gspos("I048",10,"IT34",-10.9316,-23.937,0.0,idrotm[326],"ONLY");
-  gMC->Gspos("I048",9,"IT34",-16.8725,-19.4719,0.0,idrotm[327],"ONLY");
-  gMC->Gspos("I005",9,"IT34",-15.4744,-17.8584,-0.15,idrotm[327],"ONLY");
-  gMC->Gspos("I005",8,"IT34",-20.3415,-13.0727,-0.15,idrotm[328],"ONLY");
-  gMC->Gspos("I005",7,"IT34",-22.6728,-6.6573,-0.15,idrotm[329],"ONLY");
-  gMC->Gspos("I005",6,"IT34",-24.18,0.0,-0.15,idrotm[350],"ONLY");
-  gMC->Gspos("I005",5,"IT34",-22.6728,6.6573,-0.15,idrotm[330],"ONLY");
-  gMC->Gspos("I005",4,"IT34",-20.3415,13.0727,-0.15,idrotm[366],"ONLY");
-  gMC->Gspos("I005",3,"IT34",-15.4744,17.8584,-0.15,idrotm[331],"ONLY");
-  gMC->Gspos("I005",2,"IT34",-10.0447,21.9949,-0.15,idrotm[332],"ONLY");
-  gMC->Gspos("I005",1,"IT34",-3.3629,23.3895,-0.15,idrotm[335],"ONLY");
-  gMC->Gspos("I005",22,"IT34",3.4412,23.9339,-0.15,idrotm[334],"ONLY");
-  gMC->Gspos("I005",21,"IT34",9.8163,21.4946,-0.15,idrotm[314],"ONLY");
-  gMC->Gspos("I005",20,"IT34",15.8345,18.274,-0.15,idrotm[315],"ONLY");
-  gMC->Gspos("I005",19,"IT34",19.8788,12.7753,-0.15,idrotm[316],"ONLY");
-  gMC->Gspos("I005",18,"IT34",23.2005,6.8123,-0.15,idrotm[317],"ONLY");
-  gMC->Gspos("I005",17,"IT34",23.63,0.0,-0.15,idrotm[318],"ONLY");
-  gMC->Gspos("I005",16,"IT34",23.2005,-6.8123,-0.15,idrotm[319],"ONLY");
-  gMC->Gspos("I005",15,"IT34",19.8788,-12.7753,-0.15,idrotm[320],"ONLY");
-  gMC->Gspos("I005",14,"IT34",15.8345,-18.274,-0.15,idrotm[322],"ONLY");
-  gMC->Gspos("I005",13,"IT34",9.8163,-21.4946,-0.15,idrotm[323],"ONLY");
-  gMC->Gspos("I005",12,"IT34",3.4412,-23.9339,-0.15,idrotm[324],"ONLY");
-  gMC->Gspos("I005",11,"IT34",-3.3629,-23.3895,-0.15,idrotm[325],"ONLY");
-  gMC->Gspos("I005",10,"IT34",-10.0447,-21.9949,-0.15,idrotm[326],"ONLY");
-  gMC->Gspos("I047",6,"IT34",-10.8893,-13.6547,0.0,idrotm[311],"ONLY");
-  gMC->Gspos("I047",5,"IT34",-15.1948,-7.3174,0.0,idrotm[313],"ONLY");
-  gMC->Gspos("I047",4,"IT34",-17.465,0.0,0.0,idrotm[350],"ONLY");
-  gMC->Gspos("I047",3,"IT34",-15.1948,7.3175,0.0,idrotm[336],"ONLY");
-  gMC->Gspos("I047",2,"IT34",-10.8892,13.6547,0.0,idrotm[333],"ONLY");
-  gMC->Gspos("I047",1,"IT34",-3.7528,16.4422,0.0,idrotm[321],"ONLY");
-  gMC->Gspos("I047",14,"IT34",3.8863,17.0271,0.0,idrotm[305],"ONLY");
-  gMC->Gspos("I047",13,"IT34",10.5152,13.1856,0.0,idrotm[306],"ONLY");
-  gMC->Gspos("I047",12,"IT34",15.7354,7.5778,0.0,idrotm[307],"ONLY");
-  gMC->Gspos("I047",11,"IT34",16.865,0.0,0.0,idrotm[356],"ONLY");
-  gMC->Gspos("I047",10,"IT34",15.7354,-7.5778,0.0,idrotm[308],"ONLY");
-  gMC->Gspos("I047",9,"IT34",10.5152,-13.1856,0.0,idrotm[309],"ONLY");
-  gMC->Gspos("I047",8,"IT34",3.8863,-17.0271,0.0,idrotm[386],"ONLY");
-  gMC->Gspos("I047",7,"IT34",-3.7528,-16.4422,0.0,idrotm[310],"ONLY");
-  gMC->Gspos("I004",6,"IT34",-9.5581,-11.9855,0.0,idrotm[311],"ONLY");
-  gMC->Gspos("I004",5,"IT34",-13.2713,-6.3911,0.0,idrotm[313],"ONLY");
-  gMC->Gspos("I004",4,"IT34",-15.33,0.0,0.0,idrotm[350],"ONLY");
-  gMC->Gspos("I004",3,"IT34",-13.2713,6.3911,0.0,idrotm[336],"ONLY");
-  gMC->Gspos("I004",2,"IT34",-9.5581,11.9855,0.0,idrotm[333],"ONLY");
-  gMC->Gspos("I004",1,"IT34",-3.2777,14.3607,0.0,idrotm[321],"ONLY");
-  gMC->Gspos("I004",14,"IT34",3.4113,14.9456,0.0,idrotm[305],"ONLY");
-  gMC->Gspos("I004",13,"IT34",9.184,11.5164,0.0,idrotm[306],"ONLY");
-  gMC->Gspos("I004",12,"IT34",13.8119,6.6514,0.0,idrotm[307],"ONLY");
-  gMC->Gspos("I004",11,"IT34",14.73,0.0,0.0,idrotm[356],"ONLY");
-  gMC->Gspos("I004",10,"IT34",13.8119,-6.6514,0.0,idrotm[308],"ONLY");
-  gMC->Gspos("I004",9,"IT34",9.184,-11.5164,0.0,idrotm[309],"ONLY");
-  gMC->Gspos("I004",8,"IT34",3.4112,-14.9456,0.0,idrotm[386],"ONLY");
-  gMC->Gspos("I004",7,"IT34",-3.2777,-14.3607,0.0,idrotm[310],"ONLY");
-  gMC->Gspos("I024",3,"I048",-0.0001,0.0,31.925,0,"ONLY");
-  gMC->Gspos("I024",4,"I048",-0.0001,0.0,-31.925,idrotm[355],"ONLY");
-  gMC->Gspos("I018",14,"I048",-0.0001,0.0,-25.55,0,"ONLY");
-  gMC->Gspos("I018",13,"I048",-0.0001,0.0,-18.25,0,"ONLY");
-  gMC->Gspos("I018",12,"I048",-0.0001,0.0,-10.95,0,"ONLY");
-  gMC->Gspos("I018",11,"I048",-0.0001,0.0,25.55,0,"ONLY");
-  gMC->Gspos("I018",10,"I048",-0.0001,0.0,18.25,0,"ONLY");
-  gMC->Gspos("I018",9,"I048",-0.0001,0.0,10.95,0,"ONLY");
-  gMC->Gspos("I018",8,"I048",-0.0001,0.0,3.65,0,"ONLY");
-  gMC->Gspos("I018",7,"I048",-0.0001,0.0,-3.65,0,"ONLY");
-  gMC->Gspos("I402",5,"I005",0.0,-0.115,-3.55,0,"ONLY");
-  gMC->Gspos("I402",4,"I005",0.0,0.115,3.85,0,"ONLY");
-  gMC->Gspos("I402",2,"I005",0.0,0.115,18.75,0,"ONLY");
-  gMC->Gspos("I402",3,"I005",0.0,-0.115,11.15,0,"ONLY");
-  gMC->Gspos("I402",1,"I005",0.0,-0.115,25.9,0,"ONLY");
-  gMC->Gspos("I402",6,"I005",0.0,0.115,-11.05,0,"ONLY");
-  gMC->Gspos("I402",7,"I005",0.0,-0.115,-18.3,0,"ONLY");
-  gMC->Gspos("I402",8,"I005",0.0,0.115,-25.9,0,"ONLY");  
-  gMC->Gspos("I024",1,"I047",0.0,0.0,24.625,0,"ONLY");  
-  gMC->Gspos("I018",4,"I047",0.0,0.0,-3.65,0,"ONLY");
-  gMC->Gspos("I018",5,"I047",0.0,0.0,-10.95,0,"ONLY");
-  gMC->Gspos("I018",6,"I047",0.0,0.0,-18.25,0,"ONLY");
-  gMC->Gspos("I018",1,"I047",0.0,0.0,3.65,0,"ONLY");
-  gMC->Gspos("I018",2,"I047",0.0,0.0,10.95,0,"ONLY");
-  gMC->Gspos("I018",3,"I047",0.0,0.0,18.25,0,"ONLY");
-  gMC->Gspos("I024",2,"I047",0.0,0.0,-24.625,idrotm[355],"ONLY");
-  gMC->Gspos("I302",4,"I004",0.0,-0.115,-3.7,0,"ONLY");
-  gMC->Gspos("I302",3,"I004",0.0,0.115,3.7,0,"ONLY");
-  gMC->Gspos("I302",6,"I004",0.0,-0.115,-18.35,0,"ONLY");
-  gMC->Gspos("I302",5,"I004",0.0,0.115,-11.2,0,"ONLY");
-  gMC->Gspos("I302",2,"I004",0.0,-0.115,10.95,0,"ONLY");
-  gMC->Gspos("I302",1,"I004",0.0,0.115,18.55,0,"ONLY");
-  gMC->Gspos("I025",2,"I024",1.987,-1.5842,0.0,idrotm[343],"ONLY");
-  gMC->Gspos("I026",2,"I024",1.8824,-1.7349,0.0,idrotm[344],"ONLY");
-  gMC->Gspos("I025",1,"I024",-1.9,-1.7349,0.0,idrotm[344],"ONLY");
-  gMC->Gspos("I026",1,"I024",-1.9782,-1.5689,0.0,idrotm[342],"ONLY");
-  gMC->Gspos("I026",3,"I024",0.0958,1.6914,0.0,idrotm[343],"ONLY");
-  gMC->Gspos("I025",3,"I024",-0.087,1.7067,0.0,idrotm[342],"ONLY");
-  gMC->Gspos("I021",10,"I024",1.0761,0.0836,1.7742,idrotm[337],"ONLY");
-  gMC->Gspos("I021",9,"I024",-1.0761,0.0836,1.7742,idrotm[339],"ONLY");
-  gMC->Gspos("I021",12,"I024",1.0761,0.0836,-0.1242,idrotm[340],"ONLY");
-  gMC->Gspos("I021",11,"I024",-1.0761,0.0836,-0.1242,idrotm[338],"ONLY");
-  gMC->Gspos("I021",13,"I024",-1.0761,0.0836,-1.8758,idrotm[339],"ONLY");
-  gMC->Gspos("I021",14,"I024",1.0761,0.0836,-1.8758,idrotm[337],"ONLY");
-  gMC->Gspos("I023",3,"I024",0.0,-1.7899,-1.0,idrotm[341],"ONLY");
-  gMC->Gspos("I022",3,"I024",0.0,-1.7899,0.825,idrotm[312],"ONLY");
-  gMC->Gspos("I028",1,"I024",0.0,-1.7999,1.875,0,"MANY");
-  gMC->Gspos("I029",1,"I024",0.0,-0.9999,2.65,0,"ONLY");
-  gMC->Gspos("I030",1,"I024",0.0,0.6001,2.65,idrotm[344],"ONLY");
-  gMC->Gspos("I027",1,"I024",0.0,0.0001,1.9965,idrotm[352],"ONLY");
-  gMC->Gspos("I032",1,"I024",1.7,-0.4999,0.0,0,"ONLY");
-  gMC->Gspos("I031",1,"I024",1.7,-0.4999,0.0,0,"ONLY");
-  gMC->Gspos("I031",2,"I024",-1.7,-0.4999,0.0,0,"ONLY");
-  gMC->Gspos("I032",2,"I024",-1.7,-0.4999,0.0,0,"ONLY");
-  gMC->Gspos("I046",6,"I024",-0.616,1.1702,0.0,idrotm[353],"ONLY");
-  gMC->Gspos("I046",5,"I024",-0.566,1.1702,0.0,idrotm[353],"ONLY");
-  gMC->Gspos("I046",4,"I024",0.616,1.1702,0.0,idrotm[354],"ONLY");
-  gMC->Gspos("I046",3,"I024",0.566,1.1702,0.0,idrotm[354],"ONLY");
-  gMC->Gspos("I046",2,"I024",0.516,1.1702,0.0,idrotm[354],"ONLY");
-  gMC->Gspos("I046",1,"I024",-0.516,1.1702,0.0,idrotm[353],"ONLY");
-  gMC->Gspos("I022",2,"I018",0.0,-1.79,-0.1,idrotm[312],"ONLY");
-  gMC->Gspos("I021",8,"I018",1.0761,0.0835,0.8492,idrotm[337],"ONLY");
-  gMC->Gspos("I021",7,"I018",-1.0761,0.0835,2.6008,idrotm[338],"ONLY");
-  gMC->Gspos("I021",6,"I018",-1.0761,0.0835,0.8492,idrotm[339],"ONLY");
-  gMC->Gspos("I021",5,"I018",1.0761,0.0835,-1.0492,idrotm[340],"ONLY");
-  gMC->Gspos("I021",4,"I018",1.0761,0.0835,-2.8008,idrotm[337],"ONLY");
-  gMC->Gspos("I021",3,"I018",-1.0761,0.0835,-1.0492,idrotm[338],"ONLY");
-  gMC->Gspos("I021",2,"I018",-1.0761,0.0835,-2.8008,idrotm[339],"ONLY");
-  gMC->Gspos("I023",2,"I018",0.0,-1.79,-1.925,idrotm[341],"ONLY");
-  gMC->Gspos("I019",3,"I018",-0.087,1.7066,0.0,idrotm[342],"ONLY");
-  gMC->Gspos("I020",3,"I018",0.0958,1.6913,0.0,idrotm[343],"ONLY");
-  gMC->Gspos("I019",2,"I018",1.987,-1.5843,0.0,idrotm[343],"ONLY");
-  gMC->Gspos("I020",2,"I018",1.8824,-1.735,0.0,idrotm[344],"ONLY");
-  gMC->Gspos("I022",1,"I018",0.0,-1.79,3.55,idrotm[312],"ONLY");
-  gMC->Gspos("I021",1,"I018",1.0761,0.0835,2.6008,idrotm[340],"ONLY");
-  gMC->Gspos("I023",1,"I018",0.0,-1.79,1.725,idrotm[341],"ONLY");
-  gMC->Gspos("I019",1,"I018",-1.9,-1.735,0.0,idrotm[344],"ONLY");
-  gMC->Gspos("I020",1,"I018",-1.9782,-1.569,0.0,idrotm[342],"ONLY");
-  gMC->Gspos("I033",1,"I018",1.8,-1.75,1.35,0,"MANY");
-  gMC->Gspos("I033",4,"I018",1.8,-1.75,-2.65,0,"MANY");
-  gMC->Gspos("I033",2,"I018",-1.8,-1.75,-2.65,idrotm[345],"MANY");
-  gMC->Gspos("I033",3,"I018",-1.8,-1.75,1.35,idrotm[345],"MANY");
-  gMC->Gspos("I036",1,"I018",0.3087,1.7191,3.56,idrotm[346],"ONLY");
-  gMC->Gspos("I036",4,"I018",-0.3087,1.7191,3.56,idrotm[347],"ONLY");
-  gMC->Gspos("I036",2,"I018",0.3087,1.7191,-0.11,idrotm[346],"ONLY");
-  gMC->Gspos("I036",3,"I018",-0.3087,1.7191,-0.11,idrotm[347],"ONLY");
-  gMC->Gspos("I034",1,"I018",1.6,-1.775,1.35,idrotm[312],"ONLY");
-  gMC->Gspos("I034",4,"I018",1.6,-1.775,-2.65,idrotm[312],"ONLY");
-  gMC->Gspos("I034",2,"I018",-1.6,-1.775,-2.65,idrotm[348],"ONLY");
-  gMC->Gspos("I034",3,"I018",-1.6,-1.775,1.35,idrotm[348],"ONLY");
-  gMC->Gspos("I035",2,"I018",-1.7,-0.55,2.8581,idrotm[345],"MANY");
-  gMC->Gspos("I035",1,"I018",1.7,-0.55,2.8581,0,"MANY");
-  gMC->Gspos("I045",1,"I018",0.7483,0.9337,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I045",2,"I018",0.7065,0.9337,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I045",3,"I018",-0.7483,0.9337,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I045",4,"I018",-0.7065,0.9337,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I038",1,"I018",1.7,-0.55,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I037",1,"I018",1.7,-0.55,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I037",2,"I018",-1.7,-0.55,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I038",2,"I018",-1.7,-0.55,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I039",1,"I018",1.8126,-0.485,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I040",1,"I018",1.9204,-0.7118,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I041",1,"I018",1.7,-0.55,0.0,idrotm[346],"ONLY");
-  gMC->Gspos("I042",1,"I018",2.0342,-0.8189,3.12,idrotm[346],"ONLY");
-  gMC->Gspos("I042",2,"I018",2.0342,-0.8189,2.28,idrotm[346],"ONLY");
-  gMC->Gspos("I042",3,"I018",2.0342,-0.8189,1.38,idrotm[346],"ONLY");
-  gMC->Gspos("I042",4,"I018",2.0342,-0.8189,0.48,idrotm[346],"ONLY");
-  gMC->Gspos("I042",5,"I018",2.0342,-0.8189,-0.42,idrotm[346],"ONLY");
-  gMC->Gspos("I042",6,"I018",2.0342,-0.8189,-1.32,idrotm[346],"ONLY");
-  gMC->Gspos("I042",7,"I018",2.0342,-0.8189,-2.22,idrotm[346],"ONLY");
-  gMC->Gspos("I042",8,"I018",2.0342,-0.8189,-3.12,idrotm[346],"ONLY");
-  gMC->Gspos("I043",8,"I018",1.5592,0.0038,-3.15,idrotm[346],"ONLY");
-  gMC->Gspos("I043",7,"I018",1.5592,0.0038,-2.25,idrotm[346],"ONLY");
-  gMC->Gspos("I043",6,"I018",1.5592,0.0038,-1.35,idrotm[346],"ONLY");
-  gMC->Gspos("I043",5,"I018",1.5592,0.0038,-0.45,idrotm[346],"ONLY");
-  gMC->Gspos("I043",4,"I018",1.5592,0.0038,0.45,idrotm[346],"ONLY");
-  gMC->Gspos("I043",3,"I018",1.5592,0.0038,1.35,idrotm[346],"ONLY");
-  gMC->Gspos("I043",2,"I018",1.5592,0.0038,2.25,idrotm[346],"ONLY");
-  gMC->Gspos("I043",1,"I018",1.5592,0.0038,3.15,idrotm[346],"ONLY");
-  gMC->Gspos("I039",2,"I018",-1.8126,-0.485,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I041",2,"I018",-1.7,-0.55,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I040",2,"I018",-1.9204,-0.7118,0.0,idrotm[347],"ONLY");
-  gMC->Gspos("I043",16,"I018",-1.5592,0.0038,-3.15,idrotm[347],"ONLY");
-  gMC->Gspos("I042",9,"I018",-2.0342,-0.8189,-3.12,idrotm[347],"ONLY");
-  gMC->Gspos("I043",15,"I018",-1.5592,0.0038,-2.25,idrotm[347],"ONLY");
-  gMC->Gspos("I042",10,"I018",-2.0342,-0.8189,-2.22,idrotm[347],"ONLY");
-  gMC->Gspos("I042",11,"I018",-2.0342,-0.8189,-1.32,idrotm[347],"ONLY");
-  gMC->Gspos("I043",14,"I018",-1.5592,0.0038,-1.35,idrotm[347],"ONLY");
-  gMC->Gspos("I042",12,"I018",-2.0342,-0.8189,-0.42,idrotm[347],"ONLY");
-  gMC->Gspos("I043",13,"I018",-1.5592,0.0038,-0.45,idrotm[347],"ONLY");
-  gMC->Gspos("I043",12,"I018",-1.5592,0.0038,0.45,idrotm[347],"ONLY");
-  gMC->Gspos("I043",11,"I018",-1.5592,0.0038,1.35,idrotm[347],"ONLY");
-  gMC->Gspos("I043",10,"I018",-1.5592,0.0038,2.25,idrotm[347],"ONLY");
-  gMC->Gspos("I043",9,"I018",-1.5592,0.0038,3.15,idrotm[347],"ONLY");
-  gMC->Gspos("I042",16,"I018",-2.0342,-0.8189,3.12,idrotm[347],"ONLY");
-  gMC->Gspos("I042",15,"I018",-2.0342,-0.8189,2.28,idrotm[347],"ONLY");
-  gMC->Gspos("I042",14,"I018",-2.0342,-0.8189,1.38,idrotm[347],"ONLY");
-  gMC->Gspos("I042",13,"I018",-2.0342,-0.8189,0.48,idrotm[347],"ONLY");
-  gMC->Gspos("I044",2,"I018",-2.7487,-1.3673,-0.2,idrotm[349],"ONLY");
-  gMC->Gspos("I044",1,"I018",2.7487,-1.3673,-0.2,idrotm[351],"ONLY");
-  gMC->Gspos("I303",1,"I302",1.8125,0.0,4.2605,idrotm[301],"ONLY");
-  gMC->Gspos("I303",2,"I302",-1.8125,0.0,4.2605,idrotm[302],"ONLY");
-  gMC->Gspos("I303",3,"I302",-1.8125,0.0,-4.2605,idrotm[303],"ONLY");
-  gMC->Gspos("I303",4,"I302",1.8125,0.0,-4.2605,idrotm[304],"ONLY");
-  gMC->Gspos("I403",1,"I402",1.8125,0.0,4.2605,idrotm[301],"ONLY");
-  gMC->Gspos("I403",2,"I402",-1.8125,0.0,4.2605,idrotm[302],"ONLY");
-  gMC->Gspos("I403",3,"I402",-1.8125,0.0,-4.2605,idrotm[303],"ONLY");
-  gMC->Gspos("I403",4,"I402",1.8125,0.0,-4.2605,idrotm[304],"ONLY");
-  gMC->Gspos("ITS3",1,"I302",0.0,0.0,0.0,0,"ONLY");
-  gMC->Gspos("ITS4",1,"I402",0.0,0.0,0.0,0,"ONLY");
+  // -- position SDD detectors of ladder 3 / layer 3
+
+  gMC->Gspos("ITS3", 1,"I302",  0.0,      0.0,    0.0,    0,           "ONLY");
+  ySDD = Y_SDD_sep/2.+I302dits[1];
+  for (iSDD=0; iSDD<6; iSDD++) {
+    gMC->Gspos("I302", iSDD+1, "I004",  0.0, ySDD,  Z_SDD_lay3[iSDD], 0, "ONLY");
+    ySDD = -ySDD;
+  }
+
+  gMC->Gspos("I004", 1,"IT34", -3.2777,  14.3607, 0.0,   idrotm[321],"ONLY");
+  gMC->Gspos("I004", 2,"IT34", -9.5581,  11.9855, 0.0,   idrotm[333],"ONLY");
+  gMC->Gspos("I004", 3,"IT34",-13.2713,   6.3911, 0.0,   idrotm[336],"ONLY");
+  gMC->Gspos("I004", 4,"IT34",-15.33,     0.0,    0.0,   idrotm[350],"ONLY");
+  gMC->Gspos("I004", 5,"IT34",-13.2713,  -6.3911, 0.0,   idrotm[313],"ONLY");
+  gMC->Gspos("I004", 6,"IT34", -9.5581, -11.9855, 0.0,   idrotm[311],"ONLY");
+  gMC->Gspos("I004", 7,"IT34", -3.2777, -14.3607, 0.0,   idrotm[310],"ONLY");
+  gMC->Gspos("I004", 8,"IT34",  3.4112, -14.9456, 0.0,   idrotm[386],"ONLY");
+  gMC->Gspos("I004", 9,"IT34",  9.184,  -11.5164, 0.0,   idrotm[309],"ONLY");
+  gMC->Gspos("I004",10,"IT34", 13.8119,  -6.6514, 0.0,   idrotm[308],"ONLY");
+  gMC->Gspos("I004",11,"IT34", 14.73,     0.0,    0.0,   idrotm[356],"ONLY");
+  gMC->Gspos("I004",12,"IT34", 13.8119,   6.6514, 0.0,   idrotm[307],"ONLY");
+  gMC->Gspos("I004",13,"IT34",  9.184,   11.5164, 0.0,   idrotm[306],"ONLY");
+  gMC->Gspos("I004",14,"IT34",  3.4113,  14.9456, 0.0,   idrotm[305],"ONLY");
+
+
+  // -- position SDD detectors of ladder 4 / layer 4
+
+  gMC->Gspos("ITS4", 1,"I402",  0.0,      0.000,  0.0,   0,"ONLY");
+  ySDD = -(Y_SDD_sep/2.+I402dits[1]);
+  for (iSDD=0; iSDD<8; iSDD++) {
+    gMC->Gspos("I402", iSDD+1, "I005",  0.0, ySDD,  Z_SDD_lay4[iSDD], 0, "ONLY");
+    ySDD = -ySDD;
+  }
+  
+  gMC->Gspos("I005", 1,"IT34", -3.3629,  23.3895,-0.15,  idrotm[335],"ONLY");
+  gMC->Gspos("I005", 2,"IT34",-10.0447,  21.9949,-0.15,  idrotm[332],"ONLY");
+  gMC->Gspos("I005", 3,"IT34",-15.4744,  17.8584,-0.15,  idrotm[331],"ONLY");
+  gMC->Gspos("I005", 4,"IT34",-20.3415,  13.0727,-0.15,  idrotm[366],"ONLY");
+  gMC->Gspos("I005", 5,"IT34",-22.6728,   6.6573,-0.15,  idrotm[330],"ONLY");
+  gMC->Gspos("I005", 6,"IT34",-24.18,     0.0,   -0.15,  idrotm[350],"ONLY");
+  gMC->Gspos("I005", 7,"IT34",-22.6728,  -6.6573,-0.15,  idrotm[329],"ONLY");
+  gMC->Gspos("I005", 8,"IT34",-20.3415, -13.0727,-0.15,  idrotm[328],"ONLY");
+  gMC->Gspos("I005", 9,"IT34",-15.4744, -17.8584,-0.15,  idrotm[327],"ONLY");
+  gMC->Gspos("I005",10,"IT34",-10.0447, -21.9949,-0.15,  idrotm[326],"ONLY");
+  gMC->Gspos("I005",11,"IT34", -3.3629, -23.3895,-0.15,  idrotm[325],"ONLY");
+  gMC->Gspos("I005",12,"IT34",  3.4412, -23.9339,-0.15,  idrotm[324],"ONLY");
+  gMC->Gspos("I005",13,"IT34",  9.8163, -21.4946,-0.15,  idrotm[323],"ONLY");
+  gMC->Gspos("I005",14,"IT34", 15.8345, -18.274, -0.15,  idrotm[322],"ONLY");
+  gMC->Gspos("I005",15,"IT34", 19.8788, -12.7753,-0.15,  idrotm[320],"ONLY");
+  gMC->Gspos("I005",16,"IT34", 23.2005,  -6.8123,-0.15,  idrotm[319],"ONLY");
+  gMC->Gspos("I005",17,"IT34", 23.63,     0.0,   -0.15,  idrotm[318],"ONLY");
+  gMC->Gspos("I005",18,"IT34", 23.2005,   6.8123,-0.15,  idrotm[317],"ONLY");
+  gMC->Gspos("I005",19,"IT34", 19.8788,  12.7753,-0.15,  idrotm[316],"ONLY");
+  gMC->Gspos("I005",20,"IT34", 15.8345,  18.274, -0.15,  idrotm[315],"ONLY");
+  gMC->Gspos("I005",21,"IT34",  9.8163,  21.4946,-0.15,  idrotm[314],"ONLY");
+  gMC->Gspos("I005",22,"IT34",  3.4412,  23.9339,-0.15,  idrotm[334],"ONLY");
+
+
+  // -- build block of the SDD ladder frame holding the electronics
+
+  gMC->Gspos("I019", 1,"I018", -1.9,     -1.735,  0.0, idrotm[344], "ONLY");
+  gMC->Gspos("I019", 2,"I018",  1.987,   -1.5843, 0.0, idrotm[343], "ONLY");
+  gMC->Gspos("I019", 3,"I018", -0.087,    1.7066, 0.0, idrotm[342], "ONLY");
+
+  gMC->Gspos("I020", 1,"I018", -1.9782,  -1.569,  0.0, idrotm[342], "ONLY");
+  gMC->Gspos("I020", 2,"I018",  1.8824,  -1.735,  0.0, idrotm[344], "ONLY");
+  gMC->Gspos("I020", 3,"I018",  0.0958,   1.6913, 0.0, idrotm[343], "ONLY");
+
+  gMC->Gspos("I021", 1,"I018",  1.0761,   0.0835, 2.6008, idrotm[340], "ONLY");
+  gMC->Gspos("I021", 2,"I018", -1.0761,   0.0835,-2.8008, idrotm[339], "ONLY");
+  gMC->Gspos("I021", 3,"I018", -1.0761,   0.0835,-1.0492, idrotm[338], "ONLY");
+  gMC->Gspos("I021", 4,"I018",  1.0761,   0.0835,-2.8008, idrotm[337], "ONLY");
+  gMC->Gspos("I021", 5,"I018",  1.0761,   0.0835,-1.0492, idrotm[340], "ONLY");
+  gMC->Gspos("I021", 6,"I018", -1.0761,   0.0835, 0.8492, idrotm[339], "ONLY");
+  gMC->Gspos("I021", 7,"I018", -1.0761,   0.0835, 2.6008, idrotm[338], "ONLY");
+  gMC->Gspos("I021", 8,"I018",  1.0761,   0.0835, 0.8492, idrotm[337], "ONLY");
+
+  gMC->Gspos("I022", 1,"I018",  0.0,     -1.79,   3.55,   idrotm[312], "ONLY");
+  gMC->Gspos("I022", 2,"I018",  0.0,     -1.79,  -0.1,    idrotm[312], "ONLY");
+
+  gMC->Gspos("I023", 1,"I018",  0.0,     -1.79,   1.725,  idrotm[341], "ONLY");
+  gMC->Gspos("I023", 2,"I018",  0.0,     -1.79,  -1.925,  idrotm[341], "ONLY");
+
+  gMC->Gspos("I033", 1,"I018",  1.8,     -1.75,   1.35,   0,           "MANY");
+  gMC->Gspos("I033", 2,"I018", -1.8,     -1.75,  -2.65,   idrotm[345], "MANY");
+  gMC->Gspos("I033", 3,"I018", -1.8,     -1.75,   1.35,   idrotm[345], "MANY");
+  gMC->Gspos("I033", 4,"I018",  1.8,     -1.75,  -2.65,   0,           "MANY");
+
+  gMC->Gspos("I034", 1,"I018",  1.6,     -1.775,  1.35,   idrotm[312], "ONLY");
+  gMC->Gspos("I034", 2,"I018", -1.6,     -1.775, -2.65,   idrotm[348], "ONLY");
+  gMC->Gspos("I034", 3,"I018", -1.6,     -1.775,  1.35,   idrotm[348], "ONLY");
+  gMC->Gspos("I034", 4,"I018",  1.6,     -1.775, -2.65,   idrotm[312], "ONLY");
+
+  gMC->Gspos("I035", 1,"I018",  1.7,     -0.55, I018dits[2]-I035dits[2], 0, "MANY");
+  gMC->Gspos("I035", 2,"I018", -1.7,     -0.55, I018dits[2]-I035dits[2], 0, "MANY");
+
+  gMC->Gspos("I036", 1,"I018",  0.3087,   1.7191, 3.56,   idrotm[346], "ONLY");
+  gMC->Gspos("I036", 2,"I018",  0.3087,   1.7191,-0.11,   idrotm[346], "ONLY");
+  gMC->Gspos("I036", 3,"I018", -0.3087,   1.7191,-0.11,   idrotm[347], "ONLY");
+  gMC->Gspos("I036", 4,"I018", -0.3087,   1.7191, 3.56,   idrotm[347], "ONLY");
+
+  gMC->Gspos("I037", 1,"I018",  SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 , "ONLY");
+  gMC->Gspos("I037", 2,"I018", -SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 , "ONLY");
+
+  gMC->Gspos("I038", 1,"I018",  SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 , "ONLY");
+  gMC->Gspos("I038", 2,"I018", -SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 , "ONLY");
+
+  gMC->Gspos("I040", 1,"I018",  1.9204,  -0.7118, 0.0, idrotm[346],"ONLY");
+  gMC->Gspos("I040", 2,"I018", -1.9204,  -0.7118, 0.0, idrotm[347],"ONLY");
+  gMC->Gspos("I041", 1,"I018",  SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], idrotm[346], "ONLY");
+  gMC->Gspos("I041", 2,"I018", -SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], idrotm[347], "ONLY");
+
+
+  // -- build block of the SDD electronics (heat bridge, chips, hybrid, anode microcable)
+
+  xI050 = SDD_CoolPipe[0]+SDD_CoolPipe[1]*sin30+I050dits[1]/cos30+I041dits[1];
+  yI050 = 0;
+  xI039 = -SDD_CoolPipe[1]/cos30;
+  yI039 = -I050dits[1]+I039dits[1];
+  gMC->Gspos("I039", 1,"I050",  xI039, yI039, 0.0, 0, "ONLY");
+  xI042 = xI039+I039dits[0]-xI042space-I042dits[0];
+  yI042 = yI039+I039dits[1]+I042dits[1];
+  xI043 = xI039-I039dits[0]+xI043space+I043dits[0];
+  yI043 = yI039+I039dits[1]+I043dits[1];
+  zChipSpace = I042dits[2];
+  if (zChipSpace < I043dits[2]) {
+    zChipSpace = I043dits[2];
+  }
+  zChipSpace = zChipSpace * 2;
+  yI051space = (2*I039dits[2] - 4*zChipSpace)/5;
+  zchip = -I039dits[2] + yI051space + zChipSpace/2.;
+  for (ichip=0; ichip<4; ichip++) { 
+    gMC->Gspos("I042", ichip+1, "I050", xI042, yI042, zchip, 0, "ONLY");
+    gMC->Gspos("I043", ichip+1, "I050", xI043, yI043, zchip, 0, "ONLY");
+    zchip += zChipSpace + yI051space;
+  }
+  xcap = 2*I039dits[0]/5.;
+  yI051 = yI039+I039dits[1]+I051dits[1];
+  zI051 = -I039dits[2] + yI051space/3.;
+  icap = 1;
+  for (ichip=0; ichip<5; ichip++) { 
+    xI051 = xI039-I039dits[0]+xcap;
+    gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    zI051 += yI051space/3.;
+    gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    xI051 += xcap;
+    gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    xI051 += xcap;
+    gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    xI051 += xcap;
+    gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    zI051 -= yI051space/3.;
+    if (ichip == 0) {
+      gMC->Gspos("I051", icap++,"I050", xI051, yI051, zI051, 0, "ONLY");
+    }
+    zI051 += zChipSpace + yI051space;
+  }
+  xI052 = -I050dits[0]+I052dits[0];
+  yI052 = yI051+I051dits[1]+I052dits[1];
+  gMC->Gspos("I052", 1,"I050", xI052, yI052, 0.0, 0, "ONLY");
+  xI044 = I050dits[0]-I044dits[3];
+  yI044 = yI052+I052dits[1]+I044dits[2];
+  gMC->Gspos("I044", 1,"I050", xI044, yI044, 0.0, idrotm[301], "ONLY");
+  gMC->Gspos("I050", 1,"I018",  xI050,  yI050,  0.0, idrotm[346],"ONLY");
+  gMC->Gspos("I050", 2,"I018", -xI050,  yI050,  0.0, idrotm[347],"ONLY");
+
+
+  // -- build block of the SDD ladder frame at the end ladders
+
+  gMC->Gspos("I021",12,"I024",  1.0761,   0.0836,-0.1242, idrotm[340], "ONLY");
+  gMC->Gspos("I021",11,"I024", -1.0761,   0.0836,-0.1242, idrotm[338], "ONLY");
+  gMC->Gspos("I021",13,"I024", -1.0761,   0.0836,-1.8758, idrotm[339], "ONLY");
+  gMC->Gspos("I021",14,"I024",  1.0761,   0.0836,-1.8758, idrotm[337], "ONLY");
+
+  gMC->Gspos("I022", 3,"I024",  0.0,     -1.7899, 0.825,  idrotm[312], "ONLY");
+
+  gMC->Gspos("I023", 3,"I024",  0.0,     -1.7899,-1.0,    idrotm[341], "ONLY");
+
+  gMC->Gspos("I025", 1,"I024", -1.9,     -1.7349, 0.0,    idrotm[344], "ONLY");
+  gMC->Gspos("I025", 2,"I024",  1.987,   -1.5842, 0.0,    idrotm[343], "ONLY");
+
+  gMC->Gspos("I026", 1,"I024", -1.9782,  -1.5689, 0.0,    idrotm[342], "ONLY");
+  gMC->Gspos("I026", 2,"I024",  1.8824,  -1.7349, 0.0,    idrotm[344], "ONLY");
+
+  gMC->Gspos("I029", 1,"I024", -0.087,    1.7067, I029dits[2]-I024dits[2], idrotm[342], "ONLY");
+
+  gMC->Gspos("I030", 1,"I024",  0.0958,   1.6914, I030dits[2]-I024dits[2], idrotm[343], "ONLY");
+
+  gMC->Gspos("I031", 1,"I024",  SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 ,"ONLY");
+  gMC->Gspos("I031", 2,"I024", -SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 ,"ONLY");
+
+  gMC->Gspos("I032", 1,"I024",  SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 ,"ONLY");
+  gMC->Gspos("I032", 2,"I024", -SDD_CoolPipe[0], SDD_CoolPipe[1], SDD_CoolPipe[2], 0 ,"ONLY");
+
+
+  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, 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");
+
+
+  // -- build the SDD ladder 3
+
+  indI425 = 1;
+  gMC->Gspos("I024", 1,"I047",  0.0,      0.0,   24.625, 0,           "ONLY");  
+  gMC->Gspos("I018", 1,"I047",  0.0,      0.0,    3.65,  0,           "ONLY");
+  gMC->Gspos("I018", 2,"I047",  0.0,      0.0,   10.95,  0,           "ONLY");
+  gMC->Gspos("I018", 3,"I047",  0.0,      0.0,   18.25,  0,           "ONLY");
+  gMC->Gspos("I018", 4,"I047",  0.0,      0.0,   -3.65,  0,           "ONLY");
+  gMC->Gspos("I018", 5,"I047",  0.0,      0.0,  -10.95,  0,           "ONLY");
+  gMC->Gspos("I018", 6,"I047",  0.0,      0.0,  -18.25,  0,           "ONLY");
+  gMC->Gspos("I024", 2,"I047",  0.0,      0.0,  -24.625, idrotm[355], "ONLY");
+  HVname[0] = 'I';
+  HVname[1] = '3';
+  HVname[2] = '1';  
+  HVname[4] = '\0';
+  for (iSDD=0; iSDD<3; iSDD++) {
+    HVname[3] = (Char_t)(48+iSDD+5);
+    dits[0] = 1.350000;
+    dits[1] = I425dits[1];
+    dits[2] = (I047dits[2] - 2*I024dits[2] - Z_SDD_lay3[iSDD])/2.;
+    gMC->Gsvolu(HVname, "BOX ", idtmed[279], dits, 3);
+    xHV = 0.0;
+    yHV = -I047dits[1] + (2*iSDD+1)*dits[1];
+    zHV = I047dits[2] - 2*I024dits[2] - dits[2];
+    gMC->Gspos(HVname, 1,"I047", xHV, yHV,  zHV, 0, "ONLY");
+    gMC->Gspos(HVname, 2,"I047", xHV, yHV, -zHV, 0, "ONLY");
+    gMC->Gspos("I425", indI425++,"I047",  xI424, yHV,   24.625, 0, "ONLY");
+    gMC->Gspos("I425", indI425++,"I047", -xI424, yHV,  -24.625, 0, "ONLY");
+  }
+  LVname[0] = 'I';
+  LVname[1] = '3';
+  LVname[2] = '1';  
+  LVname[4] = '\0';
+  for (iSDD=0; iSDD<3; iSDD++) {
+    LVname[3] = (Char_t)(48+iSDD+1);
+    dits[0] = 1.350000;
+    dits[1] = 0.004423;
+    dits[2] = (I047dits[2] - (2*iSDD+1)*I018dits[2] - I039dits[2])/2.;
+    gMC->Gsvolu(LVname, "BOX ", idtmed[280], dits, 3);
+    yLV = I018dits[1] - dits[0]*cos30 - dits[1]*sin30;
+    xLV = xI050 -
+          fabs(yI050-yLV)*sin30/cos30 +
+          (I050dits[1]+(2*iSDD+1)*dits[1])/cos30;
+    zLV = I047dits[2] - dits[2];
+    gMC->Gspos(LVname, 1,"I047",  xLV, yLV,  zLV, idrotm[346], "ONLY");
+    gMC->Gspos(LVname, 2,"I047",  xLV, yLV, -zLV, idrotm[346], "ONLY");
+    gMC->Gspos(LVname, 3,"I047", -xLV, yLV,  zLV, idrotm[347], "ONLY");
+    gMC->Gspos(LVname, 4,"I047", -xLV, yLV, -zLV, idrotm[347], "ONLY");
+  }
+
+
+  // -- build the SDD ladder 4
+
+
+  gMC->Gspos("I024", 3,"I048", -0.0001,   0.0,   31.925, 0,           "ONLY");
+  gMC->Gspos("I018", 7,"I048", -0.0001,   0.0,   -3.65,  0,           "ONLY");
+  gMC->Gspos("I018", 8,"I048", -0.0001,   0.0,    3.65,  0,           "ONLY");
+  gMC->Gspos("I018", 9,"I048", -0.0001,   0.0,   10.95,  0,           "ONLY");
+  gMC->Gspos("I018",10,"I048", -0.0001,   0.0,   18.25,  0,           "ONLY");
+  gMC->Gspos("I018",11,"I048", -0.0001,   0.0,   25.55,  0,           "ONLY");
+  gMC->Gspos("I018",12,"I048", -0.0001,   0.0,  -10.95,  0,           "ONLY");
+  gMC->Gspos("I018",13,"I048", -0.0001,   0.0,  -18.25,  0,           "ONLY");
+  gMC->Gspos("I018",14,"I048", -0.0001,   0.0,  -25.55,  0,           "ONLY");
+  gMC->Gspos("I024", 4,"I048", -0.0001,   0.0,  -31.925, idrotm[355], "ONLY");
+  HVname[0] = 'I';
+  HVname[1] = '4';
+  HVname[2] = '1';  
+  HVname[4] = '\0';  
+  for (iSDD=0; iSDD<4; iSDD++) {
+    HVname[3] = (Char_t)(48+iSDD+5);
+    dits[0] = 1.350000;
+    dits[1] = I425dits[1];
+    dits[2] = (I048dits[2] - 2*I024dits[2] - Z_SDD_lay4[iSDD])/2.;
+    gMC->Gsvolu(HVname, "BOX ", idtmed[279], dits, 3);
+    xHV = -0.0001;
+    yHV = -I048dits[1] + (2*iSDD+1)*dits[1];
+    zHV = I048dits[2] - 2*I024dits[2] - dits[2];
+    gMC->Gspos(HVname, 1,"I048", xHV, yHV,  zHV, 0, "ONLY");
+    gMC->Gspos(HVname, 2,"I048", xHV, yHV, -zHV, 0, "ONLY");
+    gMC->Gspos("I425", indI425++,"I048",  xI424, yHV,   31.925, 0, "ONLY");
+    gMC->Gspos("I425", indI425++,"I048", -xI424, yHV,  -31.925, 0, "ONLY");
+  }
+  LVname[0] = 'I';
+  LVname[1] = '4';
+  LVname[2] = '1';  
+  LVname[4] = '\0';
+  for (iSDD=0; iSDD<4; iSDD++) {
+    LVname[3] = (Char_t)(48+iSDD+1);
+    dits[0] = 1.350000;
+    dits[1] = 0.004423;
+    dits[2] = (I048dits[2] - (2*iSDD+1)*I018dits[2] - I039dits[2])/2.;
+    gMC->Gsvolu(LVname, "BOX ", idtmed[280], dits, 3);
+    yLV = I018dits[1] - dits[0]*cos30 - dits[1]*sin30;
+    xLV = xI050 -
+          fabs(yI050-yLV)*sin30/cos30 +
+          (I050dits[1]+(2*iSDD+1)*dits[1])/cos30;
+    zLV = I048dits[2] - dits[2];
+    gMC->Gspos(LVname, 1,"I048",  xLV, yLV,  zLV, idrotm[346], "ONLY");
+    gMC->Gspos(LVname, 2,"I048",  xLV, yLV, -zLV, idrotm[346], "ONLY");
+    gMC->Gspos(LVname, 3,"I048", -xLV, yLV,  zLV, idrotm[347], "ONLY");
+    gMC->Gspos(LVname, 4,"I048", -xLV, yLV, -zLV, idrotm[347], "ONLY");
+  }
+
+
+  // -- build the SDD barrel (layers 3 and 4)
+
+  gMC->Gspos("I047", 1,"IT34", -3.7528,  16.4422, 0.0,   idrotm[321], "ONLY");
+  gMC->Gspos("I047", 2,"IT34",-10.8892,  13.6547, 0.0,   idrotm[333], "ONLY");
+  gMC->Gspos("I047", 3,"IT34",-15.1948,   7.3175, 0.0,   idrotm[336], "ONLY");
+  gMC->Gspos("I047", 4,"IT34",-17.465,    0.0,    0.0,   idrotm[350], "ONLY");
+  gMC->Gspos("I047", 5,"IT34",-15.1948,  -7.3174, 0.0,   idrotm[313], "ONLY");
+  gMC->Gspos("I047", 6,"IT34",-10.8893, -13.6547, 0.0,   idrotm[311], "ONLY");
+  gMC->Gspos("I047", 7,"IT34", -3.7528, -16.4422, 0.0,   idrotm[310], "ONLY");
+  gMC->Gspos("I047", 8,"IT34",  3.8863, -17.0271, 0.0,   idrotm[386], "ONLY");
+  gMC->Gspos("I047", 9,"IT34", 10.5152, -13.1856, 0.0,   idrotm[309], "ONLY");
+  gMC->Gspos("I047",10,"IT34", 15.7354,  -7.5778, 0.0,   idrotm[308], "ONLY");
+  gMC->Gspos("I047",11,"IT34", 16.865,    0.0,    0.0,   idrotm[356], "ONLY");
+  gMC->Gspos("I047",12,"IT34", 15.7354,   7.5778, 0.0,   idrotm[307], "ONLY");
+  gMC->Gspos("I047",13,"IT34", 10.5152,  13.1856, 0.0,   idrotm[306], "ONLY");
+  gMC->Gspos("I047",14,"IT34",  3.8863,  17.0271, 0.0,   idrotm[305], "ONLY");
+
+  gMC->Gspos("I048", 1,"IT34", -3.6667,  25.5027, 0.0,   idrotm[335], "ONLY");
+  gMC->Gspos("I048", 2,"IT34",-10.9317,  23.937,  0.0,   idrotm[332], "ONLY");
+  gMC->Gspos("I048", 3,"IT34",-16.8725,  19.4719, 0.0,   idrotm[331], "ONLY");
+  gMC->Gspos("I048", 4,"IT34",-22.1376,  14.227,  0.0,   idrotm[366], "ONLY");
+  gMC->Gspos("I048", 5,"IT34",-24.7213,   7.2588, 0.0,   idrotm[330], "ONLY");
+  gMC->Gspos("I048", 6,"IT34",-26.315,    0.0,    0.0,   idrotm[350], "ONLY");
+  gMC->Gspos("I048", 7,"IT34",-24.7213,  -7.2588, 0.0,   idrotm[329], "ONLY");
+  gMC->Gspos("I048", 8,"IT34",-22.1376, -14.227,  0.0,   idrotm[328], "ONLY");
+  gMC->Gspos("I048", 9,"IT34",-16.8725, -19.4719, 0.0,   idrotm[327], "ONLY");
+  gMC->Gspos("I048",10,"IT34",-10.9316, -23.937,  0.0,   idrotm[326], "ONLY");
+  gMC->Gspos("I048",11,"IT34", -3.6667, -25.5027, 0.0,   idrotm[325], "ONLY");
+  gMC->Gspos("I048",12,"IT34",  3.745,  -26.0472, 0.0,   idrotm[324], "ONLY");
+  gMC->Gspos("I048",13,"IT34", 10.7032, -23.4367, 0.0,   idrotm[323], "ONLY");
+  gMC->Gspos("I048",14,"IT34", 17.2327, -19.8876, 0.0,   idrotm[322], "ONLY");
+  gMC->Gspos("I048",15,"IT34", 21.6749, -13.9296, 0.0,   idrotm[320], "ONLY");
+  gMC->Gspos("I048",16,"IT34", 25.2491,  -7.4138, 0.0,   idrotm[319], "ONLY");
+  gMC->Gspos("I048",17,"IT34", 25.765,    0.0,    0.0,   idrotm[318], "ONLY");
+  gMC->Gspos("I048",18,"IT34", 25.2491,   7.4138, 0.0,   idrotm[317], "ONLY");
+  gMC->Gspos("I048",19,"IT34", 21.6749,  13.9296, 0.0,   idrotm[316], "ONLY");
+  gMC->Gspos("I048",20,"IT34", 17.2327,  19.8876, 0.0,   idrotm[315], "ONLY");
+  gMC->Gspos("I048",21,"IT34", 10.7032,  23.4367, 0.0,   idrotm[314], "ONLY");
+  gMC->Gspos("I048",22,"IT34", 3.745,    26.0472, 0.0,   idrotm[334], "ONLY");
 
   
   // --- Place SSD volumes into their mother volume IT56  
@@ -4425,10 +4014,10 @@ void AliITSvPPRasymm::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 ---------------------------------- 
@@ -4436,27 +4025,26 @@ void AliITSvPPRasymm::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");
@@ -4475,10 +4063,10 @@ void AliITSvPPRasymm::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");
@@ -4540,59 +4128,54 @@ void AliITSvPPRasymm::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
@@ -4609,219 +4192,270 @@ void AliITSvPPRasymm::CreateGeometry(){
   
 
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
-  
-  dgh[0] = 45.;
-  dgh[1] = 45.+1.0;
+  //     UPPER PART
+
+  dgh[0] = 46.;    
+  dgh[1] = 46.+1.0;  
   dgh[2] = 9.5;
+  dgh[3] = 12.;
+  dgh[4] = 168.;
+  
+  gMC->Gsvolu("I1CU", "TUBS", idtmed[213], dgh, 5);  
+  gMC->Gspos("I1CU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("I1CU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");
   
-  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");
+  // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
+  //     LOWER PART
+
+  dgh[0] = 46.;    
+  dgh[1] = 46.+1.0;  
+  dgh[2] = 9.5;
+  dgh[3] = 192.;
+  dgh[4] = 348.;
   
+  gMC->Gsvolu("I2CU", "TUBS", idtmed[213], dgh, 5);  
+  gMC->Gspos("I2CU", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("I2CU", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");
+
+
   // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
+  //     UPPER PART
   
-  dgh[0] = 45.+1.0;
-  dgh[1] = 45.+1.0+1.5;
+  dgh[0] = 46.+1.0;  
+  dgh[1] = 46.+1.0+1.5;   
   dgh[2] = 9.5;
+  dgh[3] = 12.;
+  dgh[4] = 168.;
+  
+  gMC->Gsvolu("I1CC", "TUBS", idtmed[225], dgh, 5);  
+  gMC->Gspos("I1CC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("I1CC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");  
+  
+  // --- DEFINE CABLES AT THE END OF THE ITS CONES - CARBON PART
+  //     LOWER PART
   
-  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");  
+  dgh[0] = 46.+1.0;  
+  dgh[1] = 46.+1.0+1.5;   
+  dgh[2] = 9.5;
+  dgh[3] = 192.;
+  dgh[4] = 348.;
   
+  gMC->Gsvolu("I2CC", "TUBS", idtmed[225], dgh, 5);  
+  gMC->Gspos("I2CC", 1, "ITSV", 0., 0., 83.5, 0, "ONLY");
+  gMC->Gspos("I2CC", 2, "ITSV", 0., 0., -83.5, idrotm[200], "ONLY");  
+
+
   // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
+  //     UPPER PART
   
-  dgh[0] = 45.;
+  dgh[0] = 46.;  
   dgh[1] = 56.;
   dgh[2] = 2.25;
+  dgh[3] = 12.;
+  dgh[4] = 168.;
+  
+  gMC->Gsvolu("IPA1", "TUBS", idtmed[210], dgh, 5);  
+  gMC->Gspos("IPA1", 1, "ITSV", 0., 0., 95.25, 0, "ONLY");  
+  gMC->Gspos("IPA1", 2, "ITSV", 0., 0., -95.25, idrotm[200], "ONLY"); 
+  
+  // --- DEFINE PATCH PANELS AT THE END OF THE ITS CONES
+  //     LOWER PART
   
-  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"); 
+  dgh[0] = 46.;  
+  dgh[1] = 56.;
+  dgh[2] = 2.25;
+  dgh[3] = 192.;
+  dgh[4] = 348.;
   
+  gMC->Gsvolu("IPA2", "TUBS", idtmed[210], dgh, 5);  
+  gMC->Gspos("IPA2", 1, "ITSV", 0., 0., 95.25, 0, "ONLY");  
+  gMC->Gspos("IPA2", 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] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+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[213], 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] = 45.2;
-  dgh[2] = 45.2+1.0;
-  dgh[3] = 61.8;
-  dgh[4] = 61.8+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[213], 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] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[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[225], 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] = 45.2+1.0;
-  dgh[2] = 45.2+1.0+1.5;
-  dgh[3] = 61.8+1.0;
-  dgh[4] = 61.8+1.0+1.5;
+  dgh[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] = 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", 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.5;
+  dgh[0] = 62.1; 
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   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", 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.5;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   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", 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.5;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   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", 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.5;
+  dgh[0] = 62.1;  
   dgh[1] = 74.5;
   dgh[2] = 0.75;
   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", 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] = 45.;
-  dgh[1] = 45.+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[213], 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] = 45.;
-  dgh[1] = 45.+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[213], 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] = 45.+1.0;
-  dgh[1] = 45.+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[225], 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] = 45.+1.0;
-  dgh[1] = 45.+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[225], 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] = 45.;
+  dgh[0] = 46.;   
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 12.;
   dgh[4] = 168.;  
   gMC->Gsvolu("ICU7", "TUBS", idtmed[213], 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] = 45.;
+  dgh[0] = 46.; 
   dgh[1] = 74.5;
   dgh[2] = 0.5;
   dgh[3] = 192.;
   dgh[4] = 348.;   
   gMC->Gsvolu("ICU8", "TUBS", idtmed[213], 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] = 45.+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[225], 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] = 45.+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[225], 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
   
@@ -4831,7 +4465,7 @@ void AliITSvPPRasymm::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
   
@@ -4841,25 +4475,81 @@ void AliITSvPPRasymm::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[210], 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[268], dgh, 3);
+     gMC->Gspos("IRA1", 1, "ITSV", 53.5, 0., -69.5, 0, "ONLY");   
+     gMC->Gsvolu("IRA2", "BOX ", idtmed[268], dgh, 3);    
+     gMC->Gspos("IRA2", 1, "ITSV", -53.5, 0., -69.5, 0, "ONLY");    
+
+     dgh[0] = 2.-0.5;    // 0.5 was determined in such a way that the aluminum area is 20.9 cm^2      
+     dgh[1] = 8.-0.5;    // 0.5 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;    
   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., 74.1, 0, "ONLY");   
+  gMC->Gspos("ICYL", 2, "ALIC", 0., 0., -74.1, 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 
   
@@ -4867,8 +4557,6 @@ void AliITSvPPRasymm::CreateGeometry(){
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
 
-
-
 }
 //_____________________________________________________________________________
 void AliITSvPPRasymm::CreateMaterials(){
@@ -4887,7 +4575,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);
@@ -4903,15 +4597,15 @@ void AliITSvPPRasymm::CreateMaterials(){
   AliMedium(4,"C (M55J)$",4,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
   AliMaterial(5,"AIR$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
-  AliMedium(5,"AIR$",5,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+  AliMedium(5,"AIR$",5,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
 
-  AliMaterial(6,"GEN AIR$",0.14610E+02,0.73000E+01,0.12050E02,0.30423E+05,0.99900E+03);
+  AliMaterial(6,"GEN AIR$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
   AliMedium(6,"GEN AIR$",6,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
 
-  AliMaterial(7,"SDD SI CHIP$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
+  AliMaterial(7,"SDD SI CHIP$",0.374952E+02,0.178184E+02,0.24485E+01,0.76931E+01,0.99900E+03);
   AliMedium(7,"SDD SI CHIP$",7,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
-  AliMaterial(9,"SDD C (M55J)$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
+  AliMaterial(9,"SDD C (M55J)$",0.123565E+02,0.64561E+01,0.18097E+01,0.229570E+02,0.99900E+03);
   AliMedium(9,"SDD C (M55J)$",9,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
   AliMaterial(10,"SDD AIR$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
@@ -4923,6 +4617,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);
 
@@ -4977,10 +4674,10 @@ 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.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.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
+  AliMaterial(69,"SDD C AL (M55J)$",0.138802E+02,0.71315E+01,0.19837E+01,0.176542E+02,0.99900E+03);
   AliMedium(69,"SDD C AL (M55J)$",69,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
 
   AliMaterial(70,"SDDKAPTON (POLYCH2)$",0.14000E+02,0.71770E+01,0.13000E+01,0.31270E+02,0.99900E+03);
@@ -5003,13 +4700,41 @@ void AliITSvPPRasymm::CreateMaterials(){
 
   AliMaterial(76,"SPDBUS(AL+KPT+EPOX)$",0.19509E+02,0.96502E+01,0.19060E+01,0.15413E+02,0.99900E+03);
   AliMedium(76,"SPDBUS(AL+KPT+EPOX)$",76,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+               
+  AliMaterial(77,"SDD X7R capacitors$",0.1157516E+03,0.477056E+02,0.67200E+01,0.14236E+01,0.99900E+03);
+  AliMedium(77,"SDD X7R capacitors$",77,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(78,"SDD ruby sph. Al2O3$",0.218101E+02,0.106467E+02,0.39700E+01,0.48539E+01,0.99900E+03);
+  AliMedium(78,"SDD ruby sph. Al2O3$",78,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(79,"SDD SI insensitive$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
+  AliMedium(79,"SDD SI insensitive$",79,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(80,"SDD HV microcable$",0.159379E+02,0.78598E+01,0.16087E+01,0.217906E+02,0.99900E+03);
+  AliMedium(80,"SDD HV microcable$",80,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(81,"SDD LV+signal cable$",0.223689E+02,0.108531+02,0.21035E+01,0.13440E+02,0.99900E+03);
+  AliMedium(81,"SDD LV+signal cable$",81,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  AliMaterial(82,"SDD hybrid microcab$",0.218254E+02,0.106001E+02,0.20502E+01,0.137308E+02,0.99900E+03);
+  AliMedium(82,"SDD hybrid microcab$",82,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
+
+  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);
   AliMedium(90,"SPD shield$",90, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
 
-  AliMaterial(91, "SPD End ladder$", 55.845, 26., 7.87/10., 1.76*10., 999); 
+  AliMaterial(91, "SPD End ladder$", 47.0447, 21.7963, 3.6374, 4.4711, 999); 
   AliMedium(91, "SPD End ladder$",91, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
 
   AliMaterial(92, "SPD cone$",28.0855, 14., 2.33, 9.36, 999);    
@@ -5040,7 +4765,7 @@ void AliITSvPPRasymm::InitAliITSgeom(){
     } // end if
     cout << "Reading Geometry transformation directly from Geant 3." << endl;
     const Int_t nlayers = 6;
-    const Int_t ndeep = 7;
+    const Int_t ndeep = 9;
     Int_t itsGeomTreeNames[nlayers][ndeep],lnam[20],lnum[20];
     Int_t nlad[nlayers],ndet[nlayers];
     Double_t t[3],r[10];
@@ -5048,20 +4773,45 @@ void AliITSvPPRasymm::InitAliITSgeom(){
     Int_t    npar,natt,idshape,imat,imed;
     AliITSGeant3Geometry *ig = new AliITSGeant3Geometry();
     Int_t mod,lay,lad,det,i,j,k;
-    char *names[nlayers][ndeep] = {
-     {"ALIC","ITSV","ITSD","IT12","I132","I131","ITS1"}, // lay=1
-     {"ALIC","ITSV","ITSD","IT12","I132","I186","ITS2"}, // lay=2
-     {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3"}, // lay=3
-     {"ALIC","ITSV","ITSD","IT34","I005","I402","ITS4"}, // lay=4
-     {"ALIC","ITSV","ITSD","IT56","I565","I562","ITS5"}, // lay=5
-     {"ALIC","ITSV","ITSD","IT56","I569","I566","ITS6"}};// lay=6
-    Int_t itsGeomTreeCopys[nlayers][ndeep] = {{1,1,1,1,10, 2, 4},// lay=1
-                                             {1,1,1,1,10, 4, 4},// lay=2
-                                             {1,1,1,1,14, 6, 1},// lay=3
-                                             {1,1,1,1,22, 8, 1},// lay=4
-                                             {1,1,1,1,34,22, 1},// lay=5
-                                             {1,1,1,1,38,25, 1}};//lay=6
-
+    Char_t names[nlayers][ndeep][4];
+    Int_t itsGeomTreeCopys[nlayers][ndeep];
+    if(fMinorVersion == 1){ // Option A
+    Char_t *namesA[nlayers][ndeep] = {
+     {"ALIC","ITSV","ITSD","IT12","I12A","I10A","I103","I101","ITS1"}, // lay=1
+     {"ALIC","ITSV","ITSD","IT12","I12A","I20A","I1D3","I1D1","ITS2"}, // lay=2
+     {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3","    ","    "}, // lay=3
+     {"ALIC","ITSV","ITSD","IT34","I005","I402","ITS4","    ","    "}, // lay=4
+     {"ALIC","ITSV","ITSD","IT56","I565","I562","ITS5","    ","    "}, // lay=5
+     {"ALIC","ITSV","ITSD","IT56","I569","I566","ITS6","    ","    "}};// lay=6
+    Int_t itsGeomTreeCopysA[nlayers][ndeep]= {{1,1,1,1,10, 2, 4,1,1},// lay=1
+                                             {1,1,1,1,10, 4, 4,1,1},// lay=2
+                                             {1,1,1,1,14, 6, 1,0,0},// lay=3
+                                             {1,1,1,1,22, 8, 1,0,0},// lay=4
+                                             {1,1,1,1,34,22, 1,0,0},// lay=5
+                                             {1,1,1,1,38,25, 1,0,0}};//lay=6
+    for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++){
+       for(k=0;k<4;k++) names[i][j][k] = namesA[i][j][k];
+       itsGeomTreeCopys[i][j] = itsGeomTreeCopysA[i][j];
+    } // end for i,j
+    }else if(fMinorVersion == 2){ // Option B
+    Char_t *namesB[nlayers][ndeep] = {
+     {"ALIC","ITSV","ITSD","IT12","I12B","I10B","I107","I101","ITS1"}, // lay=1
+     {"ALIC","ITSV","ITSD","IT12","I12B","I20B","I1D7","I1D1","ITS2"}, // lay=2
+     {"ALIC","ITSV","ITSD","IT34","I004","I302","ITS3","    ","    "}, // lay=3
+     {"ALIC","ITSV","ITSD","IT34","I005","I402","ITS4","    ","    "}, // lay=4
+     {"ALIC","ITSV","ITSD","IT56","I565","I562","ITS5","    ","    "}, // lay=5
+     {"ALIC","ITSV","ITSD","IT56","I569","I566","ITS6","    ","    "}};// lay=6
+    Int_t itsGeomTreeCopysB[nlayers][ndeep]= {{1,1,1,1,10, 2, 4,1,1},// lay=1
+                                             {1,1,1,1,10, 4, 4,1,1},// lay=2
+                                             {1,1,1,1,14, 6, 1,0,0},// lay=3
+                                             {1,1,1,1,22, 8, 1,0,0},// lay=4
+                                             {1,1,1,1,34,22, 1,0,0},// lay=5
+                                             {1,1,1,1,38,25, 1,0,0}};//lay=6
+    for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++){
+       for(k=0;k<4;k++) names[i][j][k] = namesB[i][j][k];
+       itsGeomTreeCopys[i][j] = itsGeomTreeCopysB[i][j];
+    } // end for i,j
+    } // end if fMinorVersion
     // Sorry, but this is not very pritty code. It should be replaced
     // at some point with a version that can search through the geometry
     // tree its self.
@@ -5100,12 +4850,8 @@ void AliITSvPPRasymm::InitAliITSgeom(){
                                        par,att,imat,imed);
                        fITSgeom->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
                        if(!(fITSgeom->IsShapeDefined((Int_t)kSPD)))
-                           if(fMinorVersion==21){
-                             fITSgeom->ReSetShape(kSPD,
-                                                 new AliITSgeomSPD425Short());
-                           } else if(fMinorVersion==22)
                              fITSgeom->ReSetShape(kSPD,
-                                                 new AliITSgeomSPD425Short());
+                                         new AliITSgeomSPD425Short(npar,par));
                    } // end for det
                } // end for k
             } // end for j
@@ -5123,19 +4869,20 @@ void AliITSvPPRasymm::InitAliITSgeom(){
                    case 3: case 4:
                        fITSgeom->CreatMatrix(mod,lay,lad,det,kSDD,t,r);
                        if(!(fITSgeom->IsShapeDefined(kSDD))) 
-                           fITSgeom->ReSetShape(kSDD,new AliITSgeomSDD256());
+                           fITSgeom->ReSetShape(kSDD,
+                                            new AliITSgeomSDD256(npar,par));
                            break;
                        case 5:
                            fITSgeom->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
                            if(!(fITSgeom->IsShapeDefined(kSSD))) 
                                fITSgeom->ReSetShape(kSSD,
-                                                  new AliITSgeomSSD275and75());
+                                         new AliITSgeomSSD275and75(npar,par));
                            break;
                        case 6:
                            fITSgeom->CreatMatrix(mod,lay,lad,det,kSSDp,t,r);
                            if(!(fITSgeom->IsShapeDefined(kSSDp))) 
                                fITSgeom->ReSetShape(kSSDp,
-                                                  new AliITSgeomSSD75and275());
+                                         new AliITSgeomSSD75and275(npar,par));
                            break;
                        } // end switch
                } // end for det
@@ -5169,6 +4916,97 @@ void AliITSvPPRasymm::Init(){
     for(i=0;i<72;i++) cout << "*";
     cout << endl;
 }
+//_____________________________________________________________________________
+void AliITSvPPRasymm::SetDefaults(){
+    // sets the default segmentation, response, digit and raw cluster classes
+    const Float_t kconv = 1.0e+04; // convert cm to microns
+
+    cout << "AliITSvPPRasymm::SetDefaults" << endl;
+
+    AliITSDetType *iDetType;
+    AliITSgeomSPD  *s0;
+    AliITSgeomSDD  *s1;
+    AliITSgeomSSD  *s2;
+    Int_t i;
+    Float_t bx[256],bz[280];
+
+    //SPD
+    iDetType=DetType(0);
+    s0 = (AliITSgeomSPD*) fITSgeom->GetShape(kSPD);// Get shape info. Do it this way for now.
+    AliITSresponse *resp0=new AliITSresponseSPD();
+    SetResponseModel(0,resp0);
+    AliITSsegmentationSPD *seg0=new AliITSsegmentationSPD(fITSgeom);
+    seg0->SetDetSize(s0->GetDx()*2.*kconv, // base this on AliITSgeomSPD
+                    s0->GetDz()*2.*kconv, // for now.
+                    s0->GetDy()*2.*kconv); // x,z,y full width in microns.
+    seg0->SetNPads(256,160);// Number of Bins in x and z
+    for(i=000;i<256;i++) bx[i] =  50.0; // in x all are 50 microns.
+    for(i=000;i<160;i++) bz[i] = 425.0; // most are 425 microns except below
+    for(i=160;i<280;i++) bz[i] =   0.0; // Outside of detector.
+    bz[ 31] = bz[ 32] = 625.0; // first chip boundry
+    bz[ 63] = bz[ 64] = 625.0; // first chip boundry
+    bz[ 95] = bz[ 96] = 625.0; // first chip boundry
+    bz[127] = bz[128] = 625.0; // first chip boundry
+    bz[160] = 425.0; // Set so that there is no zero pixel size for fNz.
+    seg0->SetBinSize(bx,bz); // Based on AliITSgeomSPD for now.
+    SetSegmentationModel(0,seg0);
+    // set digit and raw cluster classes to be used
+    const char *kData0=(iDetType->GetResponseModel())->DataType();
+    if (strstr(kData0,"real")) iDetType->ClassNames("AliITSdigit",
+                                                   "AliITSRawClusterSPD");
+    else iDetType->ClassNames("AliITSdigitSPD","AliITSRawClusterSPD");
+    //iDetType->SimulationModel(new AliITSsimulationSPD(seg0,resp0));
+    //iDetType->ReconstructionModel(new AliITSClusterFinderSPD());
+
+    // SDD
+    iDetType=DetType(1);
+    s1 = (AliITSgeomSDD*) fITSgeom->GetShape(kSDD);// Get shape info. Do it this way for now.
+    AliITSresponseSDD *resp1=new AliITSresponseSDD();
+    resp1->SetDriftSpeed(7.3); // set drift speed to 7.3 microns/ns.
+    SetResponseModel(1,resp1);
+    AliITSsegmentationSDD *seg1=new AliITSsegmentationSDD(fITSgeom,resp1);
+    seg1->SetDetSize(s1->GetDx()*kconv, // base this on AliITSgeomSDD
+                    s1->GetDz()*2.*kconv, // for now.
+                    s1->GetDy()*2.*kconv); // x,z,y full width in microns.
+    bx[0] = (s1->GetDx()*kconv/(seg1->Dpx(0))*resp1->DriftSpeed())+1.;// clock in Mhz
+    seg1->SetNPads(256,256);// Use AliITSgeomSDD for now
+    SetSegmentationModel(1,seg1);
+    const char *kData1=(iDetType->GetResponseModel())->DataType();
+    const char *kopt=iDetType->GetResponseModel()->ZeroSuppOption();
+    if((!strstr(kopt,"2D")) && (!strstr(kopt,"1D")) || strstr(kData1,"real") ){
+       iDetType->ClassNames("AliITSdigit","AliITSRawClusterSDD");
+    } else iDetType->ClassNames("AliITSdigitSDD","AliITSRawClusterSDD");
+    //iDetType->SimulationModel(new AliITSsimulationSDD(seg1,resp1));
+    //iDetType->ReconstructionModel(new AliITSClusterFinderSDD());
+
+    // SSD  Layer 5
+    iDetType=DetType(2);
+    s2 = (AliITSgeomSSD*) fITSgeom->GetShape(kSSD);// Get shape info. Do it this way for now.
+    AliITSresponse *resp2=new AliITSresponseSSD();
+    SetResponseModel(2,resp2);
+    AliITSsegmentationSSD *seg2=new AliITSsegmentationSSD(fITSgeom);
+    seg2->SetDetSize(s2->GetDx()*2.*kconv, // base this on AliITSgeomSSD
+                    s2->GetDz()*2.*kconv, // for now.
+                    s2->GetDy()*2.*kconv); // x,z,y full width in microns.
+    seg2->SetPadSize(95.,0.); // strip x pitch in microns
+    seg2->SetNPads(768,0); // number of strips on each side.
+    seg2->SetAngles(0.0075,0.0275); // strip angels rad P and N side.
+    seg2->SetAnglesLay5(0.0075,0.0275); // strip angels rad P and N side.
+    seg2->SetAnglesLay6(0.0275,0.0075); // strip angels rad P and N side.
+    SetSegmentationModel(2,seg2); 
+    const char *kData2=(iDetType->GetResponseModel())->DataType();
+    if(strstr(kData2,"real") ) iDetType->ClassNames("AliITSdigit",
+                                                   "AliITSRawClusterSSD");
+    else iDetType->ClassNames("AliITSdigitSSD","AliITSRawClusterSSD");
+    //iDetType->SimulationModel(new AliITSsimulationSSD(seg2,resp2));
+    //iDetType->ReconstructionModel(new AliITSClusterFinderSSD());
+
+    if(kNTYPES>3){
+       Warning("SetDefaults",
+               "Only the four basic detector types are initialised!");
+    }// end if
+    return;
+}
 //______________________________________________________________________
 void AliITSvPPRasymm::DrawModule(){
 ////////////////////////////////////////////////////////////////////////
@@ -5252,22 +5090,22 @@ void AliITSvPPRasymm::StepManager(){
   // Only entering charged tracks
   if((id = gMC->CurrentVolID(copy)) == fIdSens[0]) {
       vol[0] = 1;
-      id = gMC->CurrentVolOffID(0,copy);
+      id = gMC->CurrentVolOffID(2,copy);
       //detector copy in the ladder = 1<->4  (ITS1 < I101 < I103 < I10A)
       vol[1] = copy;
-      gMC->CurrentVolOffID(1,copy1);
+      gMC->CurrentVolOffID(3,copy1);
       //ladder copy in the module   = 1<->2  (I10A < I12A)
-      gMC->CurrentVolOffID(2,copy2);
+      gMC->CurrentVolOffID(4,copy2);
       //module copy in the layer    = 1<->10 (I12A < IT12)
       vol[2] = copy1+(copy2-1)*2;//# of ladders in one module  = 2
   } else if(id == fIdSens[1]){
       vol[0] = 2;
-      id = gMC->CurrentVolOffID(0,copy);
+      id = gMC->CurrentVolOffID(2,copy);
       //detector copy in the ladder = 1<->4  (ITS2 < I1D1 < I1D3 < I20A)
       vol[1] = copy;
-      gMC->CurrentVolOffID(1,copy1);
+      gMC->CurrentVolOffID(3,copy1);
       //ladder copy in the module   = 1<->4  (I20A < I12A)
-      gMC->CurrentVolOffID(2,copy2);
+      gMC->CurrentVolOffID(4,copy2);
       //module copy in the layer    = 1<->10 (I12A < IT12)
       vol[2] = copy1+(copy2-1)*4;//# of ladders in one module  = 4
   } else if(id == fIdSens[2]){