Fixes for coverity.

[u/mrichter/AliRoot.git] / VZERO / AliVZEROdigit.h

diff --git a/VZERO/AliVZEROdigit.h b/VZERO/AliVZEROdigit.h
index cd13bc25cd94943f3f2a13656240ead09e417e39..24dfe9c61d92fe0de3b96d6aaa988bfeaa693322 100644 (file)
--- a/VZERO/AliVZEROdigit.h
+++ b/VZERO/AliVZEROdigit.h
@@ -12,37 +12,31 @@ class AliVZEROdigit: public AliDigit  {
 
  public:
     AliVZEROdigit();
-    AliVZEROdigit(Int_t* tracks, Int_t* digits);
-    AliVZEROdigit(Int_t   /* PMnumber */, Float_t  /* ADC */, Float_t /* Time */);
-    AliVZEROdigit(Int_t   /* PMnumber */, Float_t  /* ADC */, Float_t /* Time */, 
-                  Float_t /* TimeWidth*/, Bool_t /* BBFlag */, Bool_t /* BGFlag */);
-    AliVZEROdigit(Int_t   /* PMnumber */, Float_t  /* ADC */, Float_t /* Time */, 
-                  Float_t /* TimeWidth*/, Bool_t /* BBFlag */, Bool_t /* BGFlag */, Bool_t /* Integrator */);
+    AliVZEROdigit(Int_t   PMnumber, Float_t time, 
+                  Float_t TimeWidth,
+                 Bool_t  Integrator,
+                 Short_t *chargeADC = 0,
+                 Int_t *labels = 0);
     virtual ~AliVZEROdigit() {};
     virtual void Print(const Option_t* option="") const;
-    
+
+    enum {kNClocks = 21};
+
     Int_t   PMNumber()   const {return fPMNumber;}    
-    Float_t ADC()        const {return fADC;}
+    Short_t ADC()        const {return fChargeADC[kNClocks/2];}
     Float_t Time()       const {return fTime;}
     Float_t Width()      const {return fWidth;} 
-    Bool_t  BBFlag()     const {return fBBFlag;} 
-    Bool_t  BGFlag()     const {return fBGFlag;}
     Bool_t  Integrator() const {return fIntegrator;}
-       
-  private:
-    Int_t  fTrack;         // Track number
+    Short_t ChargeADC(Int_t clock) const {return (clock >= 0 && clock < kNClocks) ? fChargeADC[clock] : 0;}
     
   protected:
-    Int_t   fEvent;         // Event number  
     Int_t   fPMNumber;      // PhotoMultiplier number (0 to 63)
-    Float_t fADC;           // ADC response
     Float_t fTime;          // Time of Flight
     Float_t fWidth;         // Width of the time distribution
-    Bool_t  fBBFlag;        // Beam-Beam Flag given by Yannick in Raw Data only
-    Bool_t  fBGFlag;        // Beam-Gas  Flag given by Yannick in Raw Data only
     Bool_t  fIntegrator;    // Integrator used
-    
-    ClassDef(AliVZEROdigit,3)  //Digit (Header) object for set : VZERO
+    Short_t fChargeADC[kNClocks]; // ADC samples as present in raw data
+
+    ClassDef(AliVZEROdigit,6)  // VZERO Digit class
 };
 
 #endif