Adding Extraction of OCDB entries - spline fits by default

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

diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx
index 03461a61aef719aa1242718deb806d48ea1e976d..67d6f952e7564827c80ab40b875da7e7b8bdfec4 100644 (file)
--- a/TPC/AliTPCv4.cxx
+++ b/TPC/AliTPCv4.cxx
@@ -41,6 +41,7 @@ TPC version for the krypton runs (Marek)
 #include <TPDGCode.h>
 #include <TString.h>
 #include "AliLog.h"
+#include "AliMathBase.h"
 #include "AliTPCParam.h"
 #include "AliTPCTrackHitsV2.h"
 #include "AliTPCv4.h"
@@ -898,8 +899,8 @@ void AliTPCv4::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
@@ -929,8 +930,8 @@ void AliTPCv4::CreateGeometry()
     z= 126.96;
     //
     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   
+      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
@@ -945,12 +946,13 @@ void AliTPCv4::CreateGeometry()
     upar[2]=126.54; //upper
     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(rrou,1,new TGeoCombiTrans(x,y,z,&rotr)); //A
-      v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z,&rotr)); //C
+      v9->AddNode(rrou,1,new TGeoCombiTrans(x,y,z,rotr)); //A
+      v9->AddNode(rrou,2,new TGeoCombiTrans(x,y,-z,rotr)); //C
     }
     else{
     //
@@ -1281,8 +1283,8 @@ void AliTPCv4::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())/
@@ -1390,7 +1392,7 @@ void AliTPCv4::StepManager()
     {
 
       betaGamma = TMath::Max(betaGamma,(Float_t)7.e-3); // protection against too small bg
-      pp=kprim*BetheBloch(betaGamma); 
+      pp=kprim*AliMathBase::BetheBlochAleph(betaGamma); 
    
       if(TMath::Abs(charge) > 1.) pp *= (charge*charge);
     }
@@ -1402,28 +1404,3 @@ void AliTPCv4::StepManager()
   
 }
 
-//_____________________________________________________________________________
-Float_t AliTPCv4::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));
-}
-
-