X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=STEER%2FAliESDVZERO.h;h=0cae17c247ea1c53e300ba99b65843b0edf2e046;hp=932ccf36415a938e071bcd8f63c858b57b191c92;hb=a055ee243954c95b2803e90ef69facaf04836868;hpb=54cc1c1c71a31350768213a21d355a217fad1e48

diff --git a/STEER/AliESDVZERO.h b/STEER/AliESDVZERO.h
index 932ccf36415..0cae17c247e 100644
--- a/STEER/AliESDVZERO.h
+++ b/STEER/AliESDVZERO.h
@@ -8,43 +8,48 @@ class AliESDVZERO : public TObject
 public:
   AliESDVZERO();
   AliESDVZERO(const AliESDVZERO&);
-  AliESDVZERO(Int_t NbPMV0A, Int_t NbPMV0C, Int_t MTotV0A, Int_t MTotV0C, 
-              Int_t *MRingV0A, Int_t *MRingV0C);
-  virtual ~AliESDVZERO() {};
-  AliESDVZERO &operator=(const AliESDVZERO& source);
-  virtual void Copy(TObject &obj) const;
+  AliESDVZERO(UInt_t BBtriggerV0A, UInt_t BGtriggerV0A,
+	      UInt_t BBtriggerV0C, UInt_t BGtriggerV0C,
+	      Short_t *Multiplicity);
 
+  virtual ~AliESDVZERO() {};
   
-// Setters
-  virtual void  SetNbPMV0A(Int_t NbPMV0A)  {fNbPMV0A = NbPMV0A;}
-  virtual void  SetNbPMV0C(Int_t NbPMV0C)  {fNbPMV0C = NbPMV0C;}
-  virtual void  SetMTotV0A(Int_t MTotV0A)  {fMTotV0A = MTotV0A;}
-  virtual void  SetMTotV0C(Int_t MTotV0C)  {fMTotV0C = MTotV0C;}					      
-  virtual void  SetMRingV0A(Int_t MRingV0A[4]){for(Int_t j=0; j<4; j++){  
-                                                fMRingV0A[j] = MRingV0A[j];} }
-  virtual void  SetMRingV0C(Int_t MRingV0C[4]){for(Int_t j=0; j<4; j++){  
-                                                fMRingV0C[j] = MRingV0C[j];} }
-  
-// Getters  
-  Short_t GetNbPMV0A()  const {return fNbPMV0A;}
-  Short_t GetNbPMV0C()  const {return fNbPMV0C;}
-  Int_t GetMTotV0A()  const {return fMTotV0A;}
-  Int_t GetMTotV0C()  const {return fMTotV0C;}
-  Int_t* GetMRingV0A() const {return (int*) fMRingV0A;}
-  Int_t* GetMRingV0C() const {return (int*) fMRingV0C;}
+  virtual void SetBBtriggerV0A(UInt_t BBtrigger) {fBBtriggerV0A=BBtrigger;}
+  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])
+    {for(Int_t i=0;i<64;i++) fMultiplicity[i]=Multiplicity[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);
+
+  Int_t   GetMultiplicity(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  OutOfRange(Int_t i, const char *s, Int_t upper) const;
+  AliESDVZERO &operator=(const AliESDVZERO& source);
     
 protected:
-  Int_t fMTotV0A;     // Total multiplicity in V0A
-  Int_t fMTotV0C;     // Total multiplicity in V0C
-  Int_t fMRingV0A[4]; // Multiplicity per ring in V0A - 4 rings
-  Int_t fMRingV0C[4]; // Multiplicity per ring in V0C - 4 rings
-  Short_t fNbPMV0A;     // Number of PMs fired in V0A - out of 32
-  Short_t fNbPMV0C;     // Number of PMs fired in V0C - out of 32
 
+  UInt_t  fBBtriggerV0A; // bit mask for Beam-Beam trigger in V0A
+  UInt_t  fBGtriggerV0A; // bit mask for Beam-Gas trigger in V0A
+  UInt_t  fBBtriggerV0C; // bit mask for Beam-Beam trigger in V0C
+  UInt_t  fBGtriggerV0C; // bit mask for Beam-Gas trigger in V0C
+
+  UShort_t fMultiplicity[64]; // multiplicity per PMT
 
-  ClassDef(AliESDVZERO,2)
+  ClassDef(AliESDVZERO,3)
 };
 
 #endif