Increased size of collection in Merge and protected SaveHistograms

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

diff --git a/STEER/AliAODPid.h b/STEER/AliAODPid.h
index cf8768fbfbd39161126bc6e177fd96098637d6a2..37bf8703287326996ca6c8703e5fd1492752f1c3 100644 (file)
--- a/STEER/AliAODPid.h
+++ b/STEER/AliAODPid.h
@@ -25,37 +25,47 @@ class AliAODPid : public TObject {
  //setters
   void      SetITSsignal(Double_t its)                         {fITSsignal=its;}
   void      SetTPCsignal(Double_t tpc)                         {fTPCsignal=tpc;}
+  void      SetTPCsignalN(UShort_t tpcN)                       {fTPCsignalN=tpcN;}
+  void      SetTPCmomentum(Double_t tpcMom)                    {fTPCmomentum=tpcMom;}
   void      SetTRDsignal(Int_t nslices, Double_t* trdslices)   {fTRDnSlices = nslices; fTRDslices=trdslices;}
+  void      SetTRDmomentum(Int_t nplane, Float_t trdMom)       {fTRDmomentum[nplane]=trdMom;}
   void      SetTOFsignal(Double_t tof)                         {fTOFesdsignal=tof;}
   void      SetIntegratedTimes(Double_t timeint[5]);
   void      SetHMPIDsignal(Double_t hmpid)                     {fHMPIDsignal=hmpid;}
   void      SetEMCALPosition(Double_t emcalpos[3]);
   void      SetEMCALMomentum(Double_t emcalmom[3]);
 
-  Double_t  GetITSsignal()       {return  fITSsignal;}
-  Double_t  GetTPCsignal()       {return  fTPCsignal;}
-  Int_t     GetTRDnSlices()      {return  fTRDnSlices;}
-  Double_t* GetTRDsignal()       {return  fTRDslices;}
-  Double_t  GetTOFsignal()       {return  fTOFesdsignal;} 
-  void      GetIntegratedTimes(Double_t timeint[5]); 
-  Double_t  GetHMPIDsignal()     {return  fHMPIDsignal;}
-  void      GetEMCALPosition(Double_t emcalpos[3]);
-  void      GetEMCALMomentum(Double_t emcalmom[3]);
+  Double_t  GetITSsignal()       const {return  fITSsignal;}
+  Double_t  GetTPCsignal()       const {return  fTPCsignal;}
+  UShort_t  GetTPCsignalN()      const {return  fTPCsignalN;}
+  Double_t  GetTPCmomentum()     const {return  fTPCmomentum;}
+  Int_t     GetTRDnSlices()      const {return  fTRDnSlices;}
+  Double_t* GetTRDsignal()       const {return  fTRDslices;}
+  Float_t*  GetTRDmomentum()           {return  fTRDmomentum;}
+  Double_t  GetTOFsignal()       const {return  fTOFesdsignal;}
+  Double_t  GetHMPIDsignal()     const {return  fHMPIDsignal;}
+
+  void      GetIntegratedTimes(Double_t timeint[5])  const; 
+  void      GetEMCALPosition  (Double_t emcalpos[3]) const;
+  void      GetEMCALMomentum  (Double_t emcalmom[3]) const;
 
  private :
-  Double32_t fITSsignal;        //[0.,0.,10] detector raw signal
-  Double32_t fTPCsignal;        //[0.,0.,10] detector raw signal
-  Int_t      fTRDnSlices;       //N slices used for PID in the TRD
-  Double32_t* fTRDslices;       //[fTRDnSlices]
-  Double32_t fTOFesdsignal;     //TOF signal - t0 (T0 interaction time)
-  Double32_t fIntTime[5];       //track time hypothesis
-  Double32_t fHMPIDsignal;      //detector raw signal
-  Double32_t fEMCALPosition[3]; //global position of track
-                               //extrapolated to EMCAL surface
-  Double32_t fEMCALMomentum[3]; //momentum of track
-                               //extrapolated to EMCAL surface
-
-  ClassDef(AliAODPid,2);
+  Double32_t  fITSsignal;        //[0.,0.,10] detector raw signal
+  Double32_t  fTPCsignal;        //[0.,0.,10] detector raw signal
+  UShort_t    fTPCsignalN;       // number of points used for TPC dE/dx
+  Double_t    fTPCmomentum;      // momentum at the inner wall of TPC;
+  Int_t       fTRDnSlices;       // N slices used for PID in the TRD
+  Double32_t* fTRDslices;        //[fTRDnSlices]
+  Float_t     fTRDmomentum[6];   // momentum at the TRD layers
+  Double32_t  fTOFesdsignal;     // TOF signal - t0 (T0 interaction time)
+  Double32_t  fIntTime[5];       // track time hypothesis
+  Double32_t  fHMPIDsignal;      // detector raw signal
+  Double32_t  fEMCALPosition[3]; // global position of track
+                                // extrapolated to EMCAL surface
+  Double32_t  fEMCALMomentum[3]; // momentum of track
+                                // extrapolated to EMCAL surface
+
+  ClassDef(AliAODPid, 4);
 };
 
 #endif