Set finite validity (one run) to TPC/Calib/AltroConfig OCDB entries

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

diff --git a/TPC/AliTPCtrackerParam.cxx b/TPC/AliTPCtrackerParam.cxx
index 5221a5c9bf2bb98de6f89cf205706e8883ea87d7..60983c3e8b8d95ebadda013e92694f8c1b65a1ff 100644 (file)
--- a/TPC/AliTPCtrackerParam.cxx
+++ b/TPC/AliTPCtrackerParam.cxx
@@ -73,6 +73,7 @@
 #include <TLine.h>
 #include <TMatrixD.h>
 #include <TParticle.h>
+#include <TDatabasePDG.h>
 #include <TStyle.h>
 #include <TSystem.h>
 #include <TFile.h>
@@ -90,6 +91,7 @@
 #include "AliTPCtrack.h"
 #include "AliTPCtrackerParam.h"
 #include "AliTrackReference.h"
+#include "AliESDtrack.h"
 //-----------------------------
 
 Double_t RegFunc(Double_t *x,Double_t *par) {
@@ -275,9 +277,7 @@ Int_t AliTPCtrackerParam::Init() {
     
   } else printf("\n ! Creating ALL TRUE tracks at TPC inner radius !\n\n");
 
-
-  // Check if value in the galice file is equal to selected one (fBz)
-  AliMagF *fiel = (AliMagF*)gAlice->Field();
+  AliMagF *fiel = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
   Double_t fieval=TMath::Abs((Double_t)fiel->SolenoidField()/10.);
   printf("Magnetic field is %6.2f Tesla\n",fieval);
   if(fBz!=fieval) {
@@ -287,13 +287,10 @@ Int_t AliTPCtrackerParam::Init() {
     return 1;
   }
 
-  // Set the conversion constant between curvature and Pt
-  AliTracker::SetFieldMap(fiel,kTRUE);
-
   return 0;
 }
 //-----------------------------------------------------------------------------
-Int_t AliTPCtrackerParam::BuildTPCtracks(AliESD *event) {
+Int_t AliTPCtrackerParam::BuildTPCtracks(AliESDEvent *event) {
 //-----------------------------------------------------------------------------
 // This function creates the TPC parameterized tracks and writes them
 // as AliESDtrack objects in the ESD event
@@ -1112,7 +1109,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
   TFile *galiceFile = TFile::Open(galiceName);
 
   // get the AliRun object
-  AliRun *gAlice = (AliRun*)galiceFile->Get("gAlice");
+  AliRun *lAlice = (AliRun*)galiceFile->Get("gAlice");
 
 
   // create the tree for comparison results
@@ -1163,7 +1160,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
     sprintf(tname,"TreeT_TPC_%d",evt);
     
     // particles from TreeK
-    const Int_t knparticles = gAlice->GetEvent(evt);
+    const Int_t knparticles = lAlice->GetEvent(evt);
 
     Int_t *kalLab = new Int_t[knparticles];
     for(Int_t i=0; i<knparticles; i++) kalLab[i] = -1; 
@@ -1222,7 +1219,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
       geatree->GetEvent(j);
       
       label = geatrack->GetLabel();
-      part = (TParticle*)gAlice->GetMCApp()->Particle(label);
+      part = (TParticle*)lAlice->GetMCApp()->Particle(label);
       
       // use only injected tracks with fixed values of pT
       ptgener = part->Pt();
@@ -1258,7 +1255,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
       cmptrk.eta = part->Eta();
       cmptrk.r = TMath::Sqrt(part->Vx()*part->Vx()+part->Vy()*part->Vy());
       
-      cmptrk.pt   = 1/TMath::Abs(geatrack->Get1Pt());
+      cmptrk.pt   = geatrack->Pt();
       cmptrk.cosl = TMath::Cos(TMath::ATan(geatrack->GetTgl()));
       cmptrk.p    = cmptrk.pt/cmptrk.cosl;
     
@@ -1298,7 +1295,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
       cmptrk.dP2 = kaltrack->GetSnp()-geatrack->GetSnp();
       cmptrk.dP3 = kaltrack->GetTgl()-geatrack->GetTgl();
       cmptrk.dP4 = kaltrack->GetC()-geatrack->GetC();
-      cmptrk.dpt = 1/kaltrack->Get1Pt()-1/geatrack->Get1Pt();
+      cmptrk.dpt = 1/kaltrack->GetSigned1Pt()-1/geatrack->GetSigned1Pt();
     
       // get covariance matrix
       // beware: lines 3 and 4 in the matrix are inverted!
@@ -1372,7 +1369,7 @@ void AliTPCtrackerParam::CompareTPCtracks(
   WriteEffs(tpceffrootName);
 
   // delete AliRun object
-  delete gAlice; gAlice=0;
+  delete lAlice; lAlice=0;
   
   // close all input files
   kalFile->Close();
@@ -1459,7 +1456,7 @@ void AliTPCtrackerParam::CookTrack(Double_t pt,Double_t eta) {
 
   // get P and Cosl from track
   cosl = TMath::Cos(TMath::ATan(fTrack.GetTgl()));
-  p    = 1./TMath::Abs(fTrack.Get1Pt())/cosl;
+  p    = fTrack.Pt()/cosl;
 
   trkKine[0] = p;