Fixes for some mem-leaks: most changes where pretty basic (i.e. adding deletes).

[u/mrichter/AliRoot.git] / STEER / AliKalmanTrack.h

diff --git a/STEER/AliKalmanTrack.h b/STEER/AliKalmanTrack.h
index 19dc66d1213df67f9ec3e4d14b12a8a3f4421a14..db57443031167da8b48bb6fc536bb790c66ee6e4 100644 (file)
--- a/STEER/AliKalmanTrack.h
+++ b/STEER/AliKalmanTrack.h
@@ -4,62 +4,89 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
 //-------------------------------------------------------------------------
 //                          Class AliKalmanTrack
-//
-//         Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
+//      fixed the interface for the derived reconstructed track classes 
+//            Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 
-#include <TObject.h>
+#include "AliExternalTrackParam.h"
+#include "AliLog.h"
+#include "AliPID.h"
 
 class AliCluster;
 
-class AliKalmanTrack : public TObject {
+class AliKalmanTrack : public AliExternalTrackParam {
 public:
-  AliKalmanTrack() { fLab=-3141593; fChi2=0; fN=0; fMass=0.13957;}
-  AliKalmanTrack(const AliKalmanTrack &t) {
-    fLab=t.fLab; fChi2=t.fChi2; fN=t.fN; fMass=t.fMass;
-  }
+  AliKalmanTrack();
+  AliKalmanTrack(const AliKalmanTrack &t);
   virtual ~AliKalmanTrack(){};
+  AliKalmanTrack& operator=(const AliKalmanTrack &o);
   void SetLabel(Int_t lab) {fLab=lab;}
 
+  virtual Double_t GetPredictedChi2(const AliCluster *c) const = 0;
+  virtual Bool_t PropagateTo(Double_t xr, Double_t x0, Double_t rho) = 0;
+  virtual Bool_t Update(const AliCluster* c, Double_t chi2, Int_t index) = 0;
+
   Bool_t   IsSortable() const {return kTRUE;}
   Int_t    GetLabel()   const {return fLab;}
   Double_t GetChi2()    const {return fChi2;}
   Double_t GetMass()    const {return fMass;}
   Int_t    GetNumberOfClusters() const {return fN;}
-  virtual Int_t GetClusterIndex(Int_t i) const { //reserved for AliTracker
-    printf("AliKalmanTrack::GetClusterIndex(Int_t i) must be overloaded !\n");
+  virtual Int_t GetClusterIndex(Int_t) const { //reserved for AliTracker
+    AliWarning("Method must be overloaded !\n");
     return 0;
   } 
+  virtual Double_t GetPIDsignal() const {
+    AliWarning("Method must be overloaded !\n");
+    return 0.;
+  }
 
-  virtual Int_t Compare(const TObject *o) const {return 0;} 
+  virtual Int_t Compare(const TObject *) const {return 0;} 
 
-  virtual void GetExternalParameters(Double_t &xr, Double_t x[5]) const {;}
-  virtual void GetExternalCovariance(Double_t cov[15]) const {;}
+  void GetExternalParameters(Double_t &xr,Double_t p[5]) const {
+    xr=GetX();
+    for (Int_t i=0; i<5; i++) p[i]=GetParameter()[i];
+  }
+  void GetExternalCovariance(Double_t cov[15]) const {
+    for (Int_t i=0; i<15; i++) cov[i]=GetCovariance()[i];
+  }
 
-  virtual Double_t GetPredictedChi2(const AliCluster *cluster) const {return 0.;}
-  virtual 
-  Int_t PropagateTo(Double_t xr,Double_t x0,Double_t rho) {return 0;}
-  virtual Int_t Update(const AliCluster* c, Double_t chi2, UInt_t i) {return 0;}
+  // Time integration (S.Radomski@gsi.de)
+  void StartTimeIntegral();
+  void SetIntegratedLength(Double_t l) {fIntegratedLength=l;}
+  void SetIntegratedTimes(const Double_t *times);
 
-  static void SetConvConst(Double_t cc) {fConvConst=cc;}
-  Double_t GetConvConst() const {return fConvConst;}
+  Bool_t IsStartedTimeIntegral() const {return fStartTimeIntegral;}
+  void AddTimeStep(Double_t length);
+  void GetIntegratedTimes(Double_t *times) const;
+  Double_t GetIntegratedTime(Int_t pdg) const;
+  Double_t GetIntegratedLength() const {return fIntegratedLength;}
+
+  void SetNumberOfClusters(Int_t n) {fN=n;} 
+
+  void SetFakeRatio(Float_t ratio) {fFakeRatio=ratio;}
+  Float_t  GetFakeRatio()   const {return fFakeRatio;}
+  void SetMass(Double_t mass) {fMass=mass;}
 
 protected:
   void SetChi2(Double_t chi2) {fChi2=chi2;} 
-  void SetMass(Double_t mass) {fMass=mass;}
-  void SetNumberOfClusters(Int_t n) {fN=n;} 
 
-private: 
   Int_t fLab;             // track label
+  Float_t fFakeRatio;     // fake ratio
   Double_t fChi2;         // total chi2 value for this track
   Double_t fMass;         // mass hypothesis
   Int_t fN;               // number of associated clusters
 
-  static Double_t fConvConst; //conversion constant cm -> GeV/c
-
-  ClassDef(AliKalmanTrack,1)    // Reconstructed track
+private:
+  // variables for time integration (S.Radomski@gsi.de)
+  Bool_t  fStartTimeIntegral;       // indicator wether integrate time
+  Double_t fIntegratedTime[AliPID::kSPECIES];       // integrated time
+  Double_t fIntegratedLength;        // integrated length
+  
+  ClassDef(AliKalmanTrack,6)    // Reconstructed track
 };
 
 #endif