]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TPC/AliTPCv2.cxx
Corrected bug in the outer containment vessel and
[u/mrichter/AliRoot.git] / TPC / AliTPCv2.cxx
index 2ee211d407d64d266bfcb36e1d5eee459be5837d..e73674e613dae8604537d95e7937f96bc443b10e 100644 (file)
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+Revision 1.28  2000/11/02 16:55:24  kowal2
+Corrected bug in the inner containment vessel geometry.
+Thanks to J. Belikov
+
+Revision 1.27  2000/11/02 07:24:11  kowal2
+Correction in the TPC geometry.
+Changes due to the new hit structure.
+
+Revision 1.26  2000/10/05 16:16:29  kowal2
+Corrections of the hit recording algorithm.
+
+Revision 1.25  2000/10/02 21:28:18  fca
+Removal of useless dependecies via forward declarations
+
+Revision 1.24  2000/08/28 10:02:30  kowal2
+Corrected bug in the StepManager
+
+Revision 1.23  2000/07/10 20:57:39  hristov
+Update of TPC code and macros by M.Kowalski
+
+Revision 1.22  2000/06/30 12:07:50  kowal2
+Updated from the TPC-PreRelease branch
+
+Revision 1.21.2.4  2000/06/26 07:39:42  kowal2
+Changes to obey the coding rules
+
+Revision 1.21.2.3  2000/06/25 08:38:41  kowal2
+Splitted from AliTPCtracking
+
+Revision 1.21.2.2  2000/06/16 12:58:13  kowal2
+Changed parameter settings
+
+Revision 1.21.2.1  2000/06/09 07:15:07  kowal2
+
+Defaults loaded automatically (hard-wired)
+Optional parameters can be set via macro called in the constructor
+
+Revision 1.21  2000/05/15 10:00:30  kowal2
+Corrected bug in the TPC geometry, thanks to Ivana Hrivnacova
+
+Revision 1.20  2000/04/17 09:37:33  kowal2
+removed obsolete AliTPCDigitsDisplay.C
+
+Revision 1.19.8.2  2000/04/10 08:31:52  kowal2
+
+Different geometry for different sectors
+Updated readout chambers
+Some modifications to StepManager by J.Belikov
+
+Revision 1.19.8.1  2000/04/10 07:56:53  kowal2
+Not used anymore - removed
+
+Revision 1.19  1999/11/04 17:28:07  fca
+Correct barrel part of HV Degrader
+
+Revision 1.18  1999/10/14 16:52:08  fca
+Only use PDG codes and not GEANT ones
+
+Revision 1.17  1999/10/08 06:27:23  fca
+Corrected bug in the HV degrader geometry, thanks to G.Tabary
+
+Revision 1.16  1999/10/04 13:39:54  fca
+Correct array index problem
+
+Revision 1.15  1999/09/29 09:24:34  fca
+Introduction of the Copyright and cvs Log
+
+*/
+
+//
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Projection Chamber version 2 -- detailed TPC and slow simulation    //
 //                                                                           //
 //Begin_Html
 /*
-<img src="gif/AliTPCv2Class.gif">
+<img src="picts/AliTPCv2Class.gif">
 */
 //End_Html
 //                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
+#include <stdlib.h>
+
+#include <TMath.h>
+
+#include "AliTPCv2.h"
+#include "AliTPCDigitsArray.h"
+#include "AliRun.h"
+#include "AliMC.h"
+#include "AliConst.h"
+#include "AliPDG.h"
+#include "AliTPCParam.h"
+#include "AliTPCParamSR.h"
+#include "AliTPCTrackHits.h"
+
+
+ClassImp(AliTPCv2)
+//_____________________________________________________________________________
+AliTPCv2::AliTPCv2(const char *name, const char *title) :
+  AliTPC(name, title) 
+{
+  //
+  // Standard constructor for Time Projection Chamber version 2
+  //
+  fIdSens=0;
+  fIdLSec=0;
+  fIdUSec=0;
+
+  SetBufferSize(128000);
+
+  SetGasMixt(2,20,10,-1,0.9,0.1,0.); // Ne-CO2 90-10
+
+  // Default sectors
+
+  SetSecAL(4);
+  SetSecAU(4);
+  SetSecLows(1,  2,  3, 19, 20, 21);
+  SetSecUps(37, 38, 39, 37+18, 38+18, 39+18, -1, -1, -1, -1, -1, -1);
+  SetSens(1); // sensitive strips set 
+
+  if (fTPCParam)
+     fTPCParam->Write(fTPCParam->GetTitle());
+}
+//_____________________________________________________________________________
+void AliTPCv2::CreateGeometry()
+{
+  //
+  // Create the geometry of Time Projection Chamber version 2
+  //
+  //Begin_Html
+  /*
+    <img src="picts/AliTPC.gif">
+  */
+  //End_Html
+  //Begin_Html
+  /*
+    <img src="picts/AliTPCv2Tree.gif">
+  */
+  //End_Html
+
+
+  Int_t *idtmed = fIdtmed->GetArray();
+
+  Float_t dm[50];
+  Int_t idrotm[120];
+
+  Int_t nRotMat = 0;
+
+  Int_t i,ifl1=0;
+
+  // number of sectors
+
+  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 (ifl1 == 0) {
+    printf("*** ERROR: AT LEAST ONE LOWER SECTOR MUST BE SPECIFIED ***\n");
+    printf("!!! PROGRAM STOPPED !!!\n");
+    exit(1);
+  }
+
+  if (fSecAU >= 0) {
+    
+    for (i = 0; i < 12; ++i) {
+      if (fSecUps[i] > 2*nInnerSector-1 && 
+          fSecUps[i] < 2*(nInnerSector+nOuterSector)) {
+       printf("*** SECTOR %d selected\n",fSecUps[i]);
+      }
+    }
+    
+  } else {
+    printf("*** ALL UPPER SECTORS SELECTED ***\n");
+  }
+  
+
+  //--------------------------------------------------------------------
+
+  //
+  //  Mother volume (Air) - all volumes will be positioned in it
+  //
+  
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=12.;
+
+  //
+  dm[3]= -283.7;
+  dm[4]= 66.2;
+  dm[5]= 277.95;
+
+  //
+
+  dm[6]= -255.6;
+  dm[7]= 66.2;
+  dm[8]= 277.95;
+
+  //
+
+  dm[9]= -73.3;
+  dm[10]= 59.0;
+  dm[11]= 277.95;
+
+  //
+
+  dm[12]= -73.3;
+  dm[13]= 56.9;
+  dm[14]= 277.95;
+
+  //
+
+  dm[15]= -72.1;
+  dm[16]= 56.9;
+  dm[17]= 277.95;
+
+  //
+
+  dm[18]= -72.1;
+  dm[19]= 60.65;
+  dm[20]= 277.95;
+
+  //
+
+  dm[21]= 72.1;
+  dm[22]= 60.65;
+  dm[23]= 277.95;  
+
+  //
+
+  dm[24]= 72.1;
+  dm[25]= 56.9;
+  dm[26]= 277.95;
+
+  //
+
+  dm[27]= 73.3;
+  dm[28]= 56.9;
+  dm[29]= 277.95;
+
+  //
+
+  dm[30]= 73.3;
+  dm[31]= 60.65;
+  dm[32]= 277.95;
+
+  //
+
+  dm[33]= 250.4;
+  dm[34]= 66.0;
+  dm[35]= 277.95;
+
+  //
+
+  dm[36]= 283.7;
+  dm[37]= 66.0;
+  dm[38]= 277.95;
+
+
+  gMC->Gsvolu("TPC ","PCON",idtmed[0],dm,39);
+
+
+  //-------------------------------------------------------------------
+  //  Tpc Outer INsulator (CO2)
+  //-------------------------------------------------------------------
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]= 6.;
+
+  //
+  dm[3]= -253.6;
+  dm[4]= 258.;
+  dm[5]= 266.65;
+
+  //
+
+  dm[6]= -253.;
+  dm[7]= 258.;
+  dm[8]= 266.65;
+
+  dm[9]= -253.;
+  dm[10]= 258.;
+  dm[11]= 277.97;
+
+  dm[12]= 253.6;
+  dm[13]= 258.;
+  dm[14]= 277.97;
+
+  //
+
+  dm[15]= 253.6;
+  dm[16]= 265.2;
+  dm[17]= 277.95;
+
+  //
+
+  dm[18]= 255.6;
+  dm[19]= 265.2;
+  dm[20]= 277.95;
+
+
+  gMC->Gsvolu("TOIN","PCON",idtmed[3],dm,21);
+
+  //---------------------------------------------------------------
+  // shreds (G10) - TPC Rings
+  //---------------------------------------------------------------
+
+  gMC->Gsvolu("TPCR","TUBE",idtmed[12],dm,0);
+
+  dm[0]= 258.;
+  dm[1]= 266.65;
+  dm[2]= 0.3;
+
+  gMC->Gsposp("TPCR",1,"TOIN",0.,0.,-253.3,0,"ONLY",dm,3); // left bottom
+
+  //
+
+  dm[0]= 258.;
+  dm[1]= 270.9;
+  dm[2]= 0.3;
+
+  gMC->Gsposp("TPCR",2,"TOIN",0.,0.,253.3,0,"ONLY",dm,3); // right
+
+  //
+
+  dm[0]= 272.2;
+  dm[1]= 277.95;
+  dm[2]= 0.3;
+
+  gMC->Gsposp("TPCR",3,"TOIN",0.,0.,-250.7,0,"ONLY",dm,3); // left top
+
+  //----------------------------------------------------------------
+  // Tpc Outer Contaiment Vessel  
+  //  mother volume - Al, daughters - composite (sandwich)
+  //----------------------------------------------------------------
+  
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]=6.;
+
+  //
+
+  dm[3]= -250.4;
+  dm[4]= 272.2;
+  dm[5]= 277.95;
+
+  //
+
+  dm[6]= -248.4;
+  dm[7]= 272.2;
+  dm[8]= 277.95;
+
+  //
+  dm[9]= -248.4;
+  dm[10]= 274.81;
+  dm[11]= 277.95;
+  //
+
+  dm[12]= 253.6;
+  dm[13]= 274.81;
+  dm[14]= 277.95;
+
+  //
+
+  dm[15]= 253.6;
+  dm[16]= 265.2;
+  dm[17]= 277.95;
+
+  // 
+
+  dm[18]= 255.6;
+  dm[19]= 265.2;
+  dm[20]= 277.95;
+
+  gMC->Gsvolu("TOCV","PCON",idtmed[4],dm,21);
+
+  // Daughter volumes
+
+  // Tpc SAndwich 1 - Al
+  dm[0]= 274.81;
+  dm[1]= 277.95;
+  dm[2]= 251.7;
+
+  gMC->Gsvolu("TSA1","TUBE",idtmed[4],dm,3);
+
+  // Tpc SAndwich 2 - Tedlar
+
+  dm[0] += 5.e-3;
+  dm[1] -= 5.e-3;
+  
+  gMC->Gsvolu("TSA2","TUBE",idtmed[9],dm,3);
+
+  // Tpc SAndwich 3 - Kevlar
+
+  dm[0] += 5e-3;
+  dm[1] -= 5.e-3;
+
+  gMC->Gsvolu("TSA3","TUBE",idtmed[5],dm,3);
+
+  // Tpc SAndwich 4 - NOMEX honeycomb
+
+  dm[0] += 0.06;
+  dm[1] -= 0.06;
+
+  gMC->Gsvolu("TSA4","TUBE",idtmed[5],dm,3);  
+  
+  // 4->3->2->1->TOCV
+
+  gMC->Gspos("TSA4",1,"TSA3",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TSA3",1,"TSA2",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TSA2",1,"TSA1",0.,0.,0.,0,"ONLY");
+
+  gMC->Gspos("TSA1",1,"TOCV",0.,0.,2.6,0,"ONLY");
+
+  // TCOV-> TOIN
+
+  gMC->Gspos("TOCV",1,"TOIN",0.,0.,0.,0,"ONLY");
+
+  //-------------------------------------------------------
+  //  Tpc Outer Field Cage
+  //  mother volume - Al, daughters - composite (sandwich)
+  //-------------------------------------------------------
+
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=6.;
+
+  dm[3]= -253.;
+  dm[4]= 258.;
+  dm[5]= 277.95;
+
+  //
+
+  dm[6]= -251.;
+  dm[7]= 258.;
+  dm[8]= 277.95;
+
+  //
+  dm[9]= -251.;
+  dm[10]= 258.;
+  dm[11]= 260.05;
+
+  //
+
+  dm[12]= 251.;
+  dm[13]= 258.;
+  dm[14]= 260.05;
+
+  //
+
+  dm[15]= 251.;
+  dm[16]= 258.;
+  dm[17]= 270.9;
+
+  //
+
+  dm[18]= 253.;
+  dm[19]= 258.;
+  dm[20]= 270.9;
+
+  gMC->Gsvolu("TOFC","PCON",idtmed[4],dm,21);  
+
+  // Daughter volumes 
+
+  // Tpc SAndwich 5 - Tedlar
+
+  dm[0]= 258.;
+  dm[1]= 260.05;
+  dm[2]= 251.7;
+
+  gMC->Gsvolu("TSA5","TUBE",idtmed[9],dm,3);
+
+  // Tpc SAndwich 6 - Kevlar
+
+  dm[0] += 5.e-3;
+  dm[1] -= 5.e-3;
+
+  gMC->Gsvolu("TSA6","TUBE",idtmed[5],dm,3);
+
+
+  // Tpc SAndwich 8 - NOMEX
+
+  dm[0] += 0.02;
+  dm[1] -= 0.02;
+
+  gMC->Gsvolu("TSA7","TUBE",idtmed[6],dm,3);    
+
+  // 7->6->5->TOFC
+
+  gMC->Gspos("TSA7",1,"TSA6",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TSA6",1,"TSA5",0.,0.,0.,0,"ONLY"); 
+
+  gMC->Gspos("TSA5",1,"TOFC",0.,0.,0.,0,"ONLY");
+
+  // TOFC->TOIN
+
+  gMC->Gspos("TOFC",1,"TOIN",0.,0.,0.,0,"ONLY"); 
+
+  // TOIN->TPC
+
+  gMC->Gspos("TOIN",1,"TPC ",0.,0.,0.,0,"ONLY");
+
+  //--------------------------------------------------------------------
+  // Tpc Inner INsulator (CO2)
+  //--------------------------------------------------------------------
+
+
+  dm[0]=0.;
+  dm[1]= 360.;
+  dm[2]= 15.;
+
+  //
+
+  dm[3]= -255.6;
+  dm[4]= 66.2;
+  dm[5]= 74.8;
+
+  //
+
+  Float_t tanL = (66.2-59.0)/(255.6-73.3); // tangent of the left cone part
+
+  dm[6]= -253.6;
+  dm[7]= 59.0+ (253.6-73.3)*tanL;
+  dm[8]= 74.8;
+
+  //
+
+  dm[9]= -253.6;
+  dm[10]= dm[7];
+  dm[11]= 79.2;
+
+  //
+
+  dm[12]= -73.3;
+  dm[13]= 59.0;
+  dm[14]= 79.2;
+
+  //
+
+  dm[15]= -73.3;
+  dm[16]= 56.9;
+  dm[17]= 79.2;
+
+  //
+
+  dm[18]= -72.1;
+  dm[19]= 59.6;
+  dm[20]= 79.2;
+
+  //
+
+  dm[21]= -72.1;
+  dm[22]= 60.65;
+  dm[23]= 79.2;
+
+  //
+
+  dm[24]= 72.1;
+  dm[25]= 60.65;
+  dm[26]= 79.2;  
+
+  //
+
+  dm[27]= 72.1;
+  dm[28]= 59.6;
+  dm[29]= 79.2;
+
+  //
+
+  dm[30]= 73.3;
+  dm[31]= 56.9;
+  dm[32]= 79.2;
+
+  //
+
+  dm[33]= 73.3;
+  dm[34]= 59.0;
+  dm[35]= 79.2;
+
+  //
+
+  dm[36]= 250.4;
+  dm[37]= 66.0;
+  dm[38]= 79.2;
+
+  //
+  
+  dm[39]= 253.0;
+  dm[40]= 66.0;
+  dm[41]= 79.2;
+
+  //
+
+  dm[42]= 253.0;
+  dm[43]= 75.3;
+  dm[44]= 79.2;
+
+  //
+
+  dm[45]= 253.6;
+  dm[46]= 75.3;
+  dm[47]= 79.2;
+
+  gMC->Gsvolu("TIIN","PCON",idtmed[3],dm,48);
+
+
+  //--------------------------------------------------------------------
+  //  Tpc Inner Containment vessel, Left part
+  //  mother volume - Al, daughter - composite (sandwich)
+  //--------------------------------------------------------------------
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]= 8.;
+
+  //
+
+  dm[3]= -255.6;
+  dm[4]= 66.2;
+  dm[5]= 74.8;
+
+  //
+
+  Float_t cosL = 1./TMath::Sqrt(1.+tanL*tanL);
+  Float_t sandThick = 2.14; // cone composite thickness
+
+
+  //
+
+  dm[6]= -253.6;
+  dm[7]= 59.0 + (253.6-73.3)*tanL;
+  dm[8]= 74.8;
+
+  //
+
+  dm[9]= -253.6;
+  dm[10]= dm[7];
+  dm[11]= dm[7]+sandThick/cosL;
+
+  //
+
+  dm[12]= -75.6;
+  dm[13]= 59.0+(75.6-73.3)*tanL;
+  dm[14]= dm[13]+sandThick/cosL;
+
+  //
+
+  dm[15]= -75.6;
+  dm[16]= dm[13];
+  dm[17]= 60.65;
+
+  //
+
+  dm[18]= -73.3;
+  dm[19]= 59.0;
+  dm[20]= 60.65;
+
+  //
+
+  dm[21]= -73.3;
+  dm[22]= 56.9;
+  dm[23]= 60.65;
+
+  //
+
+  dm[24]= -72.1;
+  dm[25]= 56.9;
+  dm[26]= 60.65;
+
+  gMC->Gsvolu("TICL","PCON",idtmed[4],dm,27);
+
+  // Daughter volumes 
+
+  // Tpc SAndwich 9 - Al
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]= 2.;
+
+  //
+
+  dm[3]= - 254.3;
+  dm[4]= 59.0+(254.3-73.3)*tanL;
+  dm[5]= dm[4]+sandThick/cosL;
+
+  //
+
+  dm[6]= -78.3;
+  dm[7]= 59.0+(78.3-73.3)*tanL;
+  dm[8]= dm[7]+sandThick/cosL;
+
+  //
+
+  gMC->Gsvolu("TSA9","PCON",idtmed[4],dm,9);
+
+  // Tpc SAndwich 10 - Tedlar
+
+  dm[4]+= 5.e-3/cosL;
+  dm[5]-= 5.e-3/cosL;
+
+  //
+
+  dm[7]+= 5.e-3/cosL;
+  dm[8]+= 5.e-3/cosL;
+
+  gMC->Gsvolu("TS10","PCON",idtmed[9],dm,9); 
+
+  // Tpc SAndwich 11 - Kevlar
+
+  dm[4]+= 5.e-3/cosL;
+  dm[5]-= 5.e-3/cosL;
+
+  //
+
+  dm[7]+= 5.e-3/cosL;
+  dm[8]+= 5.e-3/cosL;
+
+  gMC->Gsvolu("TS11","PCON",idtmed[5],dm,9); 
+
+  // Tpc SAndwich 12 - NOMEX
+
+  dm[4]+= 0.06/cosL;
+  dm[5]-= 0.06/cosL;
+
+  //
+
+  dm[7]+= 0.06/cosL;
+  dm[8]+= 0.06/cosL;
+
+  gMC->Gsvolu("TS12","PCON",idtmed[6],dm,9);   
+
+  // 12->11->10->9
+
+  gMC->Gspos("TS12",1,"TS11",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS11",1,"TS10",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS10",1,"TSA9",0.,0.,0.,0,"ONLY");
+
+  // TSA9->TICL
+
+  gMC->Gspos("TSA9",1,"TICL",0.,0.,0.,0,"ONLY");
+  //--------------------------------------------------------------------
+  //  Tpc Inner Containment vessel, Right part
+  //  mother volume - Al, daughter - composite (sandwich)
+  //--------------------------------------------------------------------
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]=8.;
+
+  //
+
+  dm[3]= 72.1;
+  dm[4]= 56.9;
+  dm[5]= 60.65;
+
+  //
+
+  dm[6]= 73.3;
+  dm[7]= 56.9;
+  dm[8]= 60.65;
+
+  //
+
+  dm[9]= 73.3;
+  dm[10]= 59.0;
+  dm[11]= 60.65;
+
+  //
+
+  Float_t tanR = (66.0-59.0)/(250.5-73.3); // to avoid accuracy problems
+  Float_t cosR = 1./TMath::Sqrt(1.+tanR*tanR); //as above
+
+  //
+
+  dm[12]= 75.6;
+  dm[13]= 59.0+(75.6-73.3)*tanR;
+  dm[14]= 60.65;
+
+  //
+
+  dm[15]= 75.6;
+  dm[16]= dm[13];
+  dm[17]= dm[16]+sandThick/cosR;
+
+  //
+
+  dm[18]= 248.4;
+  dm[19]= 59.0+(248.4-73.3)*tanR;
+  dm[20]= dm[19]+sandThick/cosR;
+
+  //
+
+  dm[21]= 248.4;
+  dm[22]= dm[19];
+  dm[23]= 70.2;
+
+  //
+
+  dm[24]= 250.4;
+  dm[25]= 66.0;
+  dm[26]= 70.2;
+
+  gMC->Gsvolu("TICR","PCON",idtmed[4],dm,27);
+
+
+
+  // Daughter volumes 
+
+  // Tpc SAndwich 13 - Al
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]= 2.;
+
+  //
+
+  dm[3]= 78.3;
+  dm[4]= 59.0+(78.3-73.3)*tanR;
+  dm[5]= dm[4]+sandThick/cosR;
+
+  //
+
+  dm[6]= 249.1;
+  dm[7]= 59.0+(249.1-73.3)*tanR;
+  dm[8]= dm[7]+sandThick/cosR;
+
+  //
+
+  gMC->Gsvolu("TS13","PCON",idtmed[4],dm,9);
+
+  // Tpc SAndwich 14 - Tedlar
+
+  dm[4]+= 5.e-3/cosR;
+  dm[5]-= 5.e-3/cosR;
+
+  //
+
+  dm[7]+= 5.e-3/cosR;
+  dm[8]+= 5.e-3/cosR;
+
+  gMC->Gsvolu("TS14","PCON",idtmed[9],dm,9); 
+
+  // Tpc SAndwich 15 - Kevlar
+
+  dm[4]+= 5.e-3/cosR;
+  dm[5]-= 5.e-3/cosR;
+
+  //
+
+  dm[7]+= 5.e-3/cosR;
+  dm[8]+= 5.e-3/cosR;
+
+  gMC->Gsvolu("TS15","PCON",idtmed[5],dm,9); 
+
+  // Tpc SAndwich 16 - NOMEX
+
+  dm[4]+= 0.06/cosR;
+  dm[5]-= 0.06/cosR;
+
+  //
+
+  dm[7]+= 0.06/cosR;
+  dm[8]+= 0.06/cosR;
+
+  gMC->Gsvolu("TS16","PCON",idtmed[6],dm,9);   
+
+  // 16->15->14->13
+
+  gMC->Gspos("TS16",1,"TS15",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS15",1,"TS14",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS14",1,"TS13",0.,0.,0.,0,"ONLY");
+
+  // TS12->TICR
+
+  gMC->Gspos("TS13",1,"TICR",0.,0.,0.,0,"ONLY");
+
+  //------------------------------------------------------
+  // Tpc Inner Field Cage
+  // mother volume - Al, daughters - composite (sandwich)
+  //------------------------------------------------------
+
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]=6.;
+
+  //
+
+  dm[3]= -253.0;
+  dm[4]= 70.7;
+  dm[5]= 79.2;
+
+  //
+
+  dm[6]= -251.0;
+  dm[7]= 70.7;
+  dm[8]= 79.2;
+
+  //
+
+  dm[9]= -251.0;
+  dm[10]= 77.15;
+  dm[11]= 79.2;
+
+  //
+  
+  dm[12]= 251.0;
+  dm[13]= 77.15;
+  dm[14]= 79.2;
+
+  //
+
+  dm[15]= 251.0;
+  dm[16]= 66.0;
+  dm[17]= 79.2;
+
+  //
+
+  dm[18]= 253.0;
+  dm[19]= 66.0;
+  dm[20]= 79.2;
+
+  gMC->Gsvolu("TIFC","PCON",idtmed[4],dm,21);
+
+  // Daughter volumes
+
+  // Tpc Sandwich 17 - Tedlar
+
+  dm[0]= 77.15;
+  dm[1]= 79.2;
+  dm[2]= 251.7;
+
+  gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3);
+
+  // Tpc Sandwich 18 - Kevlar
+
+  dm[0]+= 5.e-3;
+  dm[1]-= 5.e-3;
+
+  gMC->Gsvolu("TS18","TUBE",idtmed[5],dm,3);
+
+
+  // Tpc Sandwich 19 - NOMEX
+
+  dm[0]+= 0.02;
+  dm[1]-= 0.02;
+
+  gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3);
+
+  // 19->18->17
+
+  gMC->Gspos("TS19",1,"TS18",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS18",1,"TS17",0.,0.,0.,0,"ONLY");
+
+  // TS17->TIFC
+
+  gMC->Gspos("TS17",1,"TIFC",0.,0.,0.,0,"ONLY");
+
+  // TPC Rings
+
+  dm[0]= 70.7;
+  dm[1]= 79.2;
+  dm[2]= 0.3;
+
+  gMC->Gsposp("TPCR",4,"TIIN",0.,0.,-253.3,0,"ONLY",dm,3);
+
+  dm[0]= 66.0;
+  dm[1]= 70.2;  
+
+  gMC->Gsposp("TPCR",5,"TIIN",0.,0.,250.7,0,"ONLY",dm,3);
+
+  dm[0]= 75.3;
+  dm[1]= 79.2;  
+
+  gMC->Gsposp("TPCR",6,"TIIN",0.,0.,253.3,0,"ONLY",dm,3);  
+
+  // TICL->TIIN
+
+  gMC->Gspos("TICL",1,"TIIN",0.,0.,0.,0,"ONLY");
+
+  // TICR->TIIN
+
+  gMC->Gspos("TICR",1,"TIIN",0.,0.,0.,0,"ONLY");
+
+  // TIFC->TIIN
+
+  gMC->Gspos("TIFC",1,"TIIN",0.,0.,0.,0,"ONLY");
+
+  // Tpc Sandwich 21 - Al (central barrel)
+
+  dm[0]= 60.65;
+  dm[1]= 61.21;
+  dm[2]= 75.2;
+
+  gMC->Gsvolu("TS21","TUBE",idtmed[4],dm,3);
+
+  // Tpc Sandwich 22 - Tedlar (central barrel) 
+
+  dm[0]+= 5.e-3;
+  dm[1]-= 5.e-3;
+
+  gMC->Gsvolu("TS22","TUBE",idtmed[9],dm,3); 
+
+  // Tpc Sandwich 23 - Kevlar (central barrel) 
+
+  dm[0]+= 5.e-3;
+  dm[1]-= 5.e-3;
+
+  gMC->Gsvolu("TS23","TUBE",idtmed[5],dm,3); 
+
+  // Tpc Sandwich 24 - NOMEX (central barrel) 
+
+  dm[0]+= 0.02;
+  dm[1]-= 0.02;
+
+  gMC->Gsvolu("TS24","TUBE",idtmed[6],dm,3); 
+
+  // 24->23->22->21
+
+  gMC->Gspos("TS24",1,"TS23",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS23",1,"TS22",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS22",1,"TS21",0.,0.,0.,0,"ONLY");
+
+  gMC->Gspos("TS21",1,"TIIN",0.,0.,0.,0,"ONLY");
+
+  // put everything into the TPC 
+
+  gMC->Gspos("TIIN",1,"TPC ",0.,0.,0.,0,"ONLY");
+
+
+  //---------------------------------------------------------
+  //  Tpc Dift Gas volume Nonsensitive (Ne-CO2 90/10)
+  //  and its daughters (HV membrane, rods, readout chambers)
+  //---------------------------------------------------------
+
+  dm[0]= 79.2;
+  dm[1]= 258.0;
+  dm[2]= 253.6;
+
+  gMC->Gsvolu("TDGN","TUBE",idtmed[1],dm,3);  // nonsensitive 
+
+    // sector opening angles
+
+  Float_t innerOpenAngle = fTPCParam->GetInnerAngle();
+  Float_t outerOpenAngle = fTPCParam->GetOuterAngle();
+
+  // sector angle shift
+
+  Float_t innerAngleShift = fTPCParam->GetInnerAngleShift();
+
+  // All above parameters are identical for inner and outer
+  // sectors. The distinction is kept for the historical reasons
+  // and eventually will disappear.
+
+  Float_t tanAlpha = TMath::Tan(0.5*innerOpenAngle);
+  Float_t cosAlpha = TMath::Sqrt(1.+tanAlpha*tanAlpha);
+  Float_t space;
+
+  //-------------------------------------------------------------------------
+  //   Tpc Inner Readout Chambers 
+  //-------------------------------------------------------------------------
+
+  dm[0]= 14.483;
+  dm[1]= 23.3345; 
+  dm[2]= 1.6; // thickness
+  dm[3]= 25.1;
+
+  gMC->Gsvolu("TIRC","TRD1",idtmed[4],dm,4);
+
+  // this volume will be positioned in the empty space
+  // of the end-cap to avoid overlaps
+
+  dm[0]= 13.7305;
+  dm[1]= 21.1895;
+  dm[2]= 2.25;
+  dm[3]= 21.15;
+
+  gMC->Gsvolu("TIC1","TRD1",idtmed[4],dm,4);
+
+  //------------------------------------------------
+  // Tpc Inner readout chamber Pad Plane
+  //------------------------------------------------
+
+  dm[0]= 14.483;
+  dm[1]= 23.3345;
+  dm[2]= 0.5;
+  dm[3]= 25.1;
+
+  gMC->Gsvolu("TIPP","TRD1",idtmed[12],dm,4);
+
+  // 
+
+  dm[0] -= 1.218511934;
+  dm[1] -= 1.218511934;
+  dm[2] = 0.35;
+
+  gMC->Gsvolu("TIC3","TRD1",idtmed[1],dm,4);
+
+  gMC->Gspos("TIC3",1,"TIPP",0.,0.15,0.,0,"ONLY");
+
+  gMC->Gspos("TIPP",1,"TIRC",0.,1.1,0.,0,"ONLY");
+
+  //----------------------------------------------
+  // Tpc Readout Chambers Empty spaces - for both
+  // inner and outer sectors
+  //----------------------------------------------
+
+  gMC->Gsvolu("TRCE","TRD1",idtmed[0],dm,0);
+
+  // Inner sector - 4 spaces
+
+
+  dm[3] = 4.7625;
+  dm[0] = 12.472;
+
+  Float_t rr = 90.52;
+  Float_t zz;
+
+  zz= -12.7875;
+  
+  space = rr*tanAlpha-dm[0];
+
+  for(Int_t nsLow=0;nsLow<4;nsLow++){
+
+    rr += 9.525;
+    dm[1]= rr*tanAlpha - space;  
+
+    dm[2]=0.8;
+
+    gMC->Gsposp("TRCE",nsLow+1,"TIRC",0.,-0.8,zz,0,"ONLY",dm,4);
+
+    //
+
+    dm[2]= 1.2;
+
+    gMC->Gsposp("TRCE",nsLow+5,"TIC1",0.,1.05,zz-2.1,0,"ONLY",dm,4);
+
+    rr += 0.4;
+    dm[0] = rr*tanAlpha - space;
+    zz += (0.4+9.525); 
+
+  }
+
+  dm[0]= 12.472;
+  // dm[1] - this is the dm[1] from the previous TRCE
+  dm[2]= 1.05;
+  dm[3]= 19.65;
+
+  gMC->Gsposp("TRCE",9,"TIC1",0.,-1.2,0.,0,"ONLY",dm,4); 
+
+  //
+  // TPc Space for Connectors
+  //
+
+  dm[0]= .3;
+  dm[1]= .3;
+  dm[2]= 4.5;
+
+  gMC->Gsvolu("TPSC","BOX ",idtmed[0],dm,3);
+
+  // TPC Connectors
+
+  dm[0]= .25;
+  dm[1]= .15;
+  dm[2]= 3.75;
+
+  gMC->Gsvolu("TPCC","BOX ",idtmed[13],dm,3); 
+
+  gMC->Gspos("TPCC",1,"TPSC",0.,0.15,0.,0,"ONLY");
+
+  zz = -12.7875;
+
+  Float_t alpha;
+  Float_t astep;
+
+  Float_t phi1,phi2,phi3,theta1,theta2,theta3; // rotation angles
+
+  // inner part of the inner sector - 2 x 20 holes
+  
+  astep = 20.00096874/19.;
+
+  alpha = 10.00048437-astep;
+
+  Float_t x1,x2;
+
+    x1 = 13.31175725;
+    x1 -= 0.996357832; 
+
+    x2 = 15.06180253;
+    x2 -= 1.163028812;
+
+  Int_t ncon;
+
+  for(ncon=0;ncon<20;ncon++){
+
+    phi1 = 0.;
+    theta1 = 90.+alpha;
+    phi2=90.;
+    theta2 = 90.;
+    phi3 = (alpha>0) ? 0. : 180.;
+    theta3 = TMath::Abs(alpha);
+
+    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+
+    gMC->Gspos("TPSC",ncon+1,"TIRC",x1,0.3,-12.7875,idrotm[nRotMat],"ONLY");
+    gMC->Gspos("TPSC",ncon+21,"TIRC",x2,0.3,-2.8625,idrotm[nRotMat],"ONLY");
+
+
+    x1 -= 1.296357833;
+    x2 -= 1.463028812;
+
+    alpha -= astep;   
+    nRotMat++; 
+
+  }
+
+  // outer part of the inner sector - 2 x 25 holes
+
+   astep = 20.00096874/24.; 
+   alpha = 10.00048437-astep;
+
+   x1 = 16.81184781;
+   x1 -= 1.016295986;
+
+   x2 = 18.5618931;
+   x2 -= 1.150914854;
+
+  for(ncon=0;ncon<25;ncon++){
+
+    phi1 = 0.;
+    theta1 = 90.+alpha;
+    phi2=90.;
+    theta2 = 90.;
+    phi3 = (alpha>0) ? 0. : 180.;
+    theta3 = TMath::Abs(alpha);
+
+    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+
+    gMC->Gspos("TPSC",ncon+41,"TIRC",x1,0.3,7.0625,idrotm[nRotMat],"ONLY");
+    gMC->Gspos("TPSC",ncon+66,"TIRC",x2,0.3,16.9875,idrotm[nRotMat],"ONLY");
+
+
+    x1 -= 1.316295986;
+    x2 -= 1.450914854;
+
+    alpha -= astep;   
+    nRotMat++; 
+
+  }  
+
+  //--------------------------------------------------------------------------
+  //  TPC Outer Readout Chambers
+  //  this is NOT a final design
+  //--------------------------------------------------------------------------
+
+  dm[0]= 23.3875;
+  dm[1]= 43.524;
+  dm[2]= 1.5; //thickness
+  dm[3]= 57.1;
+
+  gMC->Gsvolu("TORC","TRD1",idtmed[4],dm,4);
+
+  //------------------------------------------------
+  // Tpc Outer readout chamber Pad Plane
+  //------------------------------------------------
+
+  dm[2]= 0.5;
+
+  gMC->Gsvolu("TOPP","TRD1",idtmed[12],dm,4);
+
+  dm[0] -= 1.218511934;
+  dm[1] -= 1.218511934;
+  dm[2] = 0.35;
+
+  gMC->Gsvolu("TOC3","TRD1",idtmed[1],dm,4);
+
+  gMC->Gspos("TOC3",1,"TOPP",0.,0.15,0.,0,"ONLY");
+
+  gMC->Gspos("TOPP",1,"TORC",0.,1.0,0.,0,"ONLY");
+
+  // empty space
+
+
+  dm[0]= 21.035;
+  dm[1]= 38.7205;
+  dm[2]= 0.7; 
+  dm[3]= 50.15;
+
+  gMC->Gsposp("TRCE",10,"TORC",0.,-0.8,-2.15,0,"ONLY",dm,4);  
+
+  dm[0]= 22.2935;
+  dm[1]= 40.5085;
+  dm[2]= 2.25;
+  dm[3]= 51.65;
+
+  gMC->Gsvolu("TOC1","TRD1",idtmed[4],dm,4);
+
+  dm[0]= 21.35;
+  dm[1]= 38.7205;
+  dm[2]= 2.25;
+  dm[3]= 50.15;
+
+  gMC->Gsposp("TRCE",11,"TOC1",0.,0.,0.,0,"ONLY",dm,4); 
+
+
+
+  //-----------------------------------------------
+  // Tpc Services Support Wheel
+  //-----------------------------------------------
+
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=18.;
+  dm[3]=2.;
+
+  dm[4]= -5.;
+  dm[5]= 77.017;
+  dm[6]= 255.267;
+
+  dm[7]= 5.;
+  dm[8]= dm[5];
+  dm[9]= dm[6];
+
+  gMC->Gsvolu("TSSW","PGON",idtmed[4],dm,10);
+
+  // Tpc Services Wheel Cover
+
+  dm[4]= -0.5;
+  dm[7]= 0.5;
+
+  gMC->Gsvolu("TSWC","PGON",idtmed[4],dm,10);
+
+  // Tpc Service wheel Cover Empty space
+   
+  dm[0]= 10.99;
+  dm[1]= 39.599;
+  dm[2]= .5;
+  dm[3]= 81.125;
+
+  gMC->Gsvolu("TSCE","TRD1",idtmed[0],dm,4);
+
+  // Tpc services Wheel Empty Spaces
+
+  dm[0]= 13.18017507;
+  dm[1]= 44.61045938;
+  dm[2]= 4.;
+  dm[3]= 89.125;
+
+  gMC->Gsvolu("TWES","TRD1",idtmed[0],dm,4);
+
+  // Tpc Services Wheel Bars
+
+  gMC->Gsvolu("TSWB","TRD1",idtmed[4],dm,0);
+
+  // bars-> TWES
+
+  dm[2]= 4.;
+  dm[3]= .4;
+
+  dm[0]= 13.8149522;
+  dm[1]= 13.95601379;
+  
+  gMC->Gsposp("TSWB",1,"TWES",0.,0.,-85.125,0,"ONLY",dm,4);
+
+  dm[0]= 43.83462067; 
+  dm[1]= 43.97568225;
+
+  gMC->Gsposp("TSWB",2,"TWES",0.,0.,85.125,0,"ONLY",dm,4);
+
+  // TPc ELectronics - right now 30% X0 Si
+
+  dm[0]= 14.03813696;
+  dm[1]= 43.3524075;
+  dm[2]= 1.404;
+  dm[3]= 83.125;
+
+  gMC->Gsvolu("TPEL","TRD1",idtmed[11],dm,4);
+  gMC->Gspos("TPEL",1,"TWES",0.,0.,0.,0,"ONLY");
+
+  //--------------------------------------------------------------------------
+  //  End caps
+  //--------------------------------------------------------------------------
+
+  // TPc Main Wheel - Al
+
+  dm[0]= 75.3;
+  dm[1]= 264.8;
+  dm[2]= 3.0;
+
+  gMC->Gsvolu("TPMW","TUBE",idtmed[4],dm,3);
+
+  // TPc Extra Wheel (to avoid overlapping) - Al
+
+  dm[0]= 264.8;
+  dm[1]= 277.0;
+  dm[2]= 1.95;
+
+  gMC->Gsvolu("TPEW","TUBE",idtmed[4],dm,3);
+
+  //--------------------------------------------------------------------------
+  //  Tpc Empty Space for the Readout chambers
+  //--------------------------------------------------------------------------  
+
+  Float_t rLow= 86.2;
+  Float_t rUp= 243.5;
+  Float_t dR = 0.5*(rUp-rLow);
+
+  space= 1.4/cosAlpha; // wheel ribs are 2.8 cm wide
+
+  dm[0]= rLow*tanAlpha-space;
+  dm[1]= rUp*tanAlpha-space;
+  dm[2]= 3.0;
+  dm[3]= dR;
+
+  gMC->Gsvolu("TESR","TRD1",idtmed[0],dm,4);
+
+  // TIC1->TESR
+
+
+  gMC->Gspos("TIC1",1,"TESR",0.,0.75,-dR+23.97,0,"ONLY");
+
+
+  // TOC1->TESR
+
+  gMC->Gspos("TOC1",1,"TESR",0.,0.75,dR-55.02,0,"ONLY");
+
+  // Tpc Empty Space Bars - Al (daughters of TESR)
+
+  Float_t zBar;
+
+  gMC->Gsvolu("TESB","TRD1",idtmed[4],dm,0);
+
+  // lower bar
+
+  dm[0]= rLow*tanAlpha-space;
+  dm[1]= 88.7*tanAlpha-space;
+  dm[2]= 0.95;
+  dm[3]= 1.275;
+
+  zBar = -dR+dm[3];
+
+  gMC->Gsposp("TESB",1,"TESR",0.,2.05,zBar,0,"ONLY",dm,4);
+
+  // middle bar
+
+  dm[0]= 131.65*tanAlpha-space;
+  dm[1]= 136.5*tanAlpha-space;
+  dm[3]= 2.425;
+
+  zBar = -dR +131.65+dm[3]-rLow;
+
+  gMC->Gsposp("TESB",2,"TESR",0.,2.05,zBar,0,"ONLY",dm,4);
+
+  // upper bar
+
+  dm[0]= 240.4*tanAlpha-space;
+  dm[1]= rUp*tanAlpha-space;
+  dm[3]= 1.55;
+
+  zBar = dR-dm[3];
+
+  gMC->Gsposp("TESB",3,"TESR",0.,2.05,zBar,0,"ONLY",dm,4);
+
+  //------------------------------------------------------
+  //  TPc Lower "S" Sectors 
+  //------------------------------------------------------
+
+
+  Float_t inSecLowEdge = fTPCParam->GetInnerRadiusLow();
+  Float_t inSecUpEdge =  fTPCParam->GetInnerRadiusUp();
+
+  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.3);
+  dm[3] = 0.5*(inSecUpEdge-inSecLowEdge);  
+
+  gMC->Gsvolu("TPLS", "TRD1", idtmed[2], dm, 4); // sensitive 
+
+  //----------------------------------------------------------
+  //  TPc Upper Sectors
+  //----------------------------------------------------------
+
+  Float_t ouSecLowEdge = fTPCParam->GetOuterRadiusLow();
+  Float_t ouSecUpEdge = fTPCParam->GetOuterRadiusUp();
+
+  dm[0] = ouSecLowEdge*TMath::Tan(0.5*outerOpenAngle)-0.01;  
+  dm[1] = ouSecUpEdge*TMath::Tan(0.5*outerOpenAngle)-0.01;  
+  dm[2] = 0.5*(250. - 0.3);
+  dm[3] = 0.5*(ouSecUpEdge-ouSecLowEdge);
+
+  gMC->Gsvolu("TPUS", "TRD1", idtmed[2], dm, 4); // sensitive
+
+
+
+
+    gMC->Gsvolu("TPSS","TRD1",idtmed[2],dm,0); // sensitive
+
+    Int_t nofStrips,nstr;
+    Float_t r1,r2,zs;
+    Float_t stripThick = 0.01; // 100 microns
+    Float_t deadSpace;
+
+    // inner sector
+
+
+    // if all lower sectors selected define only 1 strip
+
+    nofStrips=((fSecAL <0)||(fSecAL>=0 && fSens<0)) ? 1 : fTPCParam->GetNRowLow(); 
+    deadSpace = fTPCParam->GetInnerWireMount();
+
+    dm[2] = 0.5*(250. - 0.3);
+    dm[3] = 0.5 * stripThick;  
+
+
+    for(nstr=0;nstr<nofStrips;nstr++){
+
+      r1 = fTPCParam->GetPadRowRadiiLow(nstr);
+      r2 = r1 + stripThick;     
+      dm[0] = r1 * TMath::Tan(0.5*innerOpenAngle) - deadSpace;
+      dm[1] = r2 * TMath::Tan(0.5*innerOpenAngle) - deadSpace;
+      zs = -inSecLowEdge -0.5*(inSecUpEdge-inSecLowEdge);
+      zs += r1;
+      zs += dm[3];
+    
+      gMC->Gsposp("TPSS", nstr+1, "TPLS", 0., 0., zs, 0, "ONLY", dm, 4);
+
+
+    }
+
+    // strips only if several upper sectors selected end fSens > 0
+
+    if(fSecAU >=0 && fSens >0){
+
+    Int_t nsSave = nofStrips;
+
+    // outer sector
+
+    nofStrips = fTPCParam->GetNRowUp();
+    deadSpace = fTPCParam->GetOuterWireMount();
+
+    dm[2] = 0.5*(250. - 0.3);
+    dm[3] = 0.5 * stripThick;
+
+  
+    for(nstr=0;nstr<nofStrips;nstr++){
+    
+      r1 = fTPCParam->GetPadRowRadiiUp(nstr); 
+      r2 = r1 + stripThick;
+      dm[0] = r1 * TMath::Tan(0.5*outerOpenAngle) - deadSpace;
+      dm[1] = r2 * TMath::Tan(0.5*outerOpenAngle) - deadSpace;
+      zs = -ouSecLowEdge -0.5*(ouSecUpEdge-ouSecLowEdge);
+      zs += r1;
+      zs += dm[3];
+
+      gMC->Gsposp("TPSS", nstr+1+nsSave, "TPUS", 0., 0., zs, 0, "ONLY", dm, 4);
+
+     }    
+    }
+
+  //-------------------------------------------------------
+  //  positioning of the empty spaces into the main wheel
+  //  and readout chambers and sectors into the drift gas
+  //-------------------------------------------------------
+
+  Float_t rCenter,xc,yc;
+  Float_t rInner,rOuter; // center of the inner and outer chamber
+
+  rCenter = rLow+dR;
+
+  rInner = 108.07;
+  rOuter = 190.68;
+
+  for(Int_t ns=0; ns<nInnerSector;ns++){
+
+    phi1 = ns * innerOpenAngle + innerAngleShift;
+    phi1 *= kRaddeg; // in degrees
+
+    phi1 = (Float_t)TMath::Nint(phi1) + 270.;
+
+    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.;
+
+    // "holes"->End plate
+
+    xc = rCenter*TMath::Cos(phi3*kDegrad);
+    yc = rCenter*TMath::Sin(phi3*kDegrad);
+
+    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+    gMC->Gspos("TESR",ns+1,"TPMW",xc,yc,0.,idrotm[nRotMat],"ONLY");
+
+    // TSCE->TSWC (services wheel volumes)
+
+    xc = 166.142*TMath::Cos(phi3*kDegrad);
+    yc = 166.142*TMath::Sin(phi3*kDegrad);
+
+    gMC->Gspos("TSCE",ns+1,"TSWC",xc,yc,0.,idrotm[nRotMat],"ONLY");
+    gMC->Gspos("TWES",ns+1,"TSSW",xc,yc,0.,idrotm[nRotMat],"ONLY");
+
+    // readout chambers->TDGN (drift gas)
+
+    xc = rInner*TMath::Cos(phi3*kDegrad);
+    yc = rInner*TMath::Sin(phi3*kDegrad);
+
+    gMC->Gspos("TIRC",ns+1,"TDGN",xc,yc,252.,idrotm[nRotMat],"ONLY");
+
+    // here lower sectors 
+
+    if(fSecAL <0){
+
+      // all lower sectors are positioned
+
+      gMC->Gspos("TPLS",ns+1,"TDGN",xc,yc,125.15,idrotm[nRotMat],"ONLY");
+      gMC->
+        Gspos("TPLS",ns+nInnerSector+1,"TDGN",xc,yc,-125.15,idrotm[nRotMat],"ONLY");
+    }
+    else{
+
+      // only selected sectors are positioned (up to 6 sectors)
+
+      for(Int_t sel=0;sel<6;sel++){
+
+        if(fSecLows[sel] == ns){
+          gMC->Gspos("TPLS",ns+1,"TDGN",xc,yc,125.15,idrotm[nRotMat],"ONLY");
+       }
+        else if(fSecLows[sel] == ns+nInnerSector){
+         gMC->
+          Gspos("TPLS",ns+nInnerSector+1,"TDGN",xc,yc,-125.15,idrotm[nRotMat],"ONLY");
+       }
+      }
+    } // lower sectors finished
+     
+    xc = rOuter*TMath::Cos(phi3*kDegrad);
+    yc = rOuter*TMath::Sin(phi3*kDegrad);
+
+    gMC->Gspos("TORC",ns+1,"TDGN",xc,yc,252.1,idrotm[nRotMat],"ONLY");
+
+    // here upper sectors 
+
+    if(fSecAU <0){
+
+      // all upper sectors
+
+      gMC->Gspos("TPUS",ns+1,"TDGN",xc,yc,125.15,idrotm[nRotMat],"ONLY");
+      gMC->
+        Gspos("TPUS",ns+nOuterSector+1,"TDGN",xc,yc,-125.15,idrotm[nRotMat],"ONLY");
+    }
+    else{
+
+      // only selected sectors (up to 12)
+
+      for(Int_t sel=0;sel<12;sel++){
+        if(fSecUps[sel] == ns+2*nInnerSector){
+          gMC->Gspos("TPUS",ns+1,"TDGN",xc,yc,125.15,idrotm[nRotMat],"ONLY");
+       }         
+        else if(fSecUps[sel] == ns+2*nInnerSector+nOuterSector){
+         gMC->
+          Gspos("TPUS",ns+nOuterSector+1,"TDGN",xc,yc,-125.15,idrotm[nRotMat],"ONLY"); 
+       }
+      }
+    } // upper sectors finished
+
+    nRotMat++;
+
+    theta2 = 0.; // reflection, needed for readout chambers!
+
+    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+    xc = rInner*TMath::Cos(phi3*kDegrad);
+    yc = rInner*TMath::Sin(phi3*kDegrad);
+
+    gMC->Gspos("TIRC",ns+nInnerSector+1,"TDGN",xc,yc,-252.,idrotm[nRotMat],"ONLY");
+
+    xc = rOuter*TMath::Cos(phi3*kDegrad);
+    yc = rOuter*TMath::Sin(phi3*kDegrad);
+
+    gMC->Gspos("TORC",ns+nOuterSector+1,"TDGN",xc,yc,-252.1,idrotm[nRotMat],"ONLY");
+
+    nRotMat++;
+
+
+  } 
 
-#include <TMath.h>
-#include <TGeometry.h>
-#include "AliTPCv2.h"
-#include "AliRun.h"
-#include <iostream.h>
-#include <fstream.h>
+  // reflection matrix
 
-#include "AliMC.h"
-#include "AliConst.h"
-#include <stdlib.h>
+  theta1 = 90.;
+  phi1   = 0.;
+  theta2 = 90.;
+  phi2   = 270.;
+  theta3 = 180.;
+  phi3   = 0.;
 
-#include "AliTPCParam.h"
-#include "AliTPCD.h"
+  AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+
+  // TPMW->TPC
+
+  gMC->Gspos("TPMW",1,"TPC ",0.,0.,256.6,0,"ONLY");
+  gMC->Gspos("TPMW",2,"TPC ",0.,0.,-256.6,idrotm[nRotMat],"ONLY");
+  gMC->Gspos("TPEW",1,"TPC ",0.,0.,257.65,0,"ONLY");
+  gMC->Gspos("TPEW",2,"TPC ",0.,0.,-257.65,0,"ONLY");
+
+
+
+  //-------------------------------------------------------
+  // Tpc High Voltage Membrane - NOMEX honeycomb
+  //-------------------------------------------------------
+
+  dm[0]=0.,
+  dm[1]=360.;
+  dm[2]=18.;
+  dm[3]=2.;
 
-ClassImp(AliTPCv2)
-//_____________________________________________________________________________
-AliTPCv2::AliTPCv2(const char *name, const char *title) :
-  AliTPC(name, title) 
-{
   //
-  // Standard constructor for Time Projection Chamber version 2
+
+  dm[4]= -0.3;
+  dm[5]= 81.156;
+  dm[6]= 253.386;
+
   //
-  fIdSens1=0;
-  fIdSens2=0;
-  SetBufferSize(128000);
-}
+
+  dm[7]= 0.3;
+  dm[8]= dm[5];
+  dm[9]= dm[6];
+
+  gMC->Gsvolu("THVM","PGON",idtmed[6],dm,10);
+
+  gMC->Gspos("THVM",1,"TDGN",0.,0.,0.,0,"ONLY");
+
+  //----------------------------------------------------------
+  // TPc Support Rods - MAKROLON
+  //----------------------------------------------------------
+
+  dm[0]= 0.9;
+  dm[1]= 1.2;
+  dm[2]= 126.65;
+
+  gMC->Gsvolu("TPSR","TUBE",idtmed[7],dm,3);
+
+  for(Int_t nrod=1;nrod<18;nrod++){
+    Float_t angle=innerOpenAngle*(Float_t)nrod;
+
+    xc=82.4*TMath::Cos(angle);
+    yc=82.4*TMath::Sin(angle);
+
+    gMC->Gspos("TPSR",nrod,"TDGN",xc,yc,126.95,0,"ONLY");
+    gMC->Gspos("TPSR",nrod+17,"TDGN",xc,yc,-126.95,0,"ONLY");
+
+    xc=254.2*TMath::Cos(angle);
+    yc=254.2*TMath::Sin(angle);
+
+    gMC->Gspos("TPSR",nrod+34,"TDGN",xc,yc,126.95,0,"ONLY");
+    gMC->Gspos("TPSR",nrod+51,"TDGN",xc,yc,-126.95,0,"ONLY");    
+
+  }
+
+  //----------------------------------------------------------
+  // Tpc High Voltage rod - MAKROLON + Copper cable
+  //----------------------------------------------------------
+
+  // rod with cable (Left)
+
+  dm[0]=0.;
+  dm[1]=2.25;
+  dm[2]=126.65;
+
+  gMC->Gsvolu("THVL","TUBE",idtmed[7],dm,3);
+
+  // HV cable
  
-//_____________________________________________________________________________
-void AliTPCv2::CreateGeometry()
-{
-  //
-  // Create the geometry of Time Projection Chamber version 2
-  //
-  //Begin_Html
-  /*
-    <img src="gif/AliTPCv2.gif">
-  */
-  //End_Html
-  //Begin_Html
-  /*
-    <img src="gif/AliTPCv2Tree.gif">
-  */
-  //End_Html
+  dm[0]=0.;
+  dm[1]=0.3;
+  dm[2]=126.65;
+
+  gMC->Gsvolu("THVC","TUBE",idtmed[10],dm,3);
+
+  // empty space
+
+  dm[0]=0.3;
+  dm[1]=1.;
+  dm[2]=126.65;
 
-  AliMC* pMC = AliMC::GetMC();
+  gMC->Gsvolu("THVE","TUBE",idtmed[1],dm,3);
 
-  Int_t *idtmed = gAlice->Idtmed();
+  gMC->Gspos("THVC",1,"THVL",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("THVE",1,"THVL",0.,0.,0.,0,"ONLY");
 
-  AliTPCParam * fTPCParam = &(fDigParam->GetParam());
+  // rod without cable
+
+  dm[0]=1.8;
+  dm[1]=2.25;
+  dm[2]=126.65;
+
+  gMC->Gsvolu("THVR","TUBE",idtmed[7],dm,3);
 
-  Float_t tana;
-  Int_t isll;
-  Float_t rlsl, wlsl, rssl, rlsu, wssl, wlsu, rssu, wssu;
-  Int_t i;
-  Float_t alpha, x, y, z, sec_thick;
   
-  Float_t r1, r2, x1, z0, z1, x2, theta1, theta2, theta3, dm[21];
-  Int_t il, iu;
-  Float_t z_side, zz;
-  Int_t idrotm[100];
   
-  Float_t x0l, x0u;
-  Int_t idr;
-  Float_t thl, opl;
-  Int_t ils, iss;
-  Float_t thu, opu;
-  Int_t ifl1 = 0, ifl2 = 0;
-  Float_t phi1, phi2, phi3;
+  gMC->Gspos("THVL",1,"TDGN",82.4,0.,-126.95,0,"ONLY");
+  gMC->Gspos("THVL",2,"TDGN",254.2,0.,-126.95,0,"ONLY");
+
+  gMC->Gspos("THVR",1,"TDGN",82.4,0.,126.95,0,"ONLY");
+  gMC->Gspos("THVR",2,"TDGN",254.2,0.,126.95,0,"ONLY");  
   
-  // --------------------------------------------------- 
-  //        sector specification check 
-  // --------------------------------------------------- 
-  if (fSecAL >= 0) {
-    ifl1 = 0;
-    
-    for (i = 0; i < 6; ++i) {
-      if (fSecLows[i] > 0 && fSecLows[i] <25) {
-       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] > 24 && fSecUps[i] < 73) {
-       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 - CARBON FIBER 
-  //          THIS IS ALSO A TPC MOTHER VOLUME 
-  // ---------------------------------------------------- 
-  dm[0] = 76.;
-  dm[1] = 278.;
-  dm[2] = 275.;
-  
-  pMC->Gsvolu("TPC ", "TUBE", idtmed[407], dm, 3);
-  // ------------------------------------------------------- 
-  //     drift gas Ne/CO2 (90/10 volume) - nonsensitive 
-  //     field cage thickness = 0.52% X0 
-  // ---------------------------------------------------- 
-  dm[0] = 76.+0.09776;
-  dm[1] = 257.;
-  dm[2] = 250.;
-  
-  pMC->Gsvolu("TGAS", "TUBE", idtmed[402], dm, 3);
-  // ------------------------------------------------------ 
-  //     "side" gas volume (the same as drift gas), 
-  //      here the readout chambers are positioned 
-  // ------------------------------------------------------ 
-  dm[2] = 0.5*(275.-250.);
-  z_side = dm[2];
-
-  pMC->Gsvolu("TPSG", "TUBE", idtmed[401], dm, 3);
-  // ------------------------------------------------------ 
-  //      HV midplane - 20 microns of mylar 
-  // ----------------------------------------------------- 
-  dm[2] = .001;
-  
-  pMC->Gsvolu("TPHV", "TUBE", idtmed[405], dm, 3);
-  
-  // ==================================================== 
-  //   lower and upper readout chambers 
-  // ==================================================== 
-  //   sectros opening angles in degrees 
-  // --------------------------------------------------- 
-  opl = 30.;
-  opu = 15.;
-  thl = TMath::Tan(opl * .5 * kDegrad);
-  thu = TMath::Tan(opu * .5 * kDegrad);
-  // --------------------------------------------------- 
-  //         S and L-sectors radii 
-  // --------------------------------------------------- 
-  rssl = 88.;
-  rssu = 136.;
-  rlsl = 142.;
-  rlsu = 250.;
-  // -------------------------------------------------- 
-  //          Sectors widths 
-  // -------------------------------------------------- 
-  wssl = 46.5;
-  wssu = 72.2;
-  wlsl = 37.;
-  wlsu = 65.4;
-  // --------------------------------------------------- 
-  //    Sector thickness 25% of X0 (Al) 
-  // --------------------------------------------------- 
-  sec_thick = 2.225;
-  // --------------------------------------------------- 
-  //     S-sectors (lower sectors) 
-  // --------------------------------------------------- 
-  dm[0] = wssl * .5;
-  dm[1] = wssu * .5;
-  dm[2] = sec_thick * .5;
-  dm[3] = (rssu - rssl) * .5;
-  
-  x0l = rssl + dm[3];
-  
-  pMC->Gsvolu("TRCS", "TRD1", idtmed[399], dm, 4);
-  // ----------------------------------------------------- 
-  //     S-sectors --> "gas sectors" - sensitive 
-  // ----------------------------------------------------- 
-  dm[2] = (250.-0.001)/2.;
-  pMC->Gsvolu("TSGA", "TRD1", idtmed[403], dm, 4);
-  // ------------------------------------------------------------- 
-  //  Only for the debugging purpose and resolution calculation 
-  //  Sensitive strips at the pad-row center 
-  // ------------------------------------------------------------- 
-  if (fSens >= 0) {
-    pMC->Gsvolu("TSST", "TRD1", idtmed[403], dm, 0);
-    dm[3] = .005;
-  
-    z0    = rssl + (rssu - rssl) * .5;
-    
-    for (iss = 0; iss < fTPCParam->GetNRowLow(); ++iss) {
-      r1    = fTPCParam->GetPadRowRadiiLow(iss);
-      r2    = r1 + dm[3] * 2.;
-      dm[0] = r1 * thl - 2.63;
-      dm[1] = r2 * thl - 2.63;
-      
-      zz    = -z0 + r1 +dm[3];
+  gMC->Gspos("TDGN",1,"TPC ",0.,0.,0.,0,"ONLY"); 
 
-      pMC->Gsposp("TSST", iss+1, "TSGA", 0, 0, zz, 0, "ONLY", dm, 4);
-    }
-    pMC->Gsord("TSGA", 3);
-  }
-  // --------------------------------------------------- 
-  //     L-sectors (upper sectors) 
-  // --------------------------------------------------- 
-  dm[0] = wlsl * .5;
-  dm[1] = wlsu * .5;
-  dm[2] = sec_thick * .5;
-  dm[3] = (rlsu - rlsl) * .5;
-  
-  x0u = rlsl + dm[3];
-  
-  pMC->Gsvolu("TRCL", "TRD1", idtmed[399], dm, 4);
-  // ----------------------------------------------------- 
-  //     L-sectors - "gas sectors" - sensitive! 
-  // ----------------------------------------------------- 
-  dm[2] = (250.-0.001)/2.;
-  pMC->Gsvolu("TLGA", "TRD1", idtmed[403], dm, 4);
-  // ------------------------------------------------------------- 
-  //  Only for the debugging purpose and resolution calculation 
-  //  Sensitive strips at the pad-row center 
-  // ------------------------------------------------------------- 
-  if (fSens >= 0) {
-    pMC->Gsvolu("TLST", "TRD1", idtmed[403], dm, 0);
-    
-    dm[3] = .005;
+  // services wheel cover -> wheel
 
-    z0   = rlsl+ (rlsu - rlsl) * .5;
-    
-    for (ils = 0; ils <fTPCParam->GetNRowUp(); ++ils) {
-      r1    = fTPCParam->GetPadRowRadiiUp(ils);
-      r2    = r1 + dm[3] * 2.;
-      dm[0] = r1 * thu - 2.63;
-      dm[1] = r2 * thu - 2.63;
 
-      zz  = -z0 + r1 +dm[3]; 
+  gMC->Gspos("TSWC",1,"TSSW",0.,0.,4.5,0,"ONLY");
+  gMC->Gspos("TSWC",2,"TSSW",0.,0.,-4.5,0,"ONLY");
 
-      pMC->Gsposp("TLST", ils+1, "TLGA", 0, 0, zz, 0, "ONLY", dm, 4);
-    }
-    pMC->Gsord("TLGA", 3);
-  }
-  // ****************************************************** 
-  // ------------------------------------------------ 
-  //      positioning of lower sectors (1-12)*2 
-  //          rotation matrices 1-12 
-  
-  //      the isec_al flag allows to select all (<0) or 
-  //      only a few (up to 6) sectors 
-  // ------------------------------------------------ 
-  z  = (250.+0.001)/2.;
-    z1 = -z_side + sec_thick * .5;
-    
-    for (il = 1; il <= 12; ++il) {
-      phi1 = (il - 1) * opl + 270.;
-      if (phi1 > 360.) {
-       phi1 += -360.;
-      }
-      theta1 = 90.;
-      phi2   = 90.;
-      theta2 = 180.;
-      phi3   = (il - 1) * opl;
-      theta3 = 90.;
-      
-      idr = il;
-      AliMatrix(idrotm[idr], theta1, phi1, theta2, phi2, theta3, phi3);
-      
-      alpha = (il - 1) * opl * kDegrad;
-      x     = x0l * TMath::Cos(alpha);
-      y     = x0l * TMath::Sin(alpha);
-      
-      if (fSecAL < 0) {
-       // ----------------------------------------------------------- 
-       //       position ALL lower sectors 
-       // ----------------------------------------------------------- 
-       pMC->Gspos("TSGA", il, "TGAS", x, y, z, idrotm[idr], "ONLY");
-       pMC->Gspos("TSGA",il+12 , "TGAS", x, y, -z, idrotm[idr], "ONLY");
-      } else {
-       // ----------------------------------------------------------- 
-       //       position selected lower sectors 
-       // ----------------------------------------------------------- 
-       for (isll = 1; isll <= 6; ++isll) {
-         if (fSecLows[isll - 1] == il) {
-           pMC->Gspos("TSGA", il, "TGAS", x, y, z, idrotm[idr], "ONLY");
-         } else if (fSecLows[isll - 1] == il + 12) {
-           pMC->Gspos("TSGA",il+12 , "TGAS", x, y, -z, idrotm[idr],"ONLY");
-         }
-       }
-      }
-      
-      pMC->Gspos("TRCS", il, "TPSG", x, y, z1, idrotm[idr], "ONLY");
-      
-    }
-    // ---------------------------------------------------- 
-    //      positioning of upper sectors (1-24)*2 
-    //          rotation matrices 13-36 
-    //      the isec_au flag allows to select all (<0) or 
-    //      only a few (up to 12) sectors 
-    // ---------------------------------------------------- 
-    for (iu = 1; iu <= 24; ++iu) {
-      phi1 = (iu - 1) * opu + 270.;
-      if (phi1 > 360.) {
-       phi1 += -360.;
-      }
-      theta1 = 90.;
-      phi2   = 90.;
-      theta2 = 180.;
-      phi3   = (iu - 1) * opu;
-      theta3 = 90.;
-      
-      idr = iu + 12;
-      AliMatrix(idrotm[idr], theta1, phi1, theta2, phi2, theta3, phi3);
-      
-      alpha = (iu - 1) * opu * kDegrad;
-      x     = x0u * TMath::Cos(alpha);
-      y     = x0u * TMath::Sin(alpha);
-
-      if (fSecAU < 0) {
-       // ------------------------------------------------------------- 
-       //           position ALL upper sectors 
-       // ------------------------------------------------------------- 
-       pMC->Gspos("TLGA", iu, "TGAS", x, y, z, idrotm[idr], "ONLY");
-       pMC->Gspos("TLGA",iu+24 , "TGAS", x, y, -z, idrotm[idr], "ONLY");
-      } else {
-       // ------------------------------------------------------------- 
-       //         position selected upper sectors 
-       // ------------------------------------------------------------- 
-       for (isll = 1; isll <= 12; ++isll) {
-         if (fSecUps[isll - 1] == iu + 24) {
-           pMC->Gspos("TLGA", iu, "TGAS", x, y, z, idrotm[idr], "ONLY");
-         } else if (fSecUps[isll - 1] == iu + 48) {
-           pMC->Gspos("TLGA",iu+24 , "TGAS", x, y, -z, idrotm[idr],"ONLY");
-         }
-       }
-      }
-      
-      pMC->Gspos("TRCL", iu, "TPSG", x, y, z1, idrotm[idr], "ONLY");
-    }
-    // -------------------------------------------------------- 
-    //             Spoke wheel structures 
-    // -------------------------------------------------------- 
-    pMC->Gsvolu("TSWS", "TUBE", idtmed[399], dm, 0);
-    
-    z0 = -z_side + 2.;
-    
-    dm[0] = 82.;
-    dm[1] = 86.;
-    dm[2] = 1.;
-    
-    pMC->Gsposp("TSWS", 1, "TPSG", 0, 0, z0, 0, "ONLY", dm, 3);
-    
-    dm[0] = 253.;
-    dm[1] = 257.;
-    
-    pMC->Gsposp("TSWS", 2, "TPSG", 0, 0, z0, 0, "ONLY", dm, 3);
-    
-    dm[0] = 140.9;
-    dm[1] = 141.9;
-    
-    pMC->Gsposp("TSWS", 3, "TPSG", 0, 0, z0, 0, "ONLY", dm, 3);
-    
-    // ------------------------------------------------------- 
-    //    this volumes are to avoid overlaping 
-    // ------------------------------------------------------- 
-    z0 = 253.;
-    
-    dm[0] = 76.;
-    dm[1] = 76.+0.09776;
-
-    pMC->Gsposp("TSWS", 4, "TPC ", 0, 0, z0, 0, "ONLY", dm, 3);
-    pMC->Gsposp("TSWS", 5, "TPC ", 0, 0, -z0, 0, "ONLY", dm, 3);
-
-    z0 += 21.;
-
-    pMC->Gsposp("TSWS", 6, "TPC ", 0, 0, z0, 0, "ONLY", dm, 3);
-    pMC->Gsposp("TSWS", 7, "TPC ", 0, 0, -z0, 0, "ONLY", dm, 3);
-
-    dm[0] = 257.;
-    dm[1] = 257.+0.09776;
-    dm[2] = 11.5;
-
-    z0 = 263.5;
-
-    pMC->Gsposp("TSWS", 8, "TPC ", 0, 0, z0, 0, "ONLY", dm, 3);
-    pMC->Gsposp("TSWS", 9, "TPC ", 0, 0, -z0, 0, "ONLY", dm, 3);
-    // ========================================================== 
-    //                  wheels 
-    // ========================================================== 
-    // ---------------------------------------------------------- 
-    //       Large wheel -> positioned in the TPC 
-    // ---------------------------------------------------------- 
-    dm[0] = 257.+0.09776;
-    dm[1] = 278.;
-    dm[2] = 11.5;
-    pMC->Gsvolu("TPW1", "TUBE", idtmed[399], dm, 3);
-    
-    dm[0] = 259.;
-    dm[1] = 278.;
-    dm[2] = 9.5;
-    
-    pMC->Gsvolu("TPW2", "TUBE", idtmed[498], dm, 3);
-    
-    pMC->Gspos("TPW2", 1, "TPW1", 0, 0, 0, 0, "ONLY");
-
-    pMC->Gspos("TPW1", 1, "TPC ", 0, 0, z0, 0, "ONLY");
-    pMC->Gspos("TPW1", 2, "TPC ", 0, 0, -z0, 0, "ONLY");
-    // ----------------------------------------------------------- 
-    //     Small wheel -> positioned in the TPSG 
-    // ----------------------------------------------------------- 
-    dm[0] = 76.+0.09776;
-    dm[1] = 82.;
-    dm[2] = 11.5;
-    
-    pMC->Gsvolu("TPW3", "TUBE", idtmed[399], dm, 3);
-    
-    dm[0] = 76.+0.09776;
-    dm[1] = 80.;
-    dm[2] = 9.5;
-    
-    pMC->Gsvolu("TPW4", "TUBE", idtmed[401], dm, 3);
-    
-    pMC->Gspos("TPW4", 1, "TPW3", 0, 0, 0, 0, "ONLY");
-    
-    z0 = 1.;
-    
-    pMC->Gspos("TPW3", 1, "TPSG", 0, 0, z0, 0, "ONLY");
-    // --------------------------------------------------------- 
-    //       spokes, inner and outer, also the inner ring 
-    // --------------------------------------------------------- 
-    dm[0] = 0.5*(135.9-82.1);
-    dm[1] = 3.;
-    dm[2] = 2.;
-    
-    x1 = dm[0] + 82.;
-    
-    pMC->Gsvolu("TSPI", "BOX ", idtmed[399], dm, 3);
-    
-    dm[1] = 2.;
-    dm[2] = 1.;
-    
-    pMC->Gsvolu("TSP1", "BOX ", idtmed[498], dm, 3);
-    
-    pMC->Gspos("TSP1", 1, "TSPI", 0, 0, 0, 0, "ONLY");
-    
-    dm[0] = 0.5*(256.9-142.1);
-    dm[1] = 3.;
-    dm[2] = 2.;
-    
-    x2 = dm[0] + 142.;
-    
-    pMC->Gsvolu("TSPO", "BOX ", idtmed[399], dm, 3);
-    
-    dm[1] = 2.;
-    dm[2] = 1.;
-    
-    pMC->Gsvolu("TSP2", "BOX ", idtmed[498], dm, 3);
-
-    pMC->Gspos("TSP2", 1, "TSPO", 0, 0, 0, 0, "ONLY");
-    // -------------------------------------------------------- 
-    dm[0] = 136.;
-    dm[1] = 142.;
-    dm[2] = 2.;
-
-    pMC->Gsvolu("TSWH", "TUBE", idtmed[399], dm, 3);
-
-    dm[0] = 137.;
-    dm[1] = 141.;
-    dm[2] = 1.;
-
-    pMC->Gsvolu("TSW1", "TUBE", idtmed[498], dm, 3);
-
-    pMC->Gspos("TSW1", 1, "TSWH", 0, 0, 0, 0, "ONLY");
-
-    z0 = z_side - .16168 - 2.;
-    // -------------------------------------------------------- 
-    pMC->Gspos("TSWH", 1, "TPSG", 0, 0, z0, 0, "ONLY");
-    // ------------------------------------------------------- 
-    //     posiioning of the inner spokes 
-    // ------------------------------------------------------- 
-    for (il = 1; il <= 6; ++il) {
-      phi1   = opl * .5 + (il - 1) * 2. * opl;
-      theta1 = 90.;
-      phi2   = opl * .5 + 90. + (il - 1) * 2. * opl;
-      if (phi2 > 360.) {
-       phi2 += -360.;
-      }
-      theta2 = 90.;
-      phi3   = 0.;
-      theta3 = 0.;
-      
-      alpha = phi1 * kDegrad;
-      x     = x1 * TMath::Cos(alpha);
-      y     = x1 * TMath::Sin(alpha);
-      
-      idr = il + 36;
-      
-      AliMatrix(idrotm[idr], theta1, phi1, theta2, phi2, theta3, phi3);
-      pMC->Gspos("TSPI", il, "TPSG", x, y, z0, idrotm[idr], "ONLY");
-      
-    }
-    
-    for (iu = 1; iu <= 12; ++iu) {
-      phi1   = opu * .5 + (iu - 1) * 2. * opu;
-      theta1 = 90.;
-      phi2   = opu * .5 + 90. + (iu - 1) * 2. * opu;
-      if (phi2 > 360.) {
-       phi2 += -360.;
-      }
-      theta2 = 90.;
-      phi3   = 0.;
-      theta3 = 0.;
-      
-      alpha = phi1 * kDegrad;
-      x     = x2 * TMath::Cos(alpha);
-      y     = x2 * TMath::Sin(alpha);
-      
-      idr = iu + 42;
-      
-      AliMatrix(idrotm[idr], theta1, phi1, theta2, phi2, theta3, phi3);
-      pMC->Gspos("TSPO", iu, "TPSG", x, y, z0, idrotm[idr], "ONLY");
-    }
-    // -------------------------------------------------------- 
-    //       endcap cover (C, 0.86% X0) 
-    // -------------------------------------------------------- 
-    dm[0] = 76.+0.09776;
-    dm[1] = 257.;
-    dm[2] = 0.16168*0.5;
-    
-    pMC->Gsvolu("TCOV", "TUBE", idtmed[407], dm, 3);
-    
-    z0 = z_side - dm[2];
-    
-    pMC->Gspos("TCOV", 1, "TPSG", 0, 0, z0, 0, "ONLY");
-    // -------------------------------------------------------- 
-    //         put the readout chambers into the TPC 
-    // -------------------------------------------------------- 
-    theta1 = 90.;
-    phi1   = 0.;
-    theta2 = 90.;
-    phi2   = 270.;
-    theta3 = 180.;
-    phi3   = 0.;
 
-    AliMatrix(idrotm[55], theta1, phi1, theta2, phi2, theta3, phi3);
-    
-    z0 = z_side + 250.;
-    
-    pMC->Gspos("TPSG", 1, "TPC ", 0, 0, z0, 0, "ONLY");
-    pMC->Gspos("TPSG", 2, "TPC ", 0, 0, -z0, idrotm[55], "ONLY");
-    // --------------------------------------------------------- 
-    //     outer gas insulation (CO2) 
-    // --------------------------------------------------------- 
-    dm[0] = 257.+0.09776;
-    dm[1] = 278.-0.25004;
-    dm[2] = 275.-23.;
-    
-    pMC->Gsvolu("TPOI", "TUBE", idtmed[406], dm, 3);
-    
-    pMC->Gspos("TPHV", 1, "TGAS", 0, 0, 0, 0, "ONLY");
-    pMC->Gspos("TGAS", 1, "TPC ", 0, 0, 0, 0, "ONLY");
-    pMC->Gspos("TPOI", 1, "TPC ", 0, 0, 0, 0, "ONLY");
-    
-    pMC->Gspos("TPC ", 1, "ALIC", 0, 0, 0, 0, "ONLY");
-    // ====================================================== 
-    //      all volumes below are positioned in ALIC 
-    // ====================================================== 
-    // ------------------------------------------------------ 
-    //        the last parts of the smaller wheel (TSWS) 
-    // ------------------------------------------------------ 
-    dm[0] = 74.;
-    dm[1] = 76.;
-    dm[2] = 1.;
-    
-    z0 = 253.;
-    
-    pMC->Gsposp("TSWS", 10, "TPC ", 0, 0, z0, 0, "ONLY", dm, 3);
-    pMC->Gsposp("TSWS", 11, "TPC ", 0, 0, -z0, 0, "ONLY", dm, 3);
+  // put the wheel into the TPC
 
-    dm[0] = 70.;
-    
-    z0 += 21.;
-    
-    pMC->Gsposp("TSWS", 12, "TPC ", 0, 0, z0, 0, "ONLY", dm, 3);
-    pMC->Gsposp("TSWS", 13, "TPC ", 0, 0, -z0, 0, "ONLY", dm, 3);
-    // ---------------------------------------------------- 
-    //             Inner vessel (PCON) 
-    //   This volume is to be positioned directly in ALIC 
-    // ---------------------------------------------------- 
-    dm[0] = 0.;
-    dm[1] = 360.;
-    dm[2] = 4.;
-
-    dm[3] = -250.;
-    dm[4] = 75.;
-    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] = 75.;
-    dm[14] = 76.;
-
-    pMC->Gsvolu("TPIV", "PCON", idtmed[407], dm, 15);
-    // -------------------------------------------------------- 
-    //     fill the inner vessel with CO2, (HV kDegrader) 
-    //     cone parts have different thickness 
-    //     than the central barrel, according to the TP 
-    // -------------------------------------------------------- 
-    tana = 75./185.5;
-    
-    dm[0] = 0.;
-    dm[1] = 360.;
-    dm[2] = 6.;
-    
-    dm[3] = -(250.-0.2162);
-    dm[4] = (185.5-0.2126)*tana+0.2126;
-    dm[5] = 76-0.001;
-    
-    dm[6] = -64.5;
-    dm[7] = 50.+0.2162;
-    dm[8] = 76-0.001;
-    
-    dm[9] = -64.5;
-    dm[10] = 50+0.05076;
-    dm[11] = 76-0.001;
-    
-    dm[12] = 64.5;
-    dm[13] = 50+0.05076;
-    dm[14] = 76-0.001;
-    
-    dm[15] = 64.5;
-    dm[16] = 50.+0.2162;
-    dm[17] = 76-0.001;
-    
-    dm[18] = (250.-0.2162);
-    dm[19] = (185.5-0.2126)*tana+0.2126;
-    dm[20] = 76-0.001;
-    
-    pMC->Gsvolu("TPVD", "PCON", idtmed[406], dm, 21);
-    
-    pMC->Gspos("TPVD", 1, "TPIV", 0, 0, 0, 0, "ONLY");
-    
-    pMC->Gspos("TPIV", 1, "ALIC", 0, 0, 0, 0, "ONLY");
-    // --------------------------------------------------- 
-    //               volumes ordering 
-    // --------------------------------------------------- 
-    pMC->Gsord("TGAS", 6);
-    pMC->Gsord("TPSG", 6);
-}
+  gMC->Gspos("TSSW",1,"TPC ",0.,0.,278.7,0,"ONLY");
+  gMC->Gspos("TSSW",2,"TPC ",0.,0.,-278.7,0,"ONLY");
+
+  gMC->Gsord("TPMW",6);
+  if(fSecAL >=0)  gMC->Gsord("TPLS",3);
+  if(fSecAU >=0 && fSens >0)  gMC->Gsord("TPUS",3);
+  gMC->Gsord("TDGN",6);
+  gMC->Gsord("TSSW",6);
+  gMC->Gsord("TSWC",6);
+
+  // put the TPC into ALIC (main mother volume)
+
+  gMC->Gspos("TPC ", 1, "ALIC", 0, 0, 0, 0, "ONLY");  
+
+} // end of function
  
 //_____________________________________________________________________________
 void AliTPCv2::DrawDetector()
@@ -683,41 +1894,107 @@ void AliTPCv2::DrawDetector()
   // Draw a shaded view of the Time Projection Chamber version 1
   //
 
-  AliMC* pMC = AliMC::GetMC();
-
   // Set everything unseen
-  pMC->Gsatt("*", "seen", -1);
+  gMC->Gsatt("*", "seen", -1);
   // 
   // Set ALIC mother transparent
-  pMC->Gsatt("ALIC","SEEN",0);
+  gMC->Gsatt("ALIC","SEEN",0);
   //
   // Set the volumes visible
-  pMC->Gsatt("TPC","SEEN",0);
-  pMC->Gsatt("TGAS","SEEN",0);
-  pMC->Gsatt("TPSG","SEEN",0);
-  pMC->Gsatt("TPHV","SEEN",1);
-  pMC->Gsatt("TRCS","SEEN",1);
-  pMC->Gsatt("TRCL","SEEN",1);
-  pMC->Gsatt("TSWS","SEEN",1);
-  pMC->Gsatt("TPW1","SEEN",1);
-  pMC->Gsatt("TPW3","SEEN",1);
-  pMC->Gsatt("TSPI","SEEN",1);
-  pMC->Gsatt("TSPO","SEEN",1);
-  pMC->Gsatt("TSWH","SEEN",1);
-  pMC->Gsatt("TPOI","SEEN",1);
-  pMC->Gsatt("TPIV","SEEN",1);
-  pMC->Gsatt("TPVD","SEEN",1);
-  //
-  pMC->Gdopt("hide", "on");
-  pMC->Gdopt("shad", "on");
-  pMC->Gsatt("*", "fill", 7);
-  pMC->SetClipBox(".");
-  pMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
-  pMC->DefaultRange();
-  pMC->Gdraw("alic", 40, 30, 0, 12, 9.5, .025, .025);
-  pMC->Gdhead(1111, "Time Projection Chamber");
-  pMC->Gdman(18, 4, "MAN");
-  pMC->Gdopt("hide","off");
+  //
+
+  gMC->Gsatt("TPC ","SEEN",0);
+  gMC->Gsatt("TOIN","SEEN",1);
+  gMC->Gsatt("TOIN","COLO",7);
+  gMC->Gsatt("TPCR","SEEN",0);
+  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("TOFC","SEEN",1);
+  gMC->Gsatt("TOFC","COLO",4);
+  gMC->Gsatt("TSA5","SEEN",0);
+  gMC->Gsatt("TSA6","SEEN",0);
+  gMC->Gsatt("TSA7","SEEN",0);
+  gMC->Gsatt("TIIN","COLO",7);
+  gMC->Gsatt("TIIN","SEEN",1);
+  gMC->Gsatt("TICL","SEEN",0);
+  gMC->Gsatt("TSA9","SEEN",0);
+  gMC->Gsatt("TS10","SEEN",0);
+  gMC->Gsatt("TS11","SEEN",0);
+  gMC->Gsatt("TS12","SEEN",0);
+  gMC->Gsatt("TICR","SEEN",0); 
+  gMC->Gsatt("TS13","SEEN",0);
+  gMC->Gsatt("TS14","SEEN",0);
+  gMC->Gsatt("TS15","SEEN",0);
+  gMC->Gsatt("TS16","SEEN",0);
+  gMC->Gsatt("TIFC","SEEN",1);
+  gMC->Gsatt("TIFC","COLO",4); 
+  gMC->Gsatt("TS17","SEEN",0);
+  gMC->Gsatt("TS18","SEEN",0);
+  gMC->Gsatt("TS19","SEEN",0);
+  gMC->Gsatt("TS21","SEEN",0);
+  gMC->Gsatt("TS22","SEEN",0);
+  gMC->Gsatt("TS23","SEEN",0);
+  gMC->Gsatt("TS24","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("TSCE","SEEN",1); 
+  gMC->Gsatt("TSSW","COLO",3);
+  gMC->Gsatt("TSWC","COLO",3);
+  gMC->Gsatt("TSCE","COLO",6);
+  gMC->Gsatt("TWES","SEEN",0);
+  gMC->Gsatt("TSWB","SEEN",0);
+  gMC->Gsatt("TPEL","SEEN",0);
+  gMC->Gsatt("TPMW","SEEN",1);
+  gMC->Gsatt("TPEW","SEEN",1);
+  gMC->Gsatt("TESR","SEEN",1);
+  gMC->Gsatt("TPMW","COLO",12);
+  gMC->Gsatt("TPEW","COLO",12);
+  gMC->Gsatt("TWES","COLO",5);
+  gMC->Gsatt("TIC1","COLO",5);
+  gMC->Gsatt("TOC1","COLO",5);  
+  gMC->Gsatt("TESB","SEEN",0);
+  gMC->Gsatt("TPLS","SEEN",0);
+  gMC->Gsatt("TPUS","SEEN",0);
+  gMC->Gsatt("TPSS","SEEN",0);
+  gMC->Gsatt("THVM","SEEN",1);
+  gMC->Gsatt("THVM","COLO",11);
+  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->Gdopt("hide", "on");
+  gMC->Gdopt("shad", "on");
+  gMC->Gsatt("*", "fill", 7);
+  gMC->SetClipBox(".");
+  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");
+  gMC->Gdman(18, 4, "MAN");
+  gMC->Gdopt("hide","off");
 }
 
 //_____________________________________________________________________________
@@ -726,13 +2003,7 @@ void AliTPCv2::CreateMaterials()
   //
   // Define materials for version 2 of the Time Projection Chamber
   //
-
-  AliMC* pMC = AliMC::GetMC();
-
-  //
-  // Increase maximum number of steps
-  pMC->SetMaxNStep(30000);
-  //
   AliTPC::CreateMaterials();
 }
 
@@ -742,20 +2013,24 @@ void AliTPCv2::Init()
   //
   // Initialises version 2 of the TPC after that it has been built
   //
-  AliMC* pMC=AliMC::GetMC();
-  Int_t *idtmed = gAlice->Idtmed();
+
+  Int_t *idtmed = fIdtmed->GetArray();
+  
   AliTPC::Init();
-  fIdSens1=pMC->VolId("TLGA"); // L-sector
-  fIdSens2=pMC->VolId("TSGA"); // S-sector 
-  fIdSens3=pMC->VolId("TSST"); // strip - S-sector (not always used)
-  fIdSens4=pMC->VolId("TLST"); // strip - S-sector (not always used)
 
-  pMC->SetMaxNStep(30000); // max. number of steps increased
 
-  pMC->Gstpar(idtmed[403],"LOSS",5);
+  
+  fIdSens=gMC->VolId("TPSS");  
+
+  fIdLSec=gMC->VolId("TPLS"); // lower sector 
+  fIdUSec=gMC->VolId("TPUS"); // upper sector
+
+  gMC->SetMaxNStep(30000); // max. number of steps increased
+
+  gMC->Gstpar(idtmed[2],"LOSS",5); // specific energy loss
 
   printf("*** TPC version 2 initialized ***\n");
-  printf("Maximum number of steps = %d\n",pMC->GetMaxNStep());
+  printf("Maximum number of steps = %d\n",gMC->GetMaxNStep());
 
   //
   
@@ -771,108 +2046,146 @@ 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 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];
   Int_t vol[2];  
-  TClonesArray &lhits = *fHits;
-  AliMC* pMC=AliMC::GetMC();
+  TLorentzVector p;
   
-  vol[1]=0;
+  vol[1]=0; // preset row number to 0
 
   //
 
-  pMC->SetMaxStep(big);
+  gMC->SetMaxStep(kbig);
   
-  if(!pMC->TrackAlive()) return; // particle has disappeared
+  if(!gMC->IsTrackAlive()) return; // particle has disappeared
   
-  Float_t charge = pMC->TrackCharge();
+  Float_t charge = gMC->TrackCharge();
   
   if(TMath::Abs(charge)<=0.) return; // take only charged particles
   
-  
-  id=pMC->CurrentVol(0, copy);
-  
-  // Check the sensitive volume
-  
-  if(id == fIdSens1) 
-    {
-      vol[0] = copy + 24; // L-sector number
-    }
-  else if(id == fIdSens2) 
-    {
-      vol[0] = copy; // S-sector number 
-    }
-  else if(id == fIdSens3 && pMC->TrackEntering())
-    {
-      vol[1] = copy;  // row number  
-      id = pMC->CurrentVolOff(1,0,copy);
-      vol[0] = copy; // sector number (S-sector)
-      
-      pMC->TrackPosition(hits);
-      hits[3]=0.; // this hit has no energy loss
-      new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+  // check the sensitive volume
+
+  id = gMC->CurrentVolID(copy); // current volume Id
+
+  if(id == fIdLSec){
+    vol[0] = copy-1; // lower sector number
+  }
+  else if(id == fIdUSec){
+    vol[0] = copy+fTPCParam->GetNInnerSector()-1; // upper sector number
+  }
+  else if(id == fIdSens && gMC->IsTrackEntering()){
+    // track is entering the sensitive strip
+    
+    vol[1]= copy-1; // row number (absolute)
+   
+    // sector type
+    id = gMC->CurrentVolOffID(1,copy);
+
+    if(id == fIdLSec){
+
+      // lower sector
+     
+      vol[0] = copy-1; // sector number
+
     }
-  else if(id == fIdSens4 && pMC->TrackEntering())
-    {
-      vol[1] = copy; // row number 
-      id = pMC->CurrentVolOff(1,0,copy);
-      vol[0] = copy+24; // sector number (L-sector)
-      
-      pMC->TrackPosition(hits);
+    else {
+   
+      // upper sector
+
+      vol[0] = copy-1+fTPCParam->GetNInnerSector(); // sector number
+      vol[1] -= fTPCParam->GetNRowLow(); // row number (starts also from 0)  
+
+    } 
+
+    if(vol[1] == 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
-      new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+      // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+
+      AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change
+
     }
+
+     gMC->TrackPosition(p);
+     hits[0]=p[0];
+     hits[1]=p[1];
+     hits[2]=p[2];
+     hits[3]=0.; // this hit has no energy loss
+     // new(lhits[fNhits++]) AliTPChit(fIshunt,gAlice->CurrentTrack(),vol,hits);
+
+     AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change    
+
+  }
   else return;
-  
-  //
+    
+  //-----------------------------------------------------------------
   //  charged particle is in the sensitive volume
-  //
+  //-----------------------------------------------------------------
   
-  if(pMC->TrackStep() > 0) {
+  if(gMC->TrackStep() > 0) {
     
-    Int_t nel = (Int_t)(((pMC->Edep())-poti)/w_ion) + 1;
+    Int_t nel = (Int_t)(((gMC->Edep())-kpoti)/kwIon) + 1;
     nel=TMath::Min(nel,300); // 300 electrons corresponds to 10 keV
     
-    pMC->TrackPosition(hits);
+    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);
+    // 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);
+    }
+    AddHit(gAlice->CurrentTrack(), vol,hits);  //MI change 
     
   } 
   
   // Stemax calculation for the next step
   
   Float_t pp;
-  Float_t vect[4];
-  pMC->TrackMomentum(vect);
-  Float_t ptot = vect[3];
-  Float_t beta_gamma = ptot/(pMC->TrackMass());
+  TLorentzVector mom;
+  gMC->TrackMomentum(mom);
+  Float_t ptot=mom.Rho();
+  Float_t betaGamma = ptot/gMC->TrackMass();
   
-  if(pMC->TrackPid() <= 3 && ptot > 0.002)
+  Int_t pid=gMC->TrackPid();
+  if((pid==kElectron || pid==kPositron) && ptot > 0.002)
     { 
-      pp = prim*1.58; // electrons above 20 MeV/c are on the plateau!
+      pp = kprim*1.58; // electrons above 20 MeV/c are on the plateau!
     }
   else
     {
-      pp=prim*BetheBloch(beta_gamma);    
+      pp=kprim*BetheBloch(betaGamma);    
       if(TMath::Abs(charge) > 1.) pp *= (charge*charge);
     }
   
   Float_t random[1];
-  pMC->Rndm(random,1); // good, old GRNDM from Geant3
+  gMC->Rndm(random,1); // good, old GRNDM from Geant3
   
   Double_t rnd = (Double_t)random[0];
   
-  pMC->SetMaxStep(-TMath::Log(rnd)/pp);
+  gMC->SetMaxStep(-TMath::Log(rnd)/pp);
   
 }
 
@@ -882,20 +2195,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));
 }
+
+