Adding TPC parameters at vertex (Marian)

diff --git a/PWG1/AliESDRecInfo.cxx b/PWG1/AliESDRecInfo.cxx
index b7b69dfbd5b78160e9320292db86ab8423b0a808..025161e36eda3a49c77ab7aa6ceefebddde2786e 100644 (file)
--- a/PWG1/AliESDRecInfo.cxx
+++ b/PWG1/AliESDRecInfo.cxx
@@ -17,7 +17,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Projection Chamber                                                  //
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 //  Time Projection Chamber                                                  //

-//  Comparison macro for reconstructed tracks - ESDs V0s                                     //
+//  Comparison macro for reconstructed tracks                                  //

 //  responsible: 
 //  marian.ivanov@cern.ch                                                    //
 //
 //  responsible: 
 //  marian.ivanov@cern.ch                                                    //
 //


@@ -33,6 +33,7 @@
 //ALIROOT includes
 //
 #include "AliESDtrack.h"
 //ALIROOT includes
 //
 #include "AliESDtrack.h"

+#include "AliTracker.h"

 #include "AliTPCParam.h"
 #include "AliTrackReference.h"
 #include "AliTPCParamSR.h"
 #include "AliTPCParam.h"
 #include "AliTrackReference.h"
 #include "AliTPCParamSR.h"


@@ -74,7 +75,8 @@ AliESDRecInfo::AliESDRecInfo():
   fTrackF(0),      // friend track
   fTPCtrack(0),        // tpc track
   fITStrack(0),        // its track
   fTrackF(0),      // friend track
   fTPCtrack(0),        // tpc track
   fITStrack(0),        // its track

-  fTRDtrack(0)        // trd track  
+  fTRDtrack(0),        // trd track  
+  fTPCtrackAtVertex(0) // tpc track propagated to the vertex  

 {
   //
   //  default constructor
 {
   //
   //  default constructor


@@ -224,51 +226,20 @@ void  AliESDRecInfo::UpdatePoints(AliESDtrack*track)
 //
 void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconstructed)
 {
 //
 void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconstructed)
 {

-  //

   //
   //calculates derived variables
   //  
   //
   //calculates derived variables
   //  

-  //

   UpdatePoints(fESDtrack);
   UpdatePoints(fESDtrack);

-  fBestTOFmatch=1000;
-  AliTrackReference * ref = &(info->fTrackRef);
-  fTPCinR0[0] = info->fTrackRef.X();   
-  fTPCinR0[1] = info->fTrackRef.Y();   
-  fTPCinR0[2] = info->fTrackRef.Z();
-  fTPCinR0[3] = TMath::Sqrt(fTPCinR0[0]*fTPCinR0[0]+fTPCinR0[1]*fTPCinR0[1]);
-  fTPCinR0[4] = TMath::ATan2(fTPCinR0[1],fTPCinR0[0]);
-  //
-  fTPCinP0[0] = ref->Px();
-  fTPCinP0[1] = ref->Py();
-  fTPCinP0[2] = ref->Pz();
-  fTPCinP0[3] = ref->Pt();
-  fTPCinP0[4] = ref->P();
-  fDeltaP     = (ref->P()-info->fParticle.P())/info->fParticle.P();
-  //
-  //
-  if (fTPCinP0[3]>0.0000001){
-    //
-    fTPCAngle0[0] = TMath::ATan2(fTPCinP0[1],fTPCinP0[0]);
-    fTPCAngle0[1] = TMath::ATan(fTPCinP0[2]/fTPCinP0[3]);
-  }
-  //
-  //
-  fITSinP0[0]=info->fParticle.Px();
-  fITSinP0[1]=info->fParticle.Py();
-  fITSinP0[2]=info->fParticle.Pz();
-  fITSinP0[3]=info->fParticle.Pt();    
-  //
-  fITSinR0[0]=info->fParticle.Vx();
-  fITSinR0[1]=info->fParticle.Vy();
-  fITSinR0[2]=info->fParticle.Vz();
-  fITSinR0[3] = TMath::Sqrt(fITSinR0[0]*fITSinR0[0]+fITSinR0[1]*fITSinR0[1]);
-  fITSinR0[4] = TMath::ATan2(fITSinR0[1],fITSinR0[0]);
-  //
+  UpdateStatus(info,reconstructed);
+  UpdateITS(info);
+  UpdateTPC(info);
+  UpdateTOF(info);
+}
+
+
+void  AliESDRecInfo::UpdateStatus(AliMCInfo* info, Bool_t reconstructed){

   //
   //

-  if (fITSinP0[3]>0.0000001){
-    fITSAngle0[0] = TMath::ATan2(fITSinP0[1],fITSinP0[0]);
-    fITSAngle0[1] = TMath::ATan(fITSinP0[2]/fITSinP0[3]);
-  }
+  // Interpret bit mask flags

   //
   for (Int_t i=0;i<4;i++) fStatus[i] =0;
   fReconstructed = kFALSE;
   //
   for (Int_t i=0;i<4;i++) fStatus[i] =0;
   fReconstructed = kFALSE;


@@ -309,7 +280,6 @@ void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconst
       fStatus[0]=0;
     }      
   }
       fStatus[0]=0;
     }      
   }

-

   //
   //
   if ((fESDtrack->GetStatus()&AliESDtrack::kTRDrefit)>0){
   //
   //
   if ((fESDtrack->GetStatus()&AliESDtrack::kTRDrefit)>0){


@@ -322,11 +292,14 @@ void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconst
   }
   if ((fESDtrack->GetStatus()&AliESDtrack::kTRDStop)>0){
     fStatus[2] =10;
   }
   if ((fESDtrack->GetStatus()&AliESDtrack::kTRDStop)>0){
     fStatus[2] =10;

-  }
+  }   
+}

 
 

+void AliESDRecInfo::UpdateTOF(AliMCInfo* info){

   //
   //

-  //TOF 
-  // 
+  // Update TOF related comparison information
+  //
+  fBestTOFmatch=1000;

   if (((fESDtrack->GetStatus()&AliESDtrack::kTOFout)>0)){
     //
     // best tof match
   if (((fESDtrack->GetStatus()&AliESDtrack::kTOFout)>0)){
     //
     // best tof match


@@ -352,39 +325,29 @@ void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconst
   }else{
     fStatus[3]=0;
   }
   }else{
     fStatus[3]=0;
   }

+}

 
 
 
 

-  if (fStatus[1]>0 &&info->fNTPCRef>0&&TMath::Abs(fTPCinP0[3])>0.0001){
-    //TPC
-    fESDtrack->GetInnerXYZ(fTPCinR1);
-    fTPCinR1[3] = TMath::Sqrt(fTPCinR1[0]*fTPCinR1[0]+fTPCinR1[1]*fTPCinR1[1]);
-    fTPCinR1[4] = TMath::ATan2(fTPCinR1[1],fTPCinR1[0]);       
-    fESDtrack->GetInnerPxPyPz(fTPCinP1);
-    fTPCinP1[3] = TMath::Sqrt(fTPCinP1[0]*fTPCinP1[0]+fTPCinP1[1]*fTPCinP1[1]);
-    fTPCinP1[4] = TMath::Sqrt(fTPCinP1[3]*fTPCinP1[3]+fTPCinP1[2]*fTPCinP1[2]);
-    //
-    //
-    if (fTPCinP1[3]>0.000000000000001){
-      fTPCAngle1[0] = TMath::ATan2(fTPCinP1[1],fTPCinP1[0]);
-      fTPCAngle1[1] = TMath::ATan(fTPCinP1[2]/fTPCinP1[3]);  
-    }    
-    Double_t cov[15], param[5],x, alpha;
-    fESDtrack->GetInnerExternalCovariance(cov);
-    fESDtrack->GetInnerExternalParameters(alpha, x,param);
-    if (x<50) return ;
-    //
-    fTPCDelta[0] = (fTPCinR0[4]-fTPCinR1[4])*fTPCinR1[3];  //delta rfi
-    fTPCPools[0] = fTPCDelta[0]/TMath::Sqrt(cov[0]);
-    fTPCDelta[1] = (fTPCinR0[2]-fTPCinR1[2]);              //delta z
-    fTPCPools[1] = fTPCDelta[1]/TMath::Sqrt(cov[2]);
-    fTPCDelta[2] = (fTPCAngle0[0]-fTPCAngle1[0]);
-    fTPCPools[2] = fTPCDelta[2]/TMath::Sqrt(cov[5]);
-    fTPCDelta[3] = (TMath::Tan(fTPCAngle0[1])-TMath::Tan(fTPCAngle1[1]));
-    fTPCPools[3] = fTPCDelta[3]/TMath::Sqrt(cov[9]);
-    fTPCDelta[4] = (fTPCinP0[3]-fTPCinP1[3]);
-    Double_t sign = (param[4]>0)? 1.:-1; 
-    fSign =sign;
-    fTPCPools[4] = sign*(1./fTPCinP0[3]-1./fTPCinP1[3])/TMath::Sqrt(TMath::Abs(cov[14]));
+
+void AliESDRecInfo::UpdateITS(AliMCInfo* info){
+  //
+  // Update ITS related comparison information
+  //
+  fITSinP0[0]=info->fParticle.Px();
+  fITSinP0[1]=info->fParticle.Py();
+  fITSinP0[2]=info->fParticle.Pz();
+  fITSinP0[3]=info->fParticle.Pt();    
+  //
+  fITSinR0[0]=info->fParticle.Vx();
+  fITSinR0[1]=info->fParticle.Vy();
+  fITSinR0[2]=info->fParticle.Vz();
+  fITSinR0[3] = TMath::Sqrt(fITSinR0[0]*fITSinR0[0]+fITSinR0[1]*fITSinR0[1]);
+  fITSinR0[4] = TMath::ATan2(fITSinR0[1],fITSinR0[0]);
+  //
+  //
+  if (fITSinP0[3]>0.0000001){
+    fITSAngle0[0] = TMath::ATan2(fITSinP0[1],fITSinP0[0]);
+    fITSAngle0[1] = TMath::ATan(fITSinP0[2]/fITSinP0[3]);

   }
   if (fITSOn){
     // ITS 
   }
   if (fITSOn){
     // ITS 


@@ -395,7 +358,7 @@ void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconst
     fESDtrack->GetExternalCovariance(cov);
     //fESDtrack->GetConstrainedExternalCovariance(cov);
     if (TMath::Abs(param[4])<0.0000000001) return;
     fESDtrack->GetExternalCovariance(cov);
     //fESDtrack->GetConstrainedExternalCovariance(cov);
     if (TMath::Abs(param[4])<0.0000000001) return;

-
+    

     fESDtrack->GetXYZ(fITSinR1);
     fESDtrack->GetPxPyPz(fITSinP1);
     fITSinP1[3] = TMath::Sqrt(fITSinP1[0]*fITSinP1[0]+fITSinP1[1]*fITSinP1[1]);
     fESDtrack->GetXYZ(fITSinR1);
     fESDtrack->GetPxPyPz(fITSinP1);
     fITSinP1[3] = TMath::Sqrt(fITSinP1[0]*fITSinP1[0]+fITSinP1[1]*fITSinP1[1]);


@@ -421,9 +384,86 @@ void AliESDRecInfo::Update(AliMCInfo* info,AliTPCParam * /*par*/, Bool_t reconst
     fITSDelta[4] = (fITSinP0[3]-fITSinP1[3]);    
     Double_t sign = (param[4]>0) ? 1:-1; 
     fSign = sign;
     fITSDelta[4] = (fITSinP0[3]-fITSinP1[3]);    
     Double_t sign = (param[4]>0) ? 1:-1; 
     fSign = sign;

-    fITSPools[4] = sign*(1./fITSinP0[3]-1./fITSinP1[3])/TMath::Sqrt(cov[14]);    
+    fITSPools[4] = sign*(1./fITSinP0[3]-1./fITSinP1[3])/TMath::Sqrt(cov[14]);

   }
   }

-  

 }
 
 }
 

+void AliESDRecInfo::UpdateTPC(AliMCInfo* info){
+  //
+  //
+  // Update TPC related information
+  //
+  AliTrackReference * ref = &(info->fTrackRef);
+  fTPCinR0[0] = info->fTrackRef.X();   
+  fTPCinR0[1] = info->fTrackRef.Y();   
+  fTPCinR0[2] = info->fTrackRef.Z();
+  fTPCinR0[3] = TMath::Sqrt(fTPCinR0[0]*fTPCinR0[0]+fTPCinR0[1]*fTPCinR0[1]);
+  fTPCinR0[4] = TMath::ATan2(fTPCinR0[1],fTPCinR0[0]);
+  //
+  fTPCinP0[0] = ref->Px();
+  fTPCinP0[1] = ref->Py();
+  fTPCinP0[2] = ref->Pz();
+  fTPCinP0[3] = ref->Pt();
+  fTPCinP0[4] = ref->P();
+  fDeltaP     = (ref->P()-info->fParticle.P())/info->fParticle.P();
+  //
+  //
+  if (fTPCinP0[3]>0.0000001){
+    //
+    fTPCAngle0[0] = TMath::ATan2(fTPCinP0[1],fTPCinP0[0]);
+    fTPCAngle0[1] = TMath::ATan(fTPCinP0[2]/fTPCinP0[3]);
+  }
+  //
+  if (fStatus[1]>0 &&info->fNTPCRef>0&&TMath::Abs(fTPCinP0[3])>0.0001){
+    //TPC
+    fESDtrack->GetInnerXYZ(fTPCinR1);
+    fTPCinR1[3] = TMath::Sqrt(fTPCinR1[0]*fTPCinR1[0]+fTPCinR1[1]*fTPCinR1[1]);
+    fTPCinR1[4] = TMath::ATan2(fTPCinR1[1],fTPCinR1[0]);       
+    fESDtrack->GetInnerPxPyPz(fTPCinP1);
+    fTPCinP1[3] = TMath::Sqrt(fTPCinP1[0]*fTPCinP1[0]+fTPCinP1[1]*fTPCinP1[1]);
+    fTPCinP1[4] = TMath::Sqrt(fTPCinP1[3]*fTPCinP1[3]+fTPCinP1[2]*fTPCinP1[2]);
+    //
+    //
+    if (fTPCinP1[3]>0.000000000000001){
+      fTPCAngle1[0] = TMath::ATan2(fTPCinP1[1],fTPCinP1[0]);
+      fTPCAngle1[1] = TMath::ATan(fTPCinP1[2]/fTPCinP1[3]);  
+    }    
+    Double_t cov[15], param[5],x, alpha;
+    fESDtrack->GetInnerExternalCovariance(cov);
+    fESDtrack->GetInnerExternalParameters(alpha, x,param);
+    if (x<50) return ;
+    //
+    fTPCDelta[0] = (fTPCinR0[4]-fTPCinR1[4])*fTPCinR1[3];  //delta rfi
+    fTPCPools[0] = fTPCDelta[0]/TMath::Sqrt(cov[0]);
+    fTPCDelta[1] = (fTPCinR0[2]-fTPCinR1[2]);              //delta z
+    fTPCPools[1] = fTPCDelta[1]/TMath::Sqrt(cov[2]);
+    fTPCDelta[2] = (fTPCAngle0[0]-fTPCAngle1[0]);
+    fTPCPools[2] = fTPCDelta[2]/TMath::Sqrt(cov[5]);
+    fTPCDelta[3] = (TMath::Tan(fTPCAngle0[1])-TMath::Tan(fTPCAngle1[1]));
+    fTPCPools[3] = fTPCDelta[3]/TMath::Sqrt(cov[9]);
+    fTPCDelta[4] = (fTPCinP0[3]-fTPCinP1[3]);
+    Double_t sign = (param[4]>0)? 1.:-1; 
+    fSign =sign;
+    fTPCPools[4] = sign*(1./fTPCinP0[3]-1./fTPCinP1[3])/TMath::Sqrt(TMath::Abs(cov[14]));
+  }
+  //
+  if (fESDtrack && fESDtrack->GetTPCInnerParam()){
+    AliExternalTrackParam *track = new AliExternalTrackParam(*fESDtrack->GetTPCInnerParam());
+    const Double_t kRadius  = 3;   // beam pipe radius
+    const Double_t kMaxStep = 5;   // max step
+    const Double_t kMaxD    = 123456;  // max distance to prim vertex
+    Double_t       fieldZ   = AliTracker::GetBz();  //
+    AliTracker::PropagateTrackTo(track,kRadius,info->GetMass(),kMaxStep,kTRUE);
+    AliTracker::PropagateTrackTo(track,0,info->GetMass(),0.5,kTRUE);
+    //track->RelateToVertex(fEvent->GetVertex(),fieldZ, kMaxD);
+    fTPCtrackAtVertex = track;
+  }else{
+    delete fTPCtrackAtVertex;
+    fTPCtrackAtVertex=0;
+  }  
+}
+
+
+
+

 
 

diff --git a/PWG1/AliESDRecInfo.h b/PWG1/AliESDRecInfo.h
index a9ed3e5785654d22711a21bd4f03c6dd53539b7c..81320f2b311556612b96765e055dbd4c18350329 100644 (file)
--- a/PWG1/AliESDRecInfo.h
+++ b/PWG1/AliESDRecInfo.h
@@ -35,8 +35,13 @@ public:
   AliESDRecInfo();
   AliESDRecInfo(const AliESDRecInfo& recinfo);
   ~AliESDRecInfo();
   AliESDRecInfo();
   AliESDRecInfo(const AliESDRecInfo& recinfo);
   ~AliESDRecInfo();

-  void UpdatePoints(AliESDtrack* track);

   void Update(AliMCInfo* info,AliTPCParam * par, Bool_t reconstructed);
   void Update(AliMCInfo* info,AliTPCParam * par, Bool_t reconstructed);

+  void UpdateStatus(AliMCInfo* info, Bool_t reconstructed);
+  void UpdatePoints(AliESDtrack* track);
+  void UpdateTPC(AliMCInfo* info);
+  void UpdateITS(AliMCInfo* info);
+  void UpdateTOF(AliMCInfo* info);
+  //

   void Reset();
   //
   void SetESDtrack(const AliESDtrack *track);
   void Reset();
   //
   void SetESDtrack(const AliESDtrack *track);


@@ -85,7 +90,7 @@ private:
   AliTPCseed *fTPCtrack;        // tpc track
   AliITStrackMI *fITStrack;        // its track
   AliTRDtrack   *fTRDtrack;        // trd track
   AliTPCseed *fTPCtrack;        // tpc track
   AliITStrackMI *fITStrack;        // its track
   AliTRDtrack   *fTRDtrack;        // trd track

-  
+  AliExternalTrackParam* fTPCtrackAtVertex; // TPC track propagated to the prim vertex

   ClassDef(AliESDRecInfo,2)  // container for 
 };
 
   ClassDef(AliESDRecInfo,2)  // container for 
 };