Sergey: bug fix with storing cluster id's

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

diff --git a/TPC/AliTPCv1.cxx b/TPC/AliTPCv1.cxx
index 802acdf655224e428c4d1d524f897e193f8be041..fbc64994878a6b0b053490baaa671efd21c6605b 100644 (file)
--- a/TPC/AliTPCv1.cxx
+++ b/TPC/AliTPCv1.cxx
@@ -31,12 +31,8 @@
 
 #include <Riostream.h>
 #include <stdlib.h>
-#include <TBRIK.h>
-#include <TGeometry.h>
 #include <TInterpreter.h>
 #include <TMath.h>
-#include <TNode.h>
-#include <TTUBE.h>
 #include <TVirtualMC.h>
 #include <TString.h>
 #include <TSystem.h>
@@ -910,8 +906,8 @@ void AliTPCv1::CreateGeometry()
   //
   // resistor rods assembly
   //
-   TGeoRotation rotr("rotr");
-   rotr.RotateZ(-21.);
+   TGeoRotation *rotr = new TGeoRotation("rotr");
+   rotr->RotateZ(-21.);
   //
   TGeoTube *rri = new TGeoTube(1.8,2.2,126.64);//inner
   TGeoTube *rro = new TGeoTube(1.8,2.2,126.54);//inner
@@ -920,13 +916,17 @@ void AliTPCv1::CreateGeometry()
   TGeoVolume *rrov = new TGeoVolume("TPC_RR_O",rro,m6);  
   //
   //
-  rrov->AddNode(crov,1,new TGeoCombiTrans(0.5,0.866,0.,&rotr));
-  rrov->AddNode(crov,2,new TGeoCombiTrans(0.5,-0.866,0.,&rotr));
-  rrov->AddNode(prov,1);
+  TGeoVolumeAssembly *rrin = new TGeoVolumeAssembly("TPC_RROD_I");
+  TGeoVolumeAssembly *rrou = new TGeoVolumeAssembly("TPC_RROD_O");
+  rrin->AddNode(rriv,1);
+  rrin->AddNode(criv,1,new TGeoTranslation(0.5,0.866, 0.));
+  rrin->AddNode(criv,2,new TGeoTranslation(0.5,-0.866, 0.)); 
+  rrin->AddNode(priv,1); 
   //
-  rriv->AddNode(criv,1,new TGeoCombiTrans(0.5,0.866,0.,&rotr));
-  rriv->AddNode(criv,2,new TGeoCombiTrans(0.5,-0.866,0.,&rotr));
-  rriv->AddNode(priv,1);     
+  rrou->AddNode(rrov,1);
+  rrou->AddNode(crov,1,new TGeoTranslation(0.5,0.866, 0.));
+  rrou->AddNode(crov,2,new TGeoTranslation(0.5,-0.866, 0.)); 
+  rrou->AddNode(prov,1);   
   for(Int_t i=0;i<18;i++){
     Double_t angle,x,y;
     Double_t z,r; 
@@ -937,8 +937,8 @@ void AliTPCv1::CreateGeometry()
     upar[2]=126.64; //lower
     z= 126.96;
     if(i==3){
-      v9->AddNode(rriv,1,new TGeoTranslation(x,y,z)); //A
-      v9->AddNode(rriv,2,new TGeoTranslation(x,y,-z)); //C      
+      v9->AddNode(rrin,1,new TGeoCombiTrans(x,y,z,rotr)); //A
+      v9->AddNode(rrin,2,new TGeoCombiTrans(x,y,-z,rotr)); //C     
     } 
     else { 
       gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
@@ -953,12 +953,13 @@ void AliTPCv1::CreateGeometry()
     z=127.06;
     //
     if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));//A-side only
+      //v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));//A-side only
+     v9->AddNode(hvrv,1,new TGeoTranslation(x,y,127.14));//A-side only
       gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
     }
     else if(i==11){
-      v9->AddNode(rrov,1,new TGeoTranslation(x,y,z)); //A
-      v9->AddNode(rrov,2,new TGeoTranslation(x,y,-z)); //C
+      v9->AddNode(rrou,1,new TGeoCombiTrans(x,y,z,rotr)); //A
+      v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z,rotr)); //C
     }
     else{
     //
@@ -975,7 +976,7 @@ void AliTPCv1::CreateGeometry()
 } // end of function
 
 //_____________________________________________________________________________
-void AliTPCv1::DrawDetector()
+void AliTPCv1::DrawDetector() const 
 {
   //
   // Draw a shaded view of the Time Projection Chamber version 1