Merge rev 30296 from https://alisoft.cern.ch/AliRoot/branches/EVE-dev/EVE-root-trunk

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

diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx
index 133771289d576ccd8e5aed434c04b8692efe1b35..fa3d4c07758067e263b1e3652e7fc8aed502418b 100644 (file)
--- a/TPC/AliTPCv2.cxx
+++ b/TPC/AliTPCv2.cxx
@@ -66,8 +66,8 @@ AliTPCv2::AliTPCv2(const char *name, const char *title) :
   SetBufferSize(128000);
 
 
-  if (fTPCParam)
-     fTPCParam->Write(fTPCParam->GetTitle());
+//   if (fTPCParam)
+//      fTPCParam->Write(fTPCParam->GetTitle());
 }
  
 //_____________________________________________________________________________
@@ -894,8 +894,8 @@ void AliTPCv2::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
@@ -903,14 +903,18 @@ void AliTPCv2::CreateGeometry()
   TGeoVolume *rriv = new TGeoVolume("TPC_RR_I",rri,m6);
   TGeoVolume *rrov = new TGeoVolume("TPC_RR_O",rro,m6);  
   //
+  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); 
   //
-  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);
+  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); 
   //
-  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); 
   for(Int_t i=0;i<18;i++){
     Double_t angle,x,y;
     Double_t z,r; 
@@ -922,8 +926,8 @@ void AliTPCv2::CreateGeometry()
     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
@@ -939,12 +943,13 @@ void AliTPCv2::CreateGeometry()
     z=127.06;
     //
     if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));//A-side only
-      gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+      //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{
     //
@@ -1275,8 +1280,8 @@ void AliTPCv2::StepManager()
   fTPCParam->AdjustCosSin(sector,cos,sin);
   Float_t x1=p[0]*cos + p[1]*sin;
   // check if within sector's limits
-  if(x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp()
-     ||x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp()){
+  if((x1>=fTPCParam->GetInnerRadiusLow()&&x1<=fTPCParam->GetInnerRadiusUp())
+     ||(x1>=fTPCParam->GetOuterRadiusLow()&&x1<=fTPCParam->GetOuterRadiusUp())){
   // calculate real sector number...
   if (x1>fTPCParam->GetOuterRadiusLow()){
     sector = TMath::Nint((angle-fTPCParam->GetOuterAngleShift())/