Transition to NewIO
[u/mrichter/AliRoot.git] / TPC / AliTPCv0.cxx
index 6337420..5ce2190 100644 (file)
@@ -1,3 +1,21 @@
+/**************************************************************************
+ * 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.                  *
+ **************************************************************************/
+
+/* $Id$ */
+//
+
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Projection Chamber version 0 -- "coarse" TPC                        //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <TMath.h>
+#include <Riostream.h>
+
 #include <TGeometry.h>
+#include <TMath.h>
 #include <TNode.h>
 #include <TTUBE.h>
-#include "AliTPCv0.h"
-#include "AliRun.h"
-#include <iostream.h>
-#include <fstream.h>
+#include <TVirtualMC.h>
 
-#include "AliMC.h"
 #include "AliConst.h"
-
-#include "AliTPCParam.h"
-#include "AliTPCD.h"
+#include "AliRun.h"
+#include "AliTPCDigitsArray.h"
+#include "AliTPCParamSR.h"
+#include "AliTPCv0.h"
 
 ClassImp(AliTPCv0)
  
@@ -35,18 +52,24 @@ AliTPCv0::AliTPCv0(const char *name, const char *title)
   //
   // Standard creator for TPC version 0
   //
+
+  SetGasMixt(2,20,10,-1,0.9,0.1,0.);
+
+  if (fTPCParam)
+     fTPCParam->Write(fTPCParam->GetTitle());
 }
 
 //_____________________________________________________________________________
 void AliTPCv0::CreateGeometry()
 {
+
   //
-  // Creation of the TPC coarse geometry (version 0)
-  // Origin Marek Kowalski Crakow
+  // Creation of the TPC version 0, i.e. no sensitive volumes,
+  // only the material distribution
   //
   //Begin_Html
   /*
-    <img src="picts/AliTPCv0.gif">
+    <img src="picts/AliTPC.gif">
   */
   //End_Html
   //Begin_Html
@@ -55,552 +78,1386 @@ void AliTPCv0::CreateGeometry()
   */
   //End_Html
 
-  AliTPCParam * fTPCParam = &(fDigParam->GetParam());
+  //---------------------------------------------------------------
+  //  TPC geometry
+  //
+  //  Origin: Marek Kowalski, INP Cracow
+  //  Marek.Kowalski@ifj.edu.pl
+  //---------------------------------------------------------------
+  Float_t dm[50];
 
-  Int_t *idtmed = fIdtmed->GetArray();
+  Int_t *idtmed = fIdtmed->GetArray(); // TPC media
 
-  Float_t dm[21];
-  Int_t idrotm[100];
+  Int_t idrotm[120]; // rotation matrices
 
-  Int_t nRotMat = 0;
+  Int_t nRotMat = 0; // actual number of rotation matrices
 
 
-  // ---------------------------------------------------- 
-  //          FIELD CAGE WITH ENDCAPS - G10
-  //          THIS IS ALSO A TPC MOTHER VOLUME 
-  // ---------------------------------------------------- 
+  //
+  //  Mother volume TPC (Air) - all volumes will be positioned in it
+  //
 
-  dm[0] = 76.;
-  dm[1] = 278.;
-  dm[2] = 275.;
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=8.;
 
-  gMC->Gsvolu("TPC ", "TUBE", idtmed[8], dm, 3); 
+  //
 
-  //-----------------------------------------------------
-  //  Endcap cover c-fibre 0.86% X0
-  //-----------------------------------------------------
+  dm[3]=-283.7;
+  dm[4]=65.6;
+  dm[5]=278.;
 
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 0.95;
+  //
 
-  gMC->Gsvolu("TPEC","TUBE",idtmed[10],dm,3);
+  dm[6]=-253.6;
+  dm[7]=65.6;
+  dm[8]=278.;
 
-  //-----------------------------------------------------
-  // Drift gas , leave 2 cm at the outer radius
-  // and inner raddius
-  //-----------------------------------------------------
+  //
 
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 250.;
+  dm[9]=-73.3;
+  dm[10]=60.9;
+  dm[11]=278.;  
 
-  gMC->Gsvolu("TGAS", "TUBE", idtmed[3], dm, 3);
+  //
 
+  dm[12]=-73.3;
+  dm[13]=56.9;
+  dm[14]=278.;
 
-  //------------------------------------------------------
-  //  membrane holder - carbon fiber
-  //------------------------------------------------------
+  //
 
+  dm[15]=73.3;
+  dm[16]=56.9;
+  dm[17]=278.;
 
-  gMC->Gsvolu("TPMH","TUBE",idtmed[6],dm,0);
+  //
 
-  dm[0] = 252.;
-  dm[1] = 258.;
-  dm[2] = 0.2;
+  dm[18]=73.3;
+  dm[19]=60.9;
+  dm[20]=278.;
 
-  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);
+  dm[21]=253.6;
+  dm[22]=65.6;
+  dm[23]=278.;
 
-  //----------------------------------------------------------
-  //  HV membrane - 25 microns of mylar
-  //----------------------------------------------------------
+  //
 
-  dm[0] = 82.;
-  dm[1] = 252.;
-  dm[2] = 0.00125;
+  dm[24]=283.7;
+  dm[25]=65.6;
+  dm[26]=278.;
+  
+  gMC->Gsvolu("TPC ","PCON",idtmed[0],dm,27);
 
-  gMC->Gsvolu("TPHV","TUBE",idtmed[5],dm,3);
+  // outer part
 
-  gMC->Gspos("TPHV",1,"TGAS",0.,0.,0.,0,"ONLY");
+  //-------------------------------------------------------------------
+  //   Tpc Outer INsulator (CO2) - contains cont. vessel and field cage
+  //-------------------------------------------------------------------
 
-  gMC->Gspos("TGAS",1,"TPC ",0.,0.,0.,0,"ONLY");
+  dm[0]= 0.;
+  dm[1]= 360.;
+  dm[2]= 6.;
 
-  //----------------------------------------------------------
-  // "side" gas volume, the same as the drift gas
-  // the readout chambers are placed there.  
-  //----------------------------------------------------------
+  //
 
-  dm[0] = 78.;
-  dm[1] = 258.;
-  dm[2] = 0.5*(275. - 250.);
-   
-  gMC->Gsvolu("TPSG", "TUBE", idtmed[2], dm, 3);
+  dm[3]=-253.6;
+  dm[4]=258.;
+  dm[5]=275.5;
 
-  Float_t z_side = dm[2]; // 1/2 of the side gas thickness
+  //
 
-  //-----------------------------------------------------------
-  //   Readout chambers , 25% of X0, I use Al as the material
-  //-----------------------------------------------------------
+  dm[6]=-250.6;
+  dm[7]=258.;
+  dm[8]=275.5; 
 
-  Float_t InnerOpenAngle = fTPCParam->GetInnerAngle();
-  Float_t OuterOpenAngle = fTPCParam->GetOuterAngle();
+  //
 
-  Float_t InnerAngleShift = fTPCParam->GetInnerAngleShift();
-  Float_t OuterAngleShift = fTPCParam->GetOuterAngleShift();
+  dm[9]=-250.6;
+  dm[10]=258.;
+  dm[11]=278.;
 
+  //
 
-  Int_t nInnerSector = fTPCParam->GetNInnerSector()/2;
-  Int_t nOuterSector = fTPCParam->GetNOuterSector()/2;
+  dm[12]=253.6;
+  dm[13]=258.;
+  dm[14]=278.; 
 
+  //
 
-  Float_t InSecLowEdge = fTPCParam->GetInSecLowEdge();
-  Float_t InSecUpEdge =  fTPCParam->GetInSecUpEdge();
+  dm[15]=253.6;
+  dm[16]=264.8;
+  dm[17]=278.;  
 
-  Float_t OuSecLowEdge = fTPCParam->GetOuSecLowEdge();
-  Float_t OuSecUpEdge = fTPCParam->GetOuSecUpEdge();
+  //
 
-  Float_t SecThick = 2.225; // Al
+  dm[18]=256.6;
+  dm[19]=264.8;
+  dm[20]=278.;
 
-  Float_t edge = fTPCParam->GetEdge();
+  gMC->Gsvolu("TOIN","PCON",idtmed[3],dm,21);
 
-  //  S (Inner) sectors
+  //----------------------------------------------------------------
+  // Tpc Outer Contaiment Vessel  
+  //  mother volume - Al, daughters - composite (sandwich)
+  //----------------------------------------------------------------
 
-  dm[0] = InSecLowEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
-  dm[1] = InSecUpEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
-  dm[2] = SecThick;
-  dm[3] = 0.5*(InSecUpEdge-InSecLowEdge);
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=6.;
 
-  Float_t xCenterS = InSecLowEdge+dm[3];
+  //
 
-  gMC->Gsvolu("TRCS", "TRD1", idtmed[0], dm, 4); 
+  dm[3]=-250.6;
+  dm[4]=270.4;
+  dm[5]=278.;
 
-  //  L (Outer) sectors
+  //
 
-  dm[0] = OuSecLowEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
-  dm[1] = OuSecUpEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
-  dm[2] = SecThick;
-  dm[3] = 0.5*(OuSecUpEdge-OuSecLowEdge);
+  dm[6]=-247.6;
+  dm[7]=270.4;
+  dm[8]=278.; 
 
-  Float_t xCenterL = OuSecLowEdge+dm[3];  
+  //
 
-  gMC->Gsvolu("TRCL", "TRD1", idtmed[0], dm, 4);
+  dm[9]=-247.6;
+  dm[10]=274.8124;
+  dm[11]=278.;
 
-  Float_t z1 = -z_side + SecThick*0.5;
+  //
 
-  //------------------------------------------------------------------
-  // Positioning of the S-sector readout chambers
-  //------------------------------------------------------------------
+  dm[12]=253.6;
+  dm[13]=274.8124;
+  dm[14]=278.;
 
-  Int_t ns;
-  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
+  dm[15]=253.6;
+  dm[16]=264.8;
+  dm[17]=278.;
 
-    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
+  dm[18]=256.6;
+  dm[19]=264.8;
+  dm[20]=278.;
 
-    phi3 = (Float_t)TMath::Nint(phi3);
-      
-    if(phi3 > 360.) phi3 -= 360.;
+  gMC->Gsvolu("TOCV","PCON",idtmed[4],dm,21);
 
-    theta3 = 90.;
+  // Daughter volumes - sandwich
 
-    alpha = phi3*kDegrad;
+  // Tpc SAndwich 1 - Al
 
-    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");
+  dm[0]=274.8124;
+  dm[1]=278.;
+  dm[2]=252.1;
 
-    nRotMat++;     
+  gMC->Gsvolu("TSA1","TUBE",idtmed[4],dm,3);
 
-  }
-    
-  //-------------------------------------------------------------------
-  //  Positioning of the L-sectors readout chambers
-  //-------------------------------------------------------------------
-    
-  for(ns=0;ns<nOuterSector;ns++){
-    phi1 = ns * OuterOpenAngle + 270.*kDegrad + OuterAngleShift;
-    phi1 *= kRaddeg; // in degrees
+  // Tpc SAndwich 2 - epoxy glue (I use Lexan)
 
-    phi1 = (Float_t)TMath::Nint(phi1);
-    
+  dm[0] += 5.e-3;
+  dm[1] -= 5.e-3;
 
-    if (phi1 > 360.) phi1 -= 360.;
-      
-    theta1 = 90.;
-    phi2   = 90.;
-    theta2 = 180.;
-    phi3   = ns * OuterOpenAngle+OuterAngleShift;
-    phi3 *= kRaddeg; // in degrees
+  gMC->Gsvolu("TSA2","TUBE",idtmed[14],dm,3);
 
-    phi3 = (Float_t)TMath::Nint(phi3);
+  // Tpc SAndwich 3 - Tedlar
 
-      
-    if(phi3 > 360.) phi3 -= 360.;
+  dm[0] += 0.01;
+  dm[1] -= 0.01;
+  
+  gMC->Gsvolu("TSA3","TUBE",idtmed[9],dm,3);
 
-    theta3 = 90.;
 
-    alpha = phi3*kDegrad;
+  // Tpc SAndwich 4 - fiber glass (G10)
 
-    x = xCenterL * TMath::Cos(alpha);
-    y = xCenterL * TMath::Sin(alpha); 
-    AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);  
-     
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
-    gMC->Gspos("TRCL", ns+1, "TPSG", x, y, z1, idrotm[nRotMat], "ONLY"); 
+  gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3);  
 
-    nRotMat++;   
+  // Tpc SAndwich 5 - NOMEX honeycomb
 
-  }
+  dm[0] += 0.075;
+  dm[1] -= 0.075;   
+  
+  gMC->Gsvolu("TSA5","TUBE",idtmed[6],dm,3);
+
+  // 5->4->3->2->1->TCOV
+
+
+  gMC->Gspos("TSA5",1,"TSA4",0.,0.,0.,0,"ONLY");
+  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.,3.,0,"ONLY");
+
+  // TCOV-> TOIN
+
+  gMC->Gspos("TOCV",1,"TOIN",0.,0.,0.,0,"ONLY");
+
+  //-------------------------------------------------------
+  //  Tpc Outer Field Cage
+  //  mother volume - Al, daughters - composite (sandwich)
+  //-------------------------------------------------------
 
-  Float_t z0 = z_side - 0.95;
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=6.;
 
-  gMC->Gspos("TPEC",1,"TPSG",0.,0.,z0,0,"ONLY");
+  //
 
-  // ========================================================== 
-  //                  wheels 
-  // ========================================================== 
+  dm[3]=-253.6;
+  dm[4]=258.;
+  dm[5]=275.5;
 
   //
-  //  auxilary structures
+
+  dm[6]=-250.6;
+  dm[7]=258.;
+  dm[8]=275.5;
+
   //
 
+  dm[9]=-250.6;
+  dm[10]=258.;
+  dm[11]=260.0476;
+
+  //
 
-  gMC->Gsvolu("TPWI","TUBE",idtmed[24],dm,0); // "air" 
+  dm[12]=250.6;
+  dm[13]=258.;
+  dm[14]=260.0476;
 
-  // ---------------------------------------------------------- 
-  //       Large wheel -> positioned in the TPC 
-  // ---------------------------------------------------------- 
-  
+  //
 
-  z0 = 263.5; // TPC length - 1/2 spoke wheel width
+  dm[15]=250.6;
+  dm[16]=258.;
+  dm[17]=269.6;
 
-  dm[0] = 258.;
-  dm[1] = 278.;
-  dm[2] = 11.5;
-  
-  gMC->Gsvolu("TPWL", "TUBE", idtmed[0], dm, 3); 
+  //
+
+  dm[18]=253.6;
+  dm[19]=258.;
+  dm[20]=269.6;
+
+  gMC->Gsvolu("TOFC","PCON",idtmed[4],dm,21);
+
+  // Daughter volumes 
+
+  // Tpc SAndwich 6 - Tedlar
+
+  dm[0]= 258.;
+  dm[1]= 260.0476;
+  dm[2]= 252.1;
+
+  gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3);
+
+  // Tpc SAndwich 7 - fiber glass
 
-  dm[0] = dm[0]+2.;
-  dm[1] = 278.;
-  dm[2] = dm[2]-2.;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
-  gMC->Gsposp("TPWI",1,"TPWL",0.,0.,0.,0,"ONLY",dm,3);
+  gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3);
 
-  gMC->Gspos("TPWL", 1, "TPC ", 0, 0, z0, 0, "ONLY");
-  gMC->Gspos("TPWL", 2, "TPC ", 0, 0, -z0, 0, "ONLY");
+
+  // Tpc SAndwich 8 - NOMEX
+
+  dm[0] += 0.02;
+  dm[1] -= 0.02;
+
+  gMC->Gsvolu("TSA8","TUBE",idtmed[6],dm,3);    
+
+  // 8->7->6->TOFC
+
+  gMC->Gspos("TSA8",1,"TSA7",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TSA7",1,"TSA6",0.,0.,0.,0,"ONLY"); 
+  gMC->Gspos("TSA6",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");
+
+  // inner part
+
+  //--------------------------------------------------------------------
+  // Tpc Inner INsulator (CO2) - inner f.c. will be placed there
+  // Inner containment vessel will be placed directly in the TPC
+  //-------------------------------------------------------------------- 
+
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=4.;
+
+  // 
+
+  dm[3]=-253.6;
+  dm[4]=65.9;
+  dm[5]=79.2;
 
   //
-  //  Outer vessel + CO2 HV degrader
+
+  dm[6]=-73.3;
+  dm[7]=61.2;
+  dm[8]=79.2;  
+
   //
 
-  dm[0] = 260.;
-  dm[1] = 278.;
-  dm[2] = 252.;
+  dm[9]=73.3;
+  dm[10]=61.2;
+  dm[11]=79.2;
 
-  gMC->Gsvolu("TPCO","TUBE",idtmed[12],dm,3);
+  //
 
-  dm[0] = 275.;
-  dm[1] = 278.;
-  
-  gMC->Gsvolu("TPOV","TUBE",idtmed[10],dm,3);
+  dm[12]=253.6;
+  dm[13]=65.9;
+  dm[14]=79.2;
 
-  gMC->Gspos("TPOV",1,"TPCO",0.,0.,0.,0,"ONLY");
+  gMC->Gsvolu("TIIN","PCON",idtmed[3],dm,15);
 
+  // the middle part of the F.C. is thinner - carve out the strip - Ne-CO2
 
-  // G10 plugs
+  dm[0]=79.16;
+  dm[1]=79.2;
+  dm[2]=88.;
 
-  dm[0] = 258.;
-  dm[1] = 260.;
-  dm[2] = 1.;
+  gMC->Gsvolu("TII1","TUBE",idtmed[1],dm,3);
 
-  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("TII1",1,"TIIN",0.,0.,0.,0,"ONLY");
 
-  gMC->Gspos("TPCO",1,"TPC ",0.,0.,0.,0,"ONLY");
+  //-----------------------------------------------------
+  // Tpc Inner Field Cage
+  // mother volume - Al, daughters - composite (sandwich)
+  //------------------------------------------------------
 
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=10.;
 
-  //----------------------------------------------------------
-  //  Small wheel -> positioned in "side gas
-  //----------------------------------------------------------
+  //
 
-  dm[0] = 78.;
-  dm[1] = 82.;
-  dm[2] = 11.5;
+  dm[3]=-253.6;
+  dm[4]=70.3;
+  dm[5]=79.2;
 
-  gMC->Gsvolu("TPWS", "TUBE", idtmed[0], dm, 3);
+  //
 
-  dm[0] = 78.;
-  dm[1] = dm[1]-2;
-  dm[2] = dm[2]-2.;
+  dm[6]=-250.6;
+  dm[7]=70.3;
+  dm[8]=79.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"
+  dm[9]=-250.6;
+  dm[10]=77.0524;
+  dm[11]=79.2;
 
-  gMC->Gspos("TPWS", 1, "TPSG", 0, 0, z0, 0, "ONLY");
+  //
 
+  dm[12]=-88.;
+  dm[13]=77.0524;
+  dm[14]=79.2;
 
-  // to avoid overlaps
+  //
 
-  dm[0] = 76.;
-  dm[1] = 78.;
-  dm[2] = 11.5;
+  dm[15]=-88.;
+  dm[16]=77.0924;
+  dm[17]=79.16;
 
-  gMC->Gsvolu("TPS1","TUBE",idtmed[0],dm,3);
+  //
 
-  dm[2] = 9.5;
+  dm[18]=88.;
+  dm[19]=77.0924;
+  dm[20]=79.16;
 
-  gMC->Gsvolu("TPS2","TUBE",idtmed[24],dm,3);
+  //
 
-  gMC->Gspos("TPS2",1,"TPS1",0.,0.,0.,0,"ONLY");
+  dm[21]=88.;
+  dm[22]=77.0524;
+  dm[23]=79.2;
 
-  z0= 263.5;
-  
-  gMC->Gspos("TPS1",1,"TPC ",0.,0.,z0,0,"ONLY");
-  gMC->Gspos("TPS1",2,"TPC ",0.,0.,-z0,0,"ONLY");
+  //
 
-  // G10 plug
+  dm[24]=250.6;
+  dm[25]=77.0524;
+  dm[26]=79.2;
 
-  dm[0] = 76.;
-  dm[2] = 78.;
-  dm[3] = 1.;
+  //
 
-  gMC->Gsvolu("TPG2","TUBE",idtmed[8],dm,3);
+  dm[27]=250.6;
+  dm[28]=70.3;
+  dm[29]=79.2;
 
-  z0 = 251.;
+  //
 
-  gMC->Gspos("TPG2",1,"TPC ",0.,0.,z0,0,"ONLY");
-  gMC->Gspos("TPG2",2,"TPC ",0.,0.,-z0,0,"ONLY");
+  dm[30]=253.6;
+  dm[31]=70.3;
+  dm[32]=79.2;
 
+  gMC->Gsvolu("TIFC","PCON",idtmed[4],dm,33);
 
-  //---------------------------------------------------------
-  //  central wheel  6 (radial direction) x 4 (along z) cm2
-  //---------------------------------------------------------
+  // daughter volumes - central part
 
-  dm[0] = 140.;
-  dm[1] = 146.;
-  dm[2] = 2.;
+  // Tpc Sandwich 9 -Tedlar
 
-  gMC->Gsvolu("TPWC","TUBE",idtmed[0],dm,3);
+  dm[0]=77.0924;
+  dm[1]=79.16;
+  dm[2]=88.;
 
-  dm[0] = dm[0] + 2.;
-  dm[1] = dm[1] - 2.;
-  dm[2] = dm[2] - 1.;
+  gMC->Gsvolu("TSA9","TUBE",idtmed[9],dm,3); 
 
-  gMC->Gsposp("TPWI",2,"TPWC",0.,0.,0.,0,"ONLY",dm,3);
+  // Tpc Sandwich 10 - fiber glass (G10) 
 
-  z0 = z_side - 1.9 - 2.;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
-  gMC->Gspos("TPWC",1,"TPSG",0.,0.,z0,0,"ONLY");
+  gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3);
 
-  //
+  // Tpc Sandwich 11 - NOMEX
 
-  gMC->Gsvolu("TPSE","BOX ",idtmed[24],dm,0); // "empty" part of the spoke 
+  dm[0] += 0.03;
+  dm[1] -= 0.03; 
 
-  //---------------------------------------------------------
-  //  inner spokes (nSectorInner)
-  //---------------------------------------------------------
+  gMC->Gsvolu("TS11","TUBE",idtmed[6],dm,3);
 
-  dm[0] = 0.5*(139.9-82.1);
-  dm[1] = 3.;
-  dm[2] = 2.;
+  // 11->10->9->TIFC
 
-  Float_t x1 = dm[0]+82.;
+  gMC->Gspos("TS11",1,"TS10",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS10",1,"TSA9",0.,0.,0.,0,"ONLY");
 
-  gMC->Gsvolu("TPSI","BOX",idtmed[0],dm,3);
+  gMC->Gspos("TSA9",1,"TIFC",0.,0.,0.,0,"ONLY");
 
-  dm[1] = dm[1]-1.;
-  dm[2] = dm[2]-1.;
+  // daughter volumes - outer parts (reinforced)
 
-  gMC->Gsposp("TPSE",1,"TPSI",0.,0.,0.,0,"ONLY",dm,3);
+  // Tpc Sandwich 12 -Tedlar
 
-  for(ns=0;ns<nInnerSector;ns++){
+  dm[0]=77.0524;
+  dm[1]=79.2;
+  dm[2]=82.05;
 
-    phi1 = 0.5*InnerOpenAngle + ns*InnerOpenAngle + InnerAngleShift;
-    theta1=90.;
-    phi1 *=kRaddeg;
+  gMC->Gsvolu("TS12","TUBE",idtmed[9],dm,3);
 
-    phi1 = (Float_t)TMath::Nint(phi1);
+  // Tpc Sandwich 13 - fiber glass (G10) 
 
-    phi2 = phi1+90.;
-    if(phi2>360.) phi2 -= 360.;
-    theta2=90.;
-    phi3=0.;
-    theta3=0.;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
-    alpha = phi1 * kDegrad;
-    x     = x1 * TMath::Cos(alpha);
-    y     = x1 * TMath::Sin(alpha);    
+  gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3);
 
-   AliMatrix(idrotm[nRotMat],theta1,phi1,theta2,phi2,theta3,phi3);
+  // Tpc Sandwich 14 - NOMEX
 
-   gMC->Gspos("TPSI",ns+1,"TPSG",x,y,z0,idrotm[nRotMat],"ONLY");  
+  dm[0] += 0.07;
+  dm[1] -= 0.07;  
 
-   nRotMat++;
+  gMC->Gsvolu("TS14","TUBE",idtmed[6],dm,3);
 
-  }
+  // 14->13->12->TIFC
 
-  //-------------------------------------------------------------
-  // outer spokes (nSectorOuter)
-  //-------------------------------------------------------------
+  gMC->Gspos("TS14",1,"TS13",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS13",1,"TS12",0.,0.,0.,0,"ONLY"); 
 
-  dm[0] = 0.5*(257.9-146.1);
-  dm[1] = 3.;
-  dm[2] = 2.;
+  gMC->Gspos("TS12",1,"TIFC",0.,0.,170.05,0,"ONLY");
+  gMC->Gspos("TS12",2,"TIFC",0.,0.,-170.05,0,"ONLY"); 
 
-  x1 = dm[0] + 146.;
+  // place this inside the inner insulator
 
-  gMC->Gsvolu("TPSO","BOX ",idtmed[0],dm,3);
+  gMC->Gspos("TIFC",1,"TIIN",0.,0.,0.,0,"ONLY");
 
-  dm[1] = dm[1] - 1.;
-  dm[2] = dm[2] - 1.;
+  // and now in the TPC...
 
-  gMC->Gsposp("TPSE",2,"TPSO",0.,0.,0.,0,"ONLY",dm,3);
+  gMC->Gspos("TIIN",1,"TPC ",0.,0.,0.,0,"ONLY");
 
-  for(ns=0;ns<nOuterSector;ns++){
+  //---------------------------------------------------------
+  // Tpc Inner Containment vessel - Cones
+  //---------------------------------------------------------
 
-    phi1 = 0.5*OuterOpenAngle + ns*OuterOpenAngle + OuterAngleShift;
-    theta1=90.;
-    phi1 *=kRaddeg;
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=8.;
 
-    phi1 = (Float_t)TMath::Nint(phi1);
+  //
 
-    phi2 = phi1+90.;
-    if(phi2>360.) phi2 -= 360.;
-    theta2=90.;
-    phi3=0.;
-    theta3=0.;
+  dm[3]=71.8;
+  dm[4]=56.9;
+  dm[5]=59.4;
 
-    alpha = phi1 * kDegrad;
-    x     = x1 * TMath::Cos(alpha);
-    y     = x1 * TMath::Sin(alpha);    
+  //
 
-   AliMatrix(idrotm[nRotMat],theta1,phi1,theta2,phi2,theta3,phi3);
+  dm[6]=73.;
+  dm[7]=56.9;
+  dm[8]=59.4;
 
-   gMC->Gspos("TPSO",ns+1,"TPSG",x,y,z0,idrotm[nRotMat],"ONLY");  
+  //
 
-   nRotMat++;
+  dm[9]=73.;
+  dm[10]=56.9;
+  dm[11]=61.2;
 
-  }  
-  
+  //
 
-  
-  // -------------------------------------------------------- 
-  //         put the readout chambers into the TPC 
-  // -------------------------------------------------------- 
+  dm[12]=73.3;
+  dm[13]=56.9;
+  dm[14]=61.2;
+
+  //
+   
+  dm[15]=73.3;
+  dm[16]=60.9;
+  dm[17]=61.2;
+
+  // 
+
+  dm[18]=253.6;
+  dm[19]=65.6;
+  dm[20]=65.9; 
+
+  //
+
+  dm[21]=253.6;
+  dm[22]=65.6;
+  dm[23]=74.6;
+
+  //
+
+  dm[24]=256.6;
+  dm[25]=65.6;
+  dm[26]=74.6;
+
+  gMC->Gsvolu("TICC","PCON",idtmed[4],dm,27);
 
+  Float_t phi1,phi2,phi3,theta1,theta2,theta3; // rotation angles
+
+  // reflection matrix
+  
   theta1 = 90.;
   phi1   = 0.;
   theta2 = 90.;
   phi2   = 270.;
   theta3 = 180.;
   phi3   = 0.;
-  
+
   AliMatrix(idrotm[nRotMat], theta1, phi1, theta2, phi2, theta3, phi3);
+
+  gMC->Gspos("TICC",1,"TPC ",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TICC",2,"TPC ",0.,0.,0.,idrotm[nRotMat],"ONLY");
+
+
+  //---------------------------------------------------------
+  // Tpc Inner Containment vessel - Middle part -Al
+  //---------------------------------------------------------
+
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=6.;
+
+  //
+
+  dm[3]=-71.6;
+  dm[4]=60.2;
+  dm[5]=61.2;
+
+  //
+
+  dm[6]=-69.1;
+  dm[7]=60.2;
+  dm[8]=61.2;
+
+  //
+
+  dm[9]=-69.1;
+  dm[10]=60.6224;
+  dm[11]=61.2;  
+
+  //
+
+  dm[12]=69.1;
+  dm[13]=60.6224;
+  dm[14]=61.2;
+
+  //
+
+  dm[15]=69.1;
+  dm[16]=60.2;
+  dm[17]=61.2;
+
+  //
+
+  dm[18]=71.6;
+  dm[19]=60.2;
+  dm[20]=61.2;
+
+  gMC->Gsvolu("TICM","PCON",idtmed[4],dm,21);
+
+  // Tpc Sandwich 15 - Al
+
+  dm[0]=60.6224;
+  dm[1]=61.2;
+  dm[2]=70.1;
+
+  gMC->Gsvolu("TS15","TUBE",idtmed[4],dm,3);
+
+  // Tpc Sandwich 16 -  epoxy glue
+
+  dm[0] += 5.e-3;
+  dm[1] -= 5.e-3;
+
+  gMC->Gsvolu("TS16","TUBE",idtmed[14],dm,3);
+
+  // Tpc Sandwich 17 - Tedlar
+
+  dm[0] += 0.01;
+  dm[1] -= 0.01;
+
+  gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3);
+
+  // Tpc Sandwich 18 - carbon fiber 
+
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
+
+  gMC->Gsvolu("TS18","TUBE",idtmed[15],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->16->15-> TICM
+
+  gMC->Gspos("TS19",1,"TS18",0.,0.,0.,0,"ONLY"); 
+  gMC->Gspos("TS18",1,"TS17",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS17",1,"TS16",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TS16",1,"TS15",0.,0.,0.,0,"ONLY");
+
+  gMC->Gspos("TS15",1,"TICM ",0.,0.,0.,0,"ONLY");
+
+  // TPc inner cont. vessel Joints
+
+  dm[0]=60.2;
+  dm[1]=61.2;
+  dm[2]=0.5;
+
+  gMC->Gsvolu("TPJ1","TUBE",idtmed[4],dm,3);
+
+  gMC->Gspos("TPJ1",1,"TPC ",0.,0.,72.3,0,"ONLY");
+  gMC->Gspos("TPJ1",2,"TPC ",0.,0.,-72.3,0,"ONLY");
+
+  //
+
+  dm[0]=0.;
+  dm[1]=360.;
+  dm[2]=4.;
+
+  //
+
+  dm[3]=70.8;
+  dm[4]=58.4;
+  dm[5]=60.1;
+
+  //
+
+  dm[6]=71.2;
+  dm[7]=58.4;
+  dm[8]=60.1;
+
+  //
+
+  dm[9]=71.2;
+  dm[10]=58.4;
+  dm[11]=59.4;
+
+  //
+
+  dm[12]=71.6;
+  dm[13]=58.4;
+  dm[14]=59.4;
+
+  gMC->Gsvolu("TPJ2","PCON",idtmed[4],dm,15);
+
+  gMC->Gspos("TPJ2",1,"TPC ",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("TPJ2",2,"TPC ",0.,0.,0.,idrotm[nRotMat],"ONLY");
+
+
+
+  // Tpc Inner Containment vessel Seal (Viton, I use Lexan for a time being)
+
+  dm[0]=58.4;
+  dm[1]=61.2;
+  dm[2]=0.1;
+
+  gMC->Gsvolu("TICS","TUBE",idtmed[14],dm,3);
+
+  gMC->Gspos("TICS",1,"TPC ",0.,0.,71.7,0,"ONLY");
+  gMC->Gspos("TICS",2,"TPC ",0.,0.,-71.7,0,"ONLY"); 
+
+  // TICM -> TPC
+
+  gMC->Gspos("TICM",1,"TPC ",0.,0.,0.,0,"ONLY");
+
+  //
+
+  nRotMat++; // prepare for the next rotation matrix 
+
+  //---------------------------------------------------------
+  //  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); 
+
+  // sector opening angles
+
+  Float_t innerOpenAngle = fTPCParam->GetInnerAngle();
+
+  // sector angle shift
+
+  Float_t innerAngleShift = fTPCParam->GetInnerAngleShift();
+
+  // number of sectors
+
+  Int_t nInnerSector = fTPCParam->GetNInnerSector()/2;
+  Int_t nOuterSector = fTPCParam->GetNOuterSector()/2;
+
+  // 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;
   
-  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");
-  
-  gMC->Gspos("TPC ", 1, "ALIC", 0, 0, 0, 0, "ONLY");
+  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;
 
-  //----------------------------------------------------
-  //  Inner vessel and HV degrader
-  //----------------------------------------------------
 
-  dm[0] = 0.;
-  dm[1] = 360.;
-  dm[2] = 4.;
+  Float_t alpha;
+  Float_t astep;
+
+  // inner part of the inner sector - 2 x 20 holes
   
-  dm[3] = -250.;
-  dm[4] = 74.4;
-  dm[5] = 76.;
+  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++; 
 
-  dm[6] = -64.5;
-  dm[7] = 50.;
-  dm[8] = 76.;
+  }
+
+  // outer part of the inner sector - 2 x 25 holes
 
-  dm[9] = -64.5;
-  dm[10] = 50.;
-  dm[11] = 76.;
+   astep = 20.00096874/24.; 
+   alpha = 10.00048437-astep;
 
-  dm[12] = 250.;
-  dm[13] = 74.4;
-  dm[14] = 76.;
+   x1 = 16.81184781;
+   x1 -= 1.016295986;
 
-  gMC->Gsvolu("TPVD", "PCON", idtmed[12], dm, 15); // CO2
+   x2 = 18.5618931;
+   x2 -= 1.150914854;
 
-  // cone parts
+  for(ncon=0;ncon<25;ncon++){
 
-  dm[0] = 0.;
-  dm[1] = 360.;
-  dm[2] = 2.;
+    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);
 
-  dm[3] = 64.5;
-  dm[4] = 50.;
-  dm[5] = 51.6;
  
-  dm[6] = 250.;
-  dm[7] = 74.4;
-  dm[8] = 76.;
 
+    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->Gsvolu("TIVC","PCON",idtmed[11],dm,9); // C-fibre
+  gMC->Gspos("TOC3",1,"TOPP",0.,0.15,0.,0,"ONLY");
 
-  gMC->Gspos("TIVC",1,"TPVD",0.,0.,0.,0,"ONLY");
-  gMC->Gspos("TIVC",2,"TPVD",0.,0.,0.,idrotm[nRotMat],"ONLY");
+  gMC->Gspos("TOPP",1,"TORC",0.,1.0,0.,0,"ONLY");
 
-  // barrel part
+  // empty space
 
-  dm[0] = 50.;
-  dm[1] = 50.5;
-  dm[2] = 32.25;
+  dm[0]= 21.035;
+  dm[1]= 38.7205;
+  dm[2]= 0.7; 
+  dm[3]= 50.15;
 
-  gMC->Gsvolu("TIVB","TUBE",idtmed[9],dm,3);
+  gMC->Gsposp("TRCE",10,"TORC",0.,-0.8,-2.15,0,"ONLY",dm,4);  
 
-  gMC->Gspos("TIVB",1,"TPVD",0.,0.,0.,0,"ONLY");
+  dm[0]= 22.2935;
+  dm[1]= 40.5085;
+  dm[2]= 2.25;
+  dm[3]= 51.65;
 
-  gMC->Gspos("TPVD",1,"ALIC",0.,0.,0.,0,"ONLY");
+  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]= 74.9;
+  dm[1]= 264.4;
+  dm[2]= 3.0;
+
+  gMC->Gsvolu("TPMW","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.5/cosAlpha; // wheel ribs are 3.0 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]= 2.25;
+  dm[3]= 1.275;
+
+  zBar = -dR+dm[3];
+
+  gMC->Gsposp("TESB",1,"TESR",0.,0.75,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.,0.75,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.,0.75,zBar,0,"ONLY",dm,4);
+
+  //  positioning of the empty spaces into the main wheel
+
+  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");
+     
+    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");
+
+    nRotMat++;
+
+    theta2 = 0.; // reflection
+
+    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++;
+
+  } 
+  // TPMW->TPC
+
+  gMC->Gspos("TPMW",1,"TPC ",0.,0.,256.6,0,"ONLY");
+  gMC->Gspos("TPMW",2,"TPC ",0.,0.,-256.6,idrotm[0],"ONLY");
+
+  //---------------------------------------------------------
+  //  Tpc High Voltage Membrane - 100 microns of mylar
+  //---------------------------------------------------------
+
+  dm[0]=82.8;
+  dm[1]=252.;
+  dm[2]=0.005;
+
+  gMC->Gsvolu("THVM","TUBE",idtmed[8],dm,3);
+
+  gMC->Gspos("THVM",1,"TDGN",0.,0.,0.,0,"ONLY");
+
+  // Tpc High Voltage membrane Holders
+
+  gMC->Gsvolu("THVH","TUBE",idtmed[4],dm,0);
+
+  
+
+  // inner
+
+  dm[0]=79.3;
+  dm[1]=82.8;
+  dm[2]=0.2;
+
+  gMC->Gsposp("THVH",1,"TDGN",0.,0.,0.,0,"ONLY",dm,3);
   
+  // outer
+
+  dm[0]= 252.;
+  dm[1]= 257.9;
+  dm[2]= 0.4;
+
+  gMC->Gsposp("THVH",2,"TDGN",0.,0.,0.,0,"ONLY",dm,3);
+
+  //----------------------------------------------------------
+  // TPc Support Rods - MAKROLON
+  //----------------------------------------------------------
+
+  dm[0]= 0.9;
+  dm[1]= 1.2;
+
+  gMC->Gsvolu("TPSR","TUBE",idtmed[7],dm,0); // inner and outer rods differ
+
+
+  for(Int_t nrod=0;nrod<18;nrod++){
+    Float_t angle=innerOpenAngle*(Float_t)nrod;
+
+    xc=81.5*TMath::Cos(angle);
+    yc=81.5*TMath::Sin(angle); 
+
+    dm[2]=126.7;
+
+    gMC->Gsposp("TPSR",nrod+1,"TDGN",xc,yc,126.9,0,"ONLY",dm,3); 
+    gMC->Gsposp("TPSR",nrod+19,"TDGN",xc,yc,-126.9,0,"ONLY",dm,3);
+
+    dm[2]=126.6;
+
+    xc=254.25*TMath::Cos(angle);
+    yc=254.25*TMath::Sin(angle);   
+      
+    // rod number 54 contans the HV cable
+
+    if(nrod<17) {
+      gMC->Gsposp("TPSR",nrod+37,"TDGN",xc,yc,127.,0,"ONLY",dm,3);
+      gMC->Gsposp("TPSR",nrod+54,"TDGN",xc,yc,-127.,0,"ONLY",dm,3);
+    }
+    
+  }
 
-  // --------------------------------------------------- 
-  //               volumes ordering 
-  // --------------------------------------------------- 
-  gMC->Gsord("TPSG", 6);
+  //----------------------------------------------------------
+  // Tpc High Voltage Rod - MAKROLON + Copper cable
+  //----------------------------------------------------------
+
+  // rod with cable (Left)
+
+  dm[0]=0.;
+  dm[1]=2.25;
+  dm[2]=126.6;
+
+  gMC->Gsvolu("THVL","TUBE",idtmed[7],dm,3);
+
+  // HV cable
  
+  dm[0]=0.;
+  dm[1]=0.3;
+  dm[2]=126.6;
+
+  gMC->Gsvolu("THVC","TUBE",idtmed[10],dm,3);  
+
+  // empty space
+
+  dm[0]=0.3;
+  dm[1]=1.;
+  dm[2]=126.6;
+
+  gMC->Gsvolu("THVE","TUBE",idtmed[1],dm,3);
+
+  gMC->Gspos("THVC",1,"THVL",0.,0.,0.,0,"ONLY");
+  gMC->Gspos("THVE",1,"THVL",0.,0.,0.,0,"ONLY");
+
+  // rod without cable
+
+  dm[0]=1.8;
+  dm[1]=2.25;
+  dm[2]=126.6;
+
+  gMC->Gsvolu("THVR","TUBE",idtmed[7],dm,3);
+
+  gMC->Gspos("THVL",1,"TDGN",xc,yc,-127.,0,"ONLY");  
+  gMC->Gspos("THVR",1,"TDGN",xc,yc,127.,0,"ONLY");
+
+  gMC->Gspos("TDGN",1,"TPC ",0.,0.,0.,0,"ONLY"); 
+  // services wheel cover -> wheel
+
+
+  gMC->Gspos("TSWC",1,"TSSW",0.,0.,4.5,0,"ONLY");
+  gMC->Gspos("TSWC",2,"TSSW",0.,0.,-4.5,0,"ONLY");
+
+
+  // put the wheel into the TPC
+
+  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);
+  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
 
 
@@ -627,34 +1484,88 @@ void AliTPCv0::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->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");
@@ -668,7 +1579,10 @@ void AliTPCv0::Init()
   //
   // Initialise Time Projection Chamber version 0
   //
-  printf("TPC version 0 initialized\n");
+  printf("%s: *** TPC version 0 initialized***\n",ClassName()); 
+
+  //  printf("TPC version 0 initialized\n");
 }
 
 //_____________________________________________________________________________