X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=TPC%2FAliTPCCalibTCF.h;h=3b48c50ea87dce1257439e98a0369bda3d93a82a;hb=3c3498530975638b06e6d38b2ba6b25d9c60f779;hp=b66b6b5236d5e411a353b5702088193b226f6bb4;hpb=d0bd4fcca586fc0ed9fce23c7927097419638811;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalibTCF.h b/TPC/AliTPCCalibTCF.h
index b66b6b5236d..3b48c50ea87 100644
--- a/TPC/AliTPCCalibTCF.h
+++ b/TPC/AliTPCCalibTCF.h
@@ -11,12 +11,17 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "TSystem.h"
+#include <exception>
+
 
 class TObject;
 class TGraph;
+class AliRawReader;
 class AliTPCRawStream;
+class AliTPCRawStreamV3;
 class TNtuple;
 class TH1F;
+class TH2F;
 
 class AliTPCCalibTCF : public TNamed {
 
@@ -30,26 +35,32 @@ public:
   AliTPCCalibTCF& operator = (const  AliTPCCalibTCF &source);
 
  
-  void ProcessRawFile(const char *nameRawFile, const char *nameFileOut);//Int_t *tresholds);
+  void ProcessRawFileV3(const char *nameRawFile, const char *nameFileOut);
+  void ProcessRawEventV3(AliRawReader *rawReader,AliTPCRawStreamV3 *rawStream, const char *nameFileOut);
+
+  void ProcessRawFile(const char *nameRawFile, const char *nameFileOut, bool bUseHLTOUT=false);
   void ProcessRawEvent(AliTPCRawStream *rawStream, const char *nameFileOut);
 
   void MergeHistoPerSector(const char *nameFileIn);
 
   void AnalyzeRootFile(const char *nameFileIn, Int_t minNumPulse=1, Int_t histStart=1, Int_t histEnd=1000000);
-  Int_t AnalyzePulse(TH1F *hisIn, Double_t *coefZ, Double_t *coefP); 
+  Int_t AnalyzePulse(TH1F * const hisIn, Double_t *coefZ, Double_t *coefP); 
 
-  void TestTCFonRootFile(const char *nameFileIn, const char *nameFileTCF, Int_t plotFlag=0, Int_t lowKey=1, Int_t upKey=1000000);
-  void TestTCFonRawFile(const char *nameRawFile, const char *nameFileOut, const char *nameFileTCF, Int_t plotFlag=0);
+  void TestTCFonRootFile(const char *nameFileIn, const char *nameFileTCF, Int_t nPulseMin=0, Int_t plotFlag=0, Int_t lowKey=1, Int_t upKey=1000000);
+  void TestTCFonRawFile(const char *nameRawFile, const char *nameFileOut, const char *nameFileTCF, Int_t nPulseMin=0, Int_t plotFlag=0, bool bUseHLTOUT=false);
+
+  Int_t DumpTCFparamToFilePerSector(const char *nameFileTCFPerSec, const char *nameMappingFile="$ALICE_ROOT/TPC/Calib/tpcMapping.root");  
+  Int_t DumpTCFparamToFilePerPad(const char *nameFileTCFPerPad,const char *nameFileTCFPerSec, const char *nameMappingFile="$ALICE_ROOT/TPC/Calib/tpcMapping.root");  
+ 
+  TH2F *PlotOccupSummary2Dhist(const char *nameFileIn, Int_t side=0);
+  void PlotOccupSummary(const char *nameFile, Int_t side=0, Int_t nPulseMin=0); 
 
-  void DumpTCFparamToFile(const char *nameFileTCF,const char *nameFileOut);
-  
-  TNtuple *PlotOccupSummary(const char *nameFile, Int_t nPulseMin=0); 
   void PlotQualitySummary(const char *nameFileQuality, const char *plotSpec="widthRed:maxUndershot", const char *cut="maxUndershot<0.1&&maxUndershot>-40&&widthRed>0&&widthRed<100", const char *pOpt="LEGO2Z");
 
   void PrintPulseThresholds();
 
-  void MergeHistsPerFile(const char *fileNameIn, const char *fileSum);
-
+  void MergeHistoPerFile(const char *fileNameIn, const char *fileSum, Int_t mode=0);
+  void MergeToOneFile(const char *nameFileSum);
 
 private:
   
@@ -63,15 +74,15 @@ private:
   Double_t fRatioIntLim;// ratio of signal-integral/pulse-integral limit
 
   Int_t FitPulse(TNtuple *dataTuple, Double_t *coefZ, Double_t *coefP);
-  static void FitFcn(Int_t &nPar, Double_t *grad, Double_t &f, Double_t *par, Int_t iflag);
+  static void FitFcn(Int_t &nPar, Double_t *grad, Double_t &f, Double_t * const par, Int_t iflag);
 
   Double_t* ExtractPZValues(Double_t *param);
   Int_t Equalization(TNtuple *dataTuple, Double_t *coefZ, Double_t *coefP);
 
-  Int_t FindCorTCFparam(TH1F *hisIn, const char *nameFileTCF, Double_t *coefZ, Double_t *coefP);
+  Int_t FindCorTCFparam(TH1F * const hisIn, const char *nameFileTCF, Double_t *coefZ, Double_t *coefP);
   Double_t *GetQualityOfTCF(TH1F *hisIn, Double_t *coefZ, Double_t *coefP,Int_t plotFlag=0); 
 
-  TNtuple *ApplyTCFilter(TH1F *hisIn, Double_t *coefZ, Double_t *coefP, Int_t plotFlag=0);
+  TNtuple *ApplyTCFilter(TH1F * const hisIn, Double_t * const coefZ, Double_t * const coefP, Int_t plotFlag=0);
 
   ClassDef(AliTPCCalibTCF,1);