Bug fix (Alessandro)

[u/mrichter/AliRoot.git] / TRD / AliTRDtrackV1.h

diff --git a/TRD/AliTRDtrackV1.h b/TRD/AliTRDtrackV1.h
index 49624cd6772c21de0d8fb2b15fa65ed4817329c8..e068bd3728126562822f13ec74b9c6eb20d7790b 100644 (file)
--- a/TRD/AliTRDtrackV1.h
+++ b/TRD/AliTRDtrackV1.h
@@ -42,6 +42,7 @@ public:
     kOwner     = BIT(14)
    ,kStopped   = BIT(15) 
    ,kKink      = BIT(16) 
+   ,kPrimary   = BIT(17) 
   };
 
   // propagation/update error codes (up to 4 bits)
@@ -81,7 +82,7 @@ public:
   Int_t          GetClusterIndex(Int_t id) const;
   Float_t        GetEdep() const {return fDE;}
   Int_t          GetESDid() const {return fESDid;}
-  inline Float_t GetMomentum(Int_t plane) const;
+  inline Float_t GetMomentum(Int_t plane=-1) const;
   inline Int_t   GetNCross();
   inline Int_t   GetNumberOfTracklets() const;
   Double_t       GetPIDsignal() const   { return 0.;}
@@ -95,20 +96,21 @@ public:
   AliTRDseedV1*  GetTracklet(Int_t plane) const {return plane >=0 && plane <kNplane ? fTracklet[plane] : NULL;}
   Int_t          GetTrackletIndex(Int_t plane) const          { return (plane>=0 && plane<kNplane) ? fTrackletIndex[plane] : -1;}
   AliExternalTrackParam*
-                 GetTrackLow() const  { return fTrackLow;} 
+                 GetTrackIn() const  { return fTrackLow;} 
   AliExternalTrackParam*
-                 GetTrackHigh() const  { return fTrackHigh;} 
+                 GetTrackOut() const  { return fTrackHigh;} 
   const Int_t* GetTrackletIndexes() const { return &fTrackletIndex[0];}
   
   Bool_t         IsEqual(const TObject *inTrack) const;
   Bool_t         IsKink() const    { return TestBit(kKink);}
   Bool_t         IsOwner() const   { return TestBit(kOwner);};
+  Bool_t         IsPrimary() const   { return TestBit(kPrimary);};
   Bool_t         IsStopped() const { return TestBit(kStopped);};
   Bool_t         IsElectron() const;
   inline static Bool_t IsTrackError(ETRDtrackError error, UInt_t status);
   inline static Bool_t IsLayerError(ETRDlayerError error, Int_t layer, UInt_t status);
 
-  void           MakeBackupTrack();
+  Int_t          MakeBackupTrack();
   void           Print(Option_t *o="") const;
 
   Bool_t         PropagateTo(Double_t xr, Double_t x0 = 8.72, Double_t rho = 5.86e-3);
@@ -118,6 +120,7 @@ public:
   void           SetEdep(Double32_t inDE){fDE = inDE;};
   void           SetESDid(Int_t id) {fESDid = id;}
   void           SetKink(Bool_t k)        { SetBit(kKink, k);}
+  void           SetPrimary(Bool_t k)     { SetBit(kPrimary, k);}
   void           SetNumberOfClusters();
   UChar_t        SetNumberOfTrackletsPID(Bool_t recalc);
   void           SetOwner();
@@ -126,12 +129,12 @@ public:
   inline void    SetStatus(UChar_t stat, Int_t ly=-1);
   void           SetStopped(Bool_t stop) {SetBit(kStopped, stop);}
   void           SetTracklet(AliTRDseedV1 *const trklt,  Int_t index);
-  void           SetTrackLow();
-  void           SetTrackHigh(const AliExternalTrackParam *op=NULL);
+  void           SetTrackIn();
+  void           SetTrackOut(const AliExternalTrackParam *op=NULL);
   inline void    SetReconstructor(const AliTRDReconstructor *rec);
   inline Float_t StatusForTOF();
   void           UnsetTracklet(Int_t plane);
-  Bool_t         Update(Double_t *p, Double_t *cov, Double_t chi2);
+  Bool_t         Update(Double_t *p, Double_t *cov, Double_t chi2, Bool_t useTRD=kTRUE);
   Bool_t         Update(const AliCluster *, Double_t, Int_t) { return kFALSE; };
   void           UpdateESDtrack(AliESDtrack *t);
 
@@ -154,7 +157,16 @@ private:
 //____________________________________________________
 inline Float_t AliTRDtrackV1::GetMomentum(Int_t plane) const
 {
-  return plane >=0 && plane < kNplane && fTrackletIndex[plane] != -1 ? fTracklet[plane]->GetMomentum() : -1.;
+// Return ESD momentum stored in the tracklet reconstructed in layer = "plane". 
+// By default returns the ESD momentum in first tracklet attached to track
+  if(plane==-1){
+    for(Int_t i(0); i<kNplane; i++){
+      if(fTracklet[i]) return fTracklet[i]->GetMomentum();
+    }
+  } else if( plane >=0 && plane < kNplane){
+    if(fTracklet[plane]) return fTracklet[plane]->GetMomentum();
+  }
+  return -1.;
 }
 
 //____________________________________________________