GetPt() changed to GetSignedPt(). Get1Pt() changed to GetSigned1Pt() (Markus)

diff --git a/EMCAL/AliEMCALTracker.cxx b/EMCAL/AliEMCALTracker.cxx
index 127917fcd5414570055fcc30d1378c974fdbfb90..d0b459948d1c02cf557c5e91c5a7ba3e73cc074f 100644 (file)
--- a/EMCAL/AliEMCALTracker.cxx
+++ b/EMCAL/AliEMCALTracker.cxx
@@ -895,7 +895,7 @@ Int_t AliEMCALTracker::CreateMatches()
                                candidate->SetIndexT(it);
                                candidate->SetIndexC(ic);
                                candidate->SetDistance(dist);
-                               candidate->SetPt(track->GetPt());
+                               candidate->SetPt(track->GetSignedPt());
                                fMatches->Add(candidate);
                                count++;
                        }

diff --git a/HLT/ITS/AliHLTITStrack.cxx b/HLT/ITS/AliHLTITStrack.cxx
index d4842575b73df48867aa879110bca20295496fd1..ac0b195291f9a2e8fef490f7bad9b00e3a78e4aa 100644 (file)
--- a/HLT/ITS/AliHLTITStrack.cxx
+++ b/HLT/ITS/AliHLTITStrack.cxx
@@ -58,8 +58,8 @@ Int_t AliHLTITStrack::Compare(const TObject *o) const {
   // This function compares tracks according to the their curvature
   //-----------------------------------------------------------------
   AliHLTITStrack *t=(AliHLTITStrack*)o;
-  Double_t co=TMath::Abs(t->Get1Pt());
-  Double_t c =TMath::Abs(Get1Pt());
+  Double_t co=t->OneOverPt();
+  Double_t c =OneOverPt();
   //  Double_t co=t->GetSigmaY2()*t->GetSigmaZ2();
   //  Double_t c =GetSigmaY2()*GetSigmaZ2();
   if (c>co) return 1;

diff --git a/HLT/TRD/AliTRDtrackerHLT.cxx b/HLT/TRD/AliTRDtrackerHLT.cxx
index cf4ddd4bd0cbf6823a9b26f4b69bf3a01c141292..33d2e149b2776e08ad0043d902fb66ba01a87ec5 100644 (file)
--- a/HLT/TRD/AliTRDtrackerHLT.cxx
+++ b/HLT/TRD/AliTRDtrackerHLT.cxx
@@ -793,7 +793,7 @@ Int_t AliTRDtrackerHLT::PropagateBack(AliESDEvent *event)
     /**/
     // inter-tracks competition ???
     if ((TMath::Abs(track->GetC() - p4) / TMath::Abs(p4) < 0.2) || 
-        (TMath::Abs(track->GetPt())                      > 0.8)) {
+        (track->Pt()                                     > 0.8)) {
       
       fHBackfit->Fill(4);
       
@@ -813,7 +813,7 @@ Int_t AliTRDtrackerHLT::PropagateBack(AliESDEvent *event)
         // Sign only gold tracks
        if (track->GetChi2() / track->GetNumberOfClusters() < 4) {   
          if ((seed->GetKinkIndex(0)      ==   0) &&
-              (TMath::Abs(track->GetPt()) <  1.5)) {
+              (track->Pt()                <  1.5)) {
             UseClusters(track);
          }
        }
@@ -3723,7 +3723,7 @@ Int_t AliTRDtrackerHLT::FindClusters(Int_t sector, Int_t t0, Int_t t1
     tany *= -1.0;
   }
 
-  Double_t sy2       = ExpectedSigmaY2(x0,track->GetTgl(),track->GetPt());
+  Double_t sy2       = ExpectedSigmaY2(x0,track->GetTgl(),track->GetSignedPt());
   Double_t sz2       = ExpectedSigmaZ2(x0,track->GetTgl());
   Double_t road      = 15.0 * TMath::Sqrt(track->GetSigmaY2() + sy2);
   if (road > 6.0) {
@@ -3846,7 +3846,7 @@ Int_t AliTRDtrackerHLT::FindClusters(Int_t sector, Int_t t0, Int_t t1
       fHFindCl[iCheckPoint]->Fill(checkPoint[iCheckPoint]);
 
     if (checkPoint[3]) {
-      if (track->GetPt() > 0) fHMinYPos->Fill(minY);
+      if (track->GetSignedPt() > 0) fHMinYPos->Fill(minY);
       else fHMinYNeg->Fill(minY);
 
     fHMinD->Fill(minD[0], minD[1]);

diff --git a/ITS/AliITStrackMI.cxx b/ITS/AliITStrackMI.cxx
index b4a712f5ec779d1a819d7bee9fe6744a20932b7c..15f1a789bf29766106a1ce94215f4099f8f16396 100644 (file)
--- a/ITS/AliITStrackMI.cxx
+++ b/ITS/AliITStrackMI.cxx
@@ -146,7 +146,7 @@ Int_t AliITStrackMI::CorrectForMaterial(Double_t d, Double_t x0) {
   //------------------------------------------------------------------
   //d=x0=0.;
 
-  Double_t p2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
+  Double_t p2=(1.+ GetTgl()*GetTgl())/(GetSigned1Pt()*GetSigned1Pt());
   Double_t et   = p2 + GetMass()*GetMass();
   Double_t beta2=p2/et;
   et = sqrt(et);  
@@ -158,8 +158,8 @@ Int_t AliITStrackMI::CorrectForMaterial(Double_t d, Double_t x0) {
      //Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*TMath::Abs(d)*9.36*2.33;
      Cov(5) += theta2*(1.- GetSnp()*GetSnp())*(1. + GetTgl()*GetTgl());
      Cov(9) += theta2*(1. + GetTgl()*GetTgl())*(1. + GetTgl()*GetTgl());
-     Cov(13)+= theta2*GetTgl()*Get1Pt()*(1. + GetTgl()*GetTgl());
-     Cov(14)+= theta2*GetTgl()*Get1Pt()*GetTgl()*Get1Pt();
+     Cov(13)+= theta2*GetTgl()*GetSigned1Pt()*(1. + GetTgl()*GetTgl());
+     Cov(14)+= theta2*GetTgl()*GetSigned1Pt()*GetTgl()*GetSigned1Pt();
   }
 
   //Energy losses************************
@@ -177,7 +177,7 @@ Int_t AliITStrackMI::CorrectForMaterial(Double_t d, Double_t x0) {
      //}
 
      Par(4)*=(1.- et/p2*dE);
-     Double_t delta44 = (dE*Get1Pt()*et/p2);
+     Double_t delta44 = (dE*GetSigned1Pt()*et/p2);
      delta44*=delta44;
      Cov(14)+= delta44/400.;
   }

diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx
index f604e7067f64676743957ce2cddb23fbb72c9941..f672c780415db68c2553c20df55dfc55104d6c0d 100644 (file)
--- a/ITS/AliITStrackV2.cxx
+++ b/ITS/AliITStrackV2.cxx
@@ -97,8 +97,8 @@ Int_t AliITStrackV2::Compare(const TObject *o) const {
   // This function compares tracks according to the their curvature
   //-----------------------------------------------------------------
   AliITStrackV2 *t=(AliITStrackV2*)o;
-  //Double_t co=TMath::Abs(t->Get1Pt());
-  //Double_t c =TMath::Abs(Get1Pt());
+  //Double_t co=OneOverPt();
+  //Double_t c =OneOverPt();
   Double_t co=t->GetSigmaY2()*t->GetSigmaZ2();
   Double_t c =GetSigmaY2()*GetSigmaZ2();
   if (c>co) return 1;
@@ -332,7 +332,7 @@ Bool_t AliITStrackV2::Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]) {
 
   Double_t dy = Par(0) - yv, dz = Par(1) - zv;
   Double_t r2=GetX()*GetX() + dy*dy;
-  Double_t p2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
+  Double_t p2=(1.+ GetTgl()*GetTgl())/(GetSigned1Pt()*GetSigned1Pt());
   Double_t beta2=p2/(p2 + GetMass()*GetMass());
   x0*=TMath::Sqrt((1.+ GetTgl()*GetTgl())/(1.- GetSnp()*GetSnp()));
   Double_t theta2=14.1*14.1/(beta2*p2*1e6)*x0;

diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx
index d3b4fc447f84dec98bd54a48ee8f8c159049747a..2304a27bbdcfe395c3c0387222697622c9cd425f 100644 (file)
--- a/ITS/AliITStrackerMI.cxx
+++ b/ITS/AliITStrackerMI.cxx
@@ -380,7 +380,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
          delete t;
          continue;
        }
-       if (TMath::Abs(1/t->Get1Pt())<AliITSReconstructor::GetRecoParam()->GetMinPtForProlongation()) {
+       if (t->Pt()<AliITSReconstructor::GetRecoParam()->GetMinPtForProlongation()) {
          delete t;
          continue;
        }
@@ -2148,7 +2148,7 @@ Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI
   vec(1,0)=track1->GetZ()   - track3.GetZ();
   vec(2,0)=track1->GetSnp() - track3.GetSnp();
   vec(3,0)=track1->GetTgl() - track3.GetTgl();
-  vec(4,0)=track1->Get1Pt() - track3.Get1Pt();
+  vec(4,0)=track1->GetSigned1Pt() - track3.GetSigned1Pt();
   //
   TMatrixD cov(5,5);
   cov(0,0) = track1->GetSigmaY2()+track3.GetSigmaY2();
@@ -2262,7 +2262,7 @@ Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliI
     npoints++;
   }
   if (npoints>1) return 
-                  TMath::Max(TMath::Abs(0.3*forwardtrack->Get1Pt())-0.5,0.)+
+                   TMath::Max(0.3*forwardtrack->OneOverPt()-0.5,0.)+
                   //2*forwardtrack->fNUsed+
                   res/TMath::Max(double(npoints-forwardtrack->GetNSkipped()),
                                  1./(1.+forwardtrack->GetNSkipped()));
@@ -2486,7 +2486,7 @@ AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2,
   //
   AliITStrackMI * track10=(AliITStrackMI*) arr1->UncheckedAt(0);
   AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0);
-  if (TMath::Abs(1./track10->Get1Pt())>0.5+TMath::Abs(1/track20->Get1Pt())) return track10;
+  if (track10->Pt()>0.5+track20->Pt()) return track10;
 
   for (Int_t itrack=0;itrack<entries1;itrack++){
     AliITStrackMI * track=(AliITStrackMI*) arr1->UncheckedAt(itrack);
@@ -2549,11 +2549,11 @@ AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2,
   //
   w1 = (d2/(d1+d2)+ 2*s2/(s1+s2)+
        +s2/(s1+s2)*0.5*(chi22+2.)/(chi21+chi22+4.)
-       +1.*TMath::Abs(1./track10->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+       +1.*track10->Pt()/(track10->Pt()+track20->Pt())
        );
   w2 = (d1/(d1+d2)+ 2*s1/(s1+s2)+
        s1/(s1+s2)*0.5*(chi21+2.)/(chi21+chi22+4.)
-       +1.*TMath::Abs(1./track20->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+       +1.*track20->Pt()/(track10->Pt()+track20->Pt())
        );
 
   Double_t sumw = w1+w2;

diff --git a/ITS/oldmacros/AliITSImpactParametersPP.C b/ITS/oldmacros/AliITSImpactParametersPP.C
index f05c54be82cf7eb5cad0227ddf2bbdaa3e0c7a66..c9a517bbab9a2b5de28f3f251d8ad9931be75c5d 100644 (file)
--- a/ITS/oldmacros/AliITSImpactParametersPP.C
+++ b/ITS/oldmacros/AliITSImpactParametersPP.C
@@ -110,7 +110,7 @@ void   AliITSImpactParametersPP(Int_t evFirst=0,Int_t evLast=0) {
       itstrack = (AliITStrackV2*)tArray.At(i);
 
       // pt
-      pt = 1./TMath::Abs(itstrack->Get1Pt());
+      pt = itstrack->Pt();
 
       // primary vertex from other tracks in event
       Bool_t goodVtx = kFALSE;

diff --git a/STEER/AliKFParticle.cxx b/STEER/AliKFParticle.cxx
index 6413938e6a93251b70f807adc0ac072f33eae499..d05973b064ddb95e55312e98d78f8e5f134f4cb5 100644 (file)
--- a/STEER/AliKFParticle.cxx
+++ b/STEER/AliKFParticle.cxx
@@ -38,7 +38,7 @@ AliKFParticle::AliKFParticle( const AliExternalTrackParam &track, Int_t PID )
   Double_t energy = TMath::Sqrt( mass*mass + fP[3]*fP[3] + fP[4]*fP[4] + fP[5]*fP[5]);
   fP[6] = energy;
   fP[7] = 0;
-  fQ = (track.Get1Pt() >0 ) ?1 :-1;
+  fQ = (track.GetSigned1Pt() >0 ) ?1 :-1; // fQ = track->GetSign() would do the same thing
   fNDF = 0;
   fChi2 = 0;
   fAtProductionVertex = 0;

diff --git a/STEER/AliKFParticleTest.C b/STEER/AliKFParticleTest.C
index e05775f453317112b67cb4acdc25ca769a137775..f64062b7acb604d17d91fd2b76d2159a48685dae 100644 (file)
--- a/STEER/AliKFParticleTest.C
+++ b/STEER/AliKFParticleTest.C
@@ -168,7 +168,7 @@ void RunV0(  AliESDEvent *event )
       if ( !( pTrack->GetStatus()&AliESDtrack::kITSrefit ) ) continue;
       Int_t indi[12];
       if( pTrack->GetITSclusters(indi) <5 ) continue;
-      Int_t PDG = ( pTrack->Get1Pt() <0 ) ?321 :211;
+      Int_t PDG = ( pTrack->GetSigned1Pt() <0 ) ?321 :211;
 
       //* take MC PDG  
       { 

diff --git a/STEER/AliTPCComparisonMI.C b/STEER/AliTPCComparisonMI.C
index d604b0626fd431d00a4869efdd15b5d6855590da..01e04549a01406c1811a93786c3ddc8d73737fc8 100644 (file)
--- a/STEER/AliTPCComparisonMI.C
+++ b/STEER/AliTPCComparisonMI.C
@@ -616,7 +616,7 @@ Int_t TPCCmpTr::TreeGenLoop(Int_t eventNr)
        //if multifound find track with biggest pt - returning tracks - loos energy
        //
        if (fIndexRecTracks[fMCInfo->fLabel*4]+1){
-         Double_t pt = TMath::Abs(1/fTPCTrack->Get1Pt());
+         Double_t pt = fTPCTrack-Pt();
          for (Int_t i=1;i<4;i++){
            if (fIndexRecTracks[fMCInfo->fLabel*4+i]>=0){
              AliTPCtrack * track = (AliTPCtrack*)fTracks->UncheckedAt(fIndexRecTracks[fMCInfo->fLabel*4+i]);

diff --git a/TPC/AliTPCComparisonMI.C b/TPC/AliTPCComparisonMI.C
index db549fbbb53a15b5f577ae8f1472476987303b23..4b2ef4e7e24eb5b10a06775460b78962fef605d1 100644 (file)
--- a/TPC/AliTPCComparisonMI.C
+++ b/TPC/AliTPCComparisonMI.C
@@ -1345,7 +1345,7 @@ void AliTPCComparisonDraw::ResPt()
   p2->cd();
   p2->Draw();
   TH1F* his2 =  new TH1F("Ptresolution","Ptresolution",40,-5.,5.);
-  fTree->Draw("100.*(abs(1./fTPCTrack.Get1Pt())-MC.fTrackRef.Pt())/MC.fTrackRef.Pt()>>Ptresolution","MC.fRowsWithDigits>100&&RC.fTPCTrack.fN>50&&RC.fMultiple==1"+cteta1+cpos1+cprim);
+  fTree->Draw("100.*(fTPCTrack.Pt()-MC.fTrackRef.Pt())/MC.fTrackRef.Pt()>>Ptresolution","MC.fRowsWithDigits>100&&RC.fTPCTrack.fN>50&&RC.fMultiple==1"+cteta1+cpos1+cprim);
   AliLabelAxes(his2, "#Delta p_{t} / p_{t} [%]", "entries");
   his2->Fit("gaus");
   his2->Draw();
@@ -1464,7 +1464,7 @@ TH1F * AliTPCComparisonDraw::ResPtvsPt(const char* selection, const char * quali
   Double_t maxRes = 10.;
   TH2F* hRes2 = new TH2F("hRes2", "residuals", nBins, bins, nBinsRes, -maxRes, maxRes);
   
-  fTree->Draw("100.*(abs(1./fTPCTrack.Get1Pt())-MC.fTrackRef.Pt())/MC.fTrackRef.Pt():MC.fTrackRef.Pt()>>hRes2", selection, "groff");
+  fTree->Draw("100.*(fTPCTrack.Pt()-MC.fTrackRef.Pt())/MC.fTrackRef.Pt():MC.fTrackRef.Pt()>>hRes2", selection, "groff");
 
   TH1F* hMean=0;
   TH1F* hRes = CreateResHisto(hRes2, &hMean);
@@ -1484,7 +1484,7 @@ TH1F * AliTPCComparisonDraw::MeanPtvsPt(const char* selection, const char * qual
   Double_t maxRes = 10.;
   TH2F* hRes2 = new TH2F("hRes2", "residuals", nBins, bins, nBinsRes, -maxRes, maxRes);
   
-  fTree->Draw("100.*(1./fTPCTrack.Get1Pt()-MC.fTrackRef.Pt())/MC.fTrackRef.Pt():MC.fTrackRef.Pt()>>hRes2", selection, "groff");
+  fTree->Draw("100.*(fTPCTrack.Pt()-MC.fTrackRef.Pt())/MC.fTrackRef.Pt():MC.fTrackRef.Pt()>>hRes2", selection, "groff");
 
   TH1F* hMean=0;
   TH1F* hRes = CreateResHisto(hRes2, &hMean);

diff --git a/TPC/AliTPCseed.cxx b/TPC/AliTPCseed.cxx
index 065e6caa21d0c30cddfbe3a49e147d8712e1f6f4..77b7b39fa9ae59c9bb541c188479657120459584 100644 (file)
--- a/TPC/AliTPCseed.cxx
+++ b/TPC/AliTPCseed.cxx
@@ -471,11 +471,11 @@ Int_t AliTPCseed::Compare(const TObject *o) const {
   }
   else {
     Float_t f2 =1;
-    f2 = 1-20*TMath::Sqrt(t->GetSigma1Pt2())/(TMath::Abs(t->Get1Pt())+0.0066);
+    f2 = 1-20*TMath::Sqrt(t->GetSigma1Pt2())/(t->OneOverPt()+0.0066);
     if (t->fBConstrain) f2=1.2;
 
     Float_t f1 =1;
-    f1 = 1-20*TMath::Sqrt(GetSigma1Pt2())/(TMath::Abs(Get1Pt())+0.0066);
+    f1 = 1-20*TMath::Sqrt(GetSigma1Pt2())/(OneOverPt()+0.0066);
 
     if (fBConstrain)   f1=1.2;
  

diff --git a/TPC/AliTPCtrack.cxx b/TPC/AliTPCtrack.cxx
index f73f238dc9213155c7b73d2af5c2faafbee3c0a8..872afa2b643ea9c0e8fe364036c353c3bbd7eb8a 100644 (file)
--- a/TPC/AliTPCtrack.cxx
+++ b/TPC/AliTPCtrack.cxx
@@ -186,8 +186,8 @@ Int_t AliTPCtrack::Compare(const TObject *o) const {
   // This function compares tracks according to the their curvature
   //-----------------------------------------------------------------
   AliTPCtrack *t=(AliTPCtrack*)o;
-  //Double_t co=TMath::Abs(t->Get1Pt());
-  //Double_t c =TMath::Abs(Get1Pt());
+  //Double_t co=t->OneOverPt();
+  //Double_t c = OneOverPt();
   Double_t co=t->GetSigmaY2()*t->GetSigmaZ2();
   Double_t c =GetSigmaY2()*GetSigmaZ2();
   if (c>co) return 1;

diff --git a/TPC/AliTPCtracker.cxx b/TPC/AliTPCtracker.cxx
index 19959169a0169d1072fc7034a173ccf413274963..5c1219ac20a97ee50fbb548048461c626c3cdc02 100644 (file)
--- a/TPC/AliTPCtracker.cxx
+++ b/TPC/AliTPCtracker.cxx
@@ -232,7 +232,7 @@ Int_t AliTPCtracker::FollowProlongation(AliTPCseed& t, Int_t rf) {
     UInt_t index=0;
     Double_t maxchi2=kMaxCHI2;
     const AliTPCRow &krow=fSectors[s][nr];
-    Double_t pt=1./t.Get1Pt();
+    Double_t pt=t.GetSignedPt();
     Double_t sy2=AliTPCcluster::SigmaY2(t.GetX(),t.GetTgl(),pt);
     Double_t sz2=AliTPCcluster::SigmaZ2(t.GetX(),t.GetTgl());
     Double_t road=4.*sqrt(t.GetSigmaY2() + sy2), y=t.GetY(), z=t.GetZ();
@@ -370,7 +370,7 @@ Int_t AliTPCtracker::FollowBackProlongation
     AliTPCcluster *cl=0;
     Int_t index=0;
     Double_t maxchi2=kMaxCHI2;
-    Double_t pt=1./seed.Get1Pt();
+    Double_t pt=seed.GetSignedPt();
     Double_t sy2=AliTPCcluster::SigmaY2(seed.GetX(),seed.GetTgl(),pt);
     Double_t sz2=AliTPCcluster::SigmaZ2(seed.GetX(),seed.GetTgl());
     Double_t road=4.*sqrt(seed.GetSigmaY2() + sy2), z=seed.GetZ();

diff --git a/TPC/AliTPCtrackerParam.cxx b/TPC/AliTPCtrackerParam.cxx
index 3f4c088f5a348e30cc3054f3527ed0d7b9f44bb1..022fa1eeb326878dc0351c705e857879acbfe85e 100644 (file)
--- a/TPC/AliTPCtrackerParam.cxx
+++ b/TPC/AliTPCtrackerParam.cxx
@@ -1259,7 +1259,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;
     
@@ -1299,7 +1299,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!
@@ -1460,7 +1460,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;
 

diff --git a/TPC/TPCcalib/AliTPCcalibTracks.cxx b/TPC/TPCcalib/AliTPCcalibTracks.cxx
index 4d322882b6edea54078977999cfb20062c4d3aa5..60fc5718d3465a23c06cbefec09de758de0662cd 100644 (file)
--- a/TPC/TPCcalib/AliTPCcalibTracks.cxx
+++ b/TPC/TPCcalib/AliTPCcalibTracks.cxx
@@ -404,7 +404,7 @@ Bool_t AliTPCcalibTracks::AcceptTrack(AliTPCseed * track){
   if (track->GetNumberOfClusters() < kMinClusters) return kFALSE;
   Float_t ratio = track->GetNumberOfClusters() / (track->GetNFoundable() + 1.);
   if (ratio < kMinRatio) return kFALSE;
-  Float_t mpt = track->Get1Pt();
+  Float_t mpt = track->GetSigned1Pt();
   if (TMath::Abs(mpt) > kMax1pt) return kFALSE;
   //if (TMath::Abs(track->GetZ())>240.) return kFALSE;
   //if (TMath::Abs(track->GetZ())<10.) return kFALSE;

diff --git a/TRD/AliTRDCalibraFillHisto.cxx b/TRD/AliTRDCalibraFillHisto.cxx
index 3784800584a09fc13851ace31e4b8a3634460bc2..558dc5f5943a45254e37618183de142effa9e736 100644 (file)
--- a/TRD/AliTRDCalibraFillHisto.cxx
+++ b/TRD/AliTRDCalibraFillHisto.cxx
@@ -807,7 +807,7 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistograms(AliTRDcluster *cl, AliTRDtrack *
   fPar1[time] = t->GetZ();
   fPar2[time] = t->GetSnp();
   fPar3[time] = t->GetTgl();
-  fPar4[time] = t->Get1Pt();
+  fPar4[time] = t->GetSigned1Pt();
 
   // Store the info bis of the tracklet
   Int_t *rowcol   = CalculateRowCol(cl);

diff --git a/TRD/AliTRDtrack.cxx b/TRD/AliTRDtrack.cxx
index 7c0603394ea53046e1beca7dd5e7c2d1eba95f82..3213b8212634492fad2c9cb79f115d028da55d4d 100644 (file)
--- a/TRD/AliTRDtrack.cxx
+++ b/TRD/AliTRDtrack.cxx
@@ -700,7 +700,7 @@ Bool_t AliTRDtrack::PropagateTo(Double_t xk, Double_t xx0, Double_t xrho)
   {
 
     // Energy losses************************
-    Double_t p2    = (1.0 + GetTgl()*GetTgl()) / (Get1Pt()*Get1Pt());
+    Double_t p2    = (1.0 + GetTgl()*GetTgl()) / (GetSigned1Pt()*GetSigned1Pt());
     Double_t beta2 = p2 / (p2 + GetMass()*GetMass());
     if (beta2<1.0e-10 || (5940.0 * beta2/(1.0 - beta2 + 1.0e-10) - beta2) < 0.0) {
       return kFALSE;
@@ -853,6 +853,7 @@ Int_t AliTRDtrack::UpdateMI(AliTRDcluster *c, Double_t chisq, Int_t index, Doubl
 
   return kTRUE;
 
+
 }                     
 
 // //_____________________________________________________________________________
@@ -949,6 +950,7 @@ Int_t AliTRDtrack::UpdateMI(AliTRDcluster *c, Double_t chisq, Int_t index, Doubl
 //   fCtt-=k30*oldty+k31*oldtz;
 //   fCct-=k40*oldty+k41*oldtz;
 //   //
+
 //   fCcc-=k40*oldcy+k41*oldcz;                 
 //   //
   

diff --git a/TRD/AliTRDtracker.cxx b/TRD/AliTRDtracker.cxx
index c6d1eb8b2ce56c10f9ab4d939da22244fef01970..c258d166a1ab6f108c173775f5d0f5a7db1ecc92 100644 (file)
--- a/TRD/AliTRDtracker.cxx
+++ b/TRD/AliTRDtracker.cxx
@@ -706,7 +706,7 @@ Int_t AliTRDtracker::PropagateBack(AliESDEvent *event)
     /**/
     // inter-tracks competition ???
     if ((TMath::Abs(track->GetC() - p4) / TMath::Abs(p4) < 0.2) || 
-        (TMath::Abs(track->GetPt())                      > 0.8)) {
+        (track->Pt()                                     > 0.8)) {
       
       fHBackfit->Fill(4);
       
@@ -726,7 +726,7 @@ Int_t AliTRDtracker::PropagateBack(AliESDEvent *event)
         // Sign only gold tracks
        if (track->GetChi2() / track->GetNumberOfClusters() < 4) {   
          if ((seed->GetKinkIndex(0)      ==   0) &&
-              (TMath::Abs(track->GetPt()) <  1.5)) {
+              (track->Pt()                <  1.5)) {
             UseClusters(track);
          }
        }
@@ -3514,7 +3514,7 @@ Int_t AliTRDtracker::FindClusters(Int_t sector, Int_t t0, Int_t t1
     tany *= -1.0;
   }
 
-  Double_t sy2       = ExpectedSigmaY2(x0,track->GetTgl(),track->GetPt());
+  Double_t sy2       = ExpectedSigmaY2(x0,track->GetTgl(),track->GetSignedPt());
   Double_t sz2       = ExpectedSigmaZ2(x0,track->GetTgl());
   Double_t road      = 15.0 * TMath::Sqrt(track->GetSigmaY2() + sy2);
   if (road > 6.0) {
@@ -3637,7 +3637,7 @@ Int_t AliTRDtracker::FindClusters(Int_t sector, Int_t t0, Int_t t1
       fHFindCl[iCheckPoint]->Fill(checkPoint[iCheckPoint]);
 
     if (checkPoint[3]) {
-      if (track->GetPt() > 0) fHMinYPos->Fill(minY);
+      if (track->GetSignedPt() > 0) fHMinYPos->Fill(minY);
       else fHMinYNeg->Fill(minY);
 
     fHMinD->Fill(minD[0], minD[1]);

diff --git a/TRD/AliTRDtrackingAnalysis.cxx b/TRD/AliTRDtrackingAnalysis.cxx
index d45064a24b05e62b4d4b490609f1fd9208c4e0b6..356dd08af68518d75f6f6828e6f56aa27c60ccf8 100644 (file)
--- a/TRD/AliTRDtrackingAnalysis.cxx
+++ b/TRD/AliTRDtrackingAnalysis.cxx
@@ -260,7 +260,7 @@ void AliTRDtrackingAnalysis::DrawResolutionPt(int startEvent, int stopEvent)
 
       if (!(status & AliESDtrack::kTRDout)) continue;
       if (!(status & AliESDtrack::kTRDrefit)) continue;
-      if (TMath::Abs(esdTrack->GetOuterParam()->GetPt()) < 1.0) continue;
+      if (esdTrack->GetOuterParam()->Pt() < 1.0) continue;
 
       int ch=0;
       while(param->GetX() > fGeo->GetTime0(ch)+2) ch++;
@@ -287,7 +287,7 @@ void AliTRDtrackingAnalysis::DrawResolutionPt(int startEvent, int stopEvent)
        AliExternalTrackParam out(*param);
        out.PropagateTo(aRef->LocalX(),bz);
        
-       double dp = aRef->Pt() + out.GetPt();
+       double dp = aRef->Pt() + out.GetSignedPt();
        double dy = 10. * (aRef->LocalY() - out.GetY()); // in mm
 
        fDeltaPt->Fill(100. * dp / aRef->Pt());

diff --git a/TRD/Macros/AliTRDComparison.C b/TRD/Macros/AliTRDComparison.C
index dc7030b013d13f4ddbad7853f755ac4921a4c8f5..c670102ee8ef54321ae85fb1a56205ac50a79b69 100644 (file)
--- a/TRD/Macros/AliTRDComparison.C
+++ b/TRD/Macros/AliTRDComparison.C
@@ -651,7 +651,7 @@ void MakeAlias(){
   comp.fTree->SetAlias("dt","(abs(MC.fPdg)==2212)*dtp+(abs(MC.fPdg)==211)*dtpi+(abs(MC.fPdg)==321)*dtk"); //delta time
   comp.fTree->SetAlias("Beta","sqrt(TR.P()**2/(TR.P()**2+MC.fMass**2))");
   comp.fTree->SetAlias("dtsigma","10+(1-Beta)*280");
-  comp.fTree->SetAlias("dptrel","(abs(TRD0.GetPt())-MC.fTOFReferences[0].Pt())/MC.fTOFReferences[0].Pt()");
+  comp.fTree->SetAlias("dptrel","(abs(TRD0.GetSignedPt())-MC.fTOFReferences[0].Pt())/MC.fTOFReferences[0].Pt()");
   //
   comp.fTree->SetAlias("dphi","atan2(TR.fY,TR..fX)-atan2(TR.fPy,TR..fPx)");
   comp.fTree->SetAlias("dphi0","acos((TR.fX*TR.fPx+TR.fY*TR.fPy)/(TR.Pt()*TR.R()))");

diff --git a/TRD/Macros/AliTRDComparisonV2.C b/TRD/Macros/AliTRDComparisonV2.C
index 8ee54afa731eab05cb5848e3020884aee5f9f689..7b9982d99f67a62c57cfe6c9cb144d019e642898 100644 (file)
--- a/TRD/Macros/AliTRDComparisonV2.C
+++ b/TRD/Macros/AliTRDComparisonV2.C
@@ -241,7 +241,7 @@ Int_t AliTRDComparisonV2
 
         hc->Fill(esd->GetTRDclusters(0));
 
-        Float_t pt_1=TMath::Abs(out.Get1Pt());
+        Float_t pt_1=out.OneOverPt();
         hpt->Fill((pt_1 - 1/ptg)/(1/ptg)*100.);
 
         Float_t y=out.GetY();

diff --git a/TRD/Macros/AliTRDbackTrackAnalysis.C b/TRD/Macros/AliTRDbackTrackAnalysis.C
index c1b82d385a07a565e67d1c33240d4b006ccd75e8..6d2ddf4806ab02843c50cf2c7842ee9fe0215371 100644 (file)
--- a/TRD/Macros/AliTRDbackTrackAnalysis.C
+++ b/TRD/Macros/AliTRDbackTrackAnalysis.C
@@ -453,7 +453,7 @@ void AliTRDbackTrackAnalysis() {
 
     hfound->Fill(p->Pt());
 
-    Pt = TMath::Abs(rt->GetPt()); 
+    Pt = rt->Pt(); 
     Double_t cc = TMath::Abs(rt->GetSigmaC2()); 
     mct->GetPxPyPzXYZ(mcPx,mcPy,mcPz,x,y,z,-1);
     rt->GetPxPyPz(Px,Py,Pz);      

diff --git a/TRD/Macros/AliTRDseedsAnalysis.C b/TRD/Macros/AliTRDseedsAnalysis.C
index 682b3f9fb2020bf831017130626fe0a8b351a070..abb2fd4041aae4b443eb044c9ba13965d77fef4f 100644 (file)
--- a/TRD/Macros/AliTRDseedsAnalysis.C
+++ b/TRD/Macros/AliTRDseedsAnalysis.C
@@ -489,7 +489,7 @@ void AliTRDseedsAnalysis() {
                 label, rt->GetSeedLabel());
          return;
        }
-       Pt = TMath::Abs(rt->GetPt()); 
+       Pt = rt->GetPt(); 
        Double_t cc = TMath::Abs(rt->GetSigmaC2()); 
        mct->GetPxPyPzXYZ(mcPx,mcPy,mcPz,x,y,z,-1);
        rt->GetPxPyPz(Px,Py,Pz);