X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ZDC%2FAliZDCCalibData.h;h=8768ffecd1cb62275177a7901405c27b9ba8a005;hb=b31d3cd88c1e4a2116513923734ca727dbfeee08;hp=4456207fab3ae2e26255e0ba329854d8f2203ed7;hpb=5bc762ca3d0cf908d97b92237f8c9796431f6af5;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 4456207fab3..8768ffecd1c 100644
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -10,7 +10,9 @@
 
 #include "TNamed.h"
 #include "TH1.h"
-#include "AliZDC.h"
+#include "AliCDBEntry.h"
+
+class AliZDC;
 
 class AliZDCCalibData: public TNamed {
 
@@ -23,26 +25,57 @@ class AliZDCCalibData: public TNamed {
   void Reset();
   virtual void  Print(Option_t *) const; 
   //
-  Float_t  GetMeanPed(Int_t channel)   	const {return fMeanPedestal[channel];}
-  Float_t* GetMeanPed()   const {return (float*)fMeanPedestal;}
+  Float_t  GetMeanPed(Int_t channel)   	   const {return fMeanPedestal[channel];}
+  Float_t* GetMeanPed()   		   const {return (float*)fMeanPedestal;}
+  Float_t  GetMeanPedWidth(Int_t channel)  const {return fMeanPedWidth[channel];}
+  Float_t* GetMeanPedWidth()   		   const {return (float*)fMeanPedWidth;}
+  Float_t  GetOOTPed(Int_t channel)   	   const {return fOOTPedestal[channel];}
+  Float_t* GetOOTPed()   		   const {return (float*)fOOTPedestal;}
+  Float_t  GetOOTPedWidth(Int_t channel)   const {return fOOTPedWidth[channel];}
+  Float_t* GetOOTPedWidth()   	           const {return (float*)fOOTPedWidth;}
+  Float_t  GetPedCorrCoeff0(Int_t channel) const {return fPedCorrCoeff[0][channel];}
+  Float_t  GetPedCorrCoeff1(Int_t channel) const {return fPedCorrCoeff[1][channel];}
+  Float_t* GetPedCorrCoeff()		   const {return (float*)fPedCorrCoeff;}
+  //
   Float_t  GetEnCalib(Int_t channel)	const {return fEnCalibration[channel];}
-  Float_t* GetEnCalib()   const {return (float*)fEnCalibration;}
+  Float_t* GetEnCalib()   		const {return (float*)fEnCalibration;}
   //
-  void     SetMeanPed(Float_t val, Int_t channel) {fMeanPedestal[channel]=val;}
-  void     SetMeanPed(Float_t* MeanPed);
-  void 	   SetEnCalib(Float_t val, Int_t channel) {fEnCalibration[channel]=val;}
-  void 	   SetEnCalib(Float_t* EnCalib);
+  Float_t  GetPMTHVVal(Int_t channel)   const {return fPMTHVVal[channel];}
+  Float_t* GetPMTHVVal()		  const {return (float*)fPMTHVVal;}
+ 
   //
-  void     PrepHistos();
-  TH1F*    GetHistMeanPed() const {return fHistMeanPed;}
-  void     CleanHistos();
-
+  void  SetMeanPed(Int_t channel, Float_t val) {fMeanPedestal[channel]=val;}
+  void  SetMeanPed(Float_t* MeanPed);
+  void  SetMeanPedWidth(Int_t channel, Float_t val) {fMeanPedWidth[channel]=val;}
+  void  SetMeanPedWidth(Float_t* MeanPedWidth);
+  void  SetOOTPed(Int_t channel, Float_t val) {fOOTPedestal[channel]=val;}
+  void  SetOOTPed(Float_t* OOTPed);
+  void  SetOOTPedWidth(Int_t channel, Float_t val) {fOOTPedWidth[channel]=val;}
+  void  SetOOTPedWidth(Float_t* OOTPedWidth);
+  void  SetPedCorrCoeff(Int_t channel, Float_t valCoeff0, Float_t valCoeff1)
+  	{fPedCorrCoeff[0][channel]=valCoeff0; fPedCorrCoeff[1][channel]=valCoeff1;}
+  void  SetPedCorrCoeff(Float_t* PedCorrCoeff);
+  void  SetPedCorrCoeff(Float_t* PedCorrCoeff0, Float_t* PedCorrCoeff1);
+  //
+  void 	SetEnCalib(Int_t channel, Float_t val) {fEnCalibration[channel]=val;}
+  void 	SetEnCalib(Float_t* EnCalib);
+  //
+  void 	SetPMTHVVal(Int_t channel, Float_t val) {fPMTHVVal[channel]=val;}
+  void 	SetPMTHVVal(Float_t* HVVal);
+  
  protected:
-  Float_t  fMeanPedestal[47];	// Mean pedestal values
-  Float_t  fEnCalibration[4];	// Coeff. for energy calibration (4 different ZDC's?)
-  TH1F*    fHistMeanPed;        //! histos for drawing mean pedestals
+  // --- Pedestals
+  Float_t  fMeanPedestal[47];	 // Mean pedestal values 
+  Float_t  fMeanPedWidth[47];	 // Mean pedestal values 
+  Float_t  fOOTPedestal[44];	 // "Out of Time" pedestal values
+  Float_t  fOOTPedWidth[44];	 // "Out of Time" pedestal values
+  Float_t  fPedCorrCoeff[2][44]; // Fit of correlation in-time vs. out-of-time
+  // --- E calibration
+  Float_t  fEnCalibration[6];	 // Coeff. for energy calibration
+  // --- PMTs HV values
+  Float_t  fPMTHVVal[22];	 // PMTs HV values
   //
-  ClassDef(AliZDCCalibData,1)    // ZDC Sensor Calibration data
+  ClassDef(AliZDCCalibData,5)    // ZDC  Calibration data
 };
 
 #endif