X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSCalibrator.h;h=26a9d31ddc57f396a98fe89729b0c1c444952a1d;hb=e118532f2de78776e854b15e89231b77cd12c937;hp=0469cf57c7bbd418439751ef859a846c24d3ed8d;hpb=cd22852513da82b9c42377447842a71f3b6d8e42;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSCalibrator.h b/PHOS/AliPHOSCalibrator.h
index 0469cf57c7b..26a9d31ddc5 100644
--- a/PHOS/AliPHOSCalibrator.h
+++ b/PHOS/AliPHOSCalibrator.h
@@ -3,6 +3,16 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+/* $Id$ */
+
+/* History of cvs commits:
+ *
+ * $Log$
+ * Revision 1.10  2005/05/28 14:19:04  schutz
+ * Compilation warnings fixed by T.P.
+ *
+ */
+
 
 //_________________________________________________________________________
 //  Class for performing calibration in PHOS     
@@ -13,7 +23,7 @@
 // --- ROOT system ---
 #include "TTask.h"
 #include "TObjArray.h"
-class TH1F ; 
+#include "TH1F.h"  
 
 // --- Standard library ---
 
@@ -25,12 +35,8 @@ class AliPHOSCalibrator: public TTask{
 
 public:
   AliPHOSCalibrator() ;          // ctor
-  AliPHOSCalibrator(const char* run, const char * title = "Default",Bool_t toSplit = kTRUE) ;
-  AliPHOSCalibrator(const AliPHOSCalibrator & ctor) {
-    // cpy ctor: no implementation yet
-    // requested by the Coding Convention
-    Fatal("cpy ctor", "not implemented") ;
-  }
+  AliPHOSCalibrator(const char* run, const char * title = "Default") ;
+  AliPHOSCalibrator(const AliPHOSCalibrator & ctor);
  
   virtual ~AliPHOSCalibrator() ; // dtor
 
@@ -48,7 +54,7 @@ public:
   void PlotGain(Int_t channel) ; //Plot histo with gains for a channel
   void PlotGains() ;             //Plot all gains
 
-  void Print(const Option_t * option) const ;
+  virtual void Print(const Option_t * = "") const ;
 
   TH1F * PedestalHisto(Int_t channel)
     {return dynamic_cast<TH1F* >(fPedHistos->At(channel)) ;} ;
@@ -59,16 +65,12 @@ public:
   TH1F * Pedestals(void){return fhPedestals ;}
   TH1F * Gains(void){return fhGains ;}
 
-  void SetPedestalPattern(UShort_t pattern = 257)
-    {fPedPat = pattern ;} ;   //Sets trigger pattern for PEDESTAL events
-  void SetPulserPattern(UShort_t pattern = 33)
-    {fPulPat = pattern ;} ;   //Sets trigger pattern for PULSER events
-  void SetLEDPattern(UShort_t pattern = 129)
-    {fLEDPat = pattern ;} ;   //Sets trigger pattern for LED events
-  void SetWideBeamPattern(UShort_t pattern = 1027)
-    {fWBPat = pattern ;} ;    //Sets trigger pattern for WIDE BEAM events
-  void SetNarrowBeamPattern(UShort_t pattern = 1029)
-    {fNBPat = pattern ;} ;    //Sets trigger pattern for NARROW BEAM events
+  //Clean resulting histograms
+  void Reset(void){if(fhPedestals)fhPedestals->Reset("ICE");
+                   if(fhGains)fhGains->Reset("ICE");}
+
+  //Set energy of beam used to calibrate
+  void SetBeamEnergy(Float_t e){fBeamEnergy = e;}
 
   void SetConTableDB(const char * filename, const char * title = "Default") ;
        //Connection table to convert RawId to AbsId
@@ -82,21 +84,17 @@ public:
   void SetGainMax(Float_t hmax = 0.01)
     {fGainMax = hmax ;}    //Set range of gain histograms
 
-  void WritePedestals(const char * version="v1",
-		      Int_t begValidRange = 0,
-		      Int_t endValidRange = 0) ;
+  void ReadFromASCII(const char * filename) ; //Read gains and pedestals from ascii file
 
-  void ReadPedestals(const char * version="v1",
-		     Int_t ValidRange = 0) ;
+  void WritePedestals(const char * version="v1") ;
+
+  void ReadPedestals(const char * version="v1") ;
 		      
-  void WriteGains(const char * version="v1",
-		      Int_t begValidRange = 0,
-		      Int_t endValidRange = 0) ;
+  void WriteGains(const char * version="v1") ;
 
-  void ReadGains(const char * version="v1",
-		     Int_t ValidRange = 0) ;
+  void ReadGains(const char * version="v1") ;
 
-  AliPHOSCalibrator & operator = (const AliPHOSCalibrator & rvalue){
+  AliPHOSCalibrator & operator = (const AliPHOSCalibrator & /*rvalue*/){
     Fatal("operator =","assigment operator is not implemented") ;
     return *this ;
  }
@@ -120,6 +118,7 @@ private:
   TString  fConTableDB ;      //Name of ConTableDB
   TString  fConTableDBFile ;  //File where ConTableDB is stored
 
+  Float_t  fBeamEnergy ;      //Calibration beam energy
   Float_t  fGainAcceptCorr;   //Maximal deviation from mean Gain (factor)
   Float_t  fAcceptCorr ;      //Maximal deviation of Pedestal from mean for good channel
 
@@ -129,13 +128,6 @@ private:
   Int_t    fNch ;             //Number of channels to calibrate
   UShort_t fNChan ;           //Number of bins in pedestal histos
 
-  UShort_t fPedPat ;     //trigger pattern for PEDESTAL events
-  UShort_t fPulPat ;     //trigger pattern for PULSER events
-  UShort_t fLEDPat ;     //trigger pattern for LED events
-  UShort_t fWBPat ;      //trigger pattern for WIDE BEAM events
-  UShort_t fNBPat ;      //trigger pattern for NARROW BEAM events
-  Bool_t   fToSplit ;    //To split digits from header
-
   ClassDef(AliPHOSCalibrator,1)  // description 
 
 };