Adding libEMCALjet

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

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 05ea40bedbe43d4c3c2082aa39ed99aa6cbdc5be..5b87f315b5b17a5279b51a0fcef26e94a777b4dc 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -65,8 +65,6 @@ AliTPCv2::AliTPCv2(const char *name, const char *title) :
   // Standard constructor for Time Projection Chamber version 2
   //
 
-  SetSens(-1); // no strips selected
-
 
   SetBufferSize(128000);
 
@@ -107,7 +105,7 @@ void AliTPCv2::CreateGeometry()
   //
   TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
   tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,77.,278.);
+  tpc->DefineSection(1,-259.6,70.,278.);
   //
   tpc->DefineSection(2,-259.6,68.1,278.);
   tpc->DefineSection(3,-253.6,68.1,278.);
@@ -130,7 +128,7 @@ void AliTPCv2::CreateGeometry()
   tpc->DefineSection(14,253.6,65.6,278.);
   tpc->DefineSection(15,259.6,65.6,278.);
   //
-  tpc->DefineSection(16,259.6,77.0,278.);
+  tpc->DefineSection(16,259.6,70.0,278.);
   tpc->DefineSection(17,290.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
@@ -234,7 +232,7 @@ void AliTPCv2::CreateGeometry()
   //
   tf1v->AddNode(tf2v,1); tf2v->AddNode(tf3v,1);
   //
-  v3->AddNode(tov1,1); v4->AddNode(tf1v,1);
+  v3->AddNode(tov1,1,new TGeoTranslation(0.,0.,-1.5)); v4->AddNode(tf1v,1);
   //
   v2->AddNode(v3,1); v2->AddNode(v4,1); 
   //
@@ -509,9 +507,10 @@ void AliTPCv2::CreateGeometry()
    ifstream in;
    in.open(fileName.Data(), ios_base::in); // asci file
    for(Int_t i =0;i<86;i++){
-      Double_t y = 3.9;
+      Double_t y = 3.99;
       Double_t x,z,ang;
       in>>x>>z>>ang;
+      z-=26.5;
       TGeoRotation *rrr = new TGeoRotation();
       rrr->RotateY(ang);
       TGeoCombiTrans *trans = new TGeoCombiTrans("trans",x,y,z,rrr);
@@ -726,6 +725,15 @@ void AliTPCv2::CreateGeometry()
   sh->DefineSection(1,4.,81.5-shift,250.75-shift);
   TGeoVolume *shv = new TGeoVolume("TPC_SWS1",sh,m1); //Air
   //
+  TGeoMedium *m9 =  gGeoManager->GetMedium("TPC_Si"); 
+  TGeoPgon *el = new TGeoPgon(0.,20.,1,2);
+  el->DefineSection(0,-1.872,81.5-shift,250.75-shift);
+  el->DefineSection(1,1.872,81.5-shift,250.75-shift);
+  TGeoVolume *elv = new TGeoVolume("TPC_ELEC",el,m9); //Si 
+  //
+  shv->AddNode(elv,1);
+  //
+  //
   ys = shift*TMath::Sin(OpeningAngle);
   xs = shift*TMath::Cos(OpeningAngle);
   swv->AddNode(shv,1,new TGeoTranslation(xs,ys,0.));
@@ -868,8 +876,9 @@ void AliTPCv2::CreateGeometry()
     gGeoManager->Node("TPC_Rod",i+54,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
   }
 
+  TGeoVolume *alice = gGeoManager->GetVolume("ALIC");
+  alice->AddNode(v1,1);  
   
-  gMC->Gspos("TPC_M ",1,"ALIC",0.,0.,0.,0,"ONLY");
 
 } // end of function