OCDB calib data: removal of gain values. Will be put in a separate OCDB entry as...

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

diff --git a/VZERO/AliVZEROCalibData.h b/VZERO/AliVZEROCalibData.h
index b8073886c13a16335ce1f50722a6adf2a6f3af5e..a2aeed33d32704760b7c820154a7345f28c5484b 100644 (file)
--- a/VZERO/AliVZEROCalibData.h
+++ b/VZERO/AliVZEROCalibData.h
@@ -42,8 +42,7 @@ class AliVZEROCalibData: public TNamed {
   Bool_t   IsChannelDead(Int_t channel)        const {return fDeadChannel[channel];}
   Bool_t*  GetDeadMap()   const {return (bool*)fDeadChannel;} 
    
   Bool_t   IsChannelDead(Int_t channel)        const {return fDeadChannel[channel];}
   Bool_t*  GetDeadMap()   const {return (bool*)fDeadChannel;} 
    

-  Float_t  GetGain(Int_t channel)      const {return fGain[channel];}
-  Float_t* GetGain()   const {return (float*)fGain;}  
+  Float_t  GetGain(Int_t channel)      const;

   Float_t  GetTimeOffset(Int_t channel)        const {return fTimeOffset[channel];}
   Float_t* GetTimeOffset()   const {return (float*)fTimeOffset;}
   Float_t  GetTimeGain(Int_t channel)  const {return fTimeGain[channel];}
   Float_t  GetTimeOffset(Int_t channel)        const {return fTimeOffset[channel];}
   Float_t* GetTimeOffset()   const {return (float*)fTimeOffset;}
   Float_t  GetTimeGain(Int_t channel)  const {return fTimeGain[channel];}


@@ -63,6 +62,9 @@ class AliVZEROCalibData: public TNamed {
   UInt_t   GetTriggerCountOffset(Int_t board) const { return ((board>=0 && board<kNCIUBoards)?fTriggerCountOffset[board]:0); }
   const UInt_t*  GetRollOver() const { return fRollOver; }
   UInt_t   GetRollOver(Int_t board) const { return ((board>=0 && board<kNCIUBoards)?fRollOver[board]:0); }
   UInt_t   GetTriggerCountOffset(Int_t board) const { return ((board>=0 && board<kNCIUBoards)?fTriggerCountOffset[board]:0); }
   const UInt_t*  GetRollOver() const { return fRollOver; }
   UInt_t   GetRollOver(Int_t board) const { return ((board>=0 && board<kNCIUBoards)?fRollOver[board]:0); }

+
+  Float_t  GetDiscriThr(Int_t channel) const {return fDiscriThr[channel];}
+  Float_t* GetDiscriThr()   const {return (Float_t*)fDiscriThr;}

     
   void     SetPedestal(Float_t val, Int_t channel) {fPedestal[channel]=val;}
   void     SetPedestal(const Float_t* Pedestal);
     
   void     SetPedestal(Float_t val, Int_t channel) {fPedestal[channel]=val;}
   void     SetPedestal(const Float_t* Pedestal);


@@ -79,9 +81,7 @@ class AliVZEROCalibData: public TNamed {
   void     SetDeadChannel(Bool_t val, Int_t channel) {fDeadChannel[channel]=val;}
   void     SetDeadMap(const Bool_t* deadMap);  
    
   void     SetDeadChannel(Bool_t val, Int_t channel) {fDeadChannel[channel]=val;}
   void     SetDeadMap(const Bool_t* deadMap);  
    

-  void            SetGain(Float_t val, Int_t channel) {fGain[channel]=val;}
-  void            SetGain(const Float_t* Gain);  
-  void     SetTimeOffset(Float_t val, Int_t channel) {fTimeOffset[channel]=val;}
+  void     SetTimeOffset(Float_t val, Int_t channel);

   void     SetTimeOffset(const Float_t* TimeOffset);
   void     SetTimeGain(Float_t val, Int_t channel) {fTimeGain[channel]=val;}
   void     SetTimeGain(const Float_t* TimeGain);
   void     SetTimeOffset(const Float_t* TimeOffset);
   void     SetTimeGain(Float_t val, Int_t channel) {fTimeGain[channel]=val;}
   void     SetTimeGain(const Float_t* TimeGain);


@@ -101,6 +101,9 @@ class AliVZEROCalibData: public TNamed {
   void     SetRollOver(UInt_t *offsets);
   void     SetRollOver(UInt_t offset, Int_t board);
 
   void     SetRollOver(UInt_t *offsets);
   void     SetRollOver(UInt_t offset, Int_t board);
 

+  void     SetDiscriThr(Float_t thr, Int_t channel);
+  void     SetDiscriThr(const Float_t* thresholds);
+

   Float_t  GetMIPperADC(Int_t channel) const;
 
  protected:
   Float_t  GetMIPperADC(Int_t channel) const;
 
  protected:


@@ -111,7 +114,6 @@ class AliVZEROCalibData: public TNamed {
   Float_t  fMeanHV[64];        // Mean PMT HV needed to compute MIP value
   Float_t  fWidthHV[64];       // Width of the PMT HV
   
   Float_t  fMeanHV[64];        // Mean PMT HV needed to compute MIP value
   Float_t  fWidthHV[64];       // Width of the PMT HV
   

-  Float_t  fGain[128];        // Gain factor used in digitization only  

   Float_t  fTimeOffset[64];    // Time offsets of the TDC
   Float_t  fTimeGain[64];      // Gain factors of the TDC
   Bool_t   fDeadChannel[64];   // List of dead channels
   Float_t  fTimeOffset[64];    // Time offsets of the TDC
   Float_t  fTimeGain[64];      // Gain factors of the TDC
   Bool_t   fDeadChannel[64];   // List of dead channels


@@ -123,7 +125,9 @@ class AliVZEROCalibData: public TNamed {
   UInt_t   fTriggerCountOffset[kNCIUBoards]; // HPTDC trigger count offset (25ns units)
   UInt_t   fRollOver[kNCIUBoards]; // HPTDC roll-over (25ns units)
 
   UInt_t   fTriggerCountOffset[kNCIUBoards]; // HPTDC trigger count offset (25ns units)
   UInt_t   fRollOver[kNCIUBoards]; // HPTDC roll-over (25ns units)
 

-  ClassDef(AliVZEROCalibData,5)    // VZERO Calibration data
+  Float_t  fDiscriThr[64];     // Discriminator thresholds
+
+  ClassDef(AliVZEROCalibData,7)    // VZERO Calibration data

 };
 
 #endif
 };
 
 #endif