add new data members, move members to the correlation class to the base one, and...

[u/mrichter/AliRoot.git] / STEER / AOD / AliAODHMPIDrings.h

diff --git a/STEER/AOD/AliAODHMPIDrings.h b/STEER/AOD/AliAODHMPIDrings.h
index 2b812534320145a6af2e90ce2d88bce3be59b8db..e11515969fed7038d1634b7b83318b9f7eda5c98 100644 (file)
--- a/STEER/AOD/AliAODHMPIDrings.h
+++ b/STEER/AOD/AliAODHMPIDrings.h
@@ -25,17 +25,17 @@ class AliAODHMPIDrings : public TObject {
                     Int_t trkId,
                     Int_t qn, 
                     Int_t cluIdx,
-                    Double32_t  trkTheta,
-                    Double32_t trkPhi,
-                    Double32_t signal,
-                    Double32_t occ,
-                    Double32_t chi2,
-                    Double32_t trkX,
-                    Double32_t trkY,
-                    Double32_t mipX,
-                    Double32_t mipY,
-                    Double32_t *pid,
-                    Double32_t *p                  );      //              
+                    Double_t  trkTheta,
+                    Double_t trkPhi,
+                    Double_t signal,
+                    Double_t occ,
+                    Double_t chi2,
+                    Double_t trkX,
+                    Double_t trkY,
+                    Double_t mipX,
+                    Double_t mipY,
+                    Double_t *pid,
+                    Double_t *p                  );      //              
       
       
   AliAODHMPIDrings(const AliAODHMPIDrings& hmpidAOD);//
@@ -43,7 +43,7 @@ class AliAODHMPIDrings : public TObject {
   virtual ~AliAODHMPIDrings() {};
     
   //___ Getters
-  Double32_t GetHmpTrkID()                const { return fHmpidAODtrkId; }
+  Int_t GetHmpTrkID()                const { return fHmpidAODtrkId; }
   
   Double32_t GetHmpMipCharge()            const { return fHmpidAODqn%1000000; }
   Double32_t GetHmpNumOfPhotonClusters()  const { return fHmpidAODqn/1000000;}
@@ -52,23 +52,23 @@ class AliAODHMPIDrings : public TObject {
   
   Int_t      GetHmpCluIdx()               const { return fHmpidAODcluIdx; }
   
-  Double32_t GetHmpTrackTheta()           const { return fHmpidAODtrkTheta;}
-  Double32_t GetHmpTrackPhi()             const { return fHmpidAODtrkPhi;}
+  Double_t GetHmpTrackTheta()           const { return fHmpidAODtrkTheta;}
+  Double_t GetHmpTrackPhi()             const { return fHmpidAODtrkPhi;}
   
-  Double32_t GetHmpSignal()               const { return fHmpidAODsignal;}
-  Double32_t GetHmpOccupancy()            const { return fHmpidAODocc;}
+  Double_t GetHmpSignal()               const { return fHmpidAODsignal;}
+  Double_t GetHmpOccupancy()            const { return fHmpidAODocc;}
   
-  Double32_t GetHmpChi2()                 const { return fHmpidAODchi2;}
+  Double_t GetHmpChi2()                 const { return fHmpidAODchi2;}
 
-  Double32_t GetHmpTrackX()               const { return fHmpidAODtrkX;}
-  Double32_t GetHmpTrackY()               const { return fHmpidAODtrkY;}
+  Double_t GetHmpTrackX()               const { return fHmpidAODtrkX;}
+  Double_t GetHmpTrackY()               const { return fHmpidAODtrkY;}
 
-  Double32_t GetHmpMipX()                 const { return fHmpidAODmipX;}
-  Double32_t GetHmpMipY()                 const { return fHmpidAODmipY;}
+  Double_t GetHmpMipX()                 const { return fHmpidAODmipX;}
+  Double_t GetHmpMipY()                 const { return fHmpidAODmipY;}
 
-  Double32_t GetHmpDX()                   const { return fHmpidAODmipX - fHmpidAODtrkX;}
-  Double32_t GetHmpDY()                   const { return fHmpidAODmipY - fHmpidAODtrkY;}
-  Double32_t GetHmpDist()                 const { return TMath::Sqrt((fHmpidAODmipX - fHmpidAODtrkX)*(fHmpidAODmipX - fHmpidAODtrkX) + (fHmpidAODmipY - fHmpidAODtrkY)*(fHmpidAODmipY - fHmpidAODtrkY));}
+  Double_t GetHmpDX()                   const { return fHmpidAODmipX - fHmpidAODtrkX;}
+  Double_t GetHmpDY()                   const { return fHmpidAODmipY - fHmpidAODtrkY;}
+  Double_t GetHmpDist()                 const { return TMath::Sqrt((fHmpidAODmipX - fHmpidAODtrkX)*(fHmpidAODmipX - fHmpidAODtrkX) + (fHmpidAODmipY - fHmpidAODtrkY)*(fHmpidAODmipY - fHmpidAODtrkY));}
   
   
   void GetHmpPidProbs(Double32_t *pid) const;   //defined in cxx
@@ -81,25 +81,22 @@ class AliAODHMPIDrings : public TObject {
   
   void SetHmpNumOfPhotonClusters(Int_t nph)   { fHmpidAODqn = 1000000 * nph;}
   
-  void SetHmpTrackTheta(Double32_t trkTheta)  { fHmpidAODtrkTheta = trkTheta;}
-  void SetHmpTrackPhi(Double32_t trkPhi)      { fHmpidAODtrkPhi = trkPhi;}
+  void SetHmpTrackTheta(Double_t trkTheta)  { fHmpidAODtrkTheta = trkTheta;}
+  void SetHmpTrackPhi(Double_t trkPhi)      { fHmpidAODtrkPhi = trkPhi;}
   
-  void SetHmpSignal(Double32_t thetaC)        { fHmpidAODsignal = thetaC;}
-  void SetHmpOccupancy(Double32_t occ)        { fHmpidAODocc =  occ;}
+  void SetHmpSignal(Double_t thetaC)        { fHmpidAODsignal = thetaC;}
+  void SetHmpOccupancy(Double_t occ)        { fHmpidAODocc =  occ;}
   
-  void SetHmpChi2(Double32_t chi2)            { fHmpidAODchi2 = chi2;}
+  void SetHmpChi2(Double_t chi2)            { fHmpidAODchi2 = chi2;}
 
-  void SetHmpTrackX(Double32_t trkX)          { fHmpidAODtrkX = trkX;}
-  void SetHmpTrackY(Double32_t trkY)          { fHmpidAODtrkY = trkY;}
+  void SetHmpTrackX(Double_t trkX)          { fHmpidAODtrkX = trkX;}
+  void SetHmpTrackY(Double_t trkY)          { fHmpidAODtrkY = trkY;}
 
-  void SetHmpMipX(Double32_t mipX)            { fHmpidAODmipX = mipX;}
-  void SetHmpMipY(Double32_t mipY)            { fHmpidAODmipY = mipY;}
+  void SetHmpMipX(Double_t mipX)            { fHmpidAODmipX = mipX;}
+  void SetHmpMipY(Double_t mipY)            { fHmpidAODmipY = mipY;}
  
-  void SetHmpPidProbs(Double32_t *pid);       
-  void SetHmpMom(Double32_t *mom);        
-  
-  
-  // blablabla
+  void SetHmpPidProbs(Double_t *pid);       
+  void SetHmpMom(Double_t *mom);        
   
   
   
@@ -111,17 +108,17 @@ class AliAODHMPIDrings : public TObject {
   
   Double32_t  fHmpidAODtrkTheta;                   // [-2*pi,2*pi,16] theta of the track extrapolated to the HMPID, LORS
   Double32_t  fHmpidAODtrkPhi;                     // [-2*pi,2*pi,16] theta of the track extrapolated to the HMPID, LORS
-  Double32_t  fHmpidAODsignal;                     // [0,0.9,8] HMPID signal (Theta ckov, rad)
-  Double32_t  fHmpidAODocc;                        // [0,0,,8]  chamber occupancy where the track passed through: number of pads
+  Double32_t  fHmpidAODsignal;                     // HMPID signal (Theta ckov, rad)
+  Double32_t  fHmpidAODocc;                        // chamber occupancy where the track passed through: number of pads
   Double32_t  fHmpidAODchi2;                       // [0.,0.,8] chi2 in the HMPID  
-  Double32_t  fHmpidAODtrkX;                       // [0.,0.,8] x of the track impact, LORS 
-  Double32_t  fHmpidAODtrkY;                       // [0.,0.,8] y of the track impact, LORS 
-  Double32_t  fHmpidAODmipX;                       // [0.,0.,8] x of the MIP in LORS
-  Double32_t  fHmpidAODmipY;                       // [0.,0.,8] y of the MIP in LORS
+  Double32_t  fHmpidAODtrkX;                       // x of the track impact, LORS 
+  Double32_t  fHmpidAODtrkY;                       // y of the track impact, LORS 
+  Double32_t  fHmpidAODmipX;                       // x of the MIP in LORS
+  Double32_t  fHmpidAODmipY;                       // y of the MIP in LORS
   Double32_t  fHmpidAODpid[AliPID::kSPECIES];      // [0.,0.,8] "detector response probabilities" (for the PID)
-  Double32_t  fHMPIDmom[3];                          // [0.,0.,8] track momentum at the HMPID ring reconstruction
+  Double32_t  fHMPIDmom[3];                        // track momentum at the HMPID ring reconstruction
   
-  ClassDef(AliAODHMPIDrings,1)  
+  ClassDef(AliAODHMPIDrings,2)  
         
 };
 #endif