X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCCalibViewer.h;h=7c413aeccc7c4ee6f471bfaed88435233c833bda;hb=bade7d8d0e040ea0c8d360c1224e3e6dacbde547;hp=7573dc185f6e9c075c057c751b001a85dfce682c;hpb=832bb12c54d41457d00aeb01df3c0058514831d0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCCalibViewer.h b/TPC/AliTPCCalibViewer.h
index 7573dc185f6..7c413aeccc7 100644
--- a/TPC/AliTPCCalibViewer.h
+++ b/TPC/AliTPCCalibViewer.h
@@ -11,37 +11,37 @@
 //  use Tree for visualization                   //
 ///////////////////////////////////////////////////
 
-#include <TObject.h>
-#include <TTree.h>
-#include <TFile.h>
-#include "AliTPCCalPad.h"
-#include "AliTPCCalROC.h"
-#include "TFriendElement.h"
-
-#include "AliMathBase.h"
+class TFile;
 class TLegend;
 class TGraph;
+#include <TTree.h>
+#include <TMatrixDfwd.h>
+
+class AliTPCCalPad;
+class AliTPCCalROC;
+class TFriendElement;
 
 
 class AliTPCCalibViewer : public TObject {
 public:
    AliTPCCalibViewer();
    AliTPCCalibViewer(const AliTPCCalibViewer &c);
-   AliTPCCalibViewer(TTree* tree);
-   AliTPCCalibViewer(char* fileName, char* treeName = "calPads");
+   AliTPCCalibViewer(TTree *const tree);
+   AliTPCCalibViewer(const char* fileName, const char* treeName = "calPads");
    AliTPCCalibViewer &operator = (const AliTPCCalibViewer & param);
    virtual ~AliTPCCalibViewer();
    virtual void Delete(Option_t* option = "");
    
-   TString GetAbbreviation() const { return fAbbreviation;  }
-   TString GetAppendString() const { return fAppendString; }
-   void SetAbbreviation(char* abr) { fAbbreviation = abr; }
-   void SetAppendString(char* str) { fAppendString = str; }
+   TString& GetAbbreviation()  { return fAbbreviation;  }
+   TString& GetAppendString()  { return fAppendString; }
+   void SetAbbreviation(const Char_t *abr) { fAbbreviation = abr; }
+   void SetAppendString(const Char_t *str) { fAppendString = str; }
    
    virtual void     Draw(Option_t* opt="") { fTree->Draw(opt); }
    virtual Long64_t Draw(const char* varexp, const TCut& selection, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0) { return fTree->Draw(varexp, selection, option, nentries, firstentry); };
    virtual Long64_t Draw(const char* varexp, const char* selection, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0) { return fTree->Draw(varexp, selection, option, nentries, firstentry); };
 
+   const char* AddAbbreviations(const Char_t *c, Bool_t printDrawCommand = kFALSE);
    Int_t EasyDraw(const char* drawCommand, const char* sector, const char* cuts = 0, const char* drawOptions = 0, Bool_t writeDrawCommand = kFALSE) const;   // easy drawing of data, use '~' for abbreviation of '.fElements'
    Int_t EasyDraw(const char* drawCommand, Int_t sector, const char* cuts = 0, const char* drawOptions = 0, Bool_t writeDrawCommand = kFALSE) const;   // easy drawing of data, use '~' for abbreviation of '.fElements'
    Int_t EasyDraw1D(const char* drawCommand, const char* sector, const char* cuts = 0, const char* drawOptions = 0, Bool_t writeDrawCommand = kFALSE) const;   // easy drawing of data, use '~' for abbreviation of '.fElements'
@@ -57,15 +57,17 @@ public:
    Int_t    Integrate(const char* drawCommand,       Int_t sector, const char* cuts = 0, Float_t sigmaMax = 5, Bool_t plotMean = kTRUE, Bool_t plotMedian = kTRUE, Bool_t plotLTM = kTRUE, const char *sigmas = "", Float_t sigmaStep = -1) const;    // draws an integrated histogram
    Int_t IntegrateOld(const char* drawCommand, const char* sector, const char* cuts = 0, Float_t sigmaMax = 5, Bool_t plotMean = kTRUE, Bool_t plotMedian = kTRUE, Bool_t plotLTM = kTRUE, const char *sigmas = "", Float_t sigmaStep = -1) const;    // draws an integrated histogram
    
-   AliTPCCalPad* GetCalPad(const char* desiredData, char* cuts = "", char* calPadName = "NoName") const;     // returns an AliTPCCalPad object containing the specified data with cuts applied
-   AliTPCCalROC* GetCalROC(const char* desiredData, UInt_t sector, char* cuts = "") const;  // returns an AliTPCCalROC object containing the specified data for sector with cuts applied
+   AliTPCCalPad* GetCalPadOld(const char* desiredData, const char* cuts = "", const char* calPadName = "NoName") const;     // returns an AliTPCCalPad object containing the specified data with cuts applied
+   AliTPCCalPad* GetCalPad(const char* desiredData, const char* cuts = "", const char* calPadName = "NoName") const;     // returns an AliTPCCalPad object containing the specified data with cuts applied
+
+   AliTPCCalROC* GetCalROC(const char* desiredData, UInt_t sector, const char* cuts = "") const;  // returns an AliTPCCalROC object containing the specified data for sector with cuts applied
    
    TObjArray* GetArrayOfCalPads();
    TObjArray* GetListOfVariables(Bool_t printList = kFALSE);
    TObjArray* GetListOfNormalizationVariables(Bool_t printList = kFALSE) const;
    
-   static void MakeTreeWithObjects(const char * fileName, TObjArray * array, const char * mapFileName = 0);
-   static void MakeTree(const char * fileName, TObjArray * array, const char * mapFileName = 0, AliTPCCalPad* outlierPad = 0, Float_t ltmFraction = 0.9);
+   static void MakeTreeWithObjects(const char * fileName, const TObjArray *const array, const char * mapFileName = 0);
+   static void MakeTree(const char * fileName, TObjArray * array, const char * mapFileName = 0, AliTPCCalPad *const outlierPad = 0, Float_t ltmFraction = 0.9);
    static void MakeTree(const char *outPutFileName, const Char_t *inputFileName, AliTPCCalPad *outlierPad = 0, Float_t ltmFraction = 0.9, const char *mapFileName = "$ALICE_ROOT/TPC/Calib/MapCalibrationObjects.root");
    static void CreateObjectList(const Char_t *filename, TObjArray *calibObjects);
    
@@ -73,21 +75,21 @@ public:
    TFriendElement* AddFriend(const char* treename, const char* filename) {return fTree->AddFriend(treename, filename);};
    TFriendElement* AddFriend(TTree* tree, const char* alias, Bool_t warn=kFALSE) {return fTree->AddFriend(tree, alias, warn);};
    TFriendElement* AddFriend(const char* treename, TFile* file) {return fTree->AddFriend(treename, file);};
-   TTree * GetTree() { return fTree;}
+   TTree * GetTree() const { return fTree;}
 
    TString* Fit(const char* drawCommand, const char* formula, const char* cuts, Double_t & chi2, TVectorD &fitParam, TMatrixD &covMatrix);
 
   // 
   // Array tools
   // 
-  static Double_t GetLTM(Int_t n, Double_t *array, Double_t *sigma = 0, Double_t fraction = 0.9);
+  static Double_t GetLTM(Int_t n, const Double_t *const array, Double_t *const sigma = 0, Double_t fraction = 0.9);
   static Int_t GetBin(Float_t value, Int_t nbins, Double_t binLow, Double_t binUp);
-  static TH1F* SigmaCut(Int_t n, Float_t *array, Float_t mean, Float_t sigma, Int_t nbins, Float_t binLow, Float_t binUp, Float_t sigmaMax, Float_t sigmaStep = -1, Bool_t pm = kFALSE);
-  static TH1F* SigmaCut(TH1F *histogram, Float_t mean, Float_t sigma, Float_t sigmaMax, Float_t sigmaStep = -1, Bool_t pm = kFALSE);
-  static TH1F* Integrate(TH1F *histogram, Float_t mean = 0, Float_t sigma = 0, Float_t sigmaMax = 0, Float_t sigmaStep = -1);
-  static TH1F* Integrate(Int_t n, Float_t *array, Int_t nbins, Float_t binLow, Float_t binUp, Float_t mean = 0, Float_t sigma = 0, Float_t sigmaMax = 0, Float_t sigmaStep = -1);
+  static TH1F* SigmaCut(Int_t n, const Float_t *array, Float_t mean, Float_t sigma, Int_t nbins, Float_t binLow, Float_t binUp, Float_t sigmaMax, Float_t sigmaStep = -1, Bool_t pm = kFALSE);
+  static TH1F* SigmaCut(TH1F *const histogram, Float_t mean, Float_t sigma, Float_t sigmaMax, Float_t sigmaStep = -1, Bool_t pm = kFALSE);
+  static TH1F* Integrate(TH1F *const histogram, Float_t mean = 0, Float_t sigma = 0, Float_t sigmaMax = 0, Float_t sigmaStep = -1);
+  static TH1F* Integrate(Int_t n, const Float_t *const array, Int_t nbins, Float_t binLow, Float_t binUp, Float_t mean = 0, Float_t sigma = 0, Float_t sigmaMax = 0, Float_t sigmaStep = -1);
   
-  static TH1F* SigmaCut(Int_t n, Double_t *array, Double_t mean, Double_t sigma, Int_t nbins, Double_t *xbins, Double_t sigmaMax);
+  static TH1F* SigmaCut(Int_t n, const Double_t *array, Double_t mean, Double_t sigma, Int_t nbins, const Double_t *xbins, Double_t sigmaMax);