X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HMPID%2FAliHMPIDCalib.h;h=b2c14d8ed3432fc1698b70da8377b743a593d252;hb=360e1aa3400ff949892f1dd9552b58429363c4da;hp=96d2fb2fefe85f921034a85f26844d205e888e0b;hpb=77e40af5b04610541fa86be6b14311d22ae60968;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HMPID/AliHMPIDCalib.h b/HMPID/AliHMPIDCalib.h
index 96d2fb2fefe..b2c14d8ed34 100644
--- a/HMPID/AliHMPIDCalib.h
+++ b/HMPID/AliHMPIDCalib.h
@@ -12,13 +12,13 @@
 //#include <TTree.h>
 #include <TH1.h>
 #include <TH2.h>
-#include <TH1S.h>
+//#include <TH1S.h>
 #include <TMath.h>
 #include <TFile.h>
+#include <TString.h>
 #include "AliHMPIDParam.h"
 #include "AliHMPIDRawStream.h"
 
-class TH1I;
 class TFile;
 class AliHMPIDCalib: public TObject { 
 
@@ -30,20 +30,22 @@ public:
           void FillPedestal(Int_t pad,Int_t q);                             //absolute pad number and the charge of the pad
           void FillErrors(Int_t nDDL,Int_t nErrType, Int_t nErr);           //Fill the errors from RawStream
           void FillDDLCnt(Int_t iddl,Int_t inDDL, Int_t outDDL);            //Fill the errors from RawStream
-        Bool_t CalcPedestal(Int_t nDDL, Char_t* name, Int_t nEv);           //number of the DDL, name of the output file and the number of events processed
+        Bool_t CalcPedestal(Int_t nDDL, Char_t* name, Char_t *name2,Int_t nEv);           //number of the DDL, name of the output file and the number of events processed
+        Bool_t CalcPedestalPaolo(Int_t nDDL, Char_t* name, Int_t nEv);      //number of the DDL, name of the output file and the number of events processed
+        
         Bool_t WriteErrors(Int_t nDDL, Char_t* name, Int_t nEv);            //number of the DDL, name of the output file and the number of events processed
          void InitHisto(Int_t q,Int_t histocnt,Char_t* name);               //Init the pad histograms
          void FillHisto(Int_t histocnt,Int_t q);                            //Fill the ADC histograms
          void InitFile(Int_t inVal);                                        //Init the ADC histo output file (one per LDC or one per DDL)
          void CloseFile();                                                  //Close the file
          void SetRunParams(ULong_t runNum,Int_t timeStamp, Int_t ldcId);    //Set Run Parameters such as Run Number, TimeStamp, LDCid 
-  inline void SetSigCut(Int_t nSigCut) { fSigCut=nSigCut;}                  //Set Sigma Cuts from Setter
-         void SetSigCutFromFile(Char_t* name);                              //Set Sigma Cuts from File
-  inline void SetWriteHistoPads(Bool_t isOn) {fWritePads=isOn;}             //Set wether ADC histos of pads are written or not
-  inline void SetWriteHistoPads(Bool_t isOn,Bool_t isLarge,Int_t nDDL) {fWritePads=isOn;fLargeHisto=isLarge;fSelectDDL=nDDL;}             //Set wether ADC histos of pads are written or not
-  inline Bool_t GetWritePads()            {return fWritePads;}              //Set wether ADC histos of pads are written or not
-  inline Bool_t GetLargePads()            {return fLargeHisto;}             //Set wether ADC histos of pads are written or not
-  inline Bool_t GetSelectedDDL()          {return fSelectDDL;}              //Set wether ADC histos of pads are written or not
+         void SetSigCut(Int_t nSigCut) { fSigCut=nSigCut;}                  //Set Sigma Cuts from Setter
+         void SetSigCutFromFile(TString name);                              //Set Sigma Cuts from File
+         void SetWriteHistoPads(Bool_t isOn) {fWritePads=isOn;}             //Set wether ADC histos of pads are written or not
+         void SetWriteHistoPads(Bool_t isOn,Bool_t isLarge,Int_t nDDL) {fWritePads=isOn;fLargeHisto=isLarge;fSelectDDL=nDDL;}             //Set wether ADC histos of pads are written or not
+         Bool_t GetWritePads()       const{return fWritePads;}              //Set wether ADC histos of pads are written or not
+         Bool_t GetLargePads()       const{return fLargeHisto;}             //Set wether ADC histos of pads are written or not
+         Bool_t GetSelectedDDL()     const{return fSelectDDL;}              //Set wether ADC histos of pads are written or not
 protected: 
 
     Bool_t     *faddl;                                                         //check is ddl is filled
@@ -64,6 +66,12 @@ protected:
     Int_t      *fnDDLOutStream;                                                // if the DDL is in the raw data
     Bool_t      fLargeHisto;                                                   //Default is kFALSE.if kTRUE then write large pad histograms with 4093 bins!!!! Only if you have 2GB of RAM!!!   
     Int_t       fSelectDDL;                                                    //Select the DDL to write for the in the large histograms. Only ONE at one time!
+
+private:
+  AliHMPIDCalib(const AliHMPIDCalib& c);              //dummy copy constructor
+  AliHMPIDCalib &operator=(const AliHMPIDCalib& c);   //dummy assignment operator
+    
     ClassDef(AliHMPIDCalib,3)                                                  //HMPID calibration and pedestal class        
 };
 #endif
+