X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=inline;f=TPC%2FAliTPCv3.cxx;h=53faf0ca1b4318708e871968c965cc7895b80eda;hb=4429bfefae5cacea08f60252026d17a8359b92f9;hp=9c64a8d51b93a746691d89d49c954c047afffd5f;hpb=d9888f70e6cdfd77722a14f5b336caeb56cf88e3;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCv3.cxx b/TPC/AliTPCv3.cxx
index 9c64a8d51b9..53faf0ca1b4 100644
--- a/TPC/AliTPCv3.cxx
+++ b/TPC/AliTPCv3.cxx
@@ -41,6 +41,7 @@
 
 #include "AliConst.h"
 #include "AliRun.h"
+#include "AliMathBase.h"
 #include "AliTPCDigitsArray.h"
 #include "AliTPCParam.h"
 #include "AliTPCParamSR.h"
@@ -113,33 +114,37 @@ void AliTPCv3::CreateGeometry()
   // here I define a volume TPC
   // retrive the medium name with "TPC_" as a leading string
   //
-  TGeoPcon *tpc = new TGeoPcon(0.,360.,18); //18 sections
-  tpc->DefineSection(0,-290.,77.,278.);
-  tpc->DefineSection(1,-259.6,70.,278.);
+  TGeoPcon *tpc = new TGeoPcon(0.,360.,20); //20 sections
   //
-  tpc->DefineSection(2,-259.6,68.1,278.);
-  tpc->DefineSection(3,-253.6,68.1,278.);
+  tpc->DefineSection(0,-291.,77.,278.);
+  tpc->DefineSection(1,-270,77.,278.);
   //
-  tpc->DefineSection(4,-253.6,68.,278.);
-  tpc->DefineSection(5,-74.0,60.8,278.);
+  tpc->DefineSection(2,-270.,77.,278.);
+  tpc->DefineSection(3,-259.6,70.,278.);
   //
-  tpc->DefineSection(6,-74.0,60.1,278.);
-  tpc->DefineSection(7,-73.3,60.1,278.);
+  tpc->DefineSection(4,-259.6,68.1,278.);
+  tpc->DefineSection(5,-253.6,68.1,278.);
   //
-  tpc->DefineSection(8,-73.3,56.9,278.); 
-  tpc->DefineSection(9,73.3,56.9,278.);
+  tpc->DefineSection(6,-253.6,68.,278.);
+  tpc->DefineSection(7,-74.0,60.8,278.);
   //
-  tpc->DefineSection(10,73.3,60.1,278.);
-  tpc->DefineSection(11,74.0,60.1,278.);
+  tpc->DefineSection(8,-74.0,60.1,278.);
+  tpc->DefineSection(9,-73.3,60.1,278.);
   //
-  tpc->DefineSection(12,74.0,60.8,278.);
-  tpc->DefineSection(13,253.6,65.5,278.);
+  tpc->DefineSection(10,-73.3,56.9,278.); 
+  tpc->DefineSection(11,73.3,56.9,278.);
   //
-  tpc->DefineSection(14,253.6,65.6,278.);
-  tpc->DefineSection(15,259.6,65.6,278.);
+  tpc->DefineSection(12,73.3,60.1,278.);
+  tpc->DefineSection(13,74.0,60.1,278.);
   //
-  tpc->DefineSection(16,259.6,70.0,278.);
-  tpc->DefineSection(17,290.,77.,278.);
+  tpc->DefineSection(14,74.0,60.8,278.);
+  tpc->DefineSection(15,253.6,65.5,278.);
+  //
+  tpc->DefineSection(16,253.6,65.6,278.);
+  tpc->DefineSection(17,259.6,65.6,278.);
+  //
+  tpc->DefineSection(18,259.6,70.0,278.);
+  tpc->DefineSection(19,291.,77.,278.);
   //
   TGeoMedium *m1 = gGeoManager->GetMedium("TPC_Air");
   TGeoVolume *v1 = new TGeoVolume("TPC_M",tpc,m1);
@@ -409,8 +414,8 @@ void AliTPCv3::CreateGeometry()
   TGeoTube *cs = new TGeoTube(56.9,61.2,0.1);
   TGeoMedium *sm7 = gGeoManager->GetMedium("TPC_Mylar");
   TGeoVolume *csv = new TGeoVolume("TPC_CDRS",cs,sm7);
-  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.));
-  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.));
+  v1->AddNode(csv,1,new TGeoTranslation(0.,0.,-71.2));
+  v1->AddNode(csv,2,new TGeoTranslation(0.,0.,71.2));
   //
   // seal collars 
   TGeoPcon *se = new TGeoPcon(0.,360.,6);
@@ -807,6 +812,9 @@ void AliTPCv3::CreateGeometry()
   //----------------------------------------------------------
   TGeoMedium *m6=gGeoManager->GetMedium("TPC_Makrolon");
   TGeoMedium *m7=gGeoManager->GetMedium("TPC_Cu");
+  TGeoMedium *m10 =  gGeoManager->GetMedium("TPC_Alumina");
+  TGeoMedium *m11 =  gGeoManager->GetMedium("TPC_Peek");
+  TGeoMedium *m12 =  gGeoManager->GetMedium("TPC_Water");
   // upper and lower rods differ in length!
   Double_t *upar;
   upar=NULL;
@@ -823,6 +831,54 @@ void AliTPCv3::CreateGeometry()
   TGeoVolume *hvrv = new TGeoVolume("TPC_HV_Rod",hvr,m6);
   TGeoVolume *hvcv = new TGeoVolume("TPC_HV_Cable",hvc,m7);
   hvrv->AddNode(hvcv,1);
+  //
+  // resistor rods
+  //
+  TGeoTube *cri = new TGeoTube(0.,0.45,126.64); //inner 
+  TGeoTube *cro = new TGeoTube(0.,0.45,126.54); //outer 
+  TGeoTube *cwi = new TGeoTube(0.,0.15,126.64); // water inner
+  TGeoTube *cwo = new TGeoTube(0.,0.15,126.54); // water outer
+  //
+  TGeoVolume *criv = new TGeoVolume("TPC_CR_I",cri,m10);
+  TGeoVolume *crov = new TGeoVolume("TPC_CR_O",cro,m10);    
+  TGeoVolume *cwiv = new TGeoVolume("TPC_W_I",cwi,m11);
+  TGeoVolume *cwov = new TGeoVolume("TPC_W_O",cwo,m11);   
+  //
+  // ceramic rod with water
+  //
+  criv->AddNode(cwiv,1); 
+  crov->AddNode(cwov,1);
+  //
+  TGeoTube *pri =new TGeoTube(0.2,0.35,126.64); //inner 
+  TGeoTube *pro = new TGeoTube(0.2,0.35,126.54); //outer    
+  //
+  // peek rod
+  //
+  TGeoVolume *priv = new TGeoVolume("TPC_PR_I",pri,m12);
+  TGeoVolume *prov = new TGeoVolume("TPC_PR_O",pro,m12); 
+  //
+  // resistor rods assembly
+  //
+   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
+  //
+  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); 
+  //
+  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; 
@@ -832,21 +888,37 @@ void AliTPCv3::CreateGeometry()
     y=r * TMath::Sin(angle);
     upar[2]=126.64; //lower
     z= 126.96;
-    if(i==15){
-      v9->AddNode(hvrv,1,new TGeoTranslation(x,y,z));
-      v9->AddNode(hvrv,2,new TGeoTranslation(x,y,-z));
-    }
-    else{
-     gGeoManager->Node("TPC_Rod",i+1,"TPC_Drift",x,y,z,0,kTRUE,upar,3);//shaft
-     gGeoManager->Node("TPC_Rod",i+18,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
+    //
+    if(i==3){
+      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
+      gGeoManager->Node("TPC_Rod",i+19,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);//muon
     }
+   
+
+    //
     r=254.25;
     x=r * TMath::Cos(angle);
     y=r * TMath::Sin(angle);
     upar[2]=126.54; //upper
     z=127.06;
-    gGeoManager->Node("TPC_Rod",i+36,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
-    gGeoManager->Node("TPC_Rod",i+54,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+    if(i==15){
+      //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(rrou,1,new TGeoCombiTrans(x,y,z,rotr)); //A
+      v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z,rotr)); //C
+    }
+    else{
+    //
+      gGeoManager->Node("TPC_Rod",i+37,"TPC_Drift",x,y,z,0,kTRUE,upar,3);
+      gGeoManager->Node("TPC_Rod",i+55,"TPC_Drift",x,y,-z,0,kTRUE,upar,3);
+    }
   }
 
   TGeoVolume *alice = gGeoManager->GetVolume("ALIC");
@@ -857,7 +929,7 @@ void AliTPCv3::CreateGeometry()
 } // end of function
  
 //_____________________________________________________________________________
-void AliTPCv3::DrawDetector()
+void AliTPCv3::DrawDetector() const
 {
   //
   // Draw a shaded view of the Time Projection Chamber version 3
@@ -1090,7 +1162,7 @@ void AliTPCv3::StepManager()
   else
     {
       betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); 
-      pp=kprim*BetheBloch(betaGamma);    
+      pp=kprim*AliMathBase::BetheBlochAleph(betaGamma);    
       if(TMath::Abs(charge) > 1.) pp *= (charge*charge);
     }
   
@@ -1099,27 +1171,3 @@ void AliTPCv3::StepManager()
   gMC->SetMaxStep(-TMath::Log(rnd)/pp);
   
 }
-
-//_____________________________________________________________________________
-Float_t AliTPCv3::BetheBloch(Float_t bg)
-{
-  //
-  // Bethe-Bloch energy loss formula
-  //
-  const Double_t kp1=0.76176e-1;
-  const Double_t kp2=10.632;
-  const Double_t kp3=0.13279e-4;
-  const Double_t kp4=1.8631;
-  const Double_t kp5=1.9479;
-
-  Double_t dbg = (Double_t) bg;
-
-  Double_t beta = dbg/TMath::Sqrt(1.+dbg*dbg);
-
-  Double_t aa = TMath::Power(beta,kp4);
-  Double_t bb = TMath::Power(1./dbg,kp5);
-
-  bb=TMath::Log(kp3+bb);
-  
-  return ((Float_t)((kp2-aa-bb)*kp1/aa));
-}