X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCCalibTCF.h;h=c8795dc6fb8b92c19b9e2f36079c16b578568264;hb=60f9f4163d55168955d517065bc4dabeb46b8ca4;hp=b66b6b5236d5e411a353b5702088193b226f6bb4;hpb=d0bd4fcca586fc0ed9fce23c7927097419638811;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalibTCF.h b/TPC/AliTPCCalibTCF.h
index b66b6b5236d..c8795dc6fb8 100644
--- a/TPC/AliTPCCalibTCF.h
+++ b/TPC/AliTPCCalibTCF.h
@@ -11,12 +11,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "TSystem.h"
+#include <exception>
+
 
 class TObject;
 class TGraph;
 class AliTPCRawStream;
 class TNtuple;
 class TH1F;
+class TH2F;
 
 class AliTPCCalibTCF : public TNamed {
 
@@ -30,7 +33,7 @@ public:
   AliTPCCalibTCF& operator = (const  AliTPCCalibTCF &source);
 
  
-  void ProcessRawFile(const char *nameRawFile, const char *nameFileOut);//Int_t *tresholds);
+  void ProcessRawFile(const char *nameRawFile, const char *nameFileOut, bool bUseHLTOUT=false);
   void ProcessRawEvent(AliTPCRawStream *rawStream, const char *nameFileOut);
 
   void MergeHistoPerSector(const char *nameFileIn);
@@ -38,18 +41,21 @@ public:
   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); 
 
-  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: