]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliAODTrack.cxx
fix
[u/mrichter/AliRoot.git] / STEER / AliAODTrack.cxx
index 891982ae883f193877588aa62a362191975298c2..752c0ab2ae2b49379c46edffc41d65eb4bbe564f 100644 (file)
 /* $Id$ */
 
 //-------------------------------------------------------------------------
-//     AOD track base class
+//     AOD track implementation of AliVTrack
 //     Author: Markus Oldenburg, CERN
+//     Markus.Oldenburg@cern.ch
 //-------------------------------------------------------------------------
 
+#include "AliLog.h"
 #include "AliAODTrack.h"
 
-//#include <TPDGCode.h>
-//#include <TDatabasePDG.h>
-
 ClassImp(AliAODTrack)
 
 //______________________________________________________________________________
 AliAODTrack::AliAODTrack() : 
-  AliVParticle(),
+  AliVTrack(),
   fChi2perNDF(-999.),
-  fID(-999),
+  fChi2MatchTrigger(0.),
+  fFlags(0),
   fLabel(-999),
-  fCovMatrix(NULL),
-  fProdVertex(0x0),
-  fCharge(-99),
   fITSMuonClusterMap(0),
+  fFilterMap(0),
+  fID(-999),
+  fCharge(-99),
   fType(kUndef),
-  fChi2MatchTrigger(0.),
-  fFilterMap(0)
+  fCovMatrix(NULL),
+  fDetPid(NULL),
+  fProdVertex(NULL)
 {
   // default constructor
 
   SetP();
   SetPosition((Float_t*)NULL);
+  SetXYAtDCA(-999., -999.);
+  SetPxPyPzAtDCA(-999., -999., -999.);
   SetPID((Float_t*)NULL);
 }
 
 //______________________________________________________________________________
-AliAODTrack::AliAODTrack(Int_t id,
+AliAODTrack::AliAODTrack(Short_t id,
                         Int_t label, 
                         Double_t p[3],
                         Bool_t cartesian,
@@ -63,32 +66,37 @@ AliAODTrack::AliAODTrack(Int_t id,
                         Bool_t usedForVtxFit,
                         Bool_t usedForPrimVtxFit,
                         AODTrk_t ttype,
-                        UInt_t selectInfo) :
-  AliVParticle(),
-  fChi2perNDF(-999.),
-  fID(id),
+                        UInt_t selectInfo,
+                        Float_t chi2perNDF) :
+  AliVTrack(),
+  fChi2perNDF(chi2perNDF),
+  fChi2MatchTrigger(0.),
+  fFlags(0),
   fLabel(label),
-  fCovMatrix(NULL),
-  fProdVertex(prodVertex),
+  fITSMuonClusterMap(0),
+  fFilterMap(selectInfo),
+  fID(id),
   fCharge(charge),
-  fITSMuonClusterMap(itsClusMap),
   fType(ttype),
-  fChi2MatchTrigger(0.),
-  fFilterMap(selectInfo)
+  fCovMatrix(NULL),
+  fDetPid(NULL),
+  fProdVertex(prodVertex)
 {
   // constructor
  
   SetP(p, cartesian);
   SetPosition(x, isDCA);
+  SetXYAtDCA(-999., -999.);
+  SetPxPyPzAtDCA(-999., -999., -999.);
   SetUsedForVtxFit(usedForVtxFit);
   SetUsedForPrimVtxFit(usedForPrimVtxFit);
   if(covMatrix) SetCovMatrix(covMatrix);
   SetPID(pid);
-
+  SetITSClusterMap(itsClusMap);
 }
 
 //______________________________________________________________________________
-AliAODTrack::AliAODTrack(Int_t id,
+AliAODTrack::AliAODTrack(Short_t id,
                         Int_t label, 
                         Float_t p[3],
                         Bool_t cartesian,
@@ -102,27 +110,33 @@ AliAODTrack::AliAODTrack(Int_t id,
                         Bool_t usedForVtxFit,
                         Bool_t usedForPrimVtxFit,
                         AODTrk_t ttype,
-                        UInt_t selectInfo) :
-  AliVParticle(),
-  fChi2perNDF(-999.),
-  fID(id),
+                        UInt_t selectInfo,
+                        Float_t chi2perNDF) :
+  AliVTrack(),
+  fChi2perNDF(chi2perNDF),
+  fChi2MatchTrigger(0.),
+  fFlags(0),
   fLabel(label),
-  fCovMatrix(NULL),
-  fProdVertex(prodVertex),
+  fITSMuonClusterMap(0),
+  fFilterMap(selectInfo),
+  fID(id),
   fCharge(charge),
-  fITSMuonClusterMap(itsClusMap),
   fType(ttype),
-  fChi2MatchTrigger(0.),
-  fFilterMap(selectInfo)
+  fCovMatrix(NULL),
+  fDetPid(NULL),
+  fProdVertex(prodVertex)
 {
   // constructor
  
   SetP(p, cartesian);
   SetPosition(x, isDCA);
+  SetXYAtDCA(-999., -999.);
+  SetPxPyPzAtDCA(-999., -999., -999.);
   SetUsedForVtxFit(usedForVtxFit);
   SetUsedForPrimVtxFit(usedForPrimVtxFit);
   if(covMatrix) SetCovMatrix(covMatrix);
   SetPID(pid);
+  SetITSClusterMap(itsClusMap);
 }
 
 //______________________________________________________________________________
@@ -130,32 +144,37 @@ AliAODTrack::~AliAODTrack()
 {
   // destructor
   delete fCovMatrix;
+  delete fDetPid;
 }
 
 
 //______________________________________________________________________________
 AliAODTrack::AliAODTrack(const AliAODTrack& trk) :
-  AliVParticle(trk),
+  AliVTrack(trk),
   fChi2perNDF(trk.fChi2perNDF),
-  fID(trk.fID),
+  fChi2MatchTrigger(trk.fChi2MatchTrigger),
+  fFlags(trk.fFlags),
   fLabel(trk.fLabel),
-  fCovMatrix(NULL),
-  fProdVertex(trk.fProdVertex),
-  fCharge(trk.fCharge),
   fITSMuonClusterMap(trk.fITSMuonClusterMap),
+  fFilterMap(trk.fFilterMap),
+  fID(trk.fID),
+  fCharge(trk.fCharge),
   fType(trk.fType),
-  fChi2MatchTrigger(0.),
-  fFilterMap(trk.fFilterMap)
+  fCovMatrix(NULL),
+  fDetPid(NULL),
+  fProdVertex(trk.fProdVertex)
 {
   // Copy constructor
 
   trk.GetP(fMomentum);
   trk.GetPosition(fPosition);
+  SetXYAtDCA(trk.XAtDCA(), trk.YAtDCA());
+  SetPxPyPzAtDCA(trk.PxAtDCA(), trk.PyAtDCA(), trk.PzAtDCA());
   SetUsedForVtxFit(trk.GetUsedForVtxFit());
   SetUsedForPrimVtxFit(trk.GetUsedForPrimVtxFit());
   if(trk.fCovMatrix) fCovMatrix=new AliAODRedCov<6>(*trk.fCovMatrix);
+  if(trk.fDetPid) fDetPid=new AliAODPid(*trk.fDetPid);
   SetPID(trk.fPID);
-
 }
 
 //______________________________________________________________________________
@@ -164,28 +183,40 @@ AliAODTrack& AliAODTrack::operator=(const AliAODTrack& trk)
   // Assignment operator
   if(this!=&trk) {
 
-    AliVParticle::operator=(trk);
+    AliVTrack::operator=(trk);
 
     trk.GetP(fMomentum);
     trk.GetPosition(fPosition);
     trk.GetPID(fPID);
 
+    SetXYAtDCA(trk.XAtDCA(), trk.YAtDCA());
+    SetPxPyPzAtDCA(trk.PxAtDCA(), trk.PyAtDCA(), trk.PzAtDCA());
+    
     fChi2perNDF = trk.fChi2perNDF;
+    fChi2MatchTrigger = trk.fChi2MatchTrigger;
 
-    fID = trk.fID;
+    fFlags = trk.fFlags;
     fLabel = trk.fLabel;    
     
+    fITSMuonClusterMap = trk.fITSMuonClusterMap;
+    fFilterMap = trk.fFilterMap;
+
+    fID = trk.fID;
+
+    fCharge = trk.fCharge;
+    fType = trk.fType;
+
     delete fCovMatrix;
     if(trk.fCovMatrix) fCovMatrix=new AliAODRedCov<6>(*trk.fCovMatrix);
     else fCovMatrix=NULL;
     fProdVertex = trk.fProdVertex;
 
-    fCharge = trk.fCharge;
-    fITSMuonClusterMap = trk.fITSMuonClusterMap;
     SetUsedForVtxFit(trk.GetUsedForVtxFit());
     SetUsedForPrimVtxFit(trk.GetUsedForPrimVtxFit());
-    fType = trk.fType;
-    fFilterMap = trk.fFilterMap;
+
+    delete fDetPid;
+    if(trk.fDetPid) fDetPid=new AliAODPid(*trk.fDetPid);
+    else fDetPid=NULL;
   }
 
   return *this;
@@ -347,11 +378,11 @@ template <class T> void AliAODTrack::SetP(const T *p, const Bool_t cartesian)
   if (p) {
     if (cartesian) {
       Double_t pt2 = p[0]*p[0] + p[1]*p[1];
-      Double_t P = TMath::Sqrt(pt2 + p[2]*p[2]);
+      Double_t pp  = TMath::Sqrt(pt2 + p[2]*p[2]);
       
       fMomentum[0] = TMath::Sqrt(pt2); // pt
-      fMomentum[1] = (pt2 != 0.) ? TMath::ATan2(p[1], p[0]) : -999; // phi
-      fMomentum[2] = (P != 0.) ? TMath::ACos(p[2]/P) : -999.; // theta
+      fMomentum[1] = (pt2 != 0.) ? TMath::Pi()+TMath::ATan2(-p[1], -p[0]) : -999; // phi
+      fMomentum[2] = (pp != 0.) ? TMath::ACos(p[2] / pp) : -999.; // theta
     } else {
       fMomentum[0] = p[0];  // pt
       fMomentum[1] = p[1];  // phi
@@ -417,13 +448,12 @@ void AliAODTrack::Print(Option_t* /* option */) const
   printf("       phi = %f\n", Phi());
   printf("  chi2/NDF = %f\n", Chi2perNDF());
   printf("    charge = %d\n", Charge());
-  printf(" PID object: %p\n", PID());
 }
 
-void AliAODTrack::SetMatchTrigger(Int_t MatchTrigger){
+void AliAODTrack::SetMatchTrigger(Int_t matchTrig){
 //
 // Set the MUON trigger information
-  switch(MatchTrigger){
+  switch(matchTrig){
     case 0: // 0 track does not match trigger
       fITSMuonClusterMap=fITSMuonClusterMap&0x3fffffff;
       break;
@@ -438,17 +468,11 @@ void AliAODTrack::SetMatchTrigger(Int_t MatchTrigger){
       break;
     default:
       fITSMuonClusterMap=fITSMuonClusterMap&0x3fffffff;
-      printf("AliAODTrack::SetMatchTrigger unknown case for MatchTrigger: %d\n",MatchTrigger);
+      AliWarning(Form("unknown case for matchTrig: %d\n",matchTrig));
   }
 }
 
-void AliAODTrack::SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh){
-//
-// Set the MUON hit pattern (1 bit per chamber) 
-  fITSMuonClusterMap=(fITSMuonClusterMap&0xffff00ff)|(hitsPatternInTrigCh<<8);
-}
-
-Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Char_t *cathode){
+Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Option_t *cathode){
 //
 // Retrieve hit information for MUON identified by  (station, plane, cathode)
   if(cathode){
@@ -513,18 +537,26 @@ Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Char_t *cathode){
 }
 
 Int_t AliAODTrack::HitsMuonChamber(Int_t MuonChamber){
-// Retrieve hit information for MUON Chamber
-  switch(MuonChamber){
-    case 11:
-      return HitsMT(1,1);
-    case 12:
-      return HitsMT(1,2);
-    case 13:
-      return HitsMT(2,1);
-    case 14:
-      return HitsMT(2,2);
-    default:
-      printf("Unknown MUON chamber: %d\n",MuonChamber);
-      return 0;
+  //
+  // Retrieve hit information for MUON Tracker/Trigger Chamber
+  // WARNING: chamber number start from 1 instead of 0
+  
+  if (MuonChamber > 0 && MuonChamber < 11) {
+    return ((GetMUONClusterMap() & BIT(MuonChamber-1)) != 0) ? 1 : 0;
+  } else {
+    switch(MuonChamber){
+      case 11:
+       return HitsMT(1,1);
+      case 12:
+       return HitsMT(1,2);
+      case 13:
+       return HitsMT(2,1);
+      case 14:
+       return HitsMT(2,2);
+      default:
+       printf("Unknown MUON chamber: %d\n",MuonChamber);
+       return 0;
+    }
   }
 }
+