More on char* constantness

diff --git a/JETAN/AliJetAnalysis.h b/JETAN/AliJetAnalysis.h
index a134050d6c4f77ec74d7014c69b1dda320fd5ed7..d2afceb6df0bea2755c4a2fb91177183ff15056e 100644 (file)
--- a/JETAN/AliJetAnalysis.h
+++ b/JETAN/AliJetAnalysis.h
@@ -75,9 +75,9 @@ class AliJetAnalysis : public TObject
     void Correlation(TLorentzVector *lv1,TLorentzVector *lv2,TH2F *h1, TH2F *h2, TH2F *h3, TH2F *h4);
     void Correlation50(AliJet *j,TLorentzVector *lv1,TLorentzVector *lv2,TH2F *h1, TH2F *h2, TH2F *h3, TH2F *h4);
     // setters
-    void SetDirectory(char* directory) 
+    void SetDirectory(const char* directory) 
       {fDirectory = directory;}                      // directory where file with jets is
-    void SetBkgdDirectory(char* directory) 
+    void SetBkgdDirectory(const char* directory) 
       {fBkgdDirectory = directory;}                  // directory where file with background is
     void SetOutputFile(const char* file) {fFile = file;}   // file where plots will be saved
     void SetPercentage(Float_t p) {fPercentage = p;} // minimum percentage of tracks coming from pythia (very aprox.)
@@ -101,7 +101,7 @@ class AliJetAnalysis : public TObject
     void SetDoTriggerBias(Bool_t f = kTRUE){fDoTrig = f;}      // Trigger bias plots
     void SetDivideEnergy(Float_t Efactor){fEfactor = Efactor;} // Divides E of rec.jet by Efactor
     void SetProperties(TH1* h,const char* x, const char* y) const;
-    void SetReaderHeader(char *s="AliJetKineReaderHeader"){fReaderHeader = s;}
+    void SetReaderHeader(const char *s="AliJetKineReaderHeader"){fReaderHeader = s;}
     void SetdEdrWeight();
     void SetPartPtCut(Float_t c){fPartPtCut = c;}
     void SetdrJt(Float_t r){fdrJt = r;}
@@ -111,9 +111,9 @@ class AliJetAnalysis : public TObject
     Float_t GetdEdrWeight(Float_t eta, Float_t r);
     
  private:
-    char*  fReaderHeader;    // Reader header
-    char*  fDirectory;       // Directory
-    char*  fBkgdDirectory;   // Directory for background
+    const char*  fReaderHeader;    // Reader header
+    const char*  fDirectory;       // Directory
+    const char*  fBkgdDirectory;   // Directory for background
     const char*  fFile;      // Output file name
     Int_t  fEventMin;        // Minimum event number
     Int_t  fEventMax;        // Maximum event number

diff --git a/JETAN/AliJetDistributions.h b/JETAN/AliJetDistributions.h
index 121ad2a2ba63ab686d0da20938db3dee03f796a3..f098397043a8de42eb009b8b178be7c9da2bc629 100644 (file)
--- a/JETAN/AliJetDistributions.h
+++ b/JETAN/AliJetDistributions.h
@@ -33,7 +33,7 @@ class AliJetDistributions : public TObject
     void SaveHistograms();
     
     // Setter
-    void SetDirectory(char* directory) {fDirectory = directory;}
+    void SetDirectory(const char* directory) {fDirectory = directory;}
     void SetOutputFile(const char* file) {fFile = file;}
     void SetPercentage(Float_t p) { fPercentage = p;}
     void SetEventRange(Int_t imin, Int_t imax) {fEventMin = imin; fEventMax = imax;}
@@ -48,8 +48,8 @@ class AliJetDistributions : public TObject
     void SetDoRecJet(Bool_t f = kTRUE) {fDoRecJ = f;}
     
  private:
-    char*  fReaderHeader;// Reader header
-    char*  fDirectory;   // Directory
+    const char*  fReaderHeader;// Reader header
+    const char*  fDirectory;   // Directory
     const char*  fFile     ;   // Output file name
     Int_t  fEventMin;    // Minimum event number
     Int_t  fEventMax;    // Maximum event number

diff --git a/TRD/AliTRDtrackerDebug.cxx b/TRD/AliTRDtrackerDebug.cxx
index a89a34f2fffb178e9d488c9a0525caa260b1f036..7aa821489723a7823444923dc3bb95fe1ed54e9f 100644 (file)
--- a/TRD/AliTRDtrackerDebug.cxx
+++ b/TRD/AliTRDtrackerDebug.cxx
@@ -74,7 +74,7 @@ AliTRDtrackerDebug::~AliTRDtrackerDebug()
 
 
 //____________________________________________________
-void AliTRDtrackerDebug::Draw(const Option_t *)
+void AliTRDtrackerDebug::Draw(Option_t *)
 {
 // steer draw function
 }
@@ -500,7 +500,7 @@ void AliTRDtrackerDebug::AnalyseMinMax()
 }
 
 //____________________________________________________
-TCanvas* AliTRDtrackerDebug::PlotSeedingConfiguration(Char_t *direction, Int_t event, Int_t candidate){
+TCanvas* AliTRDtrackerDebug::PlotSeedingConfiguration(const Char_t *direction, Int_t event, Int_t candidate){
 //
 // Plots the four seeding clusters, the helix fit and the reference Points for
 // a given combination consisting of eventnr. and candidatenr.
@@ -601,7 +601,7 @@ TCanvas* AliTRDtrackerDebug::PlotSeedingConfiguration(Char_t *direction, Int_t e
 }
 
 //____________________________________________________
-TCanvas* AliTRDtrackerDebug::PlotFullTrackFit(Int_t event, Int_t candidate, Int_t iteration, Char_t *direction){
+TCanvas* AliTRDtrackerDebug::PlotFullTrackFit(Int_t event, Int_t candidate, Int_t iteration, const Char_t *direction){
 //
 // Plots the tracklets (clusters and reference in y direction) and the fitted function for several iterations
 // in the function ImproveSeedQuality (default is before ImproveSeedQuality)

diff --git a/TRD/AliTRDtrackerDebug.h b/TRD/AliTRDtrackerDebug.h
index 7d6b70af0cc119174ce6679e26143d2ebf340551..a17ff44371764d16fe7783774ba662167d7b10ad 100644 (file)
--- a/TRD/AliTRDtrackerDebug.h
+++ b/TRD/AliTRDtrackerDebug.h
@@ -33,7 +33,7 @@ public:
        AliTRDtrackerDebug();
        ~AliTRDtrackerDebug();
 
-       void                            Draw(const Option_t *);
+       void                            Draw(Option_t *);
 
        Bool_t      Init();
        Bool_t      Open(const char *method);
@@ -48,8 +48,8 @@ public:
        void        AnalyseMinMax();
        void        AnalyseFindable(Char_t *treename);
 
-       TCanvas*    PlotSeedingConfiguration(Char_t *direction, Int_t event, Int_t Candidate);
-       TCanvas*    PlotFullTrackFit(Int_t event, Int_t candidate, Int_t iteration = -1, Char_t *direction = "y");
+       TCanvas*    PlotSeedingConfiguration(const Char_t *direction, Int_t event, Int_t Candidate);
+       TCanvas*    PlotFullTrackFit(Int_t event, Int_t candidate, Int_t iteration = -1, const Char_t *direction = "y");
        
        static Int_t GetEventNumber(){ return fgEventNumber; }
        static Int_t GetTrackNumber(){ return fgTrackNumber; }