Updates in event mixing code for low-pt code

[u/mrichter/AliRoot.git] / STEER / ESD / AliESDtrack.h

diff --git a/STEER/ESD/AliESDtrack.h b/STEER/ESD/AliESDtrack.h
index c027dcf5a16ca2b39322ee7e6f61e1f78ba162c9..068d8475c80f92446d18d8eadb3ceadc45dda43a 100644 (file)
--- a/STEER/ESD/AliESDtrack.h
+++ b/STEER/ESD/AliESDtrack.h
@@ -162,11 +162,10 @@ public:
   Bool_t GetOuterExternalParameters
         (Double_t &alpha, Double_t &x, Double_t p[5]) const;
   Bool_t GetOuterExternalCovariance(Double_t cov[15]) const;
-
+  
   Bool_t GetOuterHmpExternalParameters
         (Double_t &alpha, Double_t &x, Double_t p[5]) const;
-  Bool_t GetOuterHmpExternalCovariance(Double_t cov[15]) const;
-
+  Bool_t GetOuterHmpExternalCovariance(Double_t cov[15]) const; 
   
   Int_t GetNcls(Int_t idet) const;
   Int_t GetClusters(Int_t idet, Int_t *idx) const;
@@ -185,6 +184,7 @@ public:
   UChar_t GetITSClusterMap() const {return fITSClusterMap;}
   void     SetITSClusterMap(UChar_t amap) {fITSClusterMap = amap;}
 
+  Char_t   GetITSNcls() const { return fITSncls;}
   UChar_t GetITSSharedMap() const {return fITSSharedMap;}
   void    SetITSSharedFlag(int lr) {fITSSharedMap |= 0x1<<lr;}
   Bool_t  GetITSFakeFlag()   const {return (fITSSharedMap&BIT(7))!=0;}
@@ -324,19 +324,19 @@ public:
   void    SortTOFcluster(); // RS? Not to be used?
   void    ReMapTOFcluster(Int_t ncl,Int_t *mapping);  // RS? Not to be used?
 
-  void    SetTOFsignal(Double_t tof) {fTOFsignal=tof;}
+  void    SetTOFsignal(Double_t tof);
   Double_t GetTOFsignal() const;
-  void    SetTOFsignalToT(Double_t ToT) {fTOFsignalToT=ToT;}
+  void    SetTOFsignalToT(Double_t ToT);
   Double_t GetTOFsignalToT() const;
-  void    SetTOFsignalRaw(Double_t tof) {fTOFsignalRaw=tof;}
+  void    SetTOFsignalRaw(Double_t tof);
   Double_t GetTOFsignalRaw() const;
-  void    SetTOFsignalDz(Double_t dz) {fTOFsignalDz=dz;}
+  void    SetTOFsignalDz(Double_t dz);
   Double_t GetTOFsignalDz() const;
-  void    SetTOFsignalDx(Double_t dx) {fTOFsignalDx=dx;}
+  void    SetTOFsignalDx(Double_t dx);
   Double_t GetTOFsignalDx() const;
-  void     SetTOFDeltaBC(Short_t deltaBC) {fTOFdeltaBC=deltaBC;};
+  void     SetTOFDeltaBC(Short_t deltaBC);
   Short_t  GetTOFDeltaBC() const;
-  void     SetTOFL0L1(Short_t l0l1) {fTOFl0l1=l0l1;};
+  void     SetTOFL0L1(Short_t l0l1);
   Short_t  GetTOFL0L1() const;
   Double_t GetTOFchi2() const {return fTOFchi2;};
   void    SetTOFpid(const Double_t *p);
@@ -348,7 +348,7 @@ public:
   Int_t   GetTOFCalChannel() const;
   Int_t   GetTOFcluster() const;
   void    SetTOFcluster(Int_t index) {fTOFindex=index;}
-  void    SetTOFCalChannel(Int_t index) {fTOFCalChannel=index;}
+  void    SetTOFCalChannel(Int_t index);
   Int_t   GetTOFclusterN() const;
   Bool_t  IsTOFHitAlreadyMatched() const;
   void    SetTOFsignalTunedOnData(Double_t signal){fTOFsignalTuned=signal;}
@@ -458,12 +458,29 @@ public:
   //-----------
   virtual Int_t GetTrackParam         ( AliExternalTrackParam &p ) const {p=*this; return 0;}
   virtual Int_t GetTrackParamRefitted ( AliExternalTrackParam & ) const {return 0;}
-  virtual Int_t GetTrackParamIp       ( AliExternalTrackParam & ) const {return 0;}
-  virtual Int_t GetTrackParamTPCInner ( AliExternalTrackParam & ) const {return 0;}
-  virtual Int_t GetTrackParamOp       ( AliExternalTrackParam & ) const {return 0;}
-  virtual Int_t GetTrackParamCp       ( AliExternalTrackParam & ) const {return 0;}
   virtual Int_t GetTrackParamITSOut   ( AliExternalTrackParam & ) const {return 0;}
 
+  Int_t GetTrackParamIp       ( AliExternalTrackParam &p ) const {
+      if(!GetInnerParam()) return -1;
+      p=*GetInnerParam();
+      return 0;}
+
+  Int_t GetTrackParamOp       ( AliExternalTrackParam &p ) const {
+      if(!GetOuterParam()) return -1;
+      p=*GetOuterParam();
+      return 0;}
+
+  Int_t GetTrackParamTPCInner ( AliExternalTrackParam &p ) const {
+      if(!GetTPCInnerParam()) return -1;
+      p=*GetTPCInnerParam();
+      return 0;}
+
+  Int_t GetTrackParamCp       ( AliExternalTrackParam &p ) const {
+      if(!GetConstrainedParam()) return -1;
+      p=*GetConstrainedParam();
+      return 0;}
+
+
 protected:
   
   AliExternalTrackParam *fCp; // Track parameters constrained to the primary vertex