Made file static to be able to do file->cd in GetInstance

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

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index 964bc8414d8aa590937bb880e224f970c24c4ac9..b0838f68423709656ba1bc9056c0d29cf6440487 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -15,6 +15,18 @@
 
 /*
 $Log$
+Revision 1.29  2001/05/08 16:03:06  kowal2
+Geometry update according to the latest technical spec.
+
+Revision 1.28  2001/04/27 15:23:07  kowal2
+Correct materian in the central part of the inner containment vessel
+
+Revision 1.27  2001/04/26 06:15:12  kowal2
+Corrected bug in the inner containment vessel (cones)
+
+Revision 1.26  2001/04/24 11:17:33  kowal2
+New TPC geometry.
+
 Revision 1.25  2001/03/13 13:07:34  kowal2
 Corrected bug in the TPC mother volume geometry.
 Thanks to A. Morsch
@@ -303,13 +315,13 @@ void AliTPCv1::CreateGeometry()
   //
 
   dm[9]=-247.6;
-  dm[10]=274.81;
+  dm[10]=274.8124;
   dm[11]=278.;
 
   //
 
   dm[12]=253.6;
-  dm[13]=274.81;
+  dm[13]=274.8124;
   dm[14]=278.;
 
   //
@@ -330,7 +342,7 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc SAndwich 1 - Al
 
-  dm[0]=274.81;
+  dm[0]=274.8124;
   dm[1]=278.;
   dm[2]=252.1;
 
@@ -353,8 +365,8 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc SAndwich 4 - fiber glass (G10)
 
-  dm[0] += 5.e-3;
-  dm[1] -= 5.e-3;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
   gMC->Gsvolu("TSA4","TUBE",idtmed[12],dm,3);  
 
@@ -404,13 +416,13 @@ void AliTPCv1::CreateGeometry()
 
   dm[9]=-250.6;
   dm[10]=258.;
-  dm[11]=260.05;
+  dm[11]=260.0476;
 
   //
 
   dm[12]=250.6;
   dm[13]=258.;
-  dm[14]=260.05;
+  dm[14]=260.0476;
 
   //
 
@@ -431,15 +443,15 @@ void AliTPCv1::CreateGeometry()
   // Tpc SAndwich 6 - Tedlar
 
   dm[0]= 258.;
-  dm[1]= 260.05;
+  dm[1]= 260.0476;
   dm[2]= 252.1;
 
   gMC->Gsvolu("TSA6","TUBE",idtmed[9],dm,3);
 
   // Tpc SAndwich 7 - fiber glass
 
-  dm[0] += 5.e-3;
-  dm[1] -= 5.e-3;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
   gMC->Gsvolu("TSA7","TUBE",idtmed[12],dm,3);
 
@@ -536,37 +548,37 @@ void AliTPCv1::CreateGeometry()
   //
 
   dm[9]=-250.6;
-  dm[10]=77.05;
+  dm[10]=77.0524;
   dm[11]=79.2;
 
   //
 
   dm[12]=-88.;
-  dm[13]=77.05;
+  dm[13]=77.0524;
   dm[14]=79.2;
 
   //
 
   dm[15]=-88.;
-  dm[16]=77.09;
+  dm[16]=77.0924;
   dm[17]=79.16;
 
   //
 
   dm[18]=88.;
-  dm[19]=77.09;
+  dm[19]=77.0924;
   dm[20]=79.16;
 
   //
 
   dm[21]=88.;
-  dm[22]=77.05;
+  dm[22]=77.0524;
   dm[23]=79.2;
 
   //
 
   dm[24]=250.6;
-  dm[25]=77.05;
+  dm[25]=77.0524;
   dm[26]=79.2;
 
   //
@@ -587,7 +599,7 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc Sandwich 9 -Tedlar
 
-  dm[0]=77.09;
+  dm[0]=77.0924;
   dm[1]=79.16;
   dm[2]=88.;
 
@@ -595,8 +607,8 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc Sandwich 10 - fiber glass (G10) 
 
-  dm[0] += 5.e-3;
-  dm[1] -= 5.e-3;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
   gMC->Gsvolu("TS10","TUBE",idtmed[12],dm,3);
 
@@ -618,7 +630,7 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc Sandwich 12 -Tedlar
 
-  dm[0]=77.05;
+  dm[0]=77.0524;
   dm[1]=79.2;
   dm[2]=82.05;
 
@@ -626,8 +638,8 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc Sandwich 13 - fiber glass (G10) 
 
-  dm[0] += 5.e-3;
-  dm[1] -= 5.e-3;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
   gMC->Gsvolu("TS13","TUBE",idtmed[12],dm,3);
 
@@ -702,13 +714,13 @@ void AliTPCv1::CreateGeometry()
 
   dm[21]=253.6;
   dm[22]=65.6;
-  dm[23]=76.4;
+  dm[23]=74.6;
 
   //
 
-  dm[24]=256.3;
+  dm[24]=256.6;
   dm[25]=65.6;
-  dm[26]=76.4;
+  dm[26]=74.6;
 
   gMC->Gsvolu("TICC","PCON",idtmed[4],dm,27);
 
@@ -752,13 +764,13 @@ void AliTPCv1::CreateGeometry()
   //
 
   dm[9]=-69.1;
-  dm[10]=60.64;
+  dm[10]=60.6224;
   dm[11]=61.2;  
 
   //
 
   dm[12]=69.1;
-  dm[13]=60.64;
+  dm[13]=60.6224;
   dm[14]=61.2;
 
   //
@@ -777,7 +789,7 @@ void AliTPCv1::CreateGeometry()
 
   // Tpc Sandwich 15 - Al
 
-  dm[0]=60.64;
+  dm[0]=60.6224;
   dm[1]=61.2;
   dm[2]=70.1;
 
@@ -797,19 +809,19 @@ void AliTPCv1::CreateGeometry()
 
   gMC->Gsvolu("TS17","TUBE",idtmed[9],dm,3);
 
-  // Tpc Sandwich 18 - fiber glass
+  // Tpc Sandwich 18 - carbon fiber
 
-  dm[0] += 5.e-3;
-  dm[1] -= 5.e-3;
+  dm[0] += 3.8e-3;
+  dm[1] -= 3.8e-3;
 
-  gMC->Gsvolu("TS18","TUBE",idtmed[12],dm,3);  
+  gMC->Gsvolu("TS18","TUBE",idtmed[15],dm,3);  
 
   // Tpc Sandwich 19 - Nomex
 
-  dm[0] += 0.01;
-  dm[1] -= 0.01;
+  dm[0] += 0.02;
+  dm[1] -= 0.02;
 
-  gMC->Gsvolu("TS19","TUBE",idtmed[12],dm,3); 
+  gMC->Gsvolu("TS19","TUBE",idtmed[6],dm,3); 
 
   // 19->18->17->16->15-> TICM
 
@@ -1778,7 +1790,9 @@ void AliTPCv1::Init()
   fIdLSec=gMC->VolId("TPLS"); // lower sector
   fIdUSec=gMC->VolId("TPUS"); // upper sector
 
-  printf("TPC version 1 initialized\n");
+  printf("%s: *** TPC version 1 initialized***\n",ClassName());
+
+  // printf("TPC version 1 initialized\n");
 }
 
 //_____________________________________________________________________________