Updated mother volume of the TPC to accomodate some ITS parts

diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx
index 7f93446c41d43e0565959affd301d7eef9b6901c..54bbadb9750ab1dd1283224f7d620b3ec887b926 100644 (file)
--- a/TPC/AliTPCv0.cxx
+++ b/TPC/AliTPCv0.cxx
@@ -96,37 +96,49 @@ void AliTPCv0::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,28); //28 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
   //
   tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(3,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-262.1,83.1,278.);
+  tpc->DefineSection(5,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-260.,70.,278.);    
+  tpc->DefineSection(7,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-259.6,68.1,278.);
+  tpc->DefineSection(9,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-253.6,68.,278.);
+  tpc->DefineSection(11,-74.0,60.8,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-74.0,60.1,278.);
+  tpc->DefineSection(13,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-73.3,56.9,278.); 
+  tpc->DefineSection(15,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-68.5,60.,278.);
+  tpc->DefineSection(17,-65.,60.,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,-65.,56.9,278.); 
+  tpc->DefineSection(19,73.3,56.9,278.);
+  //
+  tpc->DefineSection(20,73.3,60.1,278.);
+  tpc->DefineSection(21,74.0,60.1,278.);
+  //
+  tpc->DefineSection(22,74.0,60.8,278.);
+  tpc->DefineSection(23,253.6,65.5,278.);
+  //
+  tpc->DefineSection(24,253.6,65.6,278.);
+  tpc->DefineSection(25,259.6,65.6,278.);
+  //
+  tpc->DefineSection(26,259.6,70.0,278.);
+  tpc->DefineSection(27,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index a93d18638fba595e94c89a7d8f2b8c28d2c4e4ae..83a15435626572306e7f54d7b9341fae3fbeb3a8 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -112,37 +112,49 @@ void AliTPCv1::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,28); //28 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
   //
   tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(3,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-262.1,83.1,278.);
+  tpc->DefineSection(5,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-260.,70.,278.);    
+  tpc->DefineSection(7,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-259.6,68.1,278.);
+  tpc->DefineSection(9,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-253.6,68.,278.);
+  tpc->DefineSection(11,-74.0,60.8,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-74.0,60.1,278.);
+  tpc->DefineSection(13,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-73.3,56.9,278.); 
+  tpc->DefineSection(15,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-68.5,60.,278.);
+  tpc->DefineSection(17,-65.,60.,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,-65.,56.9,278.); 
+  tpc->DefineSection(19,73.3,56.9,278.);
+  //
+  tpc->DefineSection(20,73.3,60.1,278.);
+  tpc->DefineSection(21,74.0,60.1,278.);
+  //
+  tpc->DefineSection(22,74.0,60.8,278.);
+  tpc->DefineSection(23,253.6,65.5,278.);
+  //
+  tpc->DefineSection(24,253.6,65.6,278.);
+  tpc->DefineSection(25,259.6,65.6,278.);
+  //
+  tpc->DefineSection(26,259.6,70.0,278.);
+  tpc->DefineSection(27,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index a373c4f9b547814fcca5d7a4c59f0b8319fd2fee..d1da3bdba092718194df082db0efc2bc81538f80 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -103,43 +103,49 @@ void AliTPCv2::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,24); //24 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,28); //28 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
   //
   tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(3,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-262.1,83.1,278.);
+  tpc->DefineSection(5,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-260.,70.,278.);    
+  tpc->DefineSection(7,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-259.6,68.1,278.);
+  tpc->DefineSection(9,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,-68.5,56.9,278.);
+  tpc->DefineSection(10,-253.6,68.,278.);
+  tpc->DefineSection(11,-74.0,60.8,278.);
   //
-  tpc->DefineSection(12,-68.5,60.,278.);
-  tpc->DefineSection(13,-65.,60.,278.);
+  tpc->DefineSection(12,-74.0,60.1,278.);
+  tpc->DefineSection(13,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,-65.,56.9,278.); 
-  tpc->DefineSection(15,73.3,56.9,278.);
+  tpc->DefineSection(14,-73.3,56.9,278.); 
+  tpc->DefineSection(15,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,73.3,60.1,278.);
-  tpc->DefineSection(17,74.0,60.1,278.);
+  tpc->DefineSection(16,-68.5,60.,278.);
+  tpc->DefineSection(17,-65.,60.,278.);
   //
-  tpc->DefineSection(18,74.0,60.8,278.);
-  tpc->DefineSection(19,253.6,65.5,278.);
+  tpc->DefineSection(18,-65.,56.9,278.); 
+  tpc->DefineSection(19,73.3,56.9,278.);
   //
-  tpc->DefineSection(20,253.6,65.6,278.);
-  tpc->DefineSection(21,259.6,65.6,278.);
+  tpc->DefineSection(20,73.3,60.1,278.);
+  tpc->DefineSection(21,74.0,60.1,278.);
   //
-  tpc->DefineSection(22,259.6,70.0,278.);
-  tpc->DefineSection(23,291.,77.,278.);
+  tpc->DefineSection(22,74.0,60.8,278.);
+  tpc->DefineSection(23,253.6,65.5,278.);
+  //
+  tpc->DefineSection(24,253.6,65.6,278.);
+  tpc->DefineSection(25,259.6,65.6,278.);
+  //
+  tpc->DefineSection(26,259.6,70.0,278.);
+  tpc->DefineSection(27,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);

diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 61c577b7f081466dcac3d1fea6730d948a503ba2..2363a3331bb68c35e540c14434e5efb8a3e760a9 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -114,37 +114,49 @@ void AliTPCv3::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,28); //28 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
   //
   tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(3,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-262.1,83.1,278.);
+  tpc->DefineSection(5,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-260.,70.,278.);    
+  tpc->DefineSection(7,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-259.6,68.1,278.);
+  tpc->DefineSection(9,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-253.6,68.,278.);
+  tpc->DefineSection(11,-74.0,60.8,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-74.0,60.1,278.);
+  tpc->DefineSection(13,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-73.3,56.9,278.); 
+  tpc->DefineSection(15,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-68.5,60.,278.);
+  tpc->DefineSection(17,-65.,60.,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,-65.,56.9,278.); 
+  tpc->DefineSection(19,73.3,56.9,278.);
+  //
+  tpc->DefineSection(20,73.3,60.1,278.);
+  tpc->DefineSection(21,74.0,60.1,278.);
+  //
+  tpc->DefineSection(22,74.0,60.8,278.);
+  tpc->DefineSection(23,253.6,65.5,278.);
+  //
+  tpc->DefineSection(24,253.6,65.6,278.);
+  tpc->DefineSection(25,259.6,65.6,278.);
+  //
+  tpc->DefineSection(26,259.6,70.0,278.);
+  tpc->DefineSection(27,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);

diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx
index 10fdd526569aa2a42c1c01b687c75769e6cfa3c3..183048e058cc7ce74985575bb192357a6c458d25 100644 (file)
--- a/TPC/AliTPCv4.cxx
+++ b/TPC/AliTPCv4.cxx
@@ -105,37 +105,49 @@ void AliTPCv4::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,28); //28 sections
   //
   tpc->DefineSection(0,-291.,77.,278.);
   tpc->DefineSection(1,-270,77.,278.);
   //
   tpc->DefineSection(2,-270.,77.,278.);
-  tpc->DefineSection(3,-259.6,70.,278.);
+  tpc->DefineSection(3,-262.1,77.,278.);
   //
-  tpc->DefineSection(4,-259.6,68.1,278.);
-  tpc->DefineSection(5,-253.6,68.1,278.);
+  tpc->DefineSection(4,-262.1,83.1,278.);
+  tpc->DefineSection(5,-260.,83.1,278.);
   //
-  tpc->DefineSection(6,-253.6,68.,278.);
-  tpc->DefineSection(7,-74.0,60.8,278.);
+  tpc->DefineSection(6,-260.,70.,278.);    
+  tpc->DefineSection(7,-259.6,70.,278.);
   //
-  tpc->DefineSection(8,-74.0,60.1,278.);
-  tpc->DefineSection(9,-73.3,60.1,278.);
+  tpc->DefineSection(8,-259.6,68.1,278.);
+  tpc->DefineSection(9,-253.6,68.1,278.);
   //
-  tpc->DefineSection(10,-73.3,56.9,278.); 
-  tpc->DefineSection(11,73.3,56.9,278.);
+  tpc->DefineSection(10,-253.6,68.,278.);
+  tpc->DefineSection(11,-74.0,60.8,278.);
   //
-  tpc->DefineSection(12,73.3,60.1,278.);
-  tpc->DefineSection(13,74.0,60.1,278.);
+  tpc->DefineSection(12,-74.0,60.1,278.);
+  tpc->DefineSection(13,-73.3,60.1,278.);
   //
-  tpc->DefineSection(14,74.0,60.8,278.);
-  tpc->DefineSection(15,253.6,65.5,278.);
+  tpc->DefineSection(14,-73.3,56.9,278.); 
+  tpc->DefineSection(15,-68.5,56.9,278.);
   //
-  tpc->DefineSection(16,253.6,65.6,278.);
-  tpc->DefineSection(17,259.6,65.6,278.);
+  tpc->DefineSection(16,-68.5,60.,278.);
+  tpc->DefineSection(17,-65.,60.,278.);
   //
-  tpc->DefineSection(18,259.6,70.0,278.);
-  tpc->DefineSection(19,291.,77.,278.);
+  tpc->DefineSection(18,-65.,56.9,278.); 
+  tpc->DefineSection(19,73.3,56.9,278.);
+  //
+  tpc->DefineSection(20,73.3,60.1,278.);
+  tpc->DefineSection(21,74.0,60.1,278.);
+ //
+  tpc->DefineSection(22,74.0,60.8,278.);
+  tpc->DefineSection(23,253.6,65.5,278.);
+  //
+  tpc->DefineSection(24,253.6,65.6,278.);
+  tpc->DefineSection(25,259.6,65.6,278.);
+  //
+  tpc->DefineSection(26,259.6,70.0,278.);
+  tpc->DefineSection(27,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);