Update for coding convensions

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

diff --git a/TPC/AliTPCv0.cxx b/TPC/AliTPCv0.cxx
index 2683a7d36bda65da8554841f90006bcbfdbfdba7..3701f183db7b50402bd2083d0e1ac910786941cc 100644 (file)
--- a/TPC/AliTPCv0.cxx
+++ b/TPC/AliTPCv0.cxx
@@ -15,6 +15,22 @@
 
 /*
 $Log$
+Revision 1.14  2000/04/17 09:37:33  kowal2
+removed obsolete AliTPCDigitsDisplay.C
+
+Revision 1.13.8.2  2000/04/10 08:33:44  kowal2
+
+Updated readout chambers
+
+Revision 1.13.8.1  2000/04/10 07:56:53  kowal2
+Not used anymore - removed
+
+Revision 1.13  1999/11/04 17:28:06  fca
+Correct barrel part of HV Degrader
+
+Revision 1.12  1999/10/08 06:27:23  fca
+Corrected bug in the HV degrader geometry, thanks to G.Tabary
+
 Revision 1.11  1999/10/04 13:39:54  fca
 Correct array index problem
 
@@ -44,12 +60,11 @@ Introduction of the Copyright and cvs Log
 #include "AliRun.h"
 #include <iostream.h>
 #include <fstream.h>
-
 #include "AliMC.h"
 #include "AliConst.h"
 
 #include "AliTPCParam.h"
-#include "AliTPCD.h"
+#include "AliTPCDigitsArray.h"
 
 ClassImp(AliTPCv0)
  
@@ -67,7 +82,7 @@ void AliTPCv0::CreateGeometry()
 {
   //
   // Creation of the TPC coarse geometry (version 0)
-  // Origin Marek Kowalski Crakow
+  // Origin Marek Kowalski Cracow
   //
   //Begin_Html
   /*
@@ -80,7 +95,6 @@ void AliTPCv0::CreateGeometry()
   */
   //End_Html
 
-  AliTPCParam * fTPCParam = &(fDigParam->GetParam());
 
   Int_t *idtmed = fIdtmed->GetArray();
 
@@ -184,20 +198,21 @@ void AliTPCv0::CreateGeometry()
   Int_t nOuterSector = fTPCParam->GetNOuterSector()/2;
 
 
-  Float_t InSecLowEdge = fTPCParam->GetInSecLowEdge();
-  Float_t InSecUpEdge =  fTPCParam->GetInSecUpEdge();
+  Float_t InSecLowEdge = fTPCParam->GetInnerRadiusLow();
+  Float_t InSecUpEdge =  fTPCParam->GetInnerRadiusUp();
 
-  Float_t OuSecLowEdge = fTPCParam->GetOuSecLowEdge();
-  Float_t OuSecUpEdge = fTPCParam->GetOuSecUpEdge();
+  Float_t OuSecLowEdge = fTPCParam->GetOuterRadiusLow();
+  Float_t OuSecUpEdge = fTPCParam->GetOuterRadiusUp();
 
   Float_t SecThick = 2.225; // Al
 
-  Float_t edge = fTPCParam->GetEdge();
 
   //  S (Inner) sectors
 
-  dm[0] = InSecLowEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
-  dm[1] = InSecUpEdge*TMath::Tan(0.5*InnerOpenAngle)-edge;
+  Float_t LowEdge = fTPCParam->GetInnerFrameSpace();
+
+  dm[0] = InSecLowEdge*TMath::Tan(0.5*InnerOpenAngle)-LowEdge;
+  dm[1] = InSecUpEdge*TMath::Tan(0.5*InnerOpenAngle)-LowEdge;
   dm[2] = SecThick;
   dm[3] = 0.5*(InSecUpEdge-InSecLowEdge);
 
@@ -207,8 +222,10 @@ void AliTPCv0::CreateGeometry()
 
   //  L (Outer) sectors
 
-  dm[0] = OuSecLowEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
-  dm[1] = OuSecUpEdge*TMath::Tan(0.5*OuterOpenAngle)-edge;
+  Float_t UpEdge = fTPCParam->GetOuterFrameSpace();
+
+  dm[0] = OuSecLowEdge*TMath::Tan(0.5*OuterOpenAngle)-UpEdge;
+  dm[1] = OuSecUpEdge*TMath::Tan(0.5*OuterOpenAngle)-UpEdge;
   dm[2] = SecThick;
   dm[3] = 0.5*(OuSecUpEdge-OuSecLowEdge);
 
@@ -356,16 +373,7 @@ void AliTPCv0::CreateGeometry()
 
   gMC->Gspos("TPOV",1,"TPCO",0.,0.,0.,0,"ONLY");
 
-
-  // G10 plugs
-
-  dm[0] = 258.;
-  dm[1] = 260.;
-  dm[2] = 1.;
-
-  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("TPCO",1,"TPC ",0.,0.,0.,0,"ONLY");
 
@@ -609,7 +617,7 @@ void AliTPCv0::CreateGeometry()
 
   dm[0] = 50.;
   dm[1] = 50.5;
-  dm[2] = 32.25;
+  dm[2] = 64.5;
 
   gMC->Gsvolu("TIVB","TUBE",idtmed[9],dm,3);