]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSvPPRsymm.cxx
Corrected setting of magnetic field
[u/mrichter/AliRoot.git] / ITS / AliITSvPPRsymm.cxx
index bc6e7d31efc157f5c1bce8aacf9472a672193733..537044f7549619b6836687053ca71dd5ef44d0c2 100644 (file)
@@ -1,4 +1,4 @@
-/**************************************************************************
+ /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.10  2001/03/15 13:47:55  barbera
-Some service mother volumes modified
-
-Revision 1.9  2001/03/13 18:13:30  barbera
-Some mother volumes sligthly modified to eliminate an overlap with the absorber
-
-Revision 1.8  2001/03/13 08:36:24  hristov
-fabsf replaced by TMath::Abs
-
-Revision 1.7  2001/03/13 00:43:43  barbera
-Updated version of the PPR detailed geometry with symmetric services. Of course, the central part of the detector (volume ITSD and its daughters) is the same of AliITSvPPRasymm.cxx
-
-Revision 1.6  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)))
-because just casting gMC to be TGeant3* even when it realy is a TGeant3 pointer
-did not result in a zero value. For AliITSv5asymm and AliITSv5symm, needed
-to fix a bug in the initilizers and a bug in BuildGeometry. This is now done
-in the same way as in AliITSv5.cxx.
-
-Revision 1.5  2001/02/09 20:06:26  nilsen
-Fixed bug in distructor. Can't distroy fixxed length arrays. Thanks Peter.
-
-Revision 1.4  2001/02/09 00:05:31  nilsen
-Added fMajor/MinorVersion variables and made other changes to better make
-use of the new code changes in AliITSgeom related classes.
-
-Revision 1.3  2001/01/30 09:23:13  hristov
-Streamers removed (R.Brun)
-
-Revision 1.2  2001/01/26 20:01:19  hristov
-Major upgrade of AliRoot code
-
-Revision 1.1.2.1  2001/01/15 13:38:32  barbera
-New ITS detailed geometry to be used for the PPR
-
-Revision 1.12  2000/12/10 16:00:44  barbera
-Added last definition of special media like end-ladder boxes and cones
-
-Revision 1.11  2000/10/30 08:02:25  barbera
-PCON's changed into simpler CONS and TUBS. Services now allow for the rails to go through them.
-
-Revision 1.3.2.7  2000/10/27 17:20:00  barbera
-Position of rails w.r.t. the interaction point corrected.
-
-Revision 1.9  2000/10/27 13:31:29  barbera
-Rails between ITS and TPC added.
-
-Revision 1.8  2000/10/27 13:03:08  barbera
-Small changes in the SPD volumes and materials
-
-Revision 1.6  2000/10/16 14:45:37  barbera
-Mother volume ITSD modified to avoid some overlaps
-
-Revision 1.5  2000/10/16 13:49:15  barbera
-Services volumes slightly modified and material added following Pierluigi Barberis' information
-
-Revision 1.4  2000/10/07 15:33:07  barbera
-Small corrections to the ITSV mother volume
-
-Revision 1.3  2000/10/07 13:06:50  barbera
-Some new materials and media defined
-
-Revision 1.2  2000/10/07 10:42:43  barbera
-Mother volume ITSV corrected
-
-Revision 1.1  2000/10/06 23:09:12  barbera
-New  geometry (symmetric services
-
-Revision 1.20  2000/10/02 21:28:08  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.19  2000/07/10 16:07:19  fca
-Release version of ITS code
-
-Revision 1.14.2.2  2000/05/19 10:09:21  nilsen
-fix for bug with HP and Sun unix + fix for event display in ITS-working branch
-
-Revision 1.14.2.1  2000/03/04 23:45:19  nilsen
-Fixed up the comments/documentation.
-
-Revision 1.14  1999/11/25 06:52:56  fca
-Correct value of drca
-
-Revision 1.13.2.1  1999/11/25 06:52:21  fca
-Correct value of drca
-
-Revision 1.13  1999/10/27 11:16:26  fca
-Correction of problem in geometry
-
-Revision 1.12  1999/10/22 08:25:25  fca
-remove double definition of destructors
-
-Revision 1.11  1999/10/22 08:16:49  fca
-Correct destructors, thanks to I.Hrivnacova
-
-Revision 1.10  1999/10/06 19:56:50  fca
-Add destructor
-
-Revision 1.9  1999/10/05 08:05:09  fca
-Minor corrections for uninitialised variables.
-
-Revision 1.8  1999/09/29 09:24:20  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
@@ -138,109 +31,61 @@ Introduction of the Copyright and cvs Log
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
 // See AliITSvPPRsymm::StepManager().
-#include <iostream.h>
-#include <iomanip.h>
+#include <Riostream.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <TMath.h>
+
+#include <TBRIK.h>
+#include <TCanvas.h>
+#include <TClonesArray.h>
+#include <TFile.h>    // only required for Tracking function?
 #include <TGeometry.h>
+#include <TLorentzVector.h>
+#include <TMath.h>
 #include <TNode.h>
-#include <TTUBE.h>
-#include <TFile.h>    // only required for Tracking function?
-#include <TCanvas.h>
 #include <TObjArray.h>
-#include <TLorentzVector.h>
 #include <TObjString.h>
-#include <TClonesArray.h>
-#include <TBRIK.h>
+#include <TPCON.h>
 #include <TSystem.h>
+#include <TTUBE.h>
+#include <TTUBS.h>
+#include <TVirtualMC.h>
 
-#include "AliMC.h"
 #include "AliRun.h"
 #include "AliMagF.h"
 #include "AliConst.h"
-#include "../TGeant3/TGeant3.h"
 #include "AliITSGeant3Geometry.h"
-#include "AliITShit.h"
-#include "AliITS.h"
-#include "AliITSvPPRsymm.h"
 #include "AliITSgeom.h"
-#include "AliITSgeomSPD.h"
 #include "AliITSgeomSDD.h"
+#include "AliITSgeomSPD.h"
 #include "AliITSgeomSSD.h"
-
+#include "AliITShit.h"
+#include "AliITSresponseSDD.h"
+#include "AliITSresponseSPD.h"
+#include "AliITSresponseSSD.h"
+#include "AliITSsegmentationSDD.h"
+#include "AliITSsegmentationSPD.h"
+#include "AliITSsegmentationSSD.h"
+#include "AliITSsimulationSDD.h"
+#include "AliITSsimulationSPD.h"
+#include "AliITSsimulationSSD.h"
+#include "AliITSvPPRsymm.h"
+#include "AliMagF.h"
+#include "AliRun.h"
 
 ClassImp(AliITSvPPRsymm)
  
 //_____________________________________________________________________________
-AliITSvPPRsymm::AliITSvPPRsymm() {
+AliITSvPPRsymm::AliITSvPPRsymm() : AliITSvPPRasymm() {
 ////////////////////////////////////////////////////////////////////////
 //    Standard default constructor for the ITS version 9.
 ////////////////////////////////////////////////////////////////////////
-    Int_t i;
-
-    fIdN       = 0;
-    fIdName    = 0;
-    fIdSens    = 0;
-    fEuclidOut    = kFALSE; // Don't write Euclide file
-    fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Don't Read .det file
-    fMajorVersion = IsVersion();
-    fMinorVersion = -1;
-    for(i=0;i<60;i++) fRead[i] = '\0';
-    for(i=0;i<60;i++) fWrite[i] = '\0';
-    for(i=0;i<60;i++) fEuclidGeomDet[i] = '\0';
 }
 //_____________________________________________________________________________
-AliITSvPPRsymm::AliITSvPPRsymm(const char *name, const char *title) : AliITS(name, title){
+AliITSvPPRsymm::AliITSvPPRsymm(const char *name, const char *title) : AliITSvPPRasymm(name, title){
 ////////////////////////////////////////////////////////////////////////
 //    Standard constructor for the ITS version 9.
 ////////////////////////////////////////////////////////////////////////
-    Int_t i;
-
-    fIdN = 6;
-    fIdName = new TString[fIdN];
-    fIdName[0] = "ITS1";
-    fIdName[1] = "ITS2";
-    fIdName[2] = "ITS3";
-    fIdName[3] = "ITS4";
-    fIdName[4] = "ITS5";
-    fIdName[5] = "ITS6";
-    fIdSens    = new Int_t[fIdN];
-    for (i=0;i<fIdN;i++) fIdSens[i] = 0;
-    fMajorVersion = IsVersion();
-    fMinorVersion = 2;
-    fEuclidOut    = kFALSE; // Don't write Euclide file
-    fGeomDetOut   = kFALSE; // Don't write .det file
-    fGeomDetIn    = kFALSE; // Don't Read .det file
-    SetThicknessDet1();
-    SetThicknessDet2();
-    SetThicknessChip1();
-    SetThicknessChip2();                        
-
-    fEuclidGeometry="$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.euc";
-    strncpy(fEuclidGeomDet,"$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.det",60);
-    strncpy(fRead,fEuclidGeomDet,60);
-    strncpy(fWrite,fEuclidGeomDet,60);  
-        
-}
-//____________________________________________________________________________
-AliITSvPPRsymm::AliITSvPPRsymm(const AliITSvPPRsymm &source){
-////////////////////////////////////////////////////////////////////////
-//     Copy Constructor for ITS version 9.
-////////////////////////////////////////////////////////////////////////
-    if(&source == this) return;
-    Warning("Copy Constructor","Not allowed to copy AliITSvPPRsymm");
-    return;
-}
-//_____________________________________________________________________________
-AliITSvPPRsymm& AliITSvPPRsymm::operator=(const AliITSvPPRsymm &source){
-////////////////////////////////////////////////////////////////////////
-//    Assignment operator for the ITS version 9.
-////////////////////////////////////////////////////////////////////////
-    if(&source == this) return *this;
-    Warning("= operator","Not allowed to copy AliITSvPPRsymm");
-    return *this;
 }
 //_____________________________________________________________________________
 AliITSvPPRsymm::~AliITSvPPRsymm() {
@@ -248,52 +93,6 @@ AliITSvPPRsymm::~AliITSvPPRsymm() {
 //    Standard destructor for the ITS version 9.
 ////////////////////////////////////////////////////////////////////////
 }
-//__________________________________________________________________________
-void AliITSvPPRsymm::BuildGeometry(){
-////////////////////////////////////////////////////////////////////////
-//    Geometry builder for the ITS version 9.
-////////////////////////////////////////////////////////////////////////
-    TNode *node, *top;
-    const int kColorITS=kYellow;
-    //
-    top = gAlice->GetGeometry()->GetNode("alice");
-
-    new TTUBE("S_layer1","Layer1 of ITS","void",3.95,3.95+0.05475,12.25);
-    top->cd();
-    node = new TNode("Layer1","Layer1","S_layer1",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-
-    new TTUBE("S_layer2","Layer2 of ITS","void",7.,7.+0.05475,16.3);
-    top->cd();
-    node = new TNode("Layer2","Layer2","S_layer2",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-
-    new TTUBE("S_layer3","Layer3 of ITS","void",15.,15.+0.05288,21.1);
-    top->cd();
-    node = new TNode("Layer3","Layer3","S_layer3",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-
-    new TTUBE("S_layer4","Layer4 of ITS","void",24,24+0.05288,29.6);
-    top->cd();
-    node = new TNode("Layer4","Layer4","S_layer4",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-
-    new TTUBE("S_layer5","Layer5 of ITS","void",40,40+0.05382,45.1);
-    top->cd();
-    node = new TNode("Layer5","Layer5","S_layer5",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-
-    new TTUBE("S_layer6","Layer6 of ITS","void",45,45+0.05382,50.4);
-    top->cd();
-    node = new TNode("Layer6","Layer6","S_layer6",0,0,0,"");
-    node->SetLineColor(kColorITS);
-    fNodes->Add(node);
-}
 //_____________________________________________________________________________
 void AliITSvPPRsymm::CreateGeometry(){
 ////////////////////////////////////////////////////////////////////////
@@ -301,26 +100,23 @@ void AliITSvPPRsymm::CreateGeometry(){
 ////////////////////////////////////////////////////////////////////////
   
   //INNER RADII OF THE SILICON LAYERS 
-  //  Float_t rl[6]    = { 3.8095,7.,15.,24.,38.1,43.5765 };   
+  // Float_t rl[6]    = { 3.8095,7.,15.,24.,38.1,43.5765 };   
   //THICKNESSES OF LAYERS (in % radiation length)
   Float_t drl[6]   = { 1.03,1.03,0.94,0.95,0.91,0.87 };   
   //HALF LENGTHS OF LAYERS  
-  /*
-  Float_t dzl[6]   = { 14.35,14.35,25.1,32.1,49.405,55.27 };
+  // Float_t dzl[6]   = { 14.35,14.35,25.1,32.1,49.405,55.27 };
   //LENGTHS OF END-LADDER BOXES (ALL INCLUDED)
-  Float_t dzb[6]   = { 12.4,12.4,13.5,15.,7.5,7.5 };    
+  // Float_t dzb[6]   = { 12.4,12.4,13.5,15.,7.5,7.5 };   
   //THICKNESSES OF END-LADDER BOXES (ALL INCLUDED)
-  Float_t drb[6]   = { rl[1]-rl[0],0.2,5.,5.,4.,4. };         
-  */
-
+  // Float_t drb[6]   = { rl[1]-rl[0],0.2,5.,5.,4.,4. };        
 
  
-  Float_t dits[50], rlim, zmax;
+  Float_t dits[100], rlim, zmax;
   // Float_t zpos;
   // Float_t pcits[50]
-  Float_t xltpc;
+  Float_t ztpc;
   Int_t idrotm[1999], i;
-  Float_t dgh[50];
+  Float_t dgh[100];
 
 
   // Define some variables for SPD
@@ -331,54 +127,87 @@ void AliITSvPPRsymm::CreateGeometry(){
   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 ddet1=200.;     // total detector thickness on layer 1 (micron)
+  Float_t dchip1=200.;    // 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 ddet2=200.;     // total detector thickness on layer 2 (micron)                         
+  Float_t dchip2=200.;    // total chip thickness on layer 2 (micron)
   
-  Float_t dbus=200.;      // total bus thickness on both layers (micron)
+  Float_t dbus=300.;      // total bus thickness on both layers (micron)
 
   ddet1 = GetThicknessDet1();
   ddet2 = GetThicknessDet2();
   dchip1 = GetThicknessChip1();
   dchip2 = GetThicknessChip2();    
 
-  
   if(ddet1 < 100. || ddet1 > 300.) {
-     cout << "The detector thickness for layer 1 is outside [100,300] microns."
-         " The default value of 300 microns will be used." << endl;
-         ddet1=300.;
+     cout << "ITS - WARNING: the detector thickness for layer 1 is outside the range of [100,300] microns."
+         " The default value of 200 microns will be used." << endl;
+         ddet1=200.;
   }
   
   if(ddet2 < 100. || ddet2 > 300.) {
-     cout << "The detector thickness for layer 2 is outside [100,300] microns."
-         " The default value of 300 microns will be used." << endl;
-         ddet2=300.;
+     cout << "ITS - WARNING: the detector thickness for layer 2 is outside the range of [100,300] microns."
+         " The default value of 200 microns will be used." << endl;
+         ddet2=200.;
   }
   
-  if(dchip1 < 150. || dchip1 > 300.) {
-     cout << "The chip thickness for layer 1 is outside [150,300] microns."
-         " The default value of 300 microns will be used." << endl;
-         dchip1=300.;
+  if(dchip1 < 100. || dchip1 > 300.) {
+     cout << "ITS - WARNING: the chip thickness for layer 1 is outside the range of [100,300] microns."
+         " The default value of 200 microns will be used." << endl;
+         dchip1=200.;
   }
   
-  if(dchip2 < 150. || dchip2 > 300.) {
-     cout << "The chip thickness for layer 2 is outside [150,300] microns."
-         " The default value of 300 microns will be used." << endl;
-         dchip2=300.;
+  if(dchip2 < 100. || dchip2 > 300.) {
+     cout << "ITS - WARNING: the chip thickness for layer 2 is outside the range of [100,300] microns."
+         " The default value of 200 microns will be used." << endl;
+         dchip2=200.;
   }      
+
+  Int_t rails = 1;       // flag for rails (1 --> rails in; 0 --> rails out)
+  
+  Int_t fluid = 1;       // flag for the cooling fluid (1 --> water; 0 --> freon)
+
+  rails = GetRails();
+
+  fluid = GetCoolingFluid();
+
+  if(rails != 0 && rails != 1) {
+     cout << "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;
+       
+  }  
   
+  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       
+  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;
+  Int_t thickness = GetMinorVersion()/10;
+  Int_t option    = GetMinorVersion() - 10*thickness;
 
 
   // Define some variables for SDD
@@ -476,19 +305,19 @@ void AliITSvPPRsymm::CreateGeometry(){
      AliMatrix(idrotm[234],90.0,71.9991,90.0,161.9991,0.0,0.0);
      AliMatrix(idrotm[235],90.0,270.0,90.0,0.0,0.0,0.0);
      AliMatrix(idrotm[236],90.0,180.013702,90.0,270.013702,0.0,0.0);
-     AliMatrix(idrotm[237],90.0,0.0,90.0,90.0,180.0,0.0);
+     AliMatrix(idrotm[237],90.0,180.0,90.0,90.0,0.0,0.0);
      AliMatrix(idrotm[238],90.0,144.0,90.0,234.0,0.0,0.0);
      AliMatrix(idrotm[239],90.0,216.0,90.0,306.0,0.0,0.0);
      AliMatrix(idrotm[240],90.0,288.0,90.0,18.0,0.0,0.0);
      AliMatrix(idrotm[241],90.0,324.0,90.0,54.0,0.0,0.0);
      AliMatrix(idrotm[242],90.0,36.0,90.0,126.0,0.0,0.0);
      AliMatrix(idrotm[243],90.0,108.0,90.0,198.0,0.0,0.0);
-     AliMatrix(idrotm[244],90.0,0.0,90.0,270.0,180.0,0.0);
-     AliMatrix(idrotm[245],90.0,342.0,90.0,252.0,180.0,0.0);
-     AliMatrix(idrotm[246],90.0,130.0,90.0,40.0,180.0,0.0);
-     AliMatrix(idrotm[247],90.0,139.0,90.0,49.0,180.0,0.0);
-     AliMatrix(idrotm[248],90.0,148.0,90.0,58.0,180.0,0.0);
-     AliMatrix(idrotm[249],90.0,157.0,90.0,67.0,180.0,0.0);
+     AliMatrix(idrotm[244],90.0,180.0,90.0,270.0,0.0,0.0);
+     AliMatrix(idrotm[245],90.0,162.0,90.0,252.0,0.0,0.0);
+     AliMatrix(idrotm[246],90.0,310.0,90.0,40.0,0.0,0.0);
+     AliMatrix(idrotm[247],90.0,319.0,90.0,49.0,0.0,0.0);
+     AliMatrix(idrotm[248],90.0,328.0,90.0,58.0,0.0,0.0);
+     AliMatrix(idrotm[249],90.0,337.0,90.0,67.0,0.0,0.0);
      AliMatrix(idrotm[1003],90.0,73.5,90.0,163.5,0.0,0.0);
      AliMatrix(idrotm[1011],90.0,342.0,90.0,72.0,0.0,0.0);
      AliMatrix(idrotm[1039],90.0,72.0,90.0,162.0,0.0,0.0);
@@ -524,7 +353,7 @@ void AliITSvPPRsymm::CreateGeometry(){
     
   if (option == 2) {
 
-     AliMatrix(idrotm[201],90.0,0.0,90.0,90.0,180.0,0.0);
+     AliMatrix(idrotm[201],90.0,0.0,90.0,90.0,0.0,0.0);
      AliMatrix(idrotm[202],90.0,90.0,90.0,0.0,0.0,0.0);
      AliMatrix(idrotm[203],90.0,350.0,90.0,260.0,0.0,0.0);
      AliMatrix(idrotm[204],90.0,170.0,90.0,80.0,0.0,0.0);
@@ -561,12 +390,12 @@ void AliITSvPPRsymm::CreateGeometry(){
      AliMatrix(idrotm[235],90.0,270.0,90.0,0.0,0.0,0.0);
      AliMatrix(idrotm[236],90.0,180.013702,90.0,270.013702,0.0,0.0);
      AliMatrix(idrotm[237],90.0,90.0,90.0,180.0,0.0,0.0);
-     AliMatrix(idrotm[238],90.0,0.0,90.0,270.0,180.0,0.0);
-     AliMatrix(idrotm[239],90.0,342.0,90.0,252.0,180.0,0.0);
-     AliMatrix(idrotm[240],90.0,130.0,90.0,40.0,180.0,0.0);
-     AliMatrix(idrotm[241],90.0,139.0,90.0,49.0,180.0,0.0);
-     AliMatrix(idrotm[242],90.0,148.0,90.0,58.0,180.0,0.0);
-     AliMatrix(idrotm[243],90.0,157.0,90.0,67.0,180.0,0.0);
+     AliMatrix(idrotm[238],90.0,180.0,90.0,270.0,0.0,0.0);
+     AliMatrix(idrotm[239],90.0,162.0,90.0,252.0,0.0,0.0);
+     AliMatrix(idrotm[240],90.0,310.0,90.0,40.0,0.0,0.0);
+     AliMatrix(idrotm[241],90.0,319.0,90.0,49.0,0.0,0.0);
+     AliMatrix(idrotm[242],90.0,328.0,90.0,58.0,0.0,0.0);
+     AliMatrix(idrotm[243],90.0,337.0,90.0,67.0,0.0,0.0);
      AliMatrix(idrotm[244],90.0,216.0,90.0,306.0,0.0,0.0);
      AliMatrix(idrotm[245],90.0,36.0,90.0,126.0,0.0,0.0);
      AliMatrix(idrotm[246],90.0,108.0,90.0,198.0,0.0,0.0);
@@ -890,108 +719,66 @@ void AliITSvPPRsymm::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] = 16.;
-  dgh[3] = -xltpc-5.-0.1;
-  dgh[4] = 46;   
+  dgh[3] = -ztpc-5.-0.1;
+  dgh[4] = 62.4;
   dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 46;   
+  dgh[6] = -ztpc;
+  dgh[7] = 62;
   dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 46;  
-  dgh[11] = 56.1;
-  dgh[12] = -100.7;
-  dgh[13] = 46;  
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 46;  
-  dgh[17] = 56.1;
-  dgh[18] = -42;   
+  dgh[9] = -ztpc;
+  dgh[10] = 62;
+  dgh[11] = 62+4.;
+  dgh[12] = -97.5;
+  dgh[13] = 46;
+  dgh[14] = rlim+6;
+  dgh[15] = -zmax;
+  dgh[16] = 46;
+  dgh[17] = rlim+6;
+  dgh[18] = -48;
   dgh[19] = 6;
-  dgh[20] = 56.1;
-  dgh[21] = -28;   
+  dgh[20] = rlim+6; 
+  dgh[21] = -28.6;
   dgh[22] = 6;
-  dgh[23] = 56.1;    
-  dgh[24] = -26.2;  
+  dgh[23] = rlim+6;
+  dgh[24] = -27.6;
   dgh[25] = 3.295;
-  dgh[26] = 56.1; 
-  dgh[27] = 26.2;   
+  dgh[26] = rlim+6;
+  dgh[27] = 27.6;
   dgh[28] = 3.295;
-  dgh[29] = 56.1;
-  dgh[30] = 28;   
+  dgh[29] = rlim+6;
+  dgh[30] = 28.6;
   dgh[31] = 6;
-  dgh[32] = 56.1;
-  dgh[33] = 42;   
+  dgh[32] = rlim+6;
+  dgh[33] = 48;
   dgh[34] = 6;
-  dgh[35] = 56.1;  
-  dgh[36] = 77.2;
+  dgh[35] = rlim+6;
+  dgh[36] = zmax;
   dgh[37] = 46;
-  dgh[38] = 56.1;
-  dgh[39] = 100.7;
-  dgh[40] = 46;  
-  dgh[41] = 56.1;
-  dgh[42] = xltpc;
-  dgh[43] = 62;     
-  dgh[44] = 62+4.;  
-  dgh[45] = xltpc;
-  dgh[46] = 62;     
+  dgh[38] = rlim+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] = xltpc+4.+0.1;
+  dgh[48] = ztpc+4.+0.1;
   dgh[49] = 62.4;
   dgh[50] = 85.;
   gMC->Gsvolu("ITSV", "PCON", idtmed[205], dgh, 51);
-*/
 
-  dgh[0] = 0.;
-  dgh[1] = 360.;
-  dgh[2] = 12.;
-  dgh[3] = -xltpc-5.-0.1;
-  dgh[4] = 46;   
-  dgh[5] = 85.;
-  dgh[6] = -xltpc;
-  dgh[7] = 46;   
-  dgh[8] = 85.;
-  dgh[9] = -xltpc;
-  dgh[10] = 46;  
-  dgh[11] = 56.1;
-  dgh[12] = -100.7;
-  dgh[13] = 46;  
-  dgh[14] = 56.1;
-  dgh[15] = -77.2;
-  dgh[16] = 46;  
-  dgh[17] = 56.1;
-  dgh[18] = -40.;
-  dgh[19] = 3.295;
-  dgh[20] = 56.1; 
-  dgh[21] = 40.;
-  dgh[22] = 3.295;
-  dgh[23] = 56.1;
-  dgh[24] = 77.2;
-  dgh[25] = 46;  
-  dgh[26] = 56.1;
-  dgh[27] = 100.7;
-  dgh[28] = 46;  
-  dgh[29] = 56.1;
-  dgh[30] = xltpc;
-  dgh[31] = 62;     
-  dgh[32] = 62+4.;  
-  dgh[33] = xltpc;
-  dgh[34] = 62;     
-  dgh[35] = 85.;
-  dgh[36] = xltpc+4.+0.1;
-  dgh[37] = 62.4;
-  dgh[38] = 85.;
-  gMC->Gsvolu("ITSV", "PCON", idtmed[205], dgh, 39);
 
   
   // --- Place the ghost volume in its mother volume (ALIC) and make it 
@@ -1006,32 +793,31 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[0] = 0.;
   dgh[1] = 360.;
   dgh[2] = 8.;
-  dgh[3] = -77.2;
+  dgh[3] = -zmax;  
   dgh[4] = 46.;
-  dgh[5] = 56.;
-  dgh[6] = -42;    
+  dgh[5] = rlim;
+  dgh[6] = -47.5;    
   dgh[7] = 6.005;
-  dgh[8] = 56.;
-  dgh[9] = -28;    
+  dgh[8] = rlim;
+  dgh[9] = -28.5;    
   dgh[10] = 6.005;
-  dgh[11] = 56.;  
-  dgh[12] = -26.2;   
+  dgh[11] = rlim;  
+  dgh[12] = -27.5;   
   dgh[13] = 3.3;
-  dgh[14] = 56.;
-  dgh[15] = 26.2;    
+  dgh[14] = rlim;
+  dgh[15] = 27.5;    
   dgh[16] = 3.3;
-  dgh[17] = 56.;
-  dgh[18] = 28;    
+  dgh[17] = rlim;
+  dgh[18] = 28.5;    
   dgh[19] = 6.005;
-  dgh[20] = 56.;
-  dgh[21] = 42;    
+  dgh[20] = rlim;
+  dgh[21] = 47.5;    
   dgh[22] = 6.005;
-  dgh[23] = 56.;
-  dgh[24] = 77.2;
+  dgh[23] = rlim;
+  dgh[24] = zmax;    
   dgh[25] = 46.;
-  dgh[26] = 56.;
+  dgh[26] = rlim;
   gMC->Gsvolu("ITSD", "PCON", idtmed[205], dgh, 27);
-
   
   // --- Place the ghost volume in its mother volume (ITSV) and make it 
   //     invisible 
@@ -1039,7 +825,6 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY");
   //gMC->Gsatt("ITSD", "SEEN", 0);
 
-
   // --- Define SPD (option 'a') volumes ----------------------------
   
   // SPD - option 'a' 
@@ -1220,9 +1005,9 @@ void AliITSvPPRsymm::CreateGeometry(){
      gMC->Gsvolu("I103", "BOX ", idtmed[254], di103, 3); // contains det and chip  
                                                          // layer 1
      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);  
+     gMC->Gsvolu("I105", "BOX ", idtmed[290], dits, 3);  
 
      di104[0] = 0.843;
      di104[1] = dbus;
@@ -1266,13 +1051,22 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[4] = 180;
      gMC->Gsvolu("I114", "TUBS", idtmed[264], dits, 5);  
 
-     dits[0] = 0;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 180;
-     gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);   
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5); // set water as cooling fluid   
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[212], dits, 5); // set freon as cooling fluid       
+     }
+     
      dits[0] = 0.063;
      dits[1] = 0.035;
      dits[2] = 24;
@@ -1298,10 +1092,17 @@ void AliITSvPPRsymm::CreateGeometry(){
      di1d1[2] = 3.536;
      gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);   // contains detector 
                                                            // layer 2
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
+     if (fluid == 1) {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3); // set water as cooling fuid
+     } else {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[212], dits, 3); // set freon as cooling fluid
+     }
 
      dits1[0] = 0.64;
      dits1[1] = ddet1;
@@ -1359,37 +1160,85 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[2] = 0.55;
      gMC->Gsvolu("I678", "TUBE", idtmed[263], dits, 3); // was I178 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.3;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // was I177 in old geom.
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I177 in old geom.
+     } else {
+         dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I177 in old geom.    
+     }
+     
      dits[0] = 0.07;
      dits[1] = 0.125;
      dits[2] = 0.3;
      gMC->Gsvolu("I675", "TUBE", idtmed[263], dits, 3); // was I175 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // was I174 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 3;
-     gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // was I172 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.0746;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // was I170 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I174 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I174 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I172 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I172 in old geom.        
+     }
+     
+     if (fluid == 1) {     
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // set water as cooling fluid
+                                                          // was I170 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[212], dits, 3); // set freon as cooling fluid
+                                                          // was I170 in old geom.     
+     }
+     
+     if (fluid == 1) {     
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // set water as cooling fluid
+                                                          // was I168 in old geom.
+     } else {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[212], dits, 5); // set freon as cooling fluid
+                                                          // was I168 in old geom.
+     }
 
-     dits[0] = 3.7;
-     dits[1] = 5.4;
-     dits[2] = 0.35;
-     dits[3] = 2;
-     dits[4] = 36;
-     gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // was I168 in old geom.
 
   }
 
@@ -1570,9 +1419,9 @@ void AliITSvPPRsymm::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);  
+     gMC->Gsvolu("I105", "BOX ", idtmed[290], dits, 3);  
 
      di107[0] = 0.793;
      di107[1] = ddet1+dchip1;
@@ -1625,13 +1474,22 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[4] = 180;
      gMC->Gsvolu("I114", "TUBS", idtmed[264], dits, 5);  
 
-     dits[0] = 0;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     dits[3] = 0;
-     dits[4] = 180;
-     gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);   
-
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[211], dits, 5);  // set water as cooling fluid   
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        dits[3] = 0;
+        dits[4] = 180;
+        gMC->Gsvolu("I115", "TUBS", idtmed[212], dits, 5);  // set freon as cooling fluid
+     }
+     
      dits[0] = 0.063;
      dits[1] = 0.035;
      dits[2] = 24;
@@ -1657,10 +1515,18 @@ void AliITSvPPRsymm::CreateGeometry(){
      di1d1[2] = 3.536;
      gMC->Gsvolu("I1D1", "BOX ", idtmed[250], di1d1, 3);  // contains detector  
                                                           // layer 2
-     dits[0] = 0.063;
-     dits[1] = 0.025;
-     dits[2] = 24;
-     gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3);  
+   
+     if (fluid == 1) {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[211], dits, 3); // set water as cooling fluid
+     } else {
+        dits[0] = 0.063;
+        dits[1] = 0.025;
+        dits[2] = 24;
+        gMC->Gsvolu("I117", "BOX ", idtmed[212], dits, 3); // set freon as cooling fluid
+     }
 
      dits1[0] = 0.64;
      dits1[1] = ddet1;
@@ -1718,37 +1584,85 @@ void AliITSvPPRsymm::CreateGeometry(){
      dits[2] = 0.55;
      gMC->Gsvolu("I678", "TUBE", idtmed[263], dits, 3); // was I178 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.3;
-     dits[2] = 1.5;
-     gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); // was I177 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I177 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.3;
+        dits[2] = 1.5;
+        gMC->Gsvolu("I677", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I177 in old geom.     
+     }
 
      dits[0] = 0.07;
      dits[1] = 0.125;
      dits[2] = 0.3;
      gMC->Gsvolu("I675", "TUBE", idtmed[263], dits, 3); // was I175 in old geom.
 
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); // was I174 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.1;
-     dits[2] = 3;
-     gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); // was I172 in old geom.
-
-     dits[0] = 0;
-     dits[1] = 0.0746;
-     dits[2] = 0.8;
-     gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); // was I170 in old geom.
-
-     dits[0] = 3.7;
-     dits[1] = 5.4;
-     dits[2] = 0.35;
-     dits[3] = 2;
-     dits[4] = 36;
-     gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); // was I168 in old geom.
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I174 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I674", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I174 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I172 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.1;
+        dits[2] = 3;
+        gMC->Gsvolu("I672", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I172 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[211], dits, 3); //set water as cooling fluid
+                                                          // was I170 in old geom.
+     } else {
+        dits[0] = 0;
+        dits[1] = 0.0746;
+        dits[2] = 0.8;
+        gMC->Gsvolu("I670", "TUBE", idtmed[212], dits, 3); //set freon as cooling fluid
+                                                          // was I170 in old geom.     
+     }
+     
+     if (fluid == 1) {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[211], dits, 5); //set water as cooling fluid
+                                                          // was I168 in old geom.
+     } else {
+        dits[0] = 3.7;
+        dits[1] = 5.4;
+        dits[2] = 0.35;
+        dits[3] = 2;
+        dits[4] = 36;
+        gMC->Gsvolu("I668", "TUBS", idtmed[212], dits, 5); //set freon as cooling fluid
+                                                          // was I168 in old geom.     
+     }
+     
 
   }
 
@@ -1762,24 +1676,24 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -34.6;
-  dits[4] = 23.495;
-  dits[5] = 28.5;
-  dits[6] = -27.35; 
-  dits[7] = 23.495;
-  dits[8] = 28.5;
-  dits[9] = -27.35;  
-  dits[10] = 14.595
-  dits[11] = 28.5;
-  dits[12] = 27.35;   
-  dits[13] = 14.595;
-  dits[14] = 28.5;
-  dits[15] = 27.35;    
-  dits[16] = 23.495;
-  dits[17] = 28.5;
-  dits[18] = 34.65;
-  dits[19] = 23.495;
-  dits[20] = 28.5;
+  dits[3] = -34.6; 
+  dits[4] = 23.49;
+  dits[5] = 28;
+  dits[6] = -23.65; 
+  dits[7] = 23.49;
+  dits[8] = 28;
+  dits[9] = -23.65;  
+  dits[10] = 14.59; 
+  dits[11] = 28;
+  dits[12] = 23.65;   
+  dits[13] = 14.59;
+  dits[14] = 28;
+  dits[15] = 23.65;    
+  dits[16] = 23.49;
+  dits[17] = 28;
+  dits[18] = 34.6;  
+  dits[19] = 23.49;
+  dits[20] = 28;
   gMC->Gsvolu("IT34", "PCON", idtmed[209], dits, 21);  
 
   // block of the SDD electronics and related ladder frame 
@@ -1855,10 +1769,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("I420", "BOX ", idtmed[264], I420dits, 3);  
 
   // positioning-box #2 at SDD end-ladder - F.T. March,7-2001
-  I421dits[0] = 0.4400;
-  I421dits[1] = 0.4000;
-  I421dits[2] = 0.4400;
-  gMC->Gsvolu("I421", "BOX ", idtmed[209], I421dits, 3);  
+  I421dits[0] = 0.;
+  I421dits[1] = 0.25;
+  I421dits[2] = I420dits[1];
+  gMC->Gsvolu("I421", "TUBE", idtmed[209], I421dits, 3);  
 
   // reference ruby-sphere at SDD end-ladder - F.T. March,7-2001 
   I422dits[0] = 0.0000;
@@ -1872,7 +1786,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   // support for ruby-sphere (I422) - F.T. March,7-2001
   I423dits[0] = 0.0000;
   I423dits[1] = 0.1000;
-  I423dits[2] = (I421dits[1]-I422dits[1])/2.;
+  I423dits[2] = (I420dits[1]-I422dits[1])/2.;
   gMC->Gsvolu("I423", "TUBE", idtmed[264], I423dits, 3);  
 
   // passage for HV microcables - F.T. March,7-2001
@@ -1923,12 +1837,20 @@ void AliITSvPPRsymm::CreateGeometry(){
   I031dits[2] = I024dits[2];
   gMC->Gsvolu("I031", "TUBE", idtmed[264], I031dits, 3);  
 
-  // cooling water for the end ladder - F.T. March,7-2001
-  I032dits[0] = 0;
-  I032dits[1] = I031dits[0];
-  I032dits[2] = I024dits[2];
-  gMC->Gsvolu("I032", "TUBE", idtmed[211], I032dits, 3);  
-
+  if (fluid == 1) {
+     // cooling water for the end ladder - F.T. March,7-2001
+     I032dits[0] = 0;
+     I032dits[1] = I031dits[0];
+     I032dits[2] = I024dits[2];
+     gMC->Gsvolu("I032", "TUBE", idtmed[211], I032dits, 3);  
+  } else {
+     // cooling freon for the end ladder - R.B. March,21-2001
+     I032dits[0] = 0;
+     I032dits[1] = I031dits[0];
+     I032dits[2] = I024dits[2];
+     gMC->Gsvolu("I032", "TUBE", idtmed[212], I032dits, 3);    
+  }
+  
   // -- block of the SDD ladder frame holding the electronics
 
   // edge of the ladder frame - part 1
@@ -1996,12 +1918,19 @@ void AliITSvPPRsymm::CreateGeometry(){
   I037dits[2] = I018dits[2];
   gMC->Gsvolu("I037", "TUBE", idtmed[264], I037dits, 3);
 
-  // cooling water - F.T. March,7-2001
-  I038dits[0] = 0;
-  I038dits[1] = I037dits[0];
-  I038dits[2] = I018dits[2];
-  gMC->Gsvolu("I038", "TUBE", idtmed[211], I038dits, 3);  
-
+  if (fluid == 1) {
+     // cooling water - F.T. March,7-2001
+     I038dits[0] = 0;
+     I038dits[1] = I037dits[0];
+     I038dits[2] = I018dits[2];
+     gMC->Gsvolu("I038", "TUBE", idtmed[211], I038dits, 3);  
+  } else {
+     // cooling freon - R.B. March,21-2001
+     I038dits[0] = 0;
+     I038dits[1] = I037dits[0];
+     I038dits[2] = I018dits[2];
+     gMC->Gsvolu("I038", "TUBE", idtmed[212], I038dits, 3);    
+  }
   // -- block of the SDD electronics (heat bridge, chips, hybrid, anode microcable)
 
   // SDD heat bridge - F.T. March,7-2001
@@ -2047,7 +1976,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   I052dits[0] = 1.725000;
   I052dits[1] = 0.003743;
   I052dits[2] = I039dits[2];
-  gMC->Gsvolu("I052", "BOX ", idtmed[82], I052dits, 3);
+  gMC->Gsvolu("I052", "BOX ", idtmed[281], I052dits, 3);
 
   // SDD anode microcable : changed - F.T. March,7-2001
   I044dits[0] = I018dits[2];
@@ -2082,23 +2011,23 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -57.5;
-  dits[4] = 43.5;
+  dits[3] = -57.45;
+  dits[4] = 43.6;
   dits[5] = 48;  
-  dits[6] = -47.2
-  dits[7] = 43.5;
+  dits[6] = -49.15
+  dits[7] = 43.6;
   dits[8] = 48;  
-  dits[9] = -47.2;  
-  dits[10] = 36.7;
+  dits[9] = -49.15;  
+  dits[10] = 36.9;
   dits[11] = 48;  
-  dits[12] = 47.2;  
-  dits[13] = 36.7;
+  dits[12] = 50.55;  
+  dits[13] = 36.9;
   dits[14] = 48;  
-  dits[15] = 47.2;  
-  dits[16] = 43.5;
+  dits[15] = 50.55;  
+  dits[16] = 43.6;
   dits[17] = 48;  
-  dits[18] = 56.96;
-  dits[19] = 43.5;
+  dits[18] = 57.45;
+  dits[19] = 43.6;
   dits[20] = 48;   
   gMC->Gsvolu("IT56", "PCON", idtmed[220], dits, 21);   
   
@@ -2152,10 +2081,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 2.1;
   gMC->Gsvolu("I562", "BOX ", idtmed[206], dits, 3);   
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 3.15;
-  gMC->Gsvolu("I559", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I559", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I559", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2225,10 +2161,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 1.955;
   gMC->Gsvolu("I542", "TUBE", idtmed[210], dits, 3);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 1.955;
-  gMC->Gsvolu("I541", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I541", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid 
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I541", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.3;
   dits[1] = 0.15;
@@ -2277,10 +2220,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 2;
   gMC->Gsvolu("ITS6", "BOX ", idtmed[200], dits, 3);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 3.15;
-  gMC->Gsvolu("I550", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I550", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 3.15;
+     gMC->Gsvolu("I550", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
   
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2382,10 +2332,17 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[3] = 0.08;
   gMC->Gsvolu("I517", "TRD1", idtmed[203], dits, 4);  
   
-  dits[0] = 0;
-  dits[1] = 0.07;
-  dits[2] = 1.955;
-  gMC->Gsvolu("I531", "TUBE", idtmed[211], dits, 3);  
+  if (fluid == 1) {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I531", "TUBE", idtmed[211], dits, 3);  // set water as cooling fluid
+  } else {
+     dits[0] = 0;
+     dits[1] = 0.07;
+     dits[2] = 1.955;
+     gMC->Gsvolu("I531", "TUBE", idtmed[212], dits, 3);  // set freon as cooling fluid
+  }
      
   dits[0] = 0.07;
   dits[1] = 0.1;
@@ -2403,7 +2360,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("ITS5", "BOX ", idtmed[200], dits, 3);  
 
 
-  // --- Define volumes of shield between SPD and SDD ----------------
+
+  // --- Define volumes of shield of SPD ----------------
 
 
   dits[0] = 8.37;
@@ -2412,20 +2370,24 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gsvolu("IC01", "TUBE", idtmed[289], dits, 3);   
 
   dits[0] = 8.3;
-  dits[1] = 10;
+  dits[1] = 9.995;
   dits[2] = 17.5/2.;
   gMC->Gsvolu("IC02", "TUBE", idtmed[289], dits, 3);    
   
  
-   // --- Define volumes of cylinder between SDD and SSD --------------
-  
+  // --- Define volume of first cylinder between SPD and SDD --------------
   
-  dits[0] = (59.5-0.13/2.)/2.;
-  dits[1] = (59.5+0.13/2.)/2.;
-  dits[2] = 56.2;
-  gMC->Gsvolu("ICY2", "TUBE", idtmed[225], dits, 3);
+  dits[0] = (21.-0.128)/2.;      
+  dits[1] = 21./2.;
+  dits[2] = 39.4;      
+  gMC->Gsvolu("ICY1", "TUBE", idtmed[208], dits, 3);
          
+  // --- Define volume of second cylinder between SDD and SSD --------------
 
+  dits[0] = (59.5-0.128)/2.;      
+  dits[1] = 59.5/2.;
+  dits[2] = 56.2;      // was 57
+  gMC->Gsvolu("ICY2", "TUBE", idtmed[208], dits, 3);
 
   // --- Define volumes of SDD cone ---------------------------------- 
 
@@ -2434,13 +2396,13 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[2] = 12;
   dits[3] = -59.7;
   dits[4] = 27;
-  dits[5] = 28;
+  dits[5] = 28.6;
   dits[6] = -42.7;
   dits[7] = 10;
-  dits[8] = 28;
+  dits[8] = 28.6;
   dits[9] = -34.65;
   dits[10] = 10;
-  dits[11] = 28;
+  dits[11] = 28.6;
   dits[12] = -34.65;
   dits[13] = 10;
   dits[14] = 23.495;
@@ -2461,42 +2423,42 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[29] = 23.495;
   dits[30] = 34.65;
   dits[31] = 10;
-  dits[32] = 28;
-  dits[33] = 42.6263;
+  dits[32] = 28.6;
+  dits[33] = 42.7;
   dits[34] = 10;
-  dits[35] = 28;
+  dits[35] = 28.6;
   dits[36] = 59.7;
   dits[37] = 27.2637;
-  dits[38] = 28;             
+  dits[38] = 28.6;             
   gMC->Gsvolu("IS02", "PCON", idtmed[204], dits, 39);
   
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = 39.4;
-  dits[4] = 10.065;
-  dits[5] = 12.7;
-  dits[6] = 40.66;
-  dits[7] = 10.065;
-  dits[8] = 13.96;
-  dits[9] = 40.66;
-  dits[10] = 12.1781;
+  dits[3] = 38.65;
+  dits[4] = 10.75;    
+  dits[5] = 12.25;      
+  dits[6] = 40.15;
+  dits[7] = 10.75;
+  dits[8] = 13.96;   
+  dits[9] = 40.15;
+  dits[10] = 12.46;  
   dits[11] = 13.96;
-  dits[12] = 54.7;
-  dits[13] = 26.2181;
-  dits[14] = 28;
-  dits[15] = 55.2219;
-  dits[16] = 26.74;
-  dits[17] = 28;
-  dits[18] = 57.4;
-  dits[19] = 26.74;
-  dits[20] = 28;
+  dits[12] = 55.75;
+  dits[13] = 27;
+  dits[14] = 28.5;
+  dits[15] = 55.75;
+  dits[16] = 27;
+  dits[17] = 28.5;
+  dits[18] = 57.25;
+  dits[19] = 27;
+  dits[20] = 28.5;       
   gMC->Gsvolu("I093", "PCON", idtmed[272], dits, 21);  // SDD cone
 
   dits[0] = 0;
   dits[1] = 50;
   dits[2] = 3;
-  dits[3] = 27.35;  // 23.7
+  dits[3] = 39;  
   dits[4] = 14;
   dits[5] = 18.75;
   dits[6] = 46.7-3;
@@ -2505,12 +2467,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[9] = 51.45-3;
   dits[10] = 18.75;
   dits[11] = 18.75;
-  gMC->Gsvolu("I099", "PCON", idtmed[292], dits, 12); // SDD 3 end-ladder elect.
+  gMC->Gsvolu("I099", "PCON", idtmed[204], dits, 12); // SDD 3 cone hole
 
   dits[0] = 0;
   dits[1] = 25;
   dits[2] = 3;
-  dits[3] = 34.65;
+  dits[3] = 49;
   dits[4] = 23.4;
   dits[5] = 26.4;
   dits[6] = 56.1-3;
@@ -2519,27 +2481,22 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[9] = 59.1-3;
   dits[10] = 26.4;
   dits[11] = 26.4;
-  gMC->Gsvolu("I200", "PCON", idtmed[292], dits, 12); // SDD 4 end-ladder elect.
+  gMC->Gsvolu("I200", "PCON", idtmed[204], dits, 12); // SDD 4 cone hole
 
-  dits[0] = 10.065;
-  dits[1] = 11;
+  dits[0] = 10.0;
+  dits[1] = 10.5;
   dits[2] = 0.25;
-  gMC->Gsvolu("I090", "TUBE", idtmed[208], dits, 3);
-
-  dits[0] = 10.001;
-  dits[1] = 10.065;
-  dits[2] = 40;
-  gMC->Gsvolu("I089", "TUBE", idtmed[208], dits, 3);
+  gMC->Gsvolu("I090", "TUBE", idtmed[224], dits, 3);  // SDD cylinder flange
 
   dits[0] = 21.95;
-  dits[1] = 24.2;
+  dits[1] = 22.95;    
   dits[2] = 1;
-  gMC->Gsvolu("I098", "TUBE", idtmed[204], dits, 3);
+  gMC->Gsvolu("I098", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 4
 
-  dits[0] = 13.1;
-  dits[1] = 15.4;
+  dits[0] = 13.1;    
+  dits[1] = 14.1;    
   dits[2] = 1;
-  gMC->Gsvolu("I097", "TUBE", idtmed[204], dits, 3);
+  gMC->Gsvolu("I097", "TUBE", idtmed[283], dits, 3);    // ladder support on layer 3
 
   dits[0] = 1;
   dits[1] = 1;
@@ -2574,153 +2531,143 @@ void AliITSvPPRsymm::CreateGeometry(){
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 12;
-  dits[3] = -77.2;
-  dits[4] = 46;
-  dits[5] = 47;
+  dits[3] = -zmax;
+  dits[4] = 46;         
+  dits[5] = 49.25;       
   dits[6] = -61.2;
-  dits[7] = 28.5;
-  dits[8] = 47;
+  dits[7] = 28.7;
+  dits[8] = 49.25;       
   dits[9] = -57.5;
-  dits[10] = 28.5;
-  dits[11] = 47;
+  dits[10] = 28.7;
+  dits[11] = 49.25;      
   dits[12] = -57.5;
-  dits[13] = 28.5;
+  dits[13] = 28.7;
   dits[14] = 43.5;
-  dits[15] = -51.365;
-  dits[16] = 28.5;
+  dits[15] = -49.2;
+  dits[16] = 28.7;
   dits[17] = 43.5;
-  dits[18] = -51.365;
-  dits[19] = 28.5;
-  dits[20] = 36.69;
-  dits[21] = 51.3651;
-  dits[22] = 28.5;
-  dits[23] = 36.69;
-  dits[24] = 51.3651;
-  dits[25] = 28.5;
+  dits[18] = -49.2;
+  dits[19] = 28.7;
+  dits[20] = 36.85;
+  dits[21] = 50.6;
+  dits[22] = 28.7;
+  dits[23] = 36.85;
+  dits[24] = 50.6;
+  dits[25] = 28.7;
   dits[26] = 43.5;
-  dits[27] = 56.96;
-  dits[28] = 28.5;
+  dits[27] = 57.5;
+  dits[28] = 28.7;
   dits[29] = 43.5;
-  dits[30] = 56.96;
-  dits[31] = 28.5;
-  dits[32] = 47;
-  dits[33] = 60.66;
-  dits[34] = 28.5;
-  dits[35] = 47;
-  dits[36] = 77.2;
-  dits[37] = 46;
-  dits[38] = 47;  
-  gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);
+  dits[30] = 57.5;
+  dits[31] = 28.7;
+  dits[32] = 49.25;      
+  dits[33] = 61.2;
+  dits[34] = 28.7;
+  dits[35] = 49.25;      
+  dits[36] = zmax;
+  dits[37] = 46;      
+  dits[38] = 49.25;      
+  gMC->Gsvolu("IS01", "PCON", idtmed[204], dits, 39);   // SSD cone mother volume
   
   dits[0] = 0;
   dits[1] = 360;
   dits[2] = 6;
-  dits[3] = -77.2;
-  dits[4] = 46; 
-  dits[5] = 48.5;   
-  dits[6] = -73.5;
-  dits[7] = 46;  
-  dits[8] = 47.5;   
-  dits[9] = -72.7819;
-  dits[10] = 46;   
-  dits[11] = 47.2819;
-  dits[12] = -59.5;
-  dits[13] = 31.2181;
-  dits[14] = 33;
-  dits[15] = -59.5;
-  dits[16] = 28;
-  dits[17] = 33;
-  dits[18] = -57;
-  dits[19] = 28;
-  dits[20] = 30.5;
+  dits[3] = -zmax;  
+  dits[4] = 47.75;  
+  dits[5] = 49.25;  
+  dits[6] = -zmax+2.;  
+  dits[7] = 47.75;  
+  dits[8] = 49.25;   
+  dits[9] = -71.2819;
+  dits[10] = 46.75;   
+  dits[11] = 49.0319;
+  dits[12] = -57.25;   // was 58.5 
+  dits[13] = 32.9681;
+  dits[14] = 34.75;
+  dits[15] = -57.25;   // was 58.5   
+  dits[16] = 30;
+  dits[17] = 34.75;
+  dits[18] = -55.75;   // was 57 
+  dits[19] = 30;     
+  dits[20] = 32.25;    // was 31.5 
   gMC->Gsvolu("I212", "PCON", idtmed[272], dits, 21);  // SSD cone
   
-  dits[0] = 28;
-  dits[1] = 29.82;
+  dits[0] = 28.75;          
+  dits[1] = 29.75;   
   dits[2] = 0.5;
-  gMC->Gsvolu("I211", "TUBE", idtmed[219], dits, 3);
-  
-  dits[0] = 37.35;
-  dits[1] = 38.25;
-  dits[2] = 1;
-  gMC->Gsvolu("I217", "TUBE", idtmed[224], dits, 3);
+  gMC->Gsvolu("I211", "TUBE", idtmed[224], dits, 3);   // SSD cylinder flange
   
-  dits[0] = 38.25;
-  dits[1] = 39.08;
+  dits[0] = 35.8;   
+  dits[1] = 36.8;   
   dits[2] = 1;
-  gMC->Gsvolu("I218", "TUBE", idtmed[264], dits, 3);
+  gMC->Gsvolu("I217", "TUBE", idtmed[283], dits, 3);   // ladder support on layer 5 
   
-  dits[0] = 41.85;
-  dits[1] = 42.75;
+  dits[0] = 41.4;  
+  dits[1] = 42.4;  
   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;
+  gMC->Gsvolu("I219", "TUBE", idtmed[283], dits, 3);   // ladder support on layer 6
+        
+  dits[0] = 42.05+5.;       
+  dits[1] = 42.55+5.;     
   dits[2] = 1.25;
-  gMC->Gsvolu("I214", "TUBE", idtmed[224], dits, 3);
-    
-  dits[0] = 37.1;
-  dits[1] = 37.5;
+  gMC->Gsvolu("I214", "TUBE", idtmed[224], dits, 3);   // layer 6 electronic support
+                                                       // this will change after PPR
+  dits[0] = 37.05+5.;   
+  dits[1] = 37.55+5.;   
   dits[2] = 1.25;
-  gMC->Gsvolu("I213", "TUBE", idtmed[224], dits, 3);
-        
+  gMC->Gsvolu("I213", "TUBE", idtmed[224], dits, 3);   // layer 5 electronic support
+                                                       // this will change after PPR
   dits[0] = 0;
   dits[1] = 25;
   dits[2] = 5;
-  dits[3] = -77.2+3;
-  dits[4] = 44.5;
-  dits[5] = 44.5;
+  dits[3] = -zmax+3;
+  dits[4] = 45.5;
+  dits[5] = 45.5;
   dits[6] = -69.7+3;
   dits[7] = 37;
-  dits[8] = 44.5;
+  dits[8] = 45.5;
   dits[9] = -68.5+3;
   dits[10] = 37;
-  dits[11] = 44.5;
+  dits[11] = 45.5;
   dits[12] = -68.5+4.8;  
   dits[13] = 37;
-  dits[14] = 44.5; 
+  dits[14] = 45.5; 
   dits[15] = -63.5+4.8;
   dits[16] = 37;
-  dits[17] = 44.5;   
-  gMC->Gsvolu("I215", "PCON", idtmed[294], dits, 18);  // SSD end-ladder elect.  
+  dits[17] = 45.5;   
+  gMC->Gsvolu("I215", "PCON", idtmed[204], dits, 18);  // SSD cone hole 
  
   dits[0] = 0;
   dits[1] = 3.2;
   dits[2] = 9;
-  dits[3] = -16.45;
+  dits[3] = -14;
   dits[4] = 30.5;
   dits[5] = 33.5;
-  dits[6] = -7.85;
+  dits[6] = -9.85;
   dits[7] = 30.5;
   dits[8] = 33.5;
-  dits[9] = -7.85;
+  dits[9] = -9.85;
   dits[10] = 30.5;
-  dits[11] = 41.85;
-  dits[12] = -5.85;
+  dits[11] = 43.45;
+  dits[12] = -7.85;
   dits[13] = 30.5;
-  dits[14] = 41.85;
-  dits[15] = -5.85;
+  dits[14] = 43.45;
+  dits[15] = -7.85;
   dits[16] = 30.5;
   dits[17] = 36.5;
-  dits[18] = -5;
+  dits[18] = -7;
   dits[19] = 30.5;
   dits[20] = 36.5;
-  dits[21] = -2;
+  dits[21] = -4;
   dits[22] = 33.0173;
   dits[23] = 36.5;
-  dits[24] = -2;
+  dits[24] = -4;
   dits[25] = 33.0173;
-  dits[26] = 37.35;
-  dits[27] = 0;
+  dits[26] = 36.80;
+  dits[27] = -2;
   dits[28] = 34.6955;
-  dits[29] = 37.35;
-  gMC->Gsvolu("I216", "PCON", idtmed[272], dits, 30);
+  dits[29] = 36.80;
+  gMC->Gsvolu("I216", "PCON", idtmed[272], dits, 30); // supports (1-6) of the ladders
        
        
   // --- Place SPD (option 'a') volumes into their mother volume IT12
@@ -2798,15 +2745,15 @@ void AliITSvPPRsymm::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,-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",3,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],-3.536,0,"ONLY");
+     gMC->Gspos("I103",4,"I10A",-0.05,-di10a[1]+2.*di104[1]+di103[1],-10.708,0,"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,-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",3,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],-3.536,0,"ONLY");
+     gMC->Gspos("I1D3",4,"I20A",-0.05,-di20a[1]+2.*di104[1]+di1d3[1],-10.708,0,"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");
@@ -2970,8 +2917,8 @@ void AliITSvPPRsymm::CreateGeometry(){
      gMC->Gspos("I105",4,"I10B",-0.05,-0.01,16.844,0,"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("I107",4,"I10B",-0.0455,-di10b[1]+di107[1],-10.708,0,"ONLY");
+     gMC->Gspos("I107",3,"I10B",-0.0455,-di10b[1]+di107[1],-3.536,0,"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,-di10b[1]+2.*di107[1]+di108[1],0.0,0,"ONLY");
@@ -3263,8 +3210,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   xI424 = I028dits[0]/3.;
   yI424 = -I028dits[1]+I424dits[1];
   gMC->Gspos("I422", 1,"I421", 0.0, 0.0, 0.0, 0, "ONLY");
-  gMC->Gspos("I423", 1,"I421", 0.0, -I421dits[1]+I423dits[2], 0.0, idrotm[312], "ONLY");
-  gMC->Gspos("I421", 1,"I420", 0.0, 0.0, 0.0, 0, "ONLY");
+  gMC->Gspos("I423", 1,"I421", 0.0, 0.0, I421dits[2]-I423dits[2], 0, "ONLY");
+  gMC->Gspos("I421", 1,"I420", 0.0, 0.0, 0.0, idrotm[312], "ONLY");
   gMC->Gspos("I420", 1,"I028", -I028dits[0]/3., I028dits[1]-I420dits[1], 0.0, 0, "ONLY");
   gMC->Gspos("I424", 1,"I028", xI424, yI424, 0.0, 0, "ONLY");
   gMC->Gspos("I028", 1,"I024", 0.0, I028dits[1]-I024dits[1], I024dits[2]-I028dits[2], 0, "MANY");
@@ -3441,7 +3388,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gspos("I570",34,"IT56",21.7497,40.1899,-0.27,idrotm[549],"ONLY");
   gMC->Gspos("I570",35,"IT56",14.7884,43.0772,-0.27,idrotm[550],"ONLY");
   gMC->Gspos("I570",36,"IT56",7.5216,45.0744,-0.27,idrotm[551],"ONLY");
-  gMC->Gspos("I570",37,"IT56",-0.27,45.545,-0.27,0,"ONLY");
+  gMC->Gspos("I570",37,"IT56",0.,45.545,-0.27,0,"ONLY");
   gMC->Gspos("I570",38,"IT56",-7.5216,45.0744,-0.27,idrotm[552],"ONLY");
   gMC->Gspos("I570",1,"IT56",-14.7884,43.0772,-0.27,idrotm[553],"ONLY");
   gMC->Gspos("I570",2,"IT56",-21.7497,40.1899,-0.27,idrotm[620],"ONLY");
@@ -3860,10 +3807,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   //gMC->Gspos("IC03",2,"ITSD",0.0,0.0,-25.-17.5-7.875,idrotm[200],"ONLY");   
   
   
-  // --- Place volumes of shield between SDD and SSD 
+  // --- Place volumes of cylinders between SPD and SDD and SDD and SSD 
   
-
-  gMC->Gspos("ICY2",1,"ITSD",0.0,0.0,-0.7,0,"ONLY");    
+  gMC->Gspos("ICY1",1,"IS02",0.0,0.0,0.,0,"ONLY");    
+  gMC->Gspos("ICY2",1,"IS01",0.0,0.0,0.,0,"ONLY");    
   
 
   // --- Place volumes of SDD cone ---------------------------------- 
@@ -3871,27 +3818,26 @@ void AliITSvPPRsymm::CreateGeometry(){
   
   gMC->Gspos("I093",1,"IS02",0.0,0.0,0.0,0,"MANY");
   gMC->Gspos("I093",2,"IS02",0.0,0.0,0.0,idrotm[856],"MANY");
-  gMC->Gspos("I099",4,"IS02",0.0,0.0,0.0,idrotm[857],"ONLY");
-  gMC->Gspos("I099",3,"IS02",0.0,0.0,0.0,idrotm[858],"ONLY");
-  gMC->Gspos("I099",5,"IS02",0.0,0.0,0.0,idrotm[859],"ONLY");
-  gMC->Gspos("I099",6,"IS02",0.0,0.0,0.0,idrotm[860],"ONLY");
-  gMC->Gspos("I099",7,"IS02",0.0,0.0,0.0,idrotm[861],"ONLY");
-  gMC->Gspos("I099",2,"IS02",0.0,0.0,0.0,idrotm[862],"ONLY");
-  gMC->Gspos("I200",4,"IS02",0.0,0.0,0.0,idrotm[863],"ONLY");
-  gMC->Gspos("I200",3,"IS02",0.0,0.0,0.0,idrotm[864],"ONLY");
-  gMC->Gspos("I200",2,"IS02",0.0,0.0,0.0,idrotm[865],"ONLY");
-  gMC->Gspos("I200",13,"IS02",0.0,0.0,0.0,idrotm[867],"ONLY");
-  gMC->Gspos("I200",12,"IS02",0.0,0.0,0.0,idrotm[869],"ONLY");
-  gMC->Gspos("I200",11,"IS02",0.0,0.0,0.0,idrotm[870],"ONLY");
-  gMC->Gspos("I200",10,"IS02",0.0,0.0,0.0,idrotm[871],"ONLY");
-  gMC->Gspos("I200",9,"IS02",0.0,0.0,0.0,idrotm[872],"ONLY");
-  gMC->Gspos("I200",8,"IS02",0.0,0.0,0.0,idrotm[873],"ONLY");
-  gMC->Gspos("I200",7,"IS02",0.0,0.0,0.0,idrotm[874],"ONLY");
-  gMC->Gspos("I200",6,"IS02",0.0,0.0,0.0,idrotm[875],"ONLY");
-  gMC->Gspos("I200",5,"IS02",0.0,0.0,0.0,idrotm[876],"ONLY");
-  gMC->Gspos("I090",2,"IS02",0.0,0.0,-39.15,0,"ONLY");
-  //gMC->Gspos("I089",1,"IS02",0.0,0.0,0.0,0,"ONLY");   // old cylind. shield
-  gMC->Gspos("I090",1,"IS02",0.0,0.0,39.15,idrotm[856],"ONLY");
+  gMC->Gspos("I099",4,"IS02",0.0,0.0,0.0,idrotm[857],"MANY");
+  gMC->Gspos("I099",3,"IS02",0.0,0.0,0.0,idrotm[858],"MANY");
+  gMC->Gspos("I099",5,"IS02",0.0,0.0,0.0,idrotm[859],"MANY");
+  gMC->Gspos("I099",6,"IS02",0.0,0.0,0.0,idrotm[860],"MANY");
+  gMC->Gspos("I099",7,"IS02",0.0,0.0,0.0,idrotm[861],"MANY");
+  gMC->Gspos("I099",2,"IS02",0.0,0.0,0.0,idrotm[862],"MANY");
+  gMC->Gspos("I200",4,"IS02",0.0,0.0,0.0,idrotm[863],"MANY");
+  gMC->Gspos("I200",3,"IS02",0.0,0.0,0.0,idrotm[864],"MANY");
+  gMC->Gspos("I200",2,"IS02",0.0,0.0,0.0,idrotm[865],"MANY");
+  gMC->Gspos("I200",13,"IS02",0.0,0.0,0.0,idrotm[867],"MANY");
+  gMC->Gspos("I200",12,"IS02",0.0,0.0,0.0,idrotm[869],"MANY");
+  gMC->Gspos("I200",11,"IS02",0.0,0.0,0.0,idrotm[870],"MANY");
+  gMC->Gspos("I200",10,"IS02",0.0,0.0,0.0,idrotm[871],"MANY");
+  gMC->Gspos("I200",9,"IS02",0.0,0.0,0.0,idrotm[872],"MANY");
+  gMC->Gspos("I200",8,"IS02",0.0,0.0,0.0,idrotm[873],"MANY");
+  gMC->Gspos("I200",7,"IS02",0.0,0.0,0.0,idrotm[874],"MANY");
+  gMC->Gspos("I200",6,"IS02",0.0,0.0,0.0,idrotm[875],"MANY");
+  gMC->Gspos("I200",5,"IS02",0.0,0.0,0.0,idrotm[876],"MANY");
+  gMC->Gspos("I090",2,"IS02",0.0,0.0,-39.4,0,"ONLY");    
+  gMC->Gspos("I090",1,"IS02",0.0,0.0,39.4,idrotm[856],"ONLY");  
   gMC->Gspos("I099",9,"IS02",0.0,0.0,0.0,idrotm[877],"ONLY");
   gMC->Gspos("I099",8,"IS02",0.0,0.0,0.0,idrotm[879],"ONLY");
   gMC->Gspos("I099",1,"IS02",0.0,0.0,0.0,idrotm[880],"ONLY");
@@ -3910,10 +3856,10 @@ void AliITSvPPRsymm::CreateGeometry(){
   gMC->Gspos("I200",21,"IS02",0.0,0.0,0.0,idrotm[892],"ONLY");
   gMC->Gspos("I200",20,"IS02",0.0,0.0,0.0,idrotm[868],"ONLY");
   gMC->Gspos("I200",19,"IS02",0.0,0.0,0.0,idrotm[893],"ONLY");
-  gMC->Gspos("I098",1,"IS02",0.0,0.0,32.1,0,"ONLY");
-  gMC->Gspos("I097",1,"IS02",0.0,0.0,25.1,0,"ONLY");
-  gMC->Gspos("I097",2,"IS02",0.0,0.0,-25.1,idrotm[856],"ONLY");
-  gMC->Gspos("I098",2,"IS02",0.0,0.0,-32.1,idrotm[856],"ONLY");
+  gMC->Gspos("I098",1,"IS02",0.0,0.0,33.6,0,"ONLY");    
+  gMC->Gspos("I097",1,"IS02",0.0,0.0,26.6,0,"ONLY");    
+  gMC->Gspos("I097",2,"IS02",0.0,0.0,-26.6,idrotm[856],"ONLY");  
+  gMC->Gspos("I098",2,"IS02",0.0,0.0,-33.6,idrotm[856],"ONLY");  
   gMC->Gspos("I202",1,"IS02",12.1,0.0,33.84,0,"ONLY");
   gMC->Gspos("I202",6,"IS02",-6.05,-10.4789,33.84,idrotm[930],"ONLY");
   gMC->Gspos("I202",5,"IS02",-6.05,10.4789,33.84,idrotm[929],"ONLY");
@@ -3975,59 +3921,54 @@ void AliITSvPPRsymm::CreateGeometry(){
   // --- Place volumes of SSD cone ----------------------------------    
 
     
-  gMC->Gspos("I212",2,"IS01",0.0,0.0,0.0,idrotm[701],"MANY"); // old z=-1.4
+  gMC->Gspos("I212",2,"IS01",0.0,0.0,0.0,idrotm[701],"MANY");
   gMC->Gspos("I212",1,"IS01",0.0,0.0,0.0,0,"MANY");
-  //gMC->Gspos("I210",1,"IS01",0.0,0.0,-0.7,0,"ONLY");  // old cylind. shield
   gMC->Gspos("I211",1,"IS01",0.0,0.0,-56.5,0,"ONLY");
-  gMC->Gspos("I217",1,"IS01",0.0,0.0,-47.75,0,"ONLY");
-  gMC->Gspos("I218",1,"IS01",0.0,0.0,-47.75,0,"ONLY");
-  gMC->Gspos("I219",1,"IS01",0.0,0.0,-53.6,0,"ONLY");
-  gMC->Gspos("I220",1,"IS01",0.0,0.0,-53.6,0,"ONLY");
-  gMC->Gspos("I211",2,"IS01",0.0,0.0,55.1,idrotm[701],"ONLY");
-  gMC->Gspos("I219",2,"IS01",0.0,0.0,52.2,idrotm[701],"ONLY");
-  gMC->Gspos("I220",2,"IS01",0.0,0.0,52.2,idrotm[701],"ONLY");
-  gMC->Gspos("I217",2,"IS01",0.0,0.0,46.35,idrotm[701],"ONLY");
-  gMC->Gspos("I218",2,"IS01",0.0,0.0,46.35,idrotm[701],"ONLY");
-  gMC->Gspos("I214",2,"IS01",0.0,0.0,65.85,idrotm[701],"ONLY");
-  gMC->Gspos("I213",2,"IS01",0.0,0.0,60.85,idrotm[701],"ONLY");
-  gMC->Gspos("I213",1,"IS01",0.0,0.0,-62.25,0,"ONLY");
-  gMC->Gspos("I214",1,"IS01",0.0,0.0,-67.25,0,"ONLY");
-  gMC->Gspos("I215",19,"IS01",0.0,0.0,-1.4,idrotm[702],"ONLY");
-  gMC->Gspos("I215",21,"IS01",0.0,0.0,-1.4,idrotm[703],"ONLY");
-  gMC->Gspos("I215",23,"IS01",0.0,0.0,-1.4,idrotm[704],"ONLY");
-  gMC->Gspos("I215",24,"IS01",0.0,0.0,-1.4,idrotm[705],"ONLY");
-  gMC->Gspos("I215",3,"IS01",0.0,0.0,-1.4,idrotm[706],"ONLY");
-  gMC->Gspos("I215",5,"IS01",0.0,0.0,-1.4,idrotm[707],"ONLY");
-  gMC->Gspos("I215",7,"IS01",0.0,0.0,-1.4,idrotm[708],"ONLY");
-  gMC->Gspos("I215",9,"IS01",0.0,0.0,-1.4,idrotm[709],"ONLY");
-  gMC->Gspos("I215",11,"IS01",0.0,0.0,-1.4,idrotm[710],"ONLY");
-  gMC->Gspos("I215",13,"IS01",0.0,0.0,-1.4,idrotm[711],"ONLY");
-  gMC->Gspos("I215",15,"IS01",0.0,0.0,-1.4,idrotm[712],"ONLY");
-  gMC->Gspos("I215",17,"IS01",0.0,0.0,-1.4,idrotm[713],"ONLY");
-  gMC->Gspos("I216",9,"IS01",0.0,0.0,45.35,idrotm[714],"ONLY");
-  gMC->Gspos("I216",11,"IS01",0.0,0.0,45.35,idrotm[715],"ONLY");
-  gMC->Gspos("I216",12,"IS01",0.0,0.0,45.35,idrotm[716],"ONLY");
-  gMC->Gspos("I216",3,"IS01",0.0,0.0,45.35,idrotm[717],"ONLY");
-  gMC->Gspos("I216",5,"IS01",0.0,0.0,45.35,idrotm[718],"ONLY");
-  gMC->Gspos("I216",7,"IS01",0.0,0.0,45.35,idrotm[719],"ONLY");
-  gMC->Gspos("I216",10,"IS01",0.0,0.0,-46.75,idrotm[720],"ONLY");
-  gMC->Gspos("I216",1,"IS01",0.0,0.0,-46.75,idrotm[721],"ONLY");
-  gMC->Gspos("I216",2,"IS01",0.0,0.0,-46.75,idrotm[722],"ONLY");
-  gMC->Gspos("I216",4,"IS01",0.0,0.0,-46.75,idrotm[723],"ONLY");
-  gMC->Gspos("I216",6,"IS01",0.0,0.0,-46.75,idrotm[724],"ONLY");
-  gMC->Gspos("I216",8,"IS01",0.0,0.0,-46.75,idrotm[725],"ONLY");
-  gMC->Gspos("I215",1,"IS01",0.0,0.0,0.0,idrotm[726],"ONLY");
-  gMC->Gspos("I215",2,"IS01",0.0,0.0,0.0,idrotm[727],"ONLY");
-  gMC->Gspos("I215",4,"IS01",0.0,0.0,0.0,idrotm[728],"ONLY");
-  gMC->Gspos("I215",6,"IS01",0.0,0.0,0.0,idrotm[729],"ONLY");
-  gMC->Gspos("I215",8,"IS01",0.0,0.0,0.0,idrotm[733],"ONLY");
-  gMC->Gspos("I215",10,"IS01",0.0,0.0,0.0,idrotm[730],"ONLY");
-  gMC->Gspos("I215",12,"IS01",0.0,0.0,0.0,idrotm[731],"ONLY");
-  gMC->Gspos("I215",14,"IS01",0.0,0.0,0.0,idrotm[768],"ONLY");
-  gMC->Gspos("I215",16,"IS01",0.0,0.0,0.0,idrotm[732],"ONLY");
-  gMC->Gspos("I215",18,"IS01",0.0,0.0,0.0,idrotm[734],"ONLY");
-  gMC->Gspos("I215",20,"IS01",0.0,0.0,0.0,idrotm[798],"ONLY");
-  gMC->Gspos("I215",22,"IS01",0.0,0.0,0.0,idrotm[735],"ONLY");
+  gMC->Gspos("I217",1,"IS01",0.0,0.0,-44.4,0,"ONLY");             // this will change after PPR to be symmetric
+  gMC->Gspos("I219",1,"IS01",0.0,0.0,-50.25,0,"ONLY");            // this will change after PPR to be symmetric
+  gMC->Gspos("I211",2,"IS01",0.0,0.0,56.5,idrotm[701],"ONLY");   
+  gMC->Gspos("I219",2,"IS01",0.0,0.0,51.65,idrotm[701],"ONLY");   // this will change after PPR to be symmetric
+  gMC->Gspos("I217",2,"IS01",0.0,0.0,45.8,idrotm[701],"ONLY");    // this will change after PPR to be symmetric
+  gMC->Gspos("I214",2,"IS01",0.0,0.0,67.25,idrotm[701],"ONLY");   
+  gMC->Gspos("I213",2,"IS01",0.0,0.0,62.25,idrotm[701],"ONLY");  
+  gMC->Gspos("I213",1,"IS01",0.0,0.0,-62.25,0,"ONLY");             
+  gMC->Gspos("I214",1,"IS01",0.0,0.0,-67.25,0,"ONLY");           
+  gMC->Gspos("I215",19,"IS01",0.0,0.0,0.0,idrotm[702],"MANY");
+  gMC->Gspos("I215",21,"IS01",0.0,0.0,0.0,idrotm[703],"MANY");
+  gMC->Gspos("I215",23,"IS01",0.0,0.0,0.0,idrotm[704],"MANY");
+  gMC->Gspos("I215",24,"IS01",0.0,0.0,0.0,idrotm[705],"MANY");
+  gMC->Gspos("I215",3,"IS01",0.0,0.0,0.0,idrotm[706],"MANY");
+  gMC->Gspos("I215",5,"IS01",0.0,0.0,0.0,idrotm[707],"MANY");
+  gMC->Gspos("I215",7,"IS01",0.0,0.0,0.0,idrotm[708],"MANY");
+  gMC->Gspos("I215",9,"IS01",0.0,0.0,0.0,idrotm[709],"MANY");
+  gMC->Gspos("I215",11,"IS01",0.0,0.0,0.0,idrotm[710],"MANY");
+  gMC->Gspos("I215",13,"IS01",0.0,0.0,0.0,idrotm[711],"MANY");
+  gMC->Gspos("I215",15,"IS01",0.0,0.0,0.0,idrotm[712],"MANY");
+  gMC->Gspos("I215",17,"IS01",0.0,0.0,0.0,idrotm[713],"MANY");
+  gMC->Gspos("I216",9,"IS01",0.0,0.0,45.5,idrotm[714],"ONLY");
+  gMC->Gspos("I216",11,"IS01",0.0,0.0,45.5,idrotm[715],"ONLY");
+  gMC->Gspos("I216",12,"IS01",0.0,0.0,45.5,idrotm[716],"ONLY");
+  gMC->Gspos("I216",3,"IS01",0.0,0.0,45.5,idrotm[717],"ONLY");
+  gMC->Gspos("I216",5,"IS01",0.0,0.0,45.5,idrotm[718],"ONLY");
+  gMC->Gspos("I216",7,"IS01",0.0,0.0,45.5,idrotm[719],"ONLY");
+  gMC->Gspos("I216",10,"IS01",0.0,0.0,-44,idrotm[720],"ONLY");
+  gMC->Gspos("I216",1,"IS01",0.0,0.0,-44,idrotm[721],"ONLY");
+  gMC->Gspos("I216",2,"IS01",0.0,0.0,-44,idrotm[722],"ONLY");
+  gMC->Gspos("I216",4,"IS01",0.0,0.0,-44,idrotm[723],"ONLY");
+  gMC->Gspos("I216",6,"IS01",0.0,0.0,-44,idrotm[724],"ONLY");
+  gMC->Gspos("I216",8,"IS01",0.0,0.0,-44,idrotm[725],"ONLY");
+  gMC->Gspos("I215",1,"IS01",0.0,0.0,0.0,idrotm[726],"MANY");
+  gMC->Gspos("I215",2,"IS01",0.0,0.0,0.0,idrotm[727],"MANY");
+  gMC->Gspos("I215",4,"IS01",0.0,0.0,0.0,idrotm[728],"MANY");
+  gMC->Gspos("I215",6,"IS01",0.0,0.0,0.0,idrotm[729],"MANY");
+  gMC->Gspos("I215",8,"IS01",0.0,0.0,0.0,idrotm[733],"MANY");
+  gMC->Gspos("I215",10,"IS01",0.0,0.0,0.0,idrotm[730],"MANY");
+  gMC->Gspos("I215",12,"IS01",0.0,0.0,0.0,idrotm[731],"MANY");
+  gMC->Gspos("I215",14,"IS01",0.0,0.0,0.0,idrotm[768],"MANY");
+  gMC->Gspos("I215",16,"IS01",0.0,0.0,0.0,idrotm[732],"MANY");
+  gMC->Gspos("I215",18,"IS01",0.0,0.0,0.0,idrotm[734],"MANY");
+  gMC->Gspos("I215",20,"IS01",0.0,0.0,0.0,idrotm[798],"MANY");
+  gMC->Gspos("I215",22,"IS01",0.0,0.0,0.0,idrotm[735],"MANY");
            
                    
   // --- Place subdetectors' mother volumes and supports' mother volumes
@@ -4042,40 +3983,90 @@ void AliITSvPPRsymm::CreateGeometry(){
 
   // ****************************  SERVICES  *********************************
 
+   // --- DEFINE CABLES AT THE END OF THE ITS CONES - COPPER PART
+  //     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");
   
   // --- 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] = 46.;
-  dgh[1] = 46.+1.0;
+  dgh[0] = 46.+1.0;  
+  dgh[1] = 46.+1.0+1.5;   
   dgh[2] = 9.5;
+  dgh[3] = 12.;
+  dgh[4] = 168.;
   
-  gMC->Gsvolu("ICCU", "TUBE", idtmed[213], dgh, 3);  
-  gMC->Gspos("ICCU", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCU", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");
+  gMC->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
   
-  dgh[0] = 46.+1.0;
-  dgh[1] = 46.+1.0+1.5;
+  dgh[0] = 46.+1.0;  
+  dgh[1] = 46.+1.0+1.5;   
   dgh[2] = 9.5;
+  dgh[3] = 192.;
+  dgh[4] = 348.;
   
-  gMC->Gsvolu("ICCC", "TUBE", idtmed[225], dgh, 3);  
-  gMC->Gspos("ICCC", 1, "ITSV", 0., 0., 86.7, 0, "ONLY");
-  gMC->Gspos("ICCC", 2, "ITSV", 0., 0., -86.7, idrotm[200], "ONLY");  
+  gMC->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] = 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
   
-  dgh[0] = 46.;
+  dgh[0] = 46.;  
   dgh[1] = 56.;
   dgh[2] = 2.25;
+  dgh[3] = 192.;
+  dgh[4] = 348.;
   
-  gMC->Gsvolu("IPAN", "TUBE", idtmed[210], dgh, 3);  
-  gMC->Gspos("IPAN", 1, "ITSV", 0., 0., 98.45, 0, "ONLY");  
-  gMC->Gspos("IPAN", 2, "ITSV", 0., 0., -98.45, idrotm[200], "ONLY"); 
+  gMC->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 - COPPER PART - UPPER PART
  
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -4083,12 +4074,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;
   gMC->Gsvolu("ICU1", "CONS", idtmed[213], dgh, 7);    
-  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICU1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - COPPER PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2;
   dgh[2] = 46.2+1.0;
   dgh[3] = 62.3;
@@ -4096,12 +4087,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;
   gMC->Gsvolu("ICU2", "CONS", idtmed[213], dgh, 7);    
-  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICU2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICU2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - UPPER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -4109,12 +4100,12 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 12.;    
   dgh[6] = 168.;  
   gMC->Gsvolu("ICC1", "CONS", idtmed[225], dgh, 7);    
-  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");   
+  gMC->Gspos("ICC1", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC1", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");   
   
   // --- DEFINE CABLES/COOLING BELOW THE TPC - CARBON PART - LOWER PART
   
-  dgh[0] = (xltpc-100.7)/2.;
+  dgh[0] = (ztpc-97.5)/2.;
   dgh[1] = 46.2+1.0;
   dgh[2] = 46.2+1.0+1.5;
   dgh[3] = 62.3+1.0;
@@ -4122,8 +4113,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[5] = 192.;    
   dgh[6] = 348.;  
   gMC->Gsvolu("ICC2", "CONS", idtmed[225], dgh, 7);    
-  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 100.7+dgh[0], 0, "ONLY");  
-  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(100.7+dgh[0]), idrotm[200], "ONLY");     
+  gMC->Gspos("ICC2", 1, "ITSV", 0., 0., 97.5+dgh[0], 0, "ONLY");  
+  gMC->Gspos("ICC2", 2, "ITSV", 0., 0., -(97.5+dgh[0]), idrotm[200], "ONLY");     
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - UPPER PART
     
@@ -4133,8 +4124,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICU3", "TUBS", idtmed[213], dgh, 5);    
-  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU3", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU3", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
   
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - COPPER PART - LOWER PART
   
@@ -4144,8 +4135,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICU4", "TUBS", idtmed[213], dgh, 5);    
-  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., xltpc+1.5+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(xltpc+1.5+dgh[2]), idrotm[200], "ONLY");      
+  gMC->Gspos("ICU4", 1, "ITSV", 0., 0., ztpc+1.5+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICU4", 2, "ITSV", 0., 0., -(ztpc+1.5+dgh[2]), idrotm[200], "ONLY");      
      
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - UPPER PART
 
@@ -4155,8 +4146,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("ICC3", "TUBS", idtmed[225], dgh, 5);    
-  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC3", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC3", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
     
   // --- DEFINE CABLES/COOLING BEHIND THE TPC - CARBON PART - LOWER PART
 
@@ -4166,8 +4157,8 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("ICC4", "TUBS", idtmed[225], dgh, 5);    
-  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., xltpc+dgh[2], 0, "ONLY");  
-  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(xltpc+dgh[2]), idrotm[200], "ONLY"); 
+  gMC->Gspos("ICC4", 1, "ITSV", 0., 0., ztpc+dgh[2], 0, "ONLY");  
+  gMC->Gspos("ICC4", 2, "ITSV", 0., 0., -(ztpc+dgh[2]), idrotm[200], "ONLY"); 
 
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - UPPER PART
   
@@ -4177,7 +4168,7 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 12.;
   dgh[4] = 168.;
   gMC->Gsvolu("IHK1", "TUBS", idtmed[264], dgh, 5);   
-  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");      
+  gMC->Gspos("IHK1", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");      
   
   // --- DEFINE HOOK TO THE TPC ON OTHER SIDE W.R.T. THE ABSORBER - LOWER PART
   
@@ -4187,525 +4178,85 @@ void AliITSvPPRsymm::CreateGeometry(){
   dgh[3] = 192.;
   dgh[4] = 348.;
   gMC->Gsvolu("IHK2", "TUBS", idtmed[264], dgh, 5);   
-  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -xltpc-dgh[2], 0, "ONLY");        
+  gMC->Gspos("IHK2", 1, "ITSV", 0., 0., -ztpc-dgh[2], 0, "ONLY");        
   
   // --- DEFINE RAILS BETWEEN THE ITS AND THE TPC
   
-  //dgh[0] = 0.85;
-  //dgh[1] = 10.;
-  //dgh[2] = 190.;  
-  //gMC->Gsvolu("IRAI", "BOX ", idtmed[285], dgh, 3);   
-  //gMC->Gspos("IRAI", 1, "ITSV", 53., 0., -69.5, 0, "ONLY");
-  //gMC->Gspos("IRAI", 2, "ITSV", -53., 0., -69.5, 0, "ONLY");        
+  if (rails == 1) {
+  
+     dgh[0] = 2.;          
+     dgh[1] = 8.;           
+     dgh[2] = 190.;         
+     gMC->Gsvolu("IRA1", "BOX ", idtmed[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;   
+  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, "ITSV", 53.4292, 10.7053, 79.75, 0, "ONLY");    
+  gMC->Gspos("ISR1", 2, "ITSV", 53.4292, -10.7053, 79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 3, "ITSV", -53.4292, 10.7053, 79.75, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 4, "ITSV", -53.4292, -10.7053, 79.75, 0, "ONLY");  
+  gMC->Gspos("ISR1", 5, "ITSV", 53.4292, 10.7053, -79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 6, "ITSV", 53.4292, -10.7053, -79.75, 0, "ONLY");   
+  gMC->Gspos("ISR1", 7, "ITSV", -53.4292, 10.7053, -79.75, 0, "ONLY"); 
+  gMC->Gspos("ISR1", 8, "ITSV", -53.4292, -10.7053, -79.75, 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 
   
-  if (fEuclidOut) {
+  if (GetEUCLID()) {
     gMC->WriteEuclid("ITSgeometry", "ITSV", 1, 5);
   }
 }
-//_____________________________________________________________________________
-void AliITSvPPRsymm::CreateMaterials(){
-////////////////////////////////////////////////////////////////////////
-  //
-  // Create ITS materials
-  //     This function defines the default materials used in the Geant
-  // Monte Carlo simulations for the geometries AliITSv1, AliITSv3,
-  // AliITSvPPRsymm.
-  // In general it is automatically replaced by
-  // the CreatMaterials routine defined in AliITSv?. Should the function
-  // CreateMaterials not exist for the geometry version you are using this
-  // one is used. See the definition found in AliITSv5 or the other routine
-  // for a complete definition.
-  //
-  
-  Int_t  isxfld  = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
-  
-  // --- 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);
-  AliMedium(1,"SI$",1,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(2,"SPD SI CHIP$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(2,"SPD SI CHIP$",2,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,   0);
-
-  AliMaterial(3,"SPD SI BUS$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(3,"SPD SI BUS$",3,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(4,"C (M55J)$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
-  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.30000E-02,.10000E+01,0);
-
-  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.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.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);
-  AliMedium(10,"SDD AIR$",10,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
-
-  AliMaterial(11,"AL$",0.26982E+02,0.13000E+02,0.26989E+01,0.89000E+01,0.99900E+03);
-  AliMedium(11,"AL$",11,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  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);
-
-  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);
-
-  AliMaterial(15,"CERAMICS$",0.22314E+02,0.10856E+02,0.36000E+01,0.76200E+01,0.31901E+02);
-  AliMedium(15,"CERAMICS$",15,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(20,"SSD C (M55J)$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
-  AliMedium(20,"SSD C (M55J)$",20,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(21,"SSD AIR$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
-  AliMedium(21,"SSD AIR$",21,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
-
-  AliMaterial(25,"G10FR4$",0.17749E+02,0.88750E+01,0.18000E+01,0.21822E+02,0.99900E+03);
-  AliMedium(25,"G10FR4$",25,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(26,"GEN C (M55J)$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
-  AliMedium(26,"GEN C (M55J)$",26,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(27,"GEN Air$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
-  AliMedium(27,"GEN Air$",27,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
-
-  AliMaterial(51,"SPD SI$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(51,"SPD SI$",51,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(52,"SPD SI CHIP$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(52,"SPD SI CHIP$",52,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(53,"SPD SI BUS$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(53,"SPD SI BUS$",53,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(54,"SPD C (M55J)$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
-  AliMedium(54,"SPD C (M55J)$",54,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(55,"SPD AIR$",0.14610E+02,0.73000E+01,0.12050E-02,0.30423E+05,0.99900E+03);
-  AliMedium(55,"SPD AIR$",55,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E-02,.10000E+01,0);
-
-  AliMaterial(56,"SPD KAPTON(POLYCH2)$",0.14000E+02,0.71770E+01,0.13000E+01,0.31270E+02,0.99900E+03);
-  AliMedium(56,"SPD KAPTON(POLYCH2)$",56,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(61,"EPOXY$",0.17749E+02,0.88750E+01,0.18000E+01,0.21822E+02,0.99900E+03);
-  AliMedium(61,"EPOXY$",61,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(62,"SILICON$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(62,"SILICON$",62,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(63,"KAPTONH(POLYCH2)$",0.14000E+02,0.71770E+01,0.13000E+01,0.31270E+02,0.99900E+03);
-  AliMedium(63,"KAPTONH(POLYCH2)$",63,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(64,"ALUMINUM$",0.26982E+02,0.13000E+02,0.26989E+01,0.89000E+01,0.99900E+03);
-  AliMedium(64,"ALUMINUM$",64,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  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);
-  AliMedium(68,"ROHACELL$",68,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(69,"SDD C AL (M55J)$",0.138802E+02,0.71315E+01,0.19837E+01,0.176542E+02,0.99900E+03);
-  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);
-  AliMedium(70,"SDDKAPTON (POLYCH2)$",70,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(71,"ITS SANDW A$",0.12011E+02,0.60000E+01,0.2115E+00,0.17479E+03,0.99900E+03);
-  AliMedium(71,"ITS SANDW A$",71,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(72,"ITS SANDW B$",0.12011E+02,0.60000E+01,0.27000E+00,0.18956E+03,0.99900E+03);
-  AliMedium(72,"ITS SANDW B$",72,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(73,"ITS SANDW C$",0.12011E+02,0.60000E+01,0.41000E+00,0.90868E+02,0.99900E+03);
-  AliMedium(73,"ITS SANDW C$",73,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(74,"HEAT COND GLUE$",0.12011E+02,0.60000E+01,0.1930E+01,0.22100E+02,0.99900E+03);
-  AliMedium(74,"HEAT COND GLUE$",74,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  AliMaterial(75,"ELASTO SIL$",0.28086E+02,0.14000E+02,0.23300E+01,0.93600E+01,0.99900E+03);
-  AliMedium(75,"ELASTO SIL$",75,0,isxfld,sxmgmx,.10000E+01,.10000E+01,0.30000E02,.10000E+01,0);
-
-  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);
-
-  // 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); 
-  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);    
-  AliMedium(92, "SPD cone$",   92, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);   
-
-  AliMaterial(93, "SDD End ladder$", 69.9298, 29.8246, 0.3824, 36.5103, 999); 
-  AliMedium(93, "SDD End ladder$",93, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-
-  AliMaterial(94, "SDD cone$",63.546, 29., 1.15, 1.265, 999);     
-  AliMedium(94, "SDD cone$",   94, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-
-  AliMaterial(95, "SSD End ladder$", 32.0988, 15.4021, 0.68, 35.3238, 999); 
-  AliMedium(95, "SSD End ladder$",95, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-  
-  AliMaterial(96, "SSD cone$",63.546, 29., 1.15, 1.265, 999); 
-  AliMedium(96, "SSD cone$",   96, 0,isxfld,sxmgmx, 10., .01, .1, .003, .003);
-
-
-}
-//______________________________________________________________________
-void AliITSvPPRsymm::InitAliITSgeom(){
-//     Based on the geometry tree defined in Geant 3.21, this
-// routine initilizes the Class AliITSgeom from the Geant 3.21 ITS geometry
-// sturture.
-    if(!(dynamic_cast<TGeant3*>(gMC))) {
-       Error("InitAliITSgeom",
-               "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls");
-       return;
-    } // end if
-    cout << "Reading Geometry transformation directly from Geant 3." << endl;
-    const Int_t nlayers = 6;
-    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];
-    Float_t  par[20],att[20];
-    Int_t    npar,natt,idshape,imat,imed;
-    AliITSGeant3Geometry *ig = new AliITSGeant3Geometry();
-    Int_t mod,lay,lad,det,i,j,k;
-    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.
-    cout << "Reading Geometry informaton from Geant3 common blocks" << endl;
-    for(i=0;i<20;i++) lnam[i] = lnum[i] = 0;
-    for(i=0;i<nlayers;i++)for(j=0;j<ndeep;j++) 
-       itsGeomTreeNames[i][j] = ig->StringToInt(names[i][j]);
-    mod = 0;
-    for(i=0;i<nlayers;i++){
-       k = 1;
-       for(j=0;j<ndeep;j++) if(itsGeomTreeCopys[i][j]!=0)
-           k *= TMath::Abs(itsGeomTreeCopys[i][j]);
-       mod += k;
-    } // end for i
-
-    if(fITSgeom!=0) delete fITSgeom;
-    nlad[0]=20;nlad[1]=40;nlad[2]=14;nlad[3]=22;nlad[4]=34;nlad[5]=38;
-    ndet[0]=4;ndet[1]=4;ndet[2]=6;ndet[3]=8;ndet[4]=22;ndet[5]=25;
-    fITSgeom = new AliITSgeom(0,6,nlad,ndet,mod);
-    mod = -1;
-    for(lay=1;lay<=nlayers;lay++){
-       for(j=0;j<ndeep;j++) lnam[j] = itsGeomTreeNames[lay-1][j];
-       for(j=0;j<ndeep;j++) lnum[j] = itsGeomTreeCopys[lay-1][j];
-       switch (lay){
-       case 1: case 2: // layers 1 and 2 are a bit special
-           lad = 0;
-           for(j=1;j<=itsGeomTreeCopys[lay-1][4];j++){
-               lnum[4] = j;
-               for(k=1;k<=itsGeomTreeCopys[lay-1][5];k++){
-                   lad++;
-                   lnum[5] = k;
-                   for(det=1;det<=itsGeomTreeCopys[lay-1][6];det++){
-                       lnum[6] = det;
-                       mod++;
-                       ig->GetGeometry(ndeep,lnam,lnum,t,r,idshape,npar,natt,
-                                       par,att,imat,imed);
-                       fITSgeom->CreatMatrix(mod,lay,lad,det,kSPD,t,r);
-                       if(!(fITSgeom->IsShapeDefined((Int_t)kSPD)))
-                             fITSgeom->ReSetShape(kSPD,
-                                                 new AliITSgeomSPD425Short());
-                   } // end for det
-               } // end for k
-            } // end for j
-           break;
-       case 3: case 4: case 5: case 6: // layers 3-6
-           lnum[6] = 1;
-           for(lad=1;lad<=itsGeomTreeCopys[lay-1][4];lad++){
-               lnum[4] = lad;
-               for(det=1;det<=itsGeomTreeCopys[lay-1][5];det++){
-                   lnum[5] = det;
-                   mod++;
-                   ig->GetGeometry(7,lnam,lnum,t,r,idshape,npar,natt,
-                                   par,att,imat,imed);
-                   switch (lay){
-                   case 3: case 4:
-                       fITSgeom->CreatMatrix(mod,lay,lad,det,kSDD,t,r);
-                       if(!(fITSgeom->IsShapeDefined(kSDD))) 
-                           fITSgeom->ReSetShape(kSDD,new AliITSgeomSDD256());
-                           break;
-                       case 5:
-                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSD,t,r);
-                           if(!(fITSgeom->IsShapeDefined(kSSD))) 
-                               fITSgeom->ReSetShape(kSSD,
-                                                  new AliITSgeomSSD275and75());
-                           break;
-                       case 6:
-                           fITSgeom->CreatMatrix(mod,lay,lad,det,kSSDp,t,r);
-                           if(!(fITSgeom->IsShapeDefined(kSSDp))) 
-                               fITSgeom->ReSetShape(kSSDp,
-                                                  new AliITSgeomSSD75and275());
-                           break;
-                       } // end switch
-               } // end for det
-           } // end for lad
-           break;
-       } // end switch
-    } // end for lay
-    return;
-}
-//_____________________________________________________________________________
-void AliITSvPPRsymm::Init(){
-////////////////////////////////////////////////////////////////////////
-//     Initialise the ITS after it has been created.
-////////////////////////////////////////////////////////////////////////
-    Int_t i;
-
-    cout << endl;
-    for(i=0;i<26;i++) cout << "*";
-    cout << " ITSvPPRsymm" << fMinorVersion << "_Init ";
-    for(i=0;i<25;i++) cout << "*";cout << endl;
-//
-    if(fRead[0]=='\0') strncpy(fRead,fEuclidGeomDet,60);
-    if(fWrite[0]=='\0') strncpy(fWrite,fEuclidGeomDet,60);
-    if(fITSgeom!=0) delete fITSgeom;
-    fITSgeom = new AliITSgeom();
-    if(fGeomDetIn) fITSgeom->ReadNewFile(fRead);
-    if(!fGeomDetIn) this->InitAliITSgeom();
-    if(fGeomDetOut) fITSgeom->WriteNewFile(fWrite);
-    AliITS::Init();
-//
-    for(i=0;i<72;i++) cout << "*";
-    cout << endl;
-}
-//_____________________________________________________________________________
-void AliITSvPPRsymm::DrawModule(){
-////////////////////////////////////////////////////////////////////////
-//     Draw a shaded view of the FMD version 9.
-////////////////////////////////////////////////////////////////////////
-  
-  // Set everything unseen
-  gMC->Gsatt("*", "seen", -1);
-  // 
-  // Set ALIC mother visible
-  gMC->Gsatt("ALIC","SEEN",0);
-  //
-  // Set the volumes visible
-  gMC->Gsatt("ITSD","SEEN",0);
-  gMC->Gsatt("ITS1","SEEN",1);
-  gMC->Gsatt("ITS2","SEEN",1);
-  gMC->Gsatt("ITS3","SEEN",1);
-  gMC->Gsatt("ITS4","SEEN",1);
-  gMC->Gsatt("ITS5","SEEN",1);
-  gMC->Gsatt("ITS6","SEEN",1);
-
-  gMC->Gsatt("IPCB","SEEN",1);
-  gMC->Gsatt("ICO2","SEEN",1);
-  gMC->Gsatt("ICER","SEEN",0);
-  gMC->Gsatt("ISI2","SEEN",0);
-  gMC->Gsatt("IPLA","SEEN",0);
-  gMC->Gsatt("ICO3","SEEN",0);
-  gMC->Gsatt("IEPX","SEEN",0);
-  gMC->Gsatt("ISI3","SEEN",1);
-  gMC->Gsatt("ISUP","SEEN",0);
-  gMC->Gsatt("ICHO","SEEN",0);
-  gMC->Gsatt("ICMO","SEEN",0);
-  gMC->Gsatt("ICMD","SEEN",0);
-  gMC->Gsatt("ICCO","SEEN",1);
-  gMC->Gsatt("ICCM","SEEN",0);
-  gMC->Gsatt("ITMD","SEEN",0);
-  gMC->Gsatt("ITTT","SEEN",1);
-
-  //
-  gMC->Gdopt("hide", "on");
-  gMC->Gdopt("shad", "on");
-  gMC->Gsatt("*", "fill", 7);
-  gMC->SetClipBox(".");
-  gMC->SetClipBox("*", 0, 300, -300, 300, -300, 300);
-  gMC->DefaultRange();
-  gMC->Gdraw("alic", 40, 30, 0, 11, 10, .07, .07);
-  gMC->Gdhead(1111, "Inner Tracking System Version 1");
-  gMC->Gdman(17, 6, "MAN");
-}
-//_____________________________________________________________________________
-void AliITSvPPRsymm::StepManager(){
-////////////////////////////////////////////////////////////////////////
-//    Called for every step in the ITS, then calles the AliITShit class
-// creator with the information to be recoreded about that hit.
-//     The value of the macro ALIITSPRINTGEOM if set to 1 will allow the
-// printing of information to a file which can be used to create a .det
-// file read in by the routine CreateGeometry(). If set to 0 or any other
-// value except 1, the default behavior, then no such file is created nor
-// it the extra variables and the like used in the printing allocated.
-////////////////////////////////////////////////////////////////////////
-  Int_t         copy, id;
-  Int_t          copy1,copy2;  
-  Float_t       hits[8];
-  Int_t         vol[4];
-  TLorentzVector position, momentum;
-  TClonesArray &lhits = *fHits;
-  //
-  // Track status
-  vol[3] = 0;
-  if(gMC->IsTrackInside())      vol[3] +=  1;
-  if(gMC->IsTrackEntering())    vol[3] +=  2;
-  if(gMC->IsTrackExiting())     vol[3] +=  4;
-  if(gMC->IsTrackOut())         vol[3] +=  8;
-  if(gMC->IsTrackDisappeared()) vol[3] += 16;
-  if(gMC->IsTrackStop())        vol[3] += 32;
-  if(gMC->IsTrackAlive())       vol[3] += 64;
-  //
-  // Fill hit structure.
-  if(!(gMC->TrackCharge())) return;
-  //
-  // Only entering charged tracks
-  if((id = gMC->CurrentVolID(copy)) == fIdSens[0]) {
-      vol[0] = 1;
-      id = gMC->CurrentVolOffID(0,copy);
-      //detector copy in the ladder = 1<->4  (ITS1 < I101 < I103 < I10A)
-      vol[1] = copy;
-      gMC->CurrentVolOffID(1,copy1);
-      //ladder copy in the module   = 1<->2  (I10A < I12A)
-      gMC->CurrentVolOffID(2,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);
-      //detector copy in the ladder = 1<->4  (ITS2 < I1D1 < I1D3 < I20A)
-      vol[1] = copy;
-      gMC->CurrentVolOffID(1,copy1);
-      //ladder copy in the module   = 1<->4  (I20A < I12A)
-      gMC->CurrentVolOffID(2,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]){
-      vol[0] = 3;
-      id = gMC->CurrentVolOffID(1,copy);
-      //detector copy in the ladder = 1<->6  (ITS3 < I302 < I004)
-      vol[1] = copy;
-      id = gMC->CurrentVolOffID(2,copy);
-      //ladder copy in the layer    = 1<->14 (I004 < IT34)
-      vol[2] = copy;
-  } else if(id == fIdSens[3]){
-      vol[0] = 4;
-      id = gMC->CurrentVolOffID(1,copy);
-      //detector copy in the ladder = 1<->8  (ITS4 < I402 < I005)
-      vol[1] = copy;
-      id = gMC->CurrentVolOffID(2,copy);
-      //ladder copy in the layer    = 1<->22 (I005 < IT34))
-      vol[2] = copy;
-  }else if(id == fIdSens[4]){
-      vol[0] = 5;
-      id = gMC->CurrentVolOffID(1,copy);
-      //detector copy in the ladder = 1<->22  (ITS5 < I562 < I565)
-      vol[1] = copy;
-      id = gMC->CurrentVolOffID(2,copy);
-     //ladder copy in the layer    = 1<->34 (I565 < IT56)
-      vol[2] = copy;
-  }else if(id == fIdSens[5]){
-      vol[0] = 6;
-      id = gMC->CurrentVolOffID(1,copy);
-      //detector copy in the ladder = 1<->25  (ITS6 < I566 < I569)
-      vol[1] = copy;
-      id = gMC->CurrentVolOffID(2,copy);
-      //ladder copy in the layer = 1<->38 (I569 < IT56)
-      vol[2] = copy;
-  } else {
-      return; // not an ITS volume?
-  } // end if/else if (gMC->CurentVolID(copy) == fIdSens[i])
-//
-  gMC->TrackPosition(position);
-  gMC->TrackMomentum(momentum);
-  hits[0]=position[0];
-  hits[1]=position[1];
-  hits[2]=position[2];
-  hits[3]=momentum[0];
-  hits[4]=momentum[1];
-  hits[5]=momentum[2];
-  hits[6]=gMC->Edep();
-  hits[7]=gMC->TrackTime();
-  // Fill hit structure with this new hit.
-  new(lhits[fNhits++]) AliITShit(fIshunt,gAlice->CurrentTrack(),vol,hits);
-
-  return;
-
-}