Multiplicities in VZERO are now float numbers (in units of MIP) (Brigitte)

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

diff --git a/STEER/AliESDVZERO.h b/STEER/AliESDVZERO.h
index c817e862e074d3d5fc38c8ef3ead96cf1f68571b..fcdc03bfab139adfd47f22c6ed50b4fe587f26f7 100644 (file)
--- a/STEER/AliESDVZERO.h
+++ b/STEER/AliESDVZERO.h
@@ -10,7 +10,7 @@ public:
   AliESDVZERO(const AliESDVZERO&);
   AliESDVZERO(UInt_t BBtriggerV0A,   UInt_t BGtriggerV0A,
              UInt_t BBtriggerV0C,   UInt_t BGtriggerV0C,
-             Short_t *Multiplicity, Short_t *Adc, 
+             Float_t *Multiplicity, Short_t *Adc, 
              Short_t *Time, Short_t *Width, Bool_t *BBFlag, Bool_t *BGFlag);
 
   virtual ~AliESDVZERO() {};
@@ -20,7 +20,7 @@ public:
   virtual void SetBGtriggerV0A(UInt_t BGtrigger) {fBGtriggerV0A=BGtrigger;}
   virtual void SetBBtriggerV0C(UInt_t BBtrigger) {fBBtriggerV0C=BBtrigger;}
   virtual void SetBGtriggerV0C(UInt_t BGtrigger) {fBGtriggerV0C=BGtrigger;}
-  virtual void SetMultiplicity(Short_t Multiplicity[64])
+  virtual void SetMultiplicity(Float_t Multiplicity[64])
     {for(Int_t i=0;i<64;i++) fMultiplicity[i]=Multiplicity[i];}
   virtual void SetADC(Short_t adc[64])
     {for(Int_t i=0;i<64;i++) fAdc[i]=adc[i];}
@@ -34,33 +34,33 @@ public:
     {for(Int_t i=0;i<64;i++) fBGFlag[i]=BGFlag[i];}   
          
   // Getters  
-  Short_t GetNbPMV0A();
-  Short_t GetNbPMV0C();
-  Int_t   GetMTotV0A();
-  Int_t   GetMTotV0C(); 
-  Int_t*  GetMRingV0A();
-  Int_t*  GetMRingV0C();
-  Int_t   GetMRingV0A(Int_t ring);
-  Int_t   GetMRingV0C(Int_t ring);
+  Short_t  GetNbPMV0A();
+  Short_t  GetNbPMV0C();
+  Float_t  GetMTotV0A();
+  Float_t  GetMTotV0C(); 
+  Float_t* GetMRingV0A();
+  Float_t* GetMRingV0C();
+  Float_t  GetMRingV0A(Int_t ring);
+  Float_t  GetMRingV0C(Int_t ring);
 
-  Int_t   GetMultiplicity(Int_t i);
-  Int_t   GetMultiplicityV0A(Int_t i);
-  Int_t   GetMultiplicityV0C(Int_t i);    
-  Int_t   GetAdc(Int_t i);
-  Int_t   GetAdcV0A(Int_t i); 
-  Int_t   GetAdcV0C(Int_t i);   
-  Int_t   GetTime(Int_t i);
-  Int_t   GetTimeV0A(Int_t i);   
-  Int_t   GetTimeV0C(Int_t i);    
-  Int_t   GetWidth(Int_t i);
-  Int_t   GetWidthV0A(Int_t i);
-  Int_t   GetWidthV0C(Int_t i);
-  Bool_t  BBTriggerV0A(Int_t i);
-  Bool_t  BGTriggerV0A(Int_t i);
-  Bool_t  BBTriggerV0C(Int_t i);
-  Bool_t  BGTriggerV0C(Int_t i);  
-  Bool_t  GetBBFlag(Int_t i);
-  Bool_t  GetBGFlag(Int_t i);
+  Float_t  GetMultiplicity(Int_t i);
+  Float_t  GetMultiplicityV0A(Int_t i);
+  Float_t  GetMultiplicityV0C(Int_t i);    
+  Int_t    GetAdc(Int_t i);
+  Int_t    GetAdcV0A(Int_t i); 
+  Int_t    GetAdcV0C(Int_t i);   
+  Int_t    GetTime(Int_t i);
+  Int_t    GetTimeV0A(Int_t i);   
+  Int_t    GetTimeV0C(Int_t i);    
+  Int_t    GetWidth(Int_t i);
+  Int_t    GetWidthV0A(Int_t i);
+  Int_t    GetWidthV0C(Int_t i);
+  Bool_t   BBTriggerV0A(Int_t i);
+  Bool_t   BGTriggerV0A(Int_t i);
+  Bool_t   BBTriggerV0C(Int_t i);
+  Bool_t   BGTriggerV0C(Int_t i);  
+  Bool_t   GetBBFlag(Int_t i);
+  Bool_t   GetBGFlag(Int_t i);
   
   Bool_t OutOfRange(Int_t i, const char *s, Int_t upper) const;
   AliESDVZERO &operator=(const AliESDVZERO& source);
@@ -72,14 +72,14 @@ protected:
   UInt_t  fBBtriggerV0C;     // bit mask for Beam-Beam trigger in V0C
   UInt_t  fBGtriggerV0C;     // bit mask for Beam-Gas trigger in V0C
 
-  Short_t fMultiplicity[64]; //  multiplicity for each channel
+  Float_t fMultiplicity[64]; //  multiplicity for each channel
   Short_t fAdc[64];          //  adc for each channel
   Short_t fTime[64];         //  time for each channel
   Short_t fWidth[64];        //  time width for each channel
   Bool_t  fBBFlag[64];       //  BB Flags from Online V0 Electronics
   Bool_t  fBGFlag[64];       //  BG Flags from Online V0 Electronics
   
-  ClassDef(AliESDVZERO,5)
+  ClassDef(AliESDVZERO,6)
 };
 
 #endif