X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCv2.cxx;h=9c342510ab9fabeed06d8f5292954ca68ed19afd;hb=8acd5e6001d451de4da3c0a67c3ab89e3cee2207;hp=829b413c6cf54e547c250a72903c69ea0b3cad6d;hpb=4c03906077acc435bf9790b980186e0015ea0b89;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 829b413c6cf..9c342510ab9 100644
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -13,10 +13,9 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
 
+//
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Projection Chamber version 2 -- detailed TPC and slow simulation    //
@@ -29,27 +28,46 @@ $Log$
 //                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
 
-#include <TMath.h>
+//#include <stdlib.h>
 
+#include <TLorentzVector.h>
+#include <TPDGCode.h>
+#include <TString.h>
+#include "AliLog.h"
+#include "AliTrackReference.h"
+#include "AliTPCParam.h"
+#include "AliTPCTrackHitsV2.h"
 #include "AliTPCv2.h"
-#include "AliTPCD.h"
-#include "AliRun.h"
-#include "AliConst.h"
+#include "AliGeomManager.h"
+#include "TGeoVolume.h"
+#include "TGeoPcon.h"
+#include "TGeoTube.h"
+#include "TGeoPgon.h"
+#include "TGeoTrd1.h"
+#include "TGeoCompositeShape.h"
+#include "TGeoPara.h"
+#include "TGeoPhysicalNode.h"
 
 ClassImp(AliTPCv2)
  
 //_____________________________________________________________________________
 AliTPCv2::AliTPCv2(const char *name, const char *title) :
-  AliTPC(name, title) 
+  AliTPC(name, title),
+  fIdSens(0),
+  fIDrift(0),
+  fSecOld(0) 
 {
   //
   // Standard constructor for Time Projection Chamber version 2
   //
-  fIdSens1=0;
-  fIdSens2=0;
+
+
   SetBufferSize(128000);
+
+
+  if (fTPCParam)
+     fTPCParam->Write(fTPCParam->GetTitle());
 }
  
 //_____________________________________________________________________________
@@ -60,7 +78,7 @@ void AliTPCv2::CreateGeometry()
   //
   //Begin_Html
   /*
-    <img src="picts/AliTPCv2.gif">
+    <img src="picts/AliTPC.gif">
   */
   //End_Html
   //Begin_Html
@@ -69,848 +87,920 @@ void AliTPCv2::CreateGeometry()
   */
   //End_Html
 
-  AliTPCParam * fTPCParam = &(fDigParam->GetParam());
-
-  Int_t *idtmed = fIdtmed->GetArray();
-
-  Float_t dm[21];
-  Int_t idrotm[120];
-
-  Int_t nRotMat = 0;
-
-  Int_t i,ifl1,ifl2;
-
-  Int_t nInnerSector = fTPCParam->GetNInnerSector()/2;
-  Int_t nOuterSector = fTPCParam->GetNOuterSector()/2;
-  
-  // --------------------------------------------------- 
-  //        sector specification check 
-  // --------------------------------------------------- 
-  if (fSecAL >= 0) {
-    ifl1 = 0;
-    
-    for (i = 0; i < 6; ++i) {
-      if (fSecLows[i] >= 0 && fSecLows[i] < 2*nInnerSector) {
-	ifl1 = 1;
-	printf("*** SECTOR %d selected\n",fSecLows[i]);
-      }
-    }
-
-  } else {
-    printf("*** ALL LOWER SECTORS SELECTED ***\n");
-    ifl1 = 1;
-  }
-
-  if (fSecAU >= 0) {
-    ifl2 = 0;
-    
-    for (i = 0; i < 12; ++i) {
-      if (fSecUps[i] > 2*nInnerSector-1 && 
-          fSecUps[i] < 2*(nInnerSector+nOuterSector)) {
-	ifl2 = 1;
-	printf("*** SECTOR %d selected\n",fSecUps[i]);
-      }
-    }
-    
-  } else {
-    printf("*** ALL UPPER SECTORS SELECTED ***\n");
-    ifl1 = 1;
-  }
-  
-  if (ifl1 == 0 && ifl2 == 0) {
-    printf("*** ERROR: AT LEAST ONE SECTOR MUST BE SPECIFIED ***\n");
-    printf("!!! PROGRAM STOPPED !!!\n");
-    exit(1);
-  }
-  
-  if ((fSecAL < 0 || fSecAU < 0) && fSens >= 0) {
-    printf("** ERROR: STRIPS CANNOT BE SPECIFIED FOR ALL SECTORS **\n");
-    printf("!!! PROGRAM STOPPED !!!\n");
-    exit(1);
-  }
-  
-  // ---------------------------------------------------- 
-  //          FIELD CAGE WITH ENDCAPS - G10
-  //          THIS IS ALSO A TPC MOTHER VOLUME 
-  // ---------------------------------------------------- 
-
-  dm[0] = 76.;
-  dm[1] = 278.;
-  dm[2] = 275.;
-
-  gMC->Gsvolu("TPC ", "TUBE", idtmed[8], dm, 3); 
-
-  //-----------------------------------------------------
-  //  Endcap cover c-fibre 0.86% X0
-  //-----------------------------------------------------
-
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 0.95;
-
-  gMC->Gsvolu("TPEC","TUBE",idtmed[10],dm,3);
-
-  //-----------------------------------------------------
-  // Drift gas , leave 2 cm at the outer radius
-  // and inner raddius
-  //-----------------------------------------------------
-
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 250.;
-
-  gMC->Gsvolu("TGAS", "TUBE", idtmed[3], dm, 3);
-
-  //------------------------------------------------------
-  //  membrane holder - carbon fiber
-  //------------------------------------------------------
-
-
-  gMC->Gsvolu("TPMH","TUBE",idtmed[6],dm,0);
-
-  dm[0] = 252.;
-  dm[1] = 258.;
-  dm[2] = 0.2;
-
-  gMC->Gsposp("TPMH",1,"TGAS",0.,0.,0.,0,"ONLY",dm,3);
- 
-  dm[0] = 78.;
-  dm[2] = 82.;
-  dm[2] = 0.1;
-
-  gMC->Gsposp("TPMH",2,"TGAS",0.,0.,0.,0,"ONLY",dm,3);
-
-  //----------------------------------------------------------
-  //  HV membrane - 25 microns of mylar
-  //----------------------------------------------------------
-
-  dm[0] = 82.;
-  dm[1] = 252.;
-  dm[2] = 0.00125;
-
-  gMC->Gsvolu("TPHV","TUBE",idtmed[5],dm,3);
-
-  gMC->Gspos("TPHV",1,"TGAS",0.,0.,0.,0,"ONLY");
-
-  gMC->Gspos("TGAS",1,"TPC ",0.,0.,0.,0,"ONLY");
-
   //----------------------------------------------------------
-  // "side" gas volume, the same as the drift gas
-  // the readout chambers are placed there.  
+  // This geometry is written using TGeo class
+  // Firstly the shapes are defined, and only then the volumes
+  // What is recognized by the MC are volumes
   //----------------------------------------------------------
+  //
+  //  tpc - this will be the mother volume
+  //
 
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 0.5*(275. - 250.);
-   
-  gMC->Gsvolu("TPSG", "TUBE", idtmed[2], dm, 3);
-
-  Float_t z_side = dm[2]; // 1/2 of the side gas thickness
-
-  //-----------------------------------------------------------
-  //   Readout chambers , 25% of X0, I use Al as the material
-  //-----------------------------------------------------------
-
-  Float_t InnerOpenAngle = fTPCParam->GetInnerAngle();
-  Float_t OuterOpenAngle = fTPCParam->GetOuterAngle();
-
-  Float_t InnerAngleShift = fTPCParam->GetInnerAngleShift();
-  Float_t OuterAngleShift = fTPCParam->GetOuterAngleShift();
-
-  Float_t InSecLowEdge = fTPCParam->GetInSecLowEdge();
-  Float_t InSecUpEdge =  fTPCParam->GetInSecUpEdge();
-
-  Float_t OuSecLowEdge = fTPCParam->GetOuSecLowEdge();
-  Float_t OuSecUpEdge = fTPCParam->GetOuSecUpEdge();
-
-
-  Float_t SecThick = 2.225; // Al
-
-  Float_t edge = fTPCParam->GetEdge();
-
-  //  S (Inner) sectors
-
-  dm[0] = InSecLowEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
-  dm[1] = InSecUpEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
-  dm[2] = 0.5*SecThick;
-  dm[3] = 0.5*(InSecUpEdge-InSecLowEdge);
-
-  Float_t xCenterS = InSecLowEdge+dm[3];
-
-  gMC->Gsvolu("TRCS", "TRD1", idtmed[0], dm, 4); 
-
-  //  L (Outer) sectors
-
-  dm[0] = OuSecLowEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
-  dm[1] = OuSecUpEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
-  dm[2] = 0.5*SecThick;
-  dm[3] = 0.5*(OuSecUpEdge-OuSecLowEdge);
-
-  Float_t xCenterL = OuSecLowEdge+dm[3];  
-
-  gMC->Gsvolu("TRCL", "TRD1", idtmed[0], dm, 4);
-
-  Float_t z1 = -z_side + SecThick*0.5;
-
-  //------------------------------------------------------------------
-  // S sectors - "gas sectors" (TRD1)
-  //------------------------------------------------------------------
-
-  dm[0] = InSecLowEdge*TMath::Tan(0.5*InnerOpenAngle)-0.01;
-  dm[1] = InSecUpEdge*TMath::Tan(0.5*InnerOpenAngle)-0.01;
-  dm[2] = 0.5*(250. - 0.001);
-  dm[3] = 0.5*(InSecUpEdge-InSecLowEdge);  
-
-  gMC->Gsvolu("TSGA", "TRD1", idtmed[4], dm, 4); // sensitive
-
-  // ------------------------------------------------------------- 
-  //  Only for the debugging purpose and resolution calculation 
-  //  Sensitive strips at the pad-row center 
-  // ------------------------------------------------------------- 
-
-  Int_t ns;
-
-  if(fSens>=0){
-
-    Float_t r1,r2,zz;
-
-    Float_t StripThick = 0.01; // 100 microns
-    Float_t dead = fTPCParam->GetDeadZone();
-
-    gMC->Gsvolu("TSST", "TRD1", idtmed[4], dm, 0);
-
-    dm[2] = 0.5*(250. - 0.002);
-    dm[3] = 0.5 * StripThick;
-
-
-    for (ns = 0; ns < fTPCParam->GetNRowLow(); ns++) {
-
-      r1 = fTPCParam->GetPadRowRadiiLow(ns);
-      r2 = r1 + StripThick;     
-      dm[0] = r1 * TMath::Tan(0.5*InnerOpenAngle) - dead;
-      dm[1] = r2 * TMath::Tan(0.5*InnerOpenAngle) - dead;
-
-      zz = -InSecLowEdge -0.5*(InSecUpEdge-InSecLowEdge);
-      zz += r1;
-      zz += dm[3];
-
-      gMC->Gsposp("TSST", ns+1, "TSGA", 0., 0., zz, 0, "ONLY", dm, 4);
-
-    
-    }   
-
-    gMC->Gsord("TSGA", 3); 
-  
-  } // if strips selected
-
-  
-  //-----------------------------------------------------------------
-  //  L sectors - "gas sectors" (PGON to avoid overlaps)
-  //-----------------------------------------------------------------
-
-  dm[0] = 360.*kDegrad - 0.5*OuterOpenAngle;
-  dm[0] *= kRaddeg;
-  dm[0] = (Float_t)TMath::Nint(dm[0]);
-
-  dm[1] = OuterOpenAngle*kRaddeg;
-  dm[1] = (Float_t)TMath::Nint(dm[1]);
-
-  dm[2] = 1.;
-  dm[3] = 4.;
-
-  dm[4] = 0.002;
-  dm[5] = OuSecLowEdge;
-  dm[6] = 252.*TMath::Cos(0.5*OuterOpenAngle)-0.002;
-
-  dm[7] = dm[4]+0.2;
-  dm[8] = dm[5];
-  dm[9] = dm[6];
-
-  dm[10] = dm[7];
-  dm[11] = OuSecLowEdge;
-  dm[12] = OuSecUpEdge;
-
-  dm[13] = 250.;
-  dm[14] = dm[11];
-  dm[15] = dm[12];
-
-  gMC->Gsvolu("TLGA","PGON",idtmed[4],dm,16);  
-
-  if (fSens >= 0) {
-    
-    Float_t rmax = dm[6];
-    Float_t r1,r2;
-    Float_t dead = fTPCParam->GetDeadZone();
-
-    Float_t StripThick = 0.01; // 100 microns
-
-    gMC->Gsvolu("TLST", "PGON", idtmed[4], dm, 0);
-
-    dm[0] = 360.*kDegrad - 0.5*OuterOpenAngle;
-    dm[0] *= kRaddeg;
-    dm[0] = (Float_t)TMath::Nint(dm[0]);
-
-    dm[1] = OuterOpenAngle*kRaddeg;
-    dm[1] = (Float_t)TMath::Nint(dm[1]);
-
-    dm[2] = 1.;
-    dm[3] = 2.;
-
-    dm[7] = 250.;
-
-    Float_t xx = dead/TMath::Tan(0.5*OuterOpenAngle);
-
-    for(ns=0;ns<fTPCParam->GetNRowUp();ns++){
-
-      r1 = fTPCParam->GetPadRowRadiiUp(ns)-xx;
-      r2 = r1 + StripThick;
-
-      dm[5] = r1;
-      dm[6] = r2;
-
-      dm[8] = r1;
-      dm[9] = r2;
-
-      if(r2+xx < rmax){
-        dm[4] = 0.002;
-      }
-      else{
-        dm[4] = 0.202;
-      }
-
-      gMC->Gsposp("TLST",ns+1,"TLGA",xx,0.,0.,0,"ONLY",dm,10);
-
-    }    
-
-        gMC->Gsord("TLGA", 4);
-
-  } // if strips selected
-
-  //------------------------------------------------------------------
-  // Positioning of the S-sector readout chambers
-  //------------------------------------------------------------------
-
-  Float_t zs = 0.5*(250.+0.002);
-
-  Float_t theta1,theta2,theta3;
-  Float_t phi1,phi2,phi3;
-  Float_t alpha;
-  Float_t x,y;
-
-  for(ns=0;ns<nInnerSector;ns++){
-    
-    phi1 = ns * InnerOpenAngle + 270.*kDegrad + InnerAngleShift;
-    phi1 *= kRaddeg; // in degrees
-
-    phi1 = (Float_t)TMath::Nint(phi1);
-
-    if (phi1 > 360.) phi1 -= 360.;
-      
-    theta1 = 90.;
-    phi2   = 90.;
-    theta2 = 180.;
-    phi3   = ns * InnerOpenAngle + InnerAngleShift;
-    phi3 *= kRaddeg; // in degrees
-
-    phi3 = (Float_t)TMath::Nint(phi3);
-      
-    if(phi3 > 360.) phi3 -= 360.;
-
-    theta3 = 90.;
-
-    alpha = phi3*kDegrad;
-
-    x = xCenterS * TMath::Cos(alpha);
-    y = xCenterS * TMath::Sin(alpha); 
- 
-    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);  
-     
-    gMC->Gspos("TRCS", ns+1, "TPSG", x, y, z1, idrotm[nRotMat], "ONLY");
-
-    if(fSecAL < 0){
-
-      //---------------------------------------------------------------
-      //  position all sectors
-      //---------------------------------------------------------------
-
-      gMC->Gspos("TSGA",ns+1,"TGAS",x,y,zs,idrotm[nRotMat], "ONLY");
-      gMC->Gspos("TSGA",ns+1+nInnerSector,"TGAS",x,y,-zs,idrotm[nRotMat], "ONLY");
-    }
-
-    else{
-
-      //---------------------------------------------------------------
-      //  position selected sectors
-      //---------------------------------------------------------------
-
-      for(Int_t sel=0;sel<6;sel++){
-
-        if(fSecLows[sel] == ns){
-        gMC->Gspos("TSGA", ns+1, "TGAS", x, y, zs, idrotm[nRotMat], "ONLY");
-	}
-        else if(fSecLows[sel] == ns+nInnerSector){
-        gMC->
-          Gspos("TSGA",ns+1+nInnerSector,"TGAS", x, y,-zs,idrotm[nRotMat],"ONLY");
-	}
-      }
-    }
-
-    nRotMat++;     
-
-  }
-    
-  //-------------------------------------------------------------------
-  //  Positioning of the L-sectors readout chambers
-  //-------------------------------------------------------------------
-    
-  for(ns=0;ns<nOuterSector;ns++){
-    phi1 = ns * OuterOpenAngle + 270.*kDegrad + OuterAngleShift;
-    phi1 *= kRaddeg; // in degrees
-
-    phi1 = (Float_t)TMath::Nint(phi1);
-    
-
-    if (phi1 > 360.) phi1 -= 360.;
-      
-    theta1 = 90.;
-    phi2   = 90.;
-    theta2 = 180.;
-    phi3   = ns * OuterOpenAngle+OuterAngleShift;
-    phi3 *= kRaddeg; // in degrees
-
-    phi3 = (Float_t)TMath::Nint(phi3);
-
-      
-    if(phi3 > 360.) phi3 -= 360.;
-
-    theta3 = 90.;
-
-    alpha = phi3*kDegrad;
-
-    x = xCenterL * TMath::Cos(alpha);
-    y = xCenterL * TMath::Sin(alpha); 
- 
-    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);  
-     
-
-    gMC->Gspos("TRCL", ns+1, "TPSG", x, y, z1, idrotm[nRotMat], "ONLY"); 
-
-    nRotMat++;   
-
-  }
-
-  //-------------------------------------------------------------------
-  // Positioning of the L-sectors (gas sectors)
-  //-------------------------------------------------------------------
-
-  for(ns=0;ns<nOuterSector;ns++){
-
-     phi1 = ns*OuterOpenAngle + OuterAngleShift;
-     phi1 *= kRaddeg;
+  //
+  // here I define a volume TPC
+  // retrive the medium name with "TPC_" as a leading string
+  //
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
+  tpc->DefineSection(0,-290.,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
+  //
+  tpc->DefineSection(2,-259.6,68.1,278.);
+  tpc->DefineSection(3,-253.6,68.1,278.);
+  //
+  tpc->DefineSection(4,-253.6,68.,278.);
+  tpc->DefineSection(5,-74.0,60.8,278.);
+  //
+  tpc->DefineSection(6,-74.0,60.1,278.);
+  tpc->DefineSection(7,-73.3,60.1,278.);
+  //
+  tpc->DefineSection(8,-73.3,56.9,278.); 
+  tpc->DefineSection(9,73.3,56.9,278.);
+  //
+  tpc->DefineSection(10,73.3,60.1,278.);
+  tpc->DefineSection(11,74.0,60.1,278.);
+  //
+  tpc->DefineSection(12,74.0,60.8,278.);
+  tpc->DefineSection(13,253.6,65.5,278.);
+  //
+  tpc->DefineSection(14,253.6,65.6,278.);
+  tpc->DefineSection(15,259.6,65.6,278.);
+  //
+  tpc->DefineSection(16,259.6,70.0,278.);
+  tpc->DefineSection(17,290.,77.,278.);
+  //
+  TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
+  TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
+  //
+  // drift volume - sensitive volume, extended beyond the
+  // endcaps, because of the alignment
+  //
+  TGeoPcon *dvol = new TGeoPcon(0.,360.,6);
+  dvol->DefineSection(0,-260.,74.5,264.4);
+  dvol->DefineSection(1,-253.6,74.5,264.4);
+  //
+  dvol->DefineSection(2,-253.6,76.6774,258.);
+  dvol->DefineSection(3,253.6,76.6774,258.); 
+  //
+  dvol->DefineSection(4,253.6,74.5,264.4);
+  dvol->DefineSection(5,260.,74.5,264.4);
+  //
+  TGeoMedium *m5 = gGeoManager->GetMedium("TPC_Ne-CO2-N-2");
+  TGeoVolume *v9 = new TGeoVolume("TPC_Drift",dvol,m5);
+  //
+  v1->AddNode(v9,1);
+  //
+  // outer insulator
+  //
+  TGeoPcon *tpco = new TGeoPcon(0.,360.,6); //insulator
+  //
+  tpco->DefineSection(0,-256.6,264.8,278.);
+  tpco->DefineSection(1,-253.6,264.8,278.);
+  //
+  tpco->DefineSection(2,-253.6,258.,278.);
+  tpco->DefineSection(3,250.6,258.,278.);
+  //
+  tpco->DefineSection(4,250.6,258.,275.5);
+  tpco->DefineSection(5,253.6,258.,275.5);
+  //
+  TGeoMedium *m2 = gGeoManager->GetMedium("TPC_CO2");
+  TGeoVolume *v2 = new TGeoVolume("TPC_OI",tpco,m2);
+  //
+  // outer containment vessel
+  //
+  TGeoPcon *tocv = new TGeoPcon(0.,360.,6);  // containment vessel
+  //
+  tocv->DefineSection(0,-256.6,264.8,278.);
+  tocv->DefineSection(1,-253.6,264.8,278.);
+  //
+  tocv->DefineSection(2,-253.6,274.8124,278.);
+  tocv->DefineSection(3,247.6,274.8124,278.);  
+  //
+  tocv->DefineSection(4,247.6,270.4,278.);
+  tocv->DefineSection(5,250.6,270.4,278.);
+  //
+  TGeoMedium *m3 = gGeoManager->GetMedium("TPC_Al");
+  TGeoVolume *v3 = new TGeoVolume("TPC_OCV",tocv,m3); 
+  //
+  TGeoTube *to1 = new TGeoTube(274.8174,277.995,252.1); //epoxy
+  TGeoTube *to2 = new TGeoTube(274.8274,277.985,252.1); //tedlar
+  TGeoTube *to3 = new TGeoTube(274.8312,277.9812,252.1);//prepreg2
+  TGeoTube *to4 = new TGeoTube(274.9062,277.9062,252.1);//nomex
+  //
+  TGeoMedium *sm1 = gGeoManager->GetMedium("TPC_Epoxy");
+  TGeoMedium *sm2 = gGeoManager->GetMedium("TPC_Tedlar");
+  TGeoMedium *sm3 = gGeoManager->GetMedium("TPC_Prepreg2");
+  TGeoMedium *sm4 = gGeoManager->GetMedium("TPC_Nomex");
+  //
+  TGeoVolume *tov1 = new TGeoVolume("TPC_OCV1",to1,sm1);
+  TGeoVolume *tov2 = new TGeoVolume("TPC_OCV2",to2,sm2);
+  TGeoVolume *tov3 = new TGeoVolume("TPC_OCV3",to3,sm3);
+  TGeoVolume *tov4 = new TGeoVolume("TPC_OCV4",to4,sm4);
+ //-------------------------------------------------------
+  //  Tpc Outer Field Cage
+  //  daughters - composite (sandwich)
+  //-------------------------------------------------------
+
+  TGeoPcon *tofc = new TGeoPcon(0.,360.,6);
+  //
+  tofc->DefineSection(0,-253.6,258.,269.6);
+  tofc->DefineSection(1,-250.6,258.,269.6);
+  //
+  tofc->DefineSection(2,-250.6,258.,260.0676); 
+  tofc->DefineSection(3,250.6,258.,260.0676);
+  //
+  tofc->DefineSection(4,250.6,258.,275.5);
+  tofc->DefineSection(5,253.6,258.,275.5);
+  //
+  TGeoVolume *v4 = new TGeoVolume("TPC_TOFC",tofc,m3); 
+  //sandwich
+  TGeoTube *tf1 = new TGeoTube(258.0,260.0676,252.1); //tedlar
+  TGeoTube *tf2 = new TGeoTube(258.0038,260.0638,252.1); //prepreg3
+  TGeoTube *tf3 = new TGeoTube(258.0338,260.0338,252.1);//nomex
+  //
+  TGeoMedium *sm5 = gGeoManager->GetMedium("TPC_Prepreg3");
+  //
+  TGeoVolume *tf1v = new TGeoVolume("TPC_OFC1",tf1,sm2);
+  TGeoVolume *tf2v = new TGeoVolume("TPC_OFC2",tf2,sm5);
+  TGeoVolume *tf3v = new TGeoVolume("TPC_OFC3",tf3,sm4);
+  //
+  // outer part - positioning
+  //
+  tov1->AddNode(tov2,1); tov2->AddNode(tov3,1); tov3->AddNode(tov4,1);
+  //
+  tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
+  //
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
+  //
+  v2->AddNode(v3,1); v2->AddNode(v4,1); 
+  //
+  v1->AddNode(v2,1);
+  //--------------------------------------------------------------------
+  // Tpc Inner INsulator (CO2) 
+  // the cones, the central drum and the inner f.c. sandwich with a piece
+  // of the flane will be placed in the TPC
+  //--------------------------------------------------------------------
+  TGeoPcon *tpci = new TGeoPcon(0.,360.,4);
+  //
+  tpci->DefineSection(0,-253.6,68.4,76.6774);
+  tpci->DefineSection(1,-74.0,61.2,76.6774);
+  //
+  tpci->DefineSection(2,74.0,61.2,76.6774);  
+  //
+  tpci->DefineSection(3,253.6,65.9,76.6774);
+  //
+  TGeoVolume *v5 = new TGeoVolume("TPC_INI",tpci,m2);
+  //
+  // now the inner field cage - only part of flanges (2 copies)
+  //
+  TGeoTube *tif1 = new TGeoTube(69.9,76.6774,1.5); 
+  TGeoVolume *v6 = new TGeoVolume("TPC_IFC1",tif1,m3);
+  //
+ //---------------------------------------------------------
+  // Tpc Inner Containment vessel - Muon side
+  //---------------------------------------------------------
+  TGeoPcon *tcms = new TGeoPcon(0.,360.,10);
+  //
+  tcms->DefineSection(0,-259.1,68.1,74.2);
+  tcms->DefineSection(1,-253.6,68.1,74.2);
+  //
+  tcms->DefineSection(2,-253.6,68.1,68.4);
+  tcms->DefineSection(3,-74.0,60.9,61.2);
+  //
+  tcms->DefineSection(4,-74.0,60.1,61.2);
+  tcms->DefineSection(5,-73.3,60.1,61.2);
+  //
+  tcms->DefineSection(6,-73.3,56.9,61.2);
+  tcms->DefineSection(7,-73.0,56.9,61.2);
+  //
+  tcms->DefineSection(8,-73.0,56.9,58.8);
+  tcms->DefineSection(9,-71.3,56.9,58.8);
+  //
+  TGeoVolume *v7 = new TGeoVolume("TPC_ICVM",tcms,m3);
+  //-----------------------------------------------
+  // inner containment vessel - shaft side
+  //-----------------------------------------------
+  TGeoPcon *tcss = new TGeoPcon(0.,360.,10);
+  //
+  tcss->DefineSection(0,71.3,56.9,58.8);
+  tcss->DefineSection(1,73.0,56.9,58.8);
+  //
+  tcss->DefineSection(2,73.0,56.9,61.2);
+  tcss->DefineSection(3,73.3,56.9,61.2);
+  //  
+  tcss->DefineSection(4,73.3,60.1,61.2);
+  tcss->DefineSection(5,74.0,60.1,61.2);
+  //
+  tcss->DefineSection(6,74.0,60.9,61.2);
+  tcss->DefineSection(7,253.6,65.6,65.9);
+  //
+  tcss->DefineSection(8,253.6,65.6,74.2);
+  tcss->DefineSection(9,258.1,65.6,74.2);
+  //
+  TGeoVolume *v8 = new TGeoVolume("TPC_ICVS",tcss,m3);
+  //-----------------------------------------------
+  //  Inner field cage
+  //  define 4 parts and make an assembly
+  //-----------------------------------------------
+  // part1 - Al - 2 copies
+  TGeoTube *t1 = new TGeoTube(76.6774,78.845,0.75);
+  TGeoVolume *tv1 = new TGeoVolume("TPC_IFC2",t1,m3);
+  // sandwich - outermost parts - 2 copies
+  TGeoTube *t2 = new TGeoTube(76.6774,78.845,74.175); // tedlar 38 microns
+  TGeoTube *t3 = new TGeoTube(76.6812,78.8412,74.175); // prepreg2 500 microns
+  TGeoTube *t4 = new TGeoTube(76.7312,78.7912,74.175); // prepreg3 300 microns
+  TGeoTube *t5 = new TGeoTube(76.7612,78.7612,74.175); // nomex 2 cm
+  //
+  TGeoVolume *tv2 = new TGeoVolume("TPC_IFC3",t2,sm2);
+  TGeoVolume *tv3 = new TGeoVolume("TPC_IFC4",t3,sm3);
+  TGeoVolume *tv4 = new TGeoVolume("TPC_IFC5",t4,sm5);
+  TGeoVolume *tv5 = new TGeoVolume("TPC_IFC6",t5,sm4);
+  //
+  // middle parts - 2 copies
+  TGeoTube *t6 = new TGeoTube(76.6774,78.795,5.); // tedlar 38 microns
+  TGeoTube *t7 = new TGeoTube(76.6812,78.7912,5.); // prepreg2 250 microns
+  TGeoTube *t8 = new TGeoTube(76.7062,78.7662,5.); // prepreg3 300 microns
+  TGeoTube *t9 = new TGeoTube(76.7362,78.7362,5.); // nomex 2 cm
+  //
+  TGeoVolume *tv6 = new TGeoVolume("TPC_IFC7",t6,sm2);
+  TGeoVolume *tv7 = new TGeoVolume("TPC_IFC8",t7,sm3);
+  TGeoVolume *tv8 = new TGeoVolume("TPC_IFC9",t8,sm5);
+  TGeoVolume *tv9 = new TGeoVolume("TPC_IFC10",t9,sm4);
+  // central part - 1 copy
+  TGeoTube *t10 = new TGeoTube(76.6774,78.745,93.75); // tedlar 38 microns 
+  TGeoTube *t11 = new TGeoTube(76.6812,78.7412,93.75); // prepreg3 300 microns
+  TGeoTube *t12 = new TGeoTube(76.7112,78.7112,93.75); // nomex 2 cm
+  //
+  TGeoVolume *tv10 = new TGeoVolume("TPC_IFC11",t10,sm2);
+  TGeoVolume *tv11 = new TGeoVolume("TPC_IFC12",t11,sm5);
+  TGeoVolume *tv12 = new TGeoVolume("TPC_IFC13",t12,sm4);
+  //
+  // inner part - positioning
+  //
+  // creating a sandwich
+  tv2->AddNode(tv3,1); tv3->AddNode(tv4,1); tv4->AddNode(tv5,1);
+  //
+  tv6->AddNode(tv7,1); tv7->AddNode(tv8,1); tv8->AddNode(tv9,1);
+  //
+  tv10->AddNode(tv11,1); tv11->AddNode(tv12,1);
+  //
+  TGeoVolumeAssembly *tv100 = new TGeoVolumeAssembly("TPC_IFC");
+  //
+  tv100->AddNode(tv10,1);
+  tv100->AddNode(tv6,1,new TGeoTranslation(0.,0.,-98.75));
+  tv100->AddNode(tv6,2,new TGeoTranslation(0.,0.,98.75));
+  tv100->AddNode(tv2,1,new TGeoTranslation(0.,0.,-177.925));
+  tv100->AddNode(tv2,2,new TGeoTranslation(0.,0.,177.925));
+  tv100->AddNode(tv1,1,new TGeoTranslation(0.,0.,-252.85));
+  tv100->AddNode(tv1,2,new TGeoTranslation(0.,0.,252.85));
+  //
+  v5->AddNode(v6,1, new TGeoTranslation(0.,0.,-252.1));
+  v5->AddNode(v6,2, new TGeoTranslation(0.,0.,252.1));
+  v1->AddNode(v5,1); v1->AddNode(v7,1); v1->AddNode(v8,1); 
+  v9->AddNode(tv100,1);
+  //
+  // central drum 
+  //
+  // flange + sandwich
+  //
+  TGeoPcon *cfl = new TGeoPcon(0.,360.,6);
+  cfl->DefineSection(0,-71.1,59.7,61.2);
+  cfl->DefineSection(1,-68.6,59.7,61.2);
+  //
+  cfl->DefineSection(2,-68.6,60.6324,61.2);
+  cfl->DefineSection(3,68.6,60.6324,61.2); 
+  //
+  cfl->DefineSection(4,68.6,59.7,61.2);
+  cfl->DefineSection(5,71.1,59.7,61.2);  
+  //
+  TGeoVolume *cflv = new TGeoVolume("TPC_CDR",cfl,m3);
+  // sandwich
+  TGeoTube *cd1 = new TGeoTube(60.6424,61.19,71.1);
+  TGeoTube *cd2 = new TGeoTube(60.6462,61.1862,71.1);
+  TGeoTube *cd3 = new TGeoTube(60.6662,61.1662,71.1);  
+  //
+  TGeoMedium *sm6 = gGeoManager->GetMedium("TPC_Prepreg1");
+  TGeoVolume *cd1v = new TGeoVolume("TPC_CDR1",cd1,sm2); //tedlar
+  TGeoVolume *cd2v = new TGeoVolume("TPC_CDR2",cd2,sm6);// prepreg1
+  TGeoVolume *cd3v = new TGeoVolume("TPC_CDR3",cd3,sm4); //nomex
+  //
+  // seals for central drum 2 copies
+  //
+  TGeoTube *cs = new TGeoTube(56.9,61.2,0.1);
+  TGeoMedium *sm7 = gGeoManager->GetMedium("TPC_Mylar");
+  TGeoVolume *csv = new TGeoVolume("TPC_CDRS",cs,sm7);
+  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.));
+  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.));
+  //
+  // seal collars 
+  TGeoPcon *se = new TGeoPcon(0.,360.,6);
+  se->DefineSection(0,-72.8,59.7,61.2);
+  se->DefineSection(1,-72.3,59.7,61.2);
+  //
+  se->DefineSection(2,-72.3,58.85,61.2);
+  se->DefineSection(3,-71.6,58.85,61.2); 
+  //
+  se->DefineSection(4,-71.6,59.7,61.2);
+  se->DefineSection(5,-71.3,59.7,61.2);  
+  //
+  TGeoVolume *sev = new TGeoVolume("TPC_CDCE",se,m3);
+  //
+  TGeoTube *si = new TGeoTube(56.9,58.8,1.); 
+  TGeoVolume *siv = new TGeoVolume("TPC_CDCI",si,m3);
+  //
+  // define reflection matrix 
+  //
+  TGeoRotation *ref = new TGeoRotation("ref",90.,0.,90.,90.,180.,0.);
+  //
+  cd1v->AddNode(cd2v,1); cd2v->AddNode(cd3v,1); cflv->AddNode(cd1v,1);
+  //
+  v1->AddNode(siv,1,new TGeoTranslation(0.,0.,-69.9));
+  v1->AddNode(siv,2,new TGeoTranslation(0.,0.,69.9));
+  v1->AddNode(sev,1); v1->AddNode(sev,2,ref); v1->AddNode(cflv,1);
+  //
+  // central membrane - 2 rings and a mylar membrane - assembly
+  //
+  TGeoTube *ih = new TGeoTube(81.05,84.05,0.3);
+  TGeoTube *oh = new TGeoTube(250.,256.,.5);
+  TGeoTube *mem = new TGeoTube(84.05,250,0.01);
+  TGeoVolume *ihv = new TGeoVolume("TPC_IHVH",ih,m3);
+  TGeoVolume *ohv = new TGeoVolume("TPC_OHVH",oh,m3);
+  TGeoVolume *memv = new TGeoVolume("TPC_HV",mem,sm7);
+  //
+  TGeoVolumeAssembly *cm = new TGeoVolumeAssembly("TPC_HVMEM");
+  cm->AddNode(ihv,1);
+  cm->AddNode(ohv,1);
+  cm->AddNode(memv,1);
+  v9->AddNode(cm,1);
+  //
+  // end caps - they are make as an assembly of single segments
+  // containing both readout chambers
+  //
+  Double_t openingAngle = 10.*TMath::DegToRad();
+  Double_t thick=1.5; // rib
+  Double_t shift = thick/TMath::Sin(openingAngle);
+  //
+  Double_t lowEdge = 86.3; // hole in the wheel
+  Double_t upEdge = 240.4; // hole in the wheel
+  //
+  new TGeoTubeSeg("sec",74.5,264.4,3.,0.,20.);
+  //
+  TGeoPgon *hole = new TGeoPgon("hole",0.,20.,1,4);
+  //
+  hole->DefineSection(0,-3.5,lowEdge-shift,upEdge-shift);
+  hole->DefineSection(1,-1.5,lowEdge-shift,upEdge-shift);
+  //
+  hole->DefineSection(2,-1.5,lowEdge-shift,upEdge+3.-shift);
+  hole->DefineSection(3,3.5,lowEdge-shift,upEdge+3.-shift);
+  //
+  Double_t ys = shift*TMath::Sin(openingAngle); 
+  Double_t xs = shift*TMath::Cos(openingAngle);
+  TGeoTranslation *tr = new TGeoTranslation("tr",xs,ys,0.);  
+  tr->RegisterYourself();
+  TGeoCompositeShape *chamber = new TGeoCompositeShape("sec-hole:tr");
+  TGeoVolume *sv = new TGeoVolume("TPC_WSEG",chamber,m3);
+  TGeoPgon *bar = new TGeoPgon("bar",0.,20.,1,2);
+  bar->DefineSection(0,-3.,131.5-shift,136.5-shift);
+  bar->DefineSection(1,1.5,131.5-shift,136.5-shift);
+  TGeoVolume *barv = new TGeoVolume("TPC_WBAR",bar,m3);
+  TGeoVolumeAssembly *ch = new TGeoVolumeAssembly("TPC_WCH");//empty segment
+  //
+  ch->AddNode(sv,1); ch->AddNode(barv,1,tr);
+  //
+  // readout chambers
+  //
+  // IROC first
+  //
+   TGeoTrd1 *ibody = new TGeoTrd1(13.8742,21.3328,4.29,21.15);
+   TGeoVolume *ibdv = new TGeoVolume("TPC_IROCB",ibody,m3);
+  // empty space
+   TGeoTrd1 *emp = new TGeoTrd1(12.3742,19.8328,3.99,19.65);
+   TGeoVolume *empv = new TGeoVolume("TPC_IROCE",emp,m1);
+   ibdv->AddNode(empv,1,new TGeoTranslation(0.,-0.3,0.));
+   //bars
+   Double_t tga = (19.8328-12.3742)/39.3;
+   Double_t xmin,xmax;
+   xmin = 9.55*tga+12.3742;
+   xmax = 9.95*tga+12.3742;
+   TGeoTrd1 *ib1 = new TGeoTrd1(xmin,xmax,3.29,0.2);
+   TGeoVolume *ib1v = new TGeoVolume("TPC_IRB1",ib1,m3);
+   empv->AddNode(ib1v,1,new TGeoTranslation("tt1",0.,0.7,-9.9));
+   xmin=19.4*tga+12.3742;
+   xmax=19.9*tga+12.3742;
+   TGeoTrd1 *ib2 = new TGeoTrd1(xmin,xmax,3.29,0.25);
+   TGeoVolume *ib2v = new TGeoVolume("TPC_TRB2",ib2,m3);
+   empv->AddNode(ib2v,1,new TGeoTranslation(0.,0.7,0.));
+   xmin=29.35*tga+12.3742;
+   xmax=29.75*tga+12.3742;
+   TGeoTrd1 *ib3 = new TGeoTrd1(xmin,xmax,3.29,0.2); 
+   TGeoVolume *ib3v = new TGeoVolume("TPC_IRB3",ib3,m3);    
+   empv->AddNode(ib3v,1,new TGeoTranslation(0.,0.7,9.9));
+   //
+   // holes for connectors
+   //
+   TGeoBBox *conn = new TGeoBBox(0.4,0.3,4.675); // identical for iroc and oroc
+   TGeoVolume *connv = new TGeoVolume("TPC_RCCON",conn,m1);
+   TString fileName(gSystem->Getenv("ALICE_ROOT"));
+   fileName += "/TPC/conn_iroc.dat";
+   ifstream in;
+   in.open(fileName.Data(), ios_base::in); // asci file
+   for(Int_t i =0;i<86;i++){
+      Double_t y = 3.99;
+      Double_t x,z,ang;
+      in>>x>>z>>ang;
+      z-=26.5;
+      TGeoRotation *rrr = new TGeoRotation();
+      rrr->RotateY(ang);
+      TGeoCombiTrans *trans = new TGeoCombiTrans("trans",x,y,z,rrr);
+      ibdv->AddNode(connv,i+1,trans);
+   }
+   in.close();
+   // "cap"
+   new TGeoTrd1("icap",14.5974,23.3521,1.19,24.825);
+   // "hole"
+   new TGeoTrd1("ihole",13.8742,21.3328,1.2,21.15);
+   TGeoTranslation *tr1 = new TGeoTranslation("tr1",0.,0.,1.725);  
+   tr1->RegisterYourself();
+   TGeoCompositeShape *ic = new TGeoCompositeShape("icap-ihole:tr1");
+   TGeoVolume *icv = new TGeoVolume("TPC_IRCAP",ic,m3);
+   //
+   // pad plane and wire fixations
+   //
+   TGeoTrd1 *pp = new TGeoTrd1(14.5974,23.3521,0.3,24.825); //pad+iso
+   TGeoMedium *m4 = gGeoManager->GetMedium("TPC_G10");
+   TGeoVolume *ppv = new TGeoVolume("TPC_IRPP",pp,m4);
+   TGeoPara *f1 = new TGeoPara(.6,.5,24.825,0.,-10.,0.);
+   TGeoVolume *f1v = new TGeoVolume("TPC_IRF1",f1,m4);
+   TGeoPara *f2 = new TGeoPara(.6,.5,24.825,0.,10.,0.);
+   TGeoVolume *f2v = new TGeoVolume("TPC_IRF2",f2,m4);
+   //
+   TGeoVolumeAssembly *iroc = new TGeoVolumeAssembly("TPC_IROC");
+   //
+   iroc->AddNode(ibdv,1);
+   iroc->AddNode(icv,1,new TGeoTranslation(0.,3.1,-1.725));
+   iroc->AddNode(ppv,1,new TGeoTranslation(0.,4.59,-1.725));
+   tga =(23.3521-14.5974)/49.65; 
+   Double_t xx = 24.825*tga+14.5974-0.6;
+   iroc->AddNode(f1v,1,new TGeoTranslation(-xx,5.39,-1.725));
+   iroc->AddNode(f2v,1,new TGeoTranslation(xx,5.39,-1.725));
+   //
+   // OROC
+   //
+   TGeoTrd1 *obody = new TGeoTrd1(22.2938,40.5084,4.19,51.65);
+   TGeoVolume *obdv = new TGeoVolume("TPC_OROCB",obody,m3);
+   TGeoTrd1 *oemp = new TGeoTrd1(20.2938,38.5084,3.89,49.65);
+   TGeoVolume *oempv = new TGeoVolume("TPC_OROCE",oemp,m1);
+   obdv->AddNode(oempv,1,new TGeoTranslation(0.,-0.3,0.));
+   //horizontal bars
+   tga=(38.5084-20.2938)/99.3;
+   xmin=tga*10.2+20.2938;
+   xmax=tga*10.6+20.2938;
+   TGeoTrd1 *ob1 = new TGeoTrd1(xmin,xmax,2.915,0.2);
+   TGeoVolume *ob1v = new TGeoVolume("TPC_ORB1",ob1,m3);
+   //
+   xmin=22.55*tga+20.2938;
+   xmax=24.15*tga+20.2938;
+   TGeoTrd1 *ob2 = new TGeoTrd1(xmin,xmax,2.915,0.8);
+   TGeoVolume *ob2v = new TGeoVolume("TPC_ORB2",ob2,m3);
+   //
+   xmin=36.1*tga+20.2938;
+   xmax=36.5*tga+20.2938;
+   TGeoTrd1 *ob3 = new TGeoTrd1(xmin,xmax,2.915,0.2);
+   TGeoVolume *ob3v = new TGeoVolume("TPC_ORB3",ob3,m3);
+   //
+   xmin=49.0*tga+20.2938;
+   xmax=50.6*tga+20.2938;   
+   TGeoTrd1 *ob4 = new TGeoTrd1(xmin,xmax,2.915,0.8);
+   TGeoVolume *ob4v = new TGeoVolume("TPC_ORB4",ob4,m3);
+   //
+   xmin=63.6*tga+20.2938;
+   xmax=64.0*tga+20.2938;
+   TGeoTrd1 *ob5 = new TGeoTrd1(xmin,xmax,2.915,0.2);
+   TGeoVolume *ob5v = new TGeoVolume("TPC_ORB5",ob5,m3);
+   //
+   xmin=75.5*tga+20.2938;
+   xmax=77.15*tga+20.2938;
+   TGeoTrd1 *ob6 = new TGeoTrd1(xmin,xmax,2.915,0.8);
+   TGeoVolume *ob6v = new TGeoVolume("TPC_ORB6",ob6,m3);
+   //
+   xmin=88.7*tga+20.2938;
+   xmax=89.1*tga+20.2938;
+   TGeoTrd1 *ob7 = new TGeoTrd1(xmin,xmax,2.915,0.2);
+   TGeoVolume *ob7v = new TGeoVolume("TPC_ORB7",ob7,m3);
+   //
+   oempv->AddNode(ob1v,1,new TGeoTranslation(0.,0.975,-39.25));
+   oempv->AddNode(ob2v,1,new TGeoTranslation(0.,0.975,-26.3));
+   oempv->AddNode(ob3v,1,new TGeoTranslation(0.,0.975,-13.35));
+   oempv->AddNode(ob4v,1,new TGeoTranslation(0.,0.975,0.15));
+   oempv->AddNode(ob5v,1,new TGeoTranslation(0.,0.975,14.15));
+   oempv->AddNode(ob6v,1,new TGeoTranslation(0.,0.975,26.7));
+   oempv->AddNode(ob7v,1,new TGeoTranslation(0.,0.975,39.25));
+   // vertical bars
+   TGeoBBox *ob8 = new TGeoBBox(0.8,2.915,5.1); 
+   TGeoBBox *ob9 = new TGeoBBox(0.8,2.915,5.975);
+   TGeoBBox *ob10 = new TGeoBBox(0.8,2.915,5.775);
+   TGeoBBox *ob11 = new TGeoBBox(0.8,2.915,6.25);
+   TGeoBBox *ob12 = new TGeoBBox(0.8,2.915,6.5);
+   //
+   TGeoVolume *ob8v = new TGeoVolume("TPC_ORB8",ob8,m3);
+   TGeoVolume *ob9v = new TGeoVolume("TPC_ORB9",ob9,m3);
+   TGeoVolume *ob10v = new TGeoVolume("TPC_ORB10",ob10,m3);
+   TGeoVolume *ob11v = new TGeoVolume("TPC_ORB11",ob11,m3);
+   TGeoVolume *ob12v = new TGeoVolume("TPC_ORB12",ob12,m3);
+   //
+   oempv->AddNode(ob8v,1,new TGeoTranslation(0.,0.975,-44.55));
+   oempv->AddNode(ob8v,2,new TGeoTranslation(0.,0.975,44.55));
+   oempv->AddNode(ob9v,1,new TGeoTranslation(0.,0.975,-33.075));
+   oempv->AddNode(ob9v,2,new TGeoTranslation(0.,0.975,-19.525));
+   oempv->AddNode(ob10v,1,new TGeoTranslation(0.,0.975,20.125));
+   oempv->AddNode(ob10v,2,new TGeoTranslation(0.,0.975,33.275));
+   oempv->AddNode(ob11v,1,new TGeoTranslation(0.,0.975,-6.9));
+   oempv->AddNode(ob12v,1,new TGeoTranslation(0.,0.975,7.45));
+   //
+   // holes for connectors
+   //
+   fileName = gSystem->Getenv("ALICE_ROOT");
+   fileName += "/TPC/conn_oroc.dat";
+   in.open(fileName.Data(), ios_base::in); // asci file
+   for(Int_t i =0;i<78;i++){
+      Double_t y =3.89;
+      Double_t x,z,ang;
+      Double_t x1,z1,x2,z2;
+      in>>x>>z>>ang;        
+      Double_t xr = 4.7*TMath::Sin(ang*TMath::DegToRad());
+      Double_t zr = 4.7*TMath::Cos(ang*TMath::DegToRad());
+      //
+      x1=xr+x; x2=-xr+x; z1=zr+z; z2 = -zr+z;      
+      //
+      TGeoRotation *rr = new TGeoRotation();
+      rr->RotateY(ang); 
+      z1-=54.95;
+      z2-=54.95;
+      TGeoCombiTrans *trans1 = new TGeoCombiTrans("trans1",x1,y,z1,rr);
+      TGeoCombiTrans *trans2 = new TGeoCombiTrans("trans2",x2,y,z2,rr);
+      obdv->AddNode(connv,i+1,trans1);
+      obdv->AddNode(connv,i+79,trans2);
+   }
+   in.close();
+   // cap
+   new TGeoTrd1("ocap",23.3874,43.5239,1.09,57.1);
+   new TGeoTrd1("ohole",22.2938,40.5084,1.09,51.65);
+   TGeoTranslation *tr5 = new TGeoTranslation("tr5",0.,0.,-2.15);
+   tr5->RegisterYourself();
+   TGeoCompositeShape *oc = new TGeoCompositeShape("ocap-ohole:tr5");
+   TGeoVolume *ocv = new TGeoVolume("TPC_ORCAP",oc,m3);
+   //
+   // pad plane and wire fixations
+   //
+   TGeoTrd1 *opp = new TGeoTrd1(23.3874,43.5239,0.3,57.1);
+   TGeoVolume *oppv = new TGeoVolume("TPC_ORPP",opp,m4);
+   //
+   tga=(43.5239-23.3874)/114.2;
+   TGeoPara *f3 = new TGeoPara(.7,.6,57.1,0.,-10.,0.);
+   TGeoPara *f4 = new TGeoPara(.7,.6,57.1,0.,10.,0.);  
+   xx = 57.1*tga+23.3874-0.7;
+   TGeoVolume *f3v = new TGeoVolume("TPC_ORF1",f3,m4);
+   TGeoVolume *f4v = new TGeoVolume("TPC_ORF2",f4,m4);
+   //
+   TGeoVolumeAssembly *oroc = new TGeoVolumeAssembly("TPC_OROC");
+   //
+   oroc->AddNode(obdv,1);
+   oroc->AddNode(ocv,1,new TGeoTranslation(0.,3.1,2.15));
+   oroc->AddNode(oppv,1,new TGeoTranslation(0.,4.49,2.15));
+   oroc->AddNode(f3v,1,new TGeoTranslation(-xx,5.39,2.15));
+   oroc->AddNode(f4v,1,new TGeoTranslation(xx,5.39,2.15));
+   // 
+   // now iroc and oroc are placed into a sector...
+   //
+   TGeoVolumeAssembly *secta = new TGeoVolumeAssembly("TPC_SECT"); // a-side
+   TGeoVolumeAssembly *sectc = new TGeoVolumeAssembly("TPC_SECT"); // c-side
+   TGeoRotation rot1("rot1",90.,90.,0.);
+   TGeoRotation rot2("rot2");
+   rot2.RotateY(10.);
+   TGeoRotation *rot = new TGeoRotation("rot");
+   *rot=rot1*rot2;
+   //
+   Double_t x0,y0;
+   x0=110.2*TMath::Cos(openingAngle);
+   y0=110.2*TMath::Sin(openingAngle);
+   TGeoCombiTrans *combi1a = new TGeoCombiTrans("combi1",x0,y0,1.09+0.195,rot); //a-side 
+   TGeoCombiTrans *combi1c = new TGeoCombiTrans("combi1",x0,y0,1.09+0.222,rot); //c-side
+   x0=188.45*TMath::Cos(openingAngle);
+   y0=188.45*TMath::Sin(openingAngle);
+   TGeoCombiTrans *combi2a = new TGeoCombiTrans("combi2",x0,y0,0.99+0.195,rot); //a-side
+   TGeoCombiTrans *combi2c = new TGeoCombiTrans("combi2",x0,y0,0.99+0.222,rot); //c-side
+   //
+   //
+   // A-side
+   //
+   secta->AddNode(ch,1);
+   secta->AddNode(iroc,1,combi1a);
+   secta->AddNode(oroc,1,combi2a);
+   //
+   // C-side
+   //
+   sectc->AddNode(ch,1);
+   sectc->AddNode(iroc,1,combi1c);
+   sectc->AddNode(oroc,1,combi2c);
+   //
+   // now I try to make  wheels...
+   //
+   TGeoVolumeAssembly *wheela = new TGeoVolumeAssembly("TPC_ENDCAP");
+   TGeoVolumeAssembly *wheelc = new TGeoVolumeAssembly("TPC_ENDCAP");
+   //
+   for(Int_t i =0;i<18;i++){
+     Double_t phi = (20.*i);
+     TGeoRotation *r = new TGeoRotation();
+     r->RotateZ(phi);
+     wheela->AddNode(secta,i+1,r);
+     wheelc->AddNode(sectc,i+1,r); 
     
-     phi1 = (Float_t)TMath::Nint(phi1);
-     if(phi1>360.) phi1 -= 360.;
-
-     theta1 = 90.;
-
-     phi2 = 90. + phi1;
-     if(phi2>360.) phi2 -= 360.;
-
-     theta2 = 90.; 
-
-     phi3 = 0.;
-     theta3 = 0.;
-
-     if(fSecAU < 0) {
-
-       //--------------------------------------------------------------
-       //  position all sectors
-       //--------------------------------------------------------------
-
-       AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3); 
-
-       gMC->Gspos("TLGA",ns+1,"TGAS" ,0.,0.,0.,idrotm[nRotMat],"ONLY");
-
-       nRotMat++;
-   
-       // reflection !!
-
-       phi3 = 0.;
-       theta3 = 180.;
-     
-       AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
-  
-       gMC->Gspos("TLGA",ns+1+nOuterSector,"TGAS" ,0.,0.,0.,idrotm[nRotMat],"ONLY");
-          
-       nRotMat++;
-     }
-
-     else{
-
-       //---------------------------------------------------------------
-       //  position selected sectors
-       //---------------------------------------------------------------
-
-       for(Int_t sel=0;sel<12;sel++){
-
-         if(fSecUps[sel] == ns+2*nInnerSector){
-           
-          AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3); 
-          gMC->Gspos("TLGA",ns+1,"TGAS" ,0.,0.,0.,idrotm[nRotMat],"ONLY");
-          nRotMat++; 
-
-	 }
-         else if(fSecUps[sel] == ns+2*nInnerSector+nOuterSector){
-
-	   // reflection
-
-           phi3 = 0.;
-           theta3 = 180.;
-
-           AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
-           gMC->
-           Gspos("TLGA",ns+1+nOuterSector,"TGAS" ,0.,0.,0.,idrotm[nRotMat],"ONLY");
-           nRotMat++; 
-
-	 }
-
-       }
-
-     }
-
-  }
-  
-  Float_t z0 = z_side - 0.95;
-
-  gMC->Gspos("TPEC",1,"TPSG",0.,0.,z0,0,"ONLY");
-
-  // ========================================================== 
-  //                  wheels 
-  // ========================================================== 
-
+   }
+   // wheels in the drift volume!   
+
+   TGeoCombiTrans *combi3 = new TGeoCombiTrans("combi3",0.,0.,256.6,ref);
+   v9->AddNode(wheela,1,combi3);
+   v9->AddNode(wheelc,2,new TGeoTranslation(0.,0.,-256.6));
+   //_____________________________________________________________
+   // service support wheel
+   //_____________________________________________________________
+  TGeoPgon *sw = new TGeoPgon(0.,20.,1,2);
+  sw->DefineSection(0,-4.,80.5,251.75);
+  sw->DefineSection(1,4.,80.5,251.75); 
+  TGeoVolume *swv = new TGeoVolume("TPC_SWSEG",sw,m3); //Al
   //
-  //  auxilary structures
+  thick=1.;
+  shift = thick/TMath::Sin(openingAngle);
+  TGeoPgon *sh = new TGeoPgon(0.,20.,1,2);
+  sh->DefineSection(0,-4.,81.5-shift,250.75-shift);
+  sh->DefineSection(1,4.,81.5-shift,250.75-shift);
+  TGeoVolume *shv = new TGeoVolume("TPC_SWS1",sh,m1); //Air
   //
-
-
-  gMC->Gsvolu("TPWI","TUBE",idtmed[24],dm,0); // "air" 
-
-  // ---------------------------------------------------------- 
-  //       Large wheel -> positioned in the TPC 
-  // ---------------------------------------------------------- 
-  
-
-  z0 = 263.5; // TPC length - 1/2 spoke wheel width
-
-  dm[0] = 258.;
-  dm[1] = 278.;
-  dm[2] = 11.5;
-  
-  gMC->Gsvolu("TPWL", "TUBE", idtmed[0], dm, 3); 
-
-  dm[0] = dm[0]+2.;
-  dm[1] = 278.;
-  dm[2] = dm[2]-2.;
-
-  gMC->Gsposp("TPWI",1,"TPWL",0.,0.,0.,0,"ONLY",dm,3);
-
-  gMC->Gspos("TPWL", 1, "TPC ", 0, 0, z0, 0, "ONLY");
-  gMC->Gspos("TPWL", 2, "TPC ", 0, 0, -z0, 0, "ONLY");
-
+  TGeoMedium *m9 =  gGeoManager->GetMedium("TPC_Si"); 
+  TGeoPgon *el = new TGeoPgon(0.,20.,1,2);
+  el->DefineSection(0,-1.872,81.5-shift,250.75-shift);
+  el->DefineSection(1,1.872,81.5-shift,250.75-shift);
+  TGeoVolume *elv = new TGeoVolume("TPC_ELEC",el,m9); //Si 
   //
-  //  Outer vessel + CO2 HV degrader
+  shv->AddNode(elv,1);
   //
-
-  dm[0] = 260.;
-  dm[1] = 278.;
-  dm[2] = 252.;
-
-  gMC->Gsvolu("TPCO","TUBE",idtmed[12],dm,3);
-
-  dm[0] = 275.;
-  dm[1] = 278.;
-  
-  gMC->Gsvolu("TPOV","TUBE",idtmed[10],dm,3);
-
-  gMC->Gspos("TPOV",1,"TPCO",0.,0.,0.,0,"ONLY");
-
-
-  // G10 plugs
-
-  dm[0] = 258.;
-  dm[1] = 260.;
-  dm[2] = 1.;
-
-  gMC->Gsvolu("TPG1","TUBE",idtmed[8],dm,3);
-  gMC->Gspos("TPG1",1,"TPCO",0.,0.,251.,0,"ONLY");
-  gMC->Gspos("TPG1",2,"TPCO",0.,0.,-251.,0,"ONLY");  
-
-  gMC->Gspos("TPCO",1,"TPC ",0.,0.,0.,0,"ONLY");
-
-
+  //
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);
+  swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
+  // cover
+  TGeoPgon *co = new TGeoPgon(0.,20.,1,2);
+  co->DefineSection(0,-0.5,77.,255.25);
+  co->DefineSection(1,0.5,77.,255.25);
+  TGeoVolume *cov = new TGeoVolume("TPC_SWC1",co,m3);//Al
+  // hole in a cover
+  TGeoPgon *coh = new TGeoPgon(0.,20.,1,2);
+  shift=4./TMath::Sin(openingAngle);
+  coh->DefineSection(0,-0.5,85.-shift,247.25-shift);
+  coh->DefineSection(1,0.5,85.-shift,247.25-shift);  
+  //
+  TGeoVolume *cohv = new TGeoVolume("TPC_SWC2",coh,m1);
+  //
+  ys = shift*TMath::Sin(openingAngle);
+  xs = shift*TMath::Cos(openingAngle);  
+  cov->AddNode(cohv,1,new TGeoTranslation(xs,ys,0.));
+  //
+  // Sector as an Assembly
+  //
+  TGeoVolumeAssembly *swhs = new TGeoVolumeAssembly("TPC_SSWSEC");
+  swhs->AddNode(swv,1);
+  swhs->AddNode(cov,1,new TGeoTranslation(0.,0.,-4.5));
+  swhs->AddNode(cov,2,new TGeoTranslation(0.,0.,4.5));
+  //
+  // SSW as an Assembly of sectors
+  //
+ TGeoVolumeAssembly *swheel = new TGeoVolumeAssembly("TPC_SSWHEEL");
+   for(Int_t i =0;i<18;i++){
+     Double_t phi = (20.*i);
+     TGeoRotation *r = new TGeoRotation();
+     r->RotateZ(phi);
+     swheel->AddNode(swhs,i+1,r);   
+   }
+   v1->AddNode(swheel,1,new TGeoTranslation(0.,0.,-284.6));
+   v1->AddNode(swheel,2,new TGeoTranslation(0.,0.,284.6));
+
+   // sensitive strips - strip "0" is always set
+   // conditional
+   Int_t totrows;
+   totrows = fTPCParam->GetNRowLow() + fTPCParam->GetNRowUp();
+   Double_t *upar;
+   upar=NULL;
+   gGeoManager->Volume("TPC_Strip","PGON",m5->GetId(),upar);
+   upar=new Double_t [10];
+   upar[0]=0.;
+   upar[1]=360.;
+   upar[2]=18.;
+   upar[3]=2.;
+   //
+   upar[4]=-124.8;
+   upar[7]=124.8;
+
+   Double_t rlow=fTPCParam->GetPadRowRadiiLow(0);
+
+   upar[5]=rlow;
+   upar[6]=rlow+.01;
+   upar[8]=upar[5];
+   upar[9]=upar[6];
+   //
+   gGeoManager->Node("TPC_Strip",1,"TPC_Drift",0.,0.,124.82,0,kTRUE,upar,10);
+   gGeoManager->Node("TPC_Strip",totrows+1,
+                     "TPC_Drift",0.,0.,-124.82,0,kTRUE,upar,10);
+   //
+   // now, strips optionally
+   //
+   if(fSens){
+     //lower sectors
+     for(Int_t i=2;i<fTPCParam->GetNRowLow()+1;i++){
+       rlow=fTPCParam->GetPadRowRadiiLow(i-1);
+       upar[5]=rlow;
+       upar[6]=rlow+.01;
+       upar[8]=upar[5];
+       upar[9]=upar[6];
+       gGeoManager->Node("TPC_Strip",i,
+                         "TPC_Drift",0.,0.,124.82,0,kTRUE,upar,10);
+       gGeoManager->Node("TPC_Strip",totrows+i,
+                         "TPC_Drift",0.,0.,-124.82,0,kTRUE,upar,10);       
+     }
+     //upper sectors
+     for(Int_t i=1;i<fTPCParam->GetNRowUp()+1;i++){
+       rlow=fTPCParam->GetPadRowRadiiUp(i-1); 
+       upar[5]=rlow;
+       upar[6]=rlow+.01;
+       upar[8]=upar[5];
+       upar[9]=upar[6];
+       gGeoManager->Node("TPC_Strip",i+fTPCParam->GetNRowLow(),
+                         "TPC_Drift",0.,0.,124.82,0,kTRUE,upar,10); 
+       gGeoManager->Node("TPC_Strip",totrows+i+fTPCParam->GetNRowLow(),
+                         "TPC_Drift",0.,0.,-124.82,0,kTRUE,upar,10); 
+     }
+   }//strips
   //----------------------------------------------------------
-  //  Small wheel -> positioned in "side gas
+  // TPc Support Rods - MAKROLON
   //----------------------------------------------------------
-
-  dm[0] = 78.;
-  dm[1] = 82.;
-  dm[2] = 11.5;
-
-  gMC->Gsvolu("TPWS", "TUBE", idtmed[0], dm, 3);
-
-  dm[0] = 78.;
-  dm[1] = dm[1]-2;
-  dm[2] = dm[2]-2.;
-
-  gMC->Gsvolu("TPW1", "TUBE", idtmed[2], dm, 3);
-  
-  gMC->Gspos("TPW1", 1, "TPWS", 0., 0., 0., 0, "ONLY");
-
-  z0 = 1.; // spoke wheel is shifted w.r.t. center of the "side gas"
-
-  gMC->Gspos("TPWS", 1, "TPSG", 0, 0, z0, 0, "ONLY");
-
-
-  // to avoid overlaps
-
-  dm[0] = 76.;
-  dm[1] = 78.;
-  dm[2] = 11.5;
-
-  gMC->Gsvolu("TPS1","TUBE",idtmed[0],dm,3);
-
-  dm[2] = 9.5;
-
-  gMC->Gsvolu("TPS2","TUBE",idtmed[24],dm,3);
-
-  gMC->Gspos("TPS2",1,"TPS1",0.,0.,0.,0,"ONLY");
-
-  z0= 263.5;
+  TGeoMedium *m6=gGeoManager->GetMedium("TPC_Makrolon");
+  TGeoMedium *m7=gGeoManager->GetMedium("TPC_Cu");
+  // upper and lower rods differ in length!
+  delete [] upar;
+  upar=NULL;
+  gGeoManager->Volume("TPC_Rod","TUBE",m6->GetId(),upar);
+  upar=new Double_t [3];
+  upar[0]=1.8;
+  upar[1]=2.2;
   
-  gMC->Gspos("TPS1",1,"TPC ",0.,0.,z0,0,"ONLY");
-  gMC->Gspos("TPS1",2,"TPC ",0.,0.,-z0,0,"ONLY");
-
-  // G10 plug
-
-  dm[0] = 76.;
-  dm[1] = 78.;
-  dm[2] = 1.;
-
-  gMC->Gsvolu("TPG2","TUBE",idtmed[8],dm,3);
-
-  z0 = 251.;
-
-  gMC->Gspos("TPG2",1,"TPC ",0.,0.,z0,0,"ONLY");
-  gMC->Gspos("TPG2",2,"TPC ",0.,0.,-z0,0,"ONLY");
-
-
-  //---------------------------------------------------------
-  //  central wheel  6 (radial direction) x 4 (along z) cm2
-  //---------------------------------------------------------
-
-  dm[0] = 140.;
-  dm[1] = 146.;
-  dm[2] = 2.;
-
-  gMC->Gsvolu("TPWC","TUBE",idtmed[0],dm,3);
-
-  dm[0] = dm[0] + 2.;
-  dm[1] = dm[1] - 2.;
-  dm[2] = dm[2] - 1.;
-
-  gMC->Gsposp("TPWI",2,"TPWC",0.,0.,0.,0,"ONLY",dm,3);
-
-  z0 = z_side - 1.9 - 2.;
-
-  gMC->Gspos("TPWC",1,"TPSG",0.,0.,z0,0,"ONLY");
-
   //
-
-  gMC->Gsvolu("TPSE","BOX ",idtmed[24],dm,0); // "empty" part of the spoke 
-
- 
-  //---------------------------------------------------------
-  //  inner spokes (nSectorInner)
-  //---------------------------------------------------------
-
-  dm[0] = 0.5*(139.9-82.1);
-  dm[1] = 3.;
-  dm[2] = 2.;
-
-  Float_t x1 = dm[0]+82.;
-
-  gMC->Gsvolu("TPSI","BOX",idtmed[0],dm,3);
-
-  dm[1] = dm[1]-1.;
-  dm[2] = dm[2]-1.;
-
-  gMC->Gsposp("TPSE",1,"TPSI",0.,0.,0.,0,"ONLY",dm,3);
-
-  for(ns=0;ns<nInnerSector;ns++){
-
-    phi1 = 0.5*InnerOpenAngle + ns*InnerOpenAngle + InnerAngleShift;
-    theta1=90.;
-    phi1 *=kRaddeg;
-
-    phi1 = (Float_t)TMath::Nint(phi1);
-    if(phi1>360.) phi1 -= 360.;    
-
-    phi2 = phi1+90.;
-    if(phi2>360.) phi2 -= 360.;
-    theta2=90.;
-    phi3=0.;
-    theta3=0.;
-
-    alpha = phi1 * kDegrad;
-    x     = x1 * TMath::Cos(alpha);
-    y     = x1 * TMath::Sin(alpha);    
-
-   AliMatrix(idrotm[nRotMat],theta1,phi1,theta2,phi2,theta3,phi3);
-
-   gMC->Gspos("TPSI",ns+1,"TPSG",x,y,z0,idrotm[nRotMat],"ONLY");  
-
-   nRotMat++;
-
-  }
-
-  //-------------------------------------------------------------
-  // outer spokes (nSectorOuter)
-  //-------------------------------------------------------------
-
-  dm[0] = 0.5*(257.9-146.1);
-  dm[1] = 3.;
-  dm[2] = 2.;
-
-  x1 = dm[0] + 146.;
-
-  gMC->Gsvolu("TPSO","BOX ",idtmed[0],dm,3);
-
-  dm[1] = dm[1] - 1.;
-  dm[2] = dm[2] - 1.;
-
-  gMC->Gsposp("TPSE",2,"TPSO",0.,0.,0.,0,"ONLY",dm,3);
-
-  for(ns=0;ns<nOuterSector;ns++){
-
-    phi1 = 0.5*OuterOpenAngle + ns*OuterOpenAngle + OuterAngleShift;
-    theta1=90.;
-    phi1 *=kRaddeg;
-
-    phi1 = (Float_t)TMath::Nint(phi1);
-    if(phi1>360.) phi1 -= 360.;
-
-    phi2 = phi1+90.;
-    if(phi2>360.) phi2 -= 360.;
-    theta2=90.;
-    phi3=0.;
-    theta3=0.;
-
-    alpha = phi1 * kDegrad;
-    x     = x1 * TMath::Cos(alpha);
-    y     = x1 * TMath::Sin(alpha);    
-
-   AliMatrix(idrotm[nRotMat],theta1,phi1,theta2,phi2,theta3,phi3);
-
-   gMC->Gspos("TPSO",ns+1,"TPSG",x,y,z0,idrotm[nRotMat],"ONLY");  
-
-   nRotMat++;
-
-  }  
+  //HV rods - makrolon + 0.58cm (diameter) Cu
+  TGeoTube *hvr = new TGeoTube(0.,2.2,126.64);
+  TGeoTube *hvc = new TGeoTube(0.,0.29,126.64);
+  //
+  TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
+  TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
+  hvrv->AddNode(hvcv,1);
   
+  for(Int_t i=0;i<18;i++){
+    Double_t angle,x,y;
+    Double_t z,r; 
+    angle=TMath::DegToRad()*20.*(Double_t)i;
+    r=81.5;
+    x=r * TMath::Cos(angle);
+    y=r * TMath::Sin(angle);
+    upar[2]=126.64; //lower
+    z= 126.96;
+    if(i==15){
+      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));
+      v9->AddNode(hvrv,2,new TGeoTranslation(x,y,-z));
+    }
+    else{
+     gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
+     gGeoManager->Node("TPC_Rod",i+19,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
+    }
+    r=254.25;
+    x=r * TMath::Cos(angle);
+    y=r * TMath::Sin(angle);
+    upar[2]=126.54; //upper
+    z=127.06;
+    gGeoManager->Node("TPC_Rod",i+37,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
+    gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+  }
 
-  
-  // -------------------------------------------------------- 
-  //         put the readout chambers into the TPC 
-  // -------------------------------------------------------- 
+  delete [] upar;
 
-  theta1 = 90.;
-  phi1   = 0.;
-  theta2 = 90.;
-  phi2   = 270.;
-  theta3 = 180.;
-  phi3   = 0.;
-  
-  AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+  TGeoVolume *alice = gGeoManager->GetVolume("ALIC");
+  alice->AddNode(v1,1);  
   
-  z0 = z_side + 250.;
-  
-  gMC->Gspos("TPSG", 1, "TPC ", 0, 0, z0, 0, "ONLY");
-  gMC->Gspos("TPSG", 2, "TPC ", 0, 0, -z0, idrotm[nRotMat], "ONLY");
+} // end of function
+ 
+//_____________________________________________________________________________
+void AliTPCv2::AddAlignableVolumes() const
+{
+  //
+  // Create entries for alignable volumes associating the symbolic volume
+  // name with the corresponding volume path. Needs to be syncronized with
+  // eventual changes in the geometry.
+  // 
+  SetInnerChambersAlignable();
+  SetOuterChambersAlignable();
+}
+ 
+//_____________________________________________________________________________
+void AliTPCv2::SetInnerChambersAlignable() const
+{
+  //
+  AliGeomManager::ELayerID idTPC1 = AliGeomManager::kTPC1;
+  Int_t modUID, modnum = 0;
+  TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
+  TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
+  TString vpappend = "/TPC_IROC_1";
+  TString snstr1="TPC/EndcapA/Sector";
+  TString snstr2="TPC/EndcapC/Sector";
+  TString snappend="/InnerChamber";
+  TString volpath, symname;
   
-  gMC->Gspos("TPC ", 1, "ALIC", 0, 0, 0, 0, "ONLY");
+  for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++);
+    volpath = vpstr1;
+    volpath += cnt;
+    volpath += vpappend;
+    symname = snstr1;
+    symname += cnt;
+    symname += snappend;
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
+      AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
+    TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,cnt-1);
+    alignableEntry->SetMatrix(matTtoL);
+  }
 
-  //----------------------------------------------------
-  //  Inner vessel and HV degrader
-  //----------------------------------------------------
+  for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC1,modnum++);
+    volpath = vpstr2;
+    volpath += cnt;
+    volpath += vpappend;
+    symname = snstr2;
+    symname += cnt;
+    symname += snappend;
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
+      AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
+    TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,18+cnt-1);
+    alignableEntry->SetMatrix(matTtoL);
+  }
+}
 
-  dm[0] = 0.;
-  dm[1] = 360.;
-  dm[2] = 4.;
+//_____________________________________________________________________________
+void AliTPCv2::SetOuterChambersAlignable() const
+{
+  //
+  AliGeomManager::ELayerID idTPC2 = AliGeomManager::kTPC2;
+  Int_t modUID, modnum = 0;
+  TString vpstr1 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_1/TPC_SECT_";
+  TString vpstr2 = "ALIC_1/TPC_M_1/TPC_Drift_1/TPC_ENDCAP_2/TPC_SECT_";
+  TString vpappend = "/TPC_OROC_1";
+  TString snstr1="TPC/EndcapA/Sector";
+  TString snstr2="TPC/EndcapC/Sector";
+  TString snappend="/OuterChamber";
+  TString volpath, symname;
   
-  dm[3] = -250.;
-  dm[4] = 74.4;
-  dm[5] = 76.;
-
-  dm[6] = -64.5;
-  dm[7] = 50.;
-  dm[8] = 76.;
-
-  dm[9] = -64.5;
-  dm[10] = 50.;
-  dm[11] = 76.;
-
-  dm[12] = 250.;
-  dm[13] = 74.4;
-  dm[14] = 76.;
-
-  gMC->Gsvolu("TPVD", "PCON", idtmed[12], dm, 15); // CO2
-
-  // cone parts
-
-  dm[0] = 0.;
-  dm[1] = 360.;
-  dm[2] = 2.;
-
-  dm[3] = 64.5;
-  dm[4] = 50.;
-  dm[5] = 51.6;
- 
-  dm[6] = 250.;
-  dm[7] = 74.4;
-  dm[8] = 76.;
-
-
-  gMC->Gsvolu("TIVC","PCON",idtmed[11],dm,9); // C-fibre
-
-  gMC->Gspos("TIVC",1,"TPVD",0.,0.,0.,0,"ONLY");
-  gMC->Gspos("TIVC",2,"TPVD",0.,0.,0.,idrotm[nRotMat],"ONLY");
-
-  // barrel part
-
-  dm[0] = 50.;
-  dm[1] = 50.5;
-  dm[2] = 32.25;
-
-  gMC->Gsvolu("TIVB","TUBE",idtmed[9],dm,3);
-
-  gMC->Gspos("TIVB",1,"TPVD",0.,0.,0.,0,"ONLY");
-
-  gMC->Gspos("TPVD",1,"ALIC",0.,0.,0.,0,"ONLY");
-
-
-  // --------------------------------------------------- 
-  //               volumes ordering 
-  // ---------------------------------------------------
-
-  gMC->Gsord("TGAS", 6);
-  gMC->Gsord("TPSG", 6); 
+  for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++);
+    volpath = vpstr1;
+    volpath += cnt;
+    volpath += vpappend;
+    symname = snstr1;
+    symname += cnt;
+    symname += snappend;
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
+      AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
+    TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+cnt-1);
+    alignableEntry->SetMatrix(matTtoL);
+  }
 
-  
+  for(Int_t cnt=1; cnt<=18; cnt++){
+    modUID = AliGeomManager::LayerToVolUID(idTPC2,modnum++);
+    volpath = vpstr2;
+    volpath += cnt;
+    volpath += vpappend;
+    symname = snstr2;
+    symname += cnt;
+    symname += snappend;
+    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data(),modUID))
+      AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
+    TGeoPNEntry *alignableEntry = gGeoManager->GetAlignableEntryByUID(modUID);
+    TGeoHMatrix* globMatrix = alignableEntry->GetGlobalOrig();
+    TGeoHMatrix* matTtoL = fTPCParam->Tracking2LocalMatrix(globMatrix,36+18+cnt-1);
+    alignableEntry->SetMatrix(matTtoL);
+  }
+}
 
-} // end of function
- 
 //_____________________________________________________________________________
-void AliTPCv2::DrawDetector()
+void AliTPCv2::DrawDetector() const
 {
   //
   // Draw a shaded view of the Time Projection Chamber version 1
@@ -923,34 +1013,93 @@ void AliTPCv2::DrawDetector()
   gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  gMC->Gsatt("TPC","SEEN",0);
-  gMC->Gsatt("TGAS","SEEN",0);
-  gMC->Gsatt("TPSG","SEEN",0);
-  gMC->Gsatt("TPHV","SEEN",1);
-  gMC->Gsatt("TPMH","SEEN",1);
-  gMC->Gsatt("TPEC","SEEN",0);
-  gMC->Gsatt("TRCS","SEEN",1);
-  gMC->Gsatt("TRCL","SEEN",1);
-  gMC->Gsatt("TPWL","SEEN",1);
-  gMC->Gsatt("TPWI","SEEN",1);
-  gMC->Gsatt("TPWS","SEEN",1);
-  gMC->Gsatt("TPW1","SEEN",1);
-  gMC->Gsatt("TPS1","SEEN",1);
-  gMC->Gsatt("TPS2","SEEN",1);
-  gMC->Gsatt("TPG1","SEEN",1);
-  gMC->Gsatt("TPG2","SEEN",1);
-  gMC->Gsatt("TPWC","SEEN",1);
-  gMC->Gsatt("TPSI","SEEN",1); 
-  gMC->Gsatt("TPSO","SEEN",1);
-  gMC->Gsatt("TPCO","SEEN",1);
-  gMC->Gsatt("TPOV","SEEN",1);
-  gMC->Gsatt("TPVD","SEEN",1);
+  //
+
+  gMC->Gsatt("TPC ","SEEN",0);
+  gMC->Gsatt("TOIN","SEEN",1);
+  gMC->Gsatt("TOIN","COLO",7);
+  gMC->Gsatt("TOCV","SEEN",1);
+  gMC->Gsatt("TOCV","COLO",4);
+  gMC->Gsatt("TSA1","SEEN",0);
+  gMC->Gsatt("TSA2","SEEN",0);
+  gMC->Gsatt("TSA3","SEEN",0);
+  gMC->Gsatt("TSA4","SEEN",0);  
+  gMC->Gsatt("TSA5","SEEN",0);
+  gMC->Gsatt("TOFC","SEEN",1);
+  gMC->Gsatt("TOFC","COLO",4);
+  gMC->Gsatt("TSA6","SEEN",0);
+  gMC->Gsatt("TSA7","SEEN",0);
+  gMC->Gsatt("TSA8","SEEN",0);    
+  gMC->Gsatt("TIIN","SEEN",1);
+  gMC->Gsatt("TIIN","COLO",7);
+  gMC->Gsatt("TII1","SEEN",0);
+  gMC->Gsatt("TIFC","SEEN",1);
+  gMC->Gsatt("TIFC","COLO",4);
+  gMC->Gsatt("TSA9","SEEN",0); 
+  gMC->Gsatt("TS10","SEEN",0);
+  gMC->Gsatt("TS11","SEEN",0);
+  gMC->Gsatt("TS12","SEEN",0);
+  gMC->Gsatt("TS13","SEEN",0);
+  gMC->Gsatt("TS14","SEEN",0);
+  gMC->Gsatt("TICC","SEEN",0);
+  gMC->Gsatt("TICM","SEEN",0);
+  gMC->Gsatt("TS15","SEEN",0);
+  gMC->Gsatt("TS16","SEEN",0);
+  gMC->Gsatt("TS17","SEEN",0);
+  gMC->Gsatt("TS18","SEEN",0);  
+  gMC->Gsatt("TS19","SEEN",0); 
+  gMC->Gsatt("TPJ1","SEEN",0);
+  gMC->Gsatt("TPJ2","SEEN",0);
+  gMC->Gsatt("TICS","SEEN",0);
+  gMC->Gsatt("TDGN","SEEN",0); 
+  gMC->Gsatt("TIRC","SEEN",0);
+  gMC->Gsatt("TIC1","SEEN",1);
+  gMC->Gsatt("TIPP","SEEN",0);
+  gMC->Gsatt("TIC3","SEEN",0);
+  gMC->Gsatt("TRCE","SEEN",0);
+  gMC->Gsatt("TPSC","SEEN",0);
+  gMC->Gsatt("TPCC","SEEN",0); 
+  gMC->Gsatt("TORC","SEEN",0);
+  gMC->Gsatt("TOPP","SEEN",0);
+  gMC->Gsatt("TOC3","SEEN",0);
+  gMC->Gsatt("TOC1","SEEN",1);
+  gMC->Gsatt("TSSW","SEEN",1);
+  gMC->Gsatt("TSWC","SEEN",1);
+  gMC->Gsatt("TSSW","COLO",3);
+  gMC->Gsatt("TSWC","COLO",3);
+  gMC->Gsatt("TSCE","COLO",6);
+  gMC->Gsatt("TSCE","SEEN",1);
+  gMC->Gsatt("TWES","SEEN",0);
+  gMC->Gsatt("TSWB","SEEN",0);
+  gMC->Gsatt("TPEL","SEEN",0);
+  gMC->Gsatt("TPMW","SEEN",1);
+  gMC->Gsatt("TESR","SEEN",1);
+  gMC->Gsatt("TPMW","COLO",12);
+  gMC->Gsatt("TIC1","COLO",5);
+  gMC->Gsatt("TOC1","COLO",5);
+  gMC->Gsatt("TESB","SEEN",0);
+  gMC->Gsatt("THVM","SEEN",1);
+  gMC->Gsatt("THVM","COLO",11);
+  gMC->Gsatt("THVH","SEEN",0);
+  gMC->Gsatt("TPSR","SEEN",0); 
+  gMC->Gsatt("THVL","SEEN",0);
+  gMC->Gsatt("THVC","SEEN",0);  
+  gMC->Gsatt("THVE","SEEN",0);
+  gMC->Gsatt("THVR","SEEN",0);
+  gMC->Gsatt("TPSS","SEEN",0);
+  gMC->Gsatt("TPUS","SEEN",0);
+  gMC->Gsatt("TPLS","SEEN",0);
+
   //
   gMC->Gdopt("hide", "on");
   gMC->Gdopt("shad", "on");
   gMC->Gsatt("*", "fill", 7);
   gMC->SetClipBox(".");
-  gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
+  gMC->SetClipBox("TPMW",-300,300,-300,300,254.,270.);
+  gMC->SetClipBox("TESR",-300,300,-300,300,254.,270.);
+  gMC->SetClipBox("TSSW",-300,300,-300,300,283.,284.);
+  gMC->SetClipBox("TSWC",-300,300,-300,300,283.,284.);
+  gMC->SetClipBox("*", 0, 300, -300, 300, -290, 290);
   gMC->DefaultRange();
   gMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .025, .025);
   gMC->Gdhead(1111, "Time Projection Chamber");
@@ -964,11 +1113,7 @@ void AliTPCv2::CreateMaterials()
   //
   // Define materials for version 2 of the Time Projection Chamber
   //
-
-  //
-  // Increase maximum number of steps
-  gMC->SetMaxNStep(30000);
-  //
+ 
   AliTPC::CreateMaterials();
 }
 
@@ -978,19 +1123,32 @@ void AliTPCv2::Init()
   //
   // Initialises version 2 of the TPC after that it has been built
   //
-  Int_t *idtmed = fIdtmed->GetArray()-399;
+
+  Int_t *idtmed = fIdtmed->GetArray();
+  
   AliTPC::Init();
-  fIdSens1=gMC->VolId("TLGA"); // L-sector
-  fIdSens2=gMC->VolId("TSGA"); // S-sector 
-  fIdSens3=gMC->VolId("TSST"); // strip - S-sector (not always used)
-  fIdSens4=gMC->VolId("TLST"); // strip - S-sector (not always used)
 
-  gMC->SetMaxNStep(30000); // max. number of steps increased
+ 
+  fIdSens=gMC->VolId("TPC_Strip");  // one strip is always selected...
+
+  fIDrift=gMC->VolId("TPC_Drift");
+  fSecOld=-100; // fake number 
+
+  gMC->SetMaxNStep(-30000); // max. number of steps increased
+
+  if (fPrimaryIonisation) {
+      gMC->Gstpar(idtmed[2],"PRIMIO_E", 20.77); // 1st ionisation potential
+ 
+      gMC->Gstpar(idtmed[2],"PRIMIO_N", 14.35);
+      gMC->Gstpar(idtmed[2],"LOSS", 14); // specific energy loss
+      gMC->Gstpar(idtmed[2],"STRA",4);
+  } else {
+      gMC->Gstpar(idtmed[2],"LOSS", 5); // specific energy loss
+  }
 
-  gMC->Gstpar(idtmed[403],"LOSS",5);
 
-  printf("*** TPC version 2 initialized ***\n");
-  printf("Maximum number of steps = %d\n",gMC->GetMaxNStep());
+  AliInfo("*** TPC version 2 initialized ***");
+  AliInfo(Form("Maximum number of steps = %d",gMC->GetMaxNStep()));
 
   //
   
@@ -1006,30 +1164,21 @@ void AliTPCv2::StepManager()
   //
   // parameters used for the energy loss calculations
   //
-  const Float_t prim = 14.35; // number of primary collisions per 1 cm
-  const Float_t poti = 20.77e-9; // first ionization potential for Ne/CO2
-  const Float_t w_ion = 35.97e-9; // energy for the ion-electron pair creation 
-
-  //  const Float_t prim = 17.65;
-  //  const Float_t poti = 19.02e-9;
-  // const Float_t w_ion = 33.06e-9;
+  const Float_t kprim = 14.35; // number of primary collisions per 1 cm
+  const Float_t kpoti = 20.77e-9; // first ionization potential for Ne/CO2
+  const Float_t kwIon = 35.97e-9; // energy for the ion-electron pair creation 
  
  
-  const Float_t big = 1.e10;
+  const Float_t kbig = 1.e10;
 
   Int_t id,copy;
-  Float_t hits[4];
+  Float_t hits[5];
   Int_t vol[2];  
-  TClonesArray &lhits = *fHits;
-  TLorentzVector pos;
-
-  AliTPCParam *fTPCParam = &(fDigParam->GetParam());
+  TLorentzVector p;
   
-  vol[1]=0;
-
+  vol[1]=0; // preset row number to 0
   //
-
-  gMC->SetMaxStep(big);
+  if (fPrimaryIonisation) gMC->SetMaxStep(kbig);
   
   if(!gMC->IsTrackAlive()) return; // particle has disappeared
   
@@ -1037,92 +1186,152 @@ void AliTPCv2::StepManager()
   
   if(TMath::Abs(charge)<=0.) return; // take only charged particles
   
-  
-  id=gMC->CurrentVolID(copy);
-  
-  // Check the sensitive volume
-  
-  if(id == fIdSens1) 
-    {
-      vol[0] = copy + fTPCParam->GetNInnerSector()-1; // L-sector number
-    }
-  else if(id == fIdSens2) 
-    {
-      vol[0] = copy-1; // S-sector number 
-    }
-  else if(id == fIdSens3 && gMC->IsTrackEntering())
-    {
-      vol[1] = copy-1;  // row number  
-      id = gMC->CurrentVolOffID(1,copy);
-      vol[0] = copy-1; // sector number (S-sector)
-      
-      gMC->TrackPosition(pos);
-      hits[0]=pos[0];
-      hits[1]=pos[1];
-      hits[2]=pos[2];
-      hits[3]=0.; // this hit has no energy loss
-      new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
-    }
-  else if(id == fIdSens4 && gMC->IsTrackEntering())
-    {
-      vol[1] = copy-1; // row number 
-      id = gMC->CurrentVolOffID(1,copy);
-      vol[0] = copy+fTPCParam->GetNInnerSector()-1; // sector number (L-sector)
-      
-      gMC->TrackPosition(pos);
-      hits[0]=pos[0];
-      hits[1]=pos[1];
-      hits[2]=pos[2];
-      hits[3]=0.; // this hit has no energy loss
-      new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
-    }
-  else return;
+  // check the sensitive volume
+
+  id = gMC->CurrentVolID(copy); // vol ID and copy number (starts from 1!)
+  if(id != fIDrift && id != fIdSens) return; // not in the sensitive folume 
+
+  gMC->TrackPosition(p);
+  Double_t r = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
+  //
   
   //
-  //  charged particle is in the sensitive volume
+  Double_t angle = TMath::ACos(p[0]/r);  
+  angle = (p[1]<0.) ? TMath::TwoPi()-angle : angle;
   //
+  // angular segment, it is not a real sector number...
+  //
+  Int_t sector=TMath::Nint((angle-fTPCParam->GetInnerAngleShift())/
+               fTPCParam->GetInnerAngle());
+  // rotate to segment "0"
+  Float_t cos,sin;
+  fTPCParam->AdjustCosSin(sector,cos,sin);
+  Float_t x1=p[0]*cos + p[1]*sin;
+  // check if within sector's limits
+  if(x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp()
+     ||x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp()){
+  // calculate real sector number...
+  if (x1>fTPCParam->GetOuterRadiusLow()){
+    sector = TMath::Nint((angle-fTPCParam->GetOuterAngleShift())/
+             fTPCParam->GetOuterAngle())+fTPCParam->GetNInnerSector();
+    if (p[2]<0) 	sector+=(fTPCParam->GetNOuterSector()>>1);
+  }
+    else   
+      if (p[2]<0) sector+=(fTPCParam->GetNInnerSector()>>1);  
+  //
+  // here I have a sector number
+  //
+
+  vol[0]=sector;
+  // check if change of sector
+  if(sector != fSecOld){
+    fSecOld=sector;
+    // add track reference
+    AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTPC);
+  }  
+  // track is in the sensitive strip
+  if(id == fIdSens){
+    // track is entering the strip
+    if (gMC->IsTrackEntering()){
+      Int_t totrows = fTPCParam->GetNRowLow()+fTPCParam->GetNRowUp();
+      vol[1] = (copy<=totrows) ? copy-1 : copy-1-totrows;
+      // row numbers are autonomous for lower and upper sectors
+      if(vol[0] > fTPCParam->GetNInnerSector()) {
+        vol[1] -= fTPCParam->GetNRowLow();
+      }
+    //
+      if(vol[0]<fTPCParam->GetNInnerSector()&&vol[1] == 0){
   
-  if(gMC->TrackStep() > 0) {
+        // lower sector, row 0, because Jouri wants to have this
+
+        gMC->TrackMomentum(p);
+        hits[0]=p[0];
+        hits[1]=p[1];
+        hits[2]=p[2];
+        hits[3]=0.; // this hit has no energy loss
+        // Get also the track time for pileup simulation
+        hits[4]=gMC->TrackTime();
+
+        AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);  
+      }
+    //
+
+       gMC->TrackPosition(p);
+       hits[0]=p[0];
+       hits[1]=p[1];
+       hits[2]=p[2];
+       hits[3]=0.; // this hit has no energy loss
+       // Get also the track time for pileup simulation
+       hits[4]=gMC->TrackTime();
+
+       AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);  
     
-    Int_t nel = (Int_t)(((gMC->Edep())-poti)/w_ion) + 1;
+    }
+    else return;
+  }  
+  //-----------------------------------------------------------------
+  //  charged particle is in the sensitive drift volume
+  //-----------------------------------------------------------------
+  if(gMC->TrackStep() > 0) {
+    Int_t nel=0;
+    if (!fPrimaryIonisation) {
+      nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1;
+    }
+    else {
+	  Float_t edep = gMC->Edep();
+	  if (edep > 0.) nel = (Int_t)((gMC->Edep()*1.5)/kwIon) + 1;      
+    }
     nel=TMath::Min(nel,300); // 300 electrons corresponds to 10 keV
-    
-    gMC->TrackPosition(pos);
-    hits[0]=pos[0];
-    hits[1]=pos[1];
-    hits[2]=pos[2];
+    //
+    gMC->TrackPosition(p);
+    hits[0]=p[0];
+    hits[1]=p[1];
+    hits[2]=p[2];
     hits[3]=(Float_t)nel;
-    
+
     // Add this hit
-    
-    new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
-    
-  } 
-  
+
+    if (fHitType&&2){
+      gMC->TrackMomentum(p);
+      Float_t momentum = TMath::Sqrt(p[0]*p[0]+p[1]*p[1]);
+      Float_t precision =   (momentum>0.1) ? 0.002 :0.01;
+      fTrackHits->SetHitPrecision(precision);
+    }
+
+    // Get also the track time for pileup simulation
+    hits[4]=gMC->TrackTime();
+ 
+    AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);
+
+  } // step>0 
+  } //within sector's limits
   // Stemax calculation for the next step
   
   Float_t pp;
   TLorentzVector mom;
-  gMC->TrackMomentum(mom);
-  Float_t ptot=mom.Rho();
-  Float_t beta_gamma = ptot/gMC->TrackMass();
-  
-  if(gMC->IdFromPDG(gMC->TrackPid()) <= 3 && ptot > 0.002)
-    { 
-      pp = prim*1.58; // electrons above 20 MeV/c are on the plateau!
-    }
-  else
-    {
-      pp=prim*BetheBloch(beta_gamma);    
-      if(TMath::Abs(charge) > 1.) pp *= (charge*charge);
+  // below is valid only for Geant3 (fPromaryIonisation not set)
+  if(!fPrimaryIonisation){
+    gMC->TrackMomentum(mom);
+    Float_t ptot=mom.Rho();
+    Float_t betaGamma = ptot/gMC->TrackMass();
+
+    Int_t pid=gMC->TrackPid();
+    if((pid==kElectron || pid==kPositron) && ptot > 0.002)
+      { 
+        pp = kprim*1.58; // electrons above 20 MeV/c are on the plateau!
+      }
+    else
+      {
+
+        betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg
+        pp=kprim*BetheBloch(betaGamma); 
+   
     }
   
-  Float_t random[1];
-  gMC->Rndm(random,1); // good, old GRNDM from Geant3
+    Double_t rnd = gMC->GetRandom()->Rndm();
   
-  Double_t rnd = (Double_t)random[0];
-  
-  gMC->SetMaxStep(-TMath::Log(rnd)/pp);
+    gMC->SetMaxStep(-TMath::Log(rnd)/pp);
+  }
   
 }
 
@@ -1132,20 +1341,22 @@ Float_t AliTPCv2::BetheBloch(Float_t bg)
   //
   // Bethe-Bloch energy loss formula
   //
-  const Double_t p1=0.76176e-1;
-  const Double_t p2=10.632;
-  const Double_t p3=0.13279e-4;
-  const Double_t p4=1.8631;
-  const Double_t p5=1.9479;
+  const Double_t kp1=0.76176e-1;
+  const Double_t kp2=10.632;
+  const Double_t kp3=0.13279e-4;
+  const Double_t kp4=1.8631;
+  const Double_t kp5=1.9479;
 
   Double_t dbg = (Double_t) bg;
 
   Double_t beta = dbg/TMath::Sqrt(1.+dbg*dbg);
 
-  Double_t aa = TMath::Power(beta,p4);
-  Double_t bb = TMath::Power(1./dbg,p5);
+  Double_t aa = TMath::Power(beta,kp4);
+  Double_t bb = TMath::Power(1./dbg,kp5);
 
-  bb=TMath::Log(p3+bb);
+  bb=TMath::Log(kp3+bb);
   
-  return ((Float_t)((p2-aa-bb)*p1/aa));
+  return ((Float_t)((kp2-aa-bb)*kp1/aa));
 }
+
+