Changes in RICH signal (Yu.Belikov, RICH)

diff --git a/STEER/AliESDtrack.cxx b/STEER/AliESDtrack.cxx
index 0165a18d32c79056f6cd4f71a11608d990ca10c6..b3c391e5c4618e61c537f8b786c6ad231ae5c50a 100644 (file)
--- a/STEER/AliESDtrack.cxx
+++ b/STEER/AliESDtrack.cxx
@@ -32,6 +32,7 @@ ClassImp(AliESDtrack)
 AliESDtrack::AliESDtrack() : 
 fFlags(0),
 fLabel(0),
+fID(0),
 fTrackLength(0),
 fD(0),
 fZ(0),
@@ -61,12 +62,18 @@ fTOFindex(0),
 fTOFsignal(-1),
 fPHOSsignal(-1),
 fEMCALsignal(-1),
-fRICHsignal(-1)
+fRICHchi2(1e10),
+fRICHncls(0),
+fRICHindex(0),
+fRICHsignal(-1),
+fRICHtheta(0),
+fRICHphi(0),
+fRICHdx(0),
+fRICHdy(0)
 {
   //
   // The default ESD constructor 
   //
-  fID =0;
   for (Int_t i=0; i<AliPID::kSPECIES; i++) {
     fTrackTime[i]=0.;
     fR[i]=1.;
@@ -114,9 +121,9 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):TObject(track){
   //
   //copy constructor
   //
-  fID = track.fID;
   fFlags = track.fFlags;
   fLabel =track.fLabel;
+  fID = track.fID;
   fTrackLength =track.fTrackLength;
   fD=track.fD; fZ=track.fZ;
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fTrackTime[i] =track.fTrackTime[i];
@@ -193,10 +200,15 @@ AliESDtrack::AliESDtrack(const AliESDtrack& track):TObject(track){
   fEMCALsignal=track.fEMCALsignal; 
   for (Int_t i=0;i<AliPID::kSPECIESN;i++) fEMCALr[i]=track.fEMCALr[i]; 
   //
+  fRICHchi2=track.fRICHchi2;     
+  fRICHncls=track.fRICHncls;     
+  fRICHindex=track.fRICHindex;     
   fRICHsignal=track.fRICHsignal;     
   for (Int_t i=0;i<AliPID::kSPECIES;i++) fRICHr[i]=track.fRICHr[i];
-  
-  
+  fRICHtheta=track.fRICHtheta;     
+  fRICHphi=track.fRICHphi;      
+  fRICHdx=track.fRICHdx;     
+  fRICHdy=track.fRICHdy;      
 }
 //_______________________________________________________________________
 AliESDtrack::~AliESDtrack(){ 

diff --git a/STEER/AliESDtrack.h b/STEER/AliESDtrack.h
index fd4075e636fc04e4df113ae11b05b6e42642b905..ac05135a6bb6e2bbef9b439deeb83c4af3f4da89 100644 (file)
--- a/STEER/AliESDtrack.h
+++ b/STEER/AliESDtrack.h
@@ -138,6 +138,24 @@ public:
   Float_t GetRICHsignal() const {return fRICHsignal;}
   void    SetRICHpid(const Double_t *p);
   void    GetRICHpid(Double_t *p) const;
+  void    SetRICHchi2(Double_t chi2) {fRICHchi2=chi2;}
+  Float_t GetRICHchi2() const {return fRICHchi2;}
+  void    SetRICHcluster(UInt_t index) {fRICHindex=index;}
+  UInt_t  GetRICHcluster() const {return fRICHindex;}
+  void    SetRICHnclusters(Int_t n) {fRICHncls=n;}
+  Int_t   GetRICHnclusters() const {return fRICHncls;}
+  void    SetRICHthetaPhi(Double_t theta, Double_t phi) {
+    fRICHtheta=theta; fRICHphi=phi;
+  }
+  void    GetRICHthetaPhi(Double_t &theta, Double_t &phi) const {
+    theta=fRICHtheta; phi=fRICHphi;
+  }
+  void    SetRICHdxdy(Double_t dx, Double_t dy) {
+    fRICHdx=dx; fRICHdy=dy;
+  }
+  void    GetRICHdxdy(Double_t &dx, Double_t &dy) const {
+    dx=fRICHtheta; dy=fRICHphi;
+  }
   
   void SetPHOSposition(const Double_t *pos)  {
     fPHOSpos[0] = pos[0]; fPHOSpos[1]=pos[1]; fPHOSpos[2]=pos[2];
@@ -270,10 +288,17 @@ protected:
   Float_t fEMCALr[AliPID::kSPECIESN]; // PID information from EMCAL
 
   // HMPID related track information
-  Float_t fRICHsignal;     // detector's PID signal (beta for RICH)
+  Float_t fRICHchi2;       // chi2 in the RICH
+  Int_t   fRICHncls;       // number of photon clusters
+  UInt_t  fRICHindex;      // index of the assigned MIP cluster
+  Float_t fRICHsignal;     // RICH PID signal
   Float_t fRICHr[AliPID::kSPECIES];// "detector response probabilities" (for the PID)
+  Float_t fRICHtheta;      // theta of the track extrapolated to the RICH
+  Float_t fRICHphi;        // phi of the track extrapolated to the RICH
+  Float_t fRICHdx;         // x of the track impact minus x of the MIP
+  Float_t fRICHdy;         // y of the track impact minus y of the MIP
        
-  ClassDef(AliESDtrack,11)  //ESDtrack 
+  ClassDef(AliESDtrack,12)  //ESDtrack 
 };
 
 #endif