Correction for superposition of ZDC volumes with MUON arm one

[u/mrichter/AliRoot.git] / TPC / AliTPCv3.cxx

diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 3c324428c50fa1802110423b38970be7b29212f4..581cd919391ea512a187e2299ea7249720e32503 100644 (file)
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -15,6 +15,21 @@
 
 /*
 $Log$
+Revision 1.21  2000/11/30 11:48:50  kowal2
+TLorentzVector.h adde to satisfy the latest changes by Federico
+
+Revision 1.20  2000/11/14 10:48:57  kowal2
+Correct material used for TSA4. Thanks to J. Barbosa.
+
+Revision 1.19  2000/11/06 17:24:10  kowal2
+Corrected bug in the outer containment vessel and
+the outer field cage geometry.
+Thanks to J. Barbosa.
+
+Revision 1.18  2000/11/02 16:55:24  kowal2
+Corrected bug in the inner containment vessel geometry.
+Thanks to J. Belikov
+
 Revision 1.17  2000/11/02 07:24:11  kowal2
 Correction in the TPC geometry.
 Changes due to the new hit structure.
@@ -98,6 +113,7 @@ Introduction of the Copyright and cvs Log
 #include"AliTPCParamSR.h"
 #include "AliPDG.h"
 #include <TInterpreter.h>
+#include "TLorentzVector.h"
 
 ClassImp(AliTPCv3)
  
@@ -210,7 +226,7 @@ void AliTPCv3::CreateGeometry()
   //
 
   dm[30]= 73.3;
-  dm[31]= 60.65;
+  dm[31]= 59.;
   dm[32]= 277.95;
 
   //
@@ -307,7 +323,7 @@ void AliTPCv3::CreateGeometry()
   
   dm[0]= 0.;
   dm[1]= 360.;
-  dm[2]=5.;
+  dm[2]=6.;
 
   //
 
@@ -323,23 +339,29 @@ void AliTPCv3::CreateGeometry()
 
   //
 
-  dm[9]= 253.6;
-  dm[10]= 272.2;
+  dm[9]= -248.4;
+  dm[10]= 274.81;
   dm[11]= 277.95;
 
   //
 
   dm[12]= 253.6;
-  dm[13]= 265.2;
+  dm[13]= 274.81;
   dm[14]= 277.95;
 
-  // 
+  //
 
-  dm[15]= 255.6;
+  dm[15]= 253.6;
   dm[16]= 265.2;
   dm[17]= 277.95;
 
-  gMC->Gsvolu("TOCV","PCON",idtmed[4],dm,18);
+  // 
+
+  dm[18]= 255.6;
+  dm[19]= 265.2;
+  dm[20]= 277.95;
+
+  gMC->Gsvolu("TOCV","PCON",idtmed[4],dm,21);
 
   // Daughter volumes
 
@@ -370,7 +392,7 @@ void AliTPCv3::CreateGeometry()
   dm[0] += 0.06;
   dm[1] -= 0.06;
 
-  gMC->Gsvolu("TSA4","TUBE",idtmed[5],dm,3);  
+  gMC->Gsvolu("TSA4","TUBE",idtmed[6],dm,3);  
   
   // 4->3->2->1->TOCV
 
@@ -419,7 +441,7 @@ void AliTPCv3::CreateGeometry()
 
   dm[15]= 251.;
   dm[16]= 258.;
-  dm[17]= 260.05;
+  dm[17]= 270.9;
 
   //