changes for merging in production mode

[u/mrichter/AliRoot.git] / TRD / AliTRDCalibraFit.h

diff --git a/TRD/AliTRDCalibraFit.h b/TRD/AliTRDCalibraFit.h
index 407ec7119e829beea3e8254ee94e04a830ee0c49..88694458a8e91956eadf5e41027865b52b528336 100644 (file)
--- a/TRD/AliTRDCalibraFit.h
+++ b/TRD/AliTRDCalibraFit.h
@@ -18,6 +18,7 @@
 # include <TVectorD.h>
 #endif 
 
+class TString;
 class TTree;
 class TProfile2D;
 class TGraphErrors;
@@ -75,15 +76,15 @@ class AliTRDCalibraFit : public TObject {
   Bool_t   AnalyseLinearFitters(AliTRDCalibraVdriftLinearFit *calivdli);
   
   // Pad Calibration
-  Bool_t   SetModeCalibration(const char *name, Int_t i);
+  Bool_t   SetModeCalibration(TString name, Int_t i);
   
   //Reset Function
   void     ResetVectorFit();
   
   // Some functions
-  Double_t *CalculPolynomeLagrange2(const Double_t *x, const Double_t *y) const;
-  Double_t *CalculPolynomeLagrange3(const Double_t *x, const Double_t *y) const;
-  Double_t *CalculPolynomeLagrange4(const Double_t *x, const Double_t *y) const;
+  void CalculPolynomeLagrange2(const Double_t *x, const Double_t *y, Double_t &c0, Double_t &c1, Double_t &c2, Double_t &c3, Double_t &c4) const;
+  void CalculPolynomeLagrange3(const Double_t *x, const Double_t *y, Double_t &c0, Double_t &c1, Double_t &c2, Double_t &c3, Double_t &c4) const;
+  void CalculPolynomeLagrange4(const Double_t *x, const Double_t *y, Double_t &c0, Double_t &c1, Double_t &c2, Double_t &c3, Double_t &c4) const;
   
   // Fill the database
   void         RemoveOutliers(Int_t type, Bool_t perdetector = kFALSE);
@@ -293,9 +294,9 @@ class AliTRDCalibraFit : public TObject {
        void     ReconstructFitRowMinRowMax(Int_t idect, Int_t i);
        Bool_t   CheckFitVoir();
        void     NormierungCharge();
-       Bool_t   SetNrphiFromTObject(const char *name, Int_t i);
-       Bool_t   SetNzFromTObject(const char *name, Int_t i);
-       Int_t    GetNumberOfGroupsPRF(const char* nametitle);
+       Bool_t   SetNrphiFromTObject(TString name, Int_t i);
+       Bool_t   SetNzFromTObject(TString name, Int_t i);
+       Int_t    GetNumberOfGroupsPRF(TString nametitle);
        
        // Calculate the mean coefs from the database
        Bool_t   CalculVdriftCoefMean();
@@ -354,3 +355,6 @@ class AliTRDCalibraFit : public TObject {
 };
   
 #endif
+
+
+