updated merging function (Michele)

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

diff --git a/VZERO/AliVZERODigitizer.h b/VZERO/AliVZERODigitizer.h
index e8d6f66898d4d537d686a3cf91afc07fc7eacc5c..7d89827ee438a3d1dea7dc82dcf94a2158441852 100644 (file)
--- a/VZERO/AliVZERODigitizer.h
+++ b/VZERO/AliVZERODigitizer.h
@@ -17,37 +17,51 @@
 
 class TClonesArray;
 class AliRunDigitizer;
-
+class AliCDBManager;
+class AliCDBStorage;
+class AliVZEROCalibData;
 
 class AliVZERODigitizer: public AliDigitizer {
 
-public:
+ public:
 
-  AliVZERODigitizer() ;                       // constructor
-  AliVZERODigitizer(AliRunDigitizer *manager);// constructor
-  virtual ~AliVZERODigitizer() ;              // destructor
+   AliVZERODigitizer() ;                       // constructor
+   AliVZERODigitizer(AliRunDigitizer *manager);// constructor
+   virtual ~AliVZERODigitizer() ;              // destructor
   
-  virtual Bool_t Init();
-  virtual void   Exec(Option_t* option=0);
+   virtual Bool_t Init();
+   virtual void   Exec(Option_t* option=0);
 
-  void AddDigit(Int_t cellnumber, Int_t adc, Int_t tof);
-  void ResetDigit();
+   void AddDigit(Int_t PMnumber, Float_t adc, Float_t time);
+   void ResetDigit();
+   void GetCollisionMode();
+   void GetCollisionMode(Int_t collisionMode, Float_t beamEnergy) 
+                        {fCollisionMode=collisionMode; fBeamEnergy=beamEnergy;}
+                                               
+   AliVZEROCalibData *GetCalibData() const;
+   Int_t GetPMNumber(Int_t cell) const;
 
+ protected:
+ 
+   AliVZEROCalibData *fCalibData;  //! calibration data
+ 
  private:
-  AliVZERODigitizer(const AliVZERODigitizer& digitizer): 
-    AliDigitizer(digitizer)
-    {Fatal("AliVZERODigitizer", "copy constructor not implemented");}
-  AliVZERODigitizer& operator = (const AliVZERODigitizer& /*digitizer*/) 
-    {Fatal("operator=", "assignment operator not implemented"); return *this;}
+ 
+   AliVZERODigitizer(const AliVZERODigitizer& /*digitizer*/); 
+      
+   AliVZERODigitizer& operator = (const AliVZERODigitizer& /*digitizer*/); 
   
-  Float_t fPhotoCathodeEfficiency; // Photocathode efficiency
-  Float_t fPMVoltage ;             // Photomultiplier voltage
-  Float_t fPMGain;                 // Photomultiplier gain
-
-  Int_t   fNdigits;               //! Number of digits
-  TClonesArray *fDigits;          //! List of digits
+   Float_t  fPhotoCathodeEfficiency; // Photocathode efficiency
+   Float_t  fPMVoltage ;             // Photomultiplier voltage
+   Float_t  fPMGain;                 // Photomultiplier gain
 
-  ClassDef(AliVZERODigitizer,2)   // digitizer for VZERO
+   Int_t    fNdigits;                //! Number of digits
+   TClonesArray *fDigits;            //! List of digits
+   
+   Int_t    fCollisionMode;          // =0->p-p, =1->A-A
+   Float_t  fBeamEnergy;            // beam energy
+   
+   ClassDef(AliVZERODigitizer,2)     // digitizer for VZERO
 
 };