Bug fix - Teminate - as virtula function

[u/mrichter/AliRoot.git] / TPC / AliTPCcalibAlign.h

diff --git a/TPC/AliTPCcalibAlign.h b/TPC/AliTPCcalibAlign.h
index 398b4d25e3125e9541e95bd1de161382b96b0fd5..3657c7d6c93bbeba69bf7099ad3bbac9c1111bdf 100644 (file)
--- a/TPC/AliTPCcalibAlign.h
+++ b/TPC/AliTPCcalibAlign.h
@@ -25,19 +25,22 @@ public:
   virtual ~AliTPCcalibAlign();
 
   virtual void Process(AliTPCseed *track);
-
+  virtual void Analyze();
+  virtual void Terminate();  
+  //
+  virtual void EvalFitters();
   void ProcessTracklets(const AliExternalTrackParam &t1,
                        const AliExternalTrackParam &t2,
                        Int_t s1,Int_t s2);
-  void Eval();
+  inline Int_t GetIndex(Int_t s1,Int_t s2){return s1*72+s2;}
   TLinearFitter* GetFitter12(Int_t s1,Int_t s2) {
-    return static_cast<TLinearFitter*>(fFitterArray12[s1*72+s2]);
+    return static_cast<TLinearFitter*>(fFitterArray12[GetIndex(s1,s2)]);
   }
   TLinearFitter* GetFitter9(Int_t s1,Int_t s2) {
-    return static_cast<TLinearFitter*>(fFitterArray9[s1*72+s2]);
+    return static_cast<TLinearFitter*>(fFitterArray9[GetIndex(s1,s2)]);
   }
   TLinearFitter* GetFitter6(Int_t s1,Int_t s2) {
-    return static_cast<TLinearFitter*>(fFitterArray6[s1*72+s2]);
+    return static_cast<TLinearFitter*>(fFitterArray6[GetIndex(s1,s2)]);
   }
   Bool_t GetTransformation12(Int_t s1,Int_t s2,TMatrixD &a);
   Bool_t GetTransformation9(Int_t s1,Int_t s2,TMatrixD &a);
@@ -49,8 +52,8 @@ public:
   TObjArray fDzHistArray;
 
 private:
-  void Process12(Double_t *t1,
-                Double_t *t2,
+  void Process12(const Double_t *t1,
+                const Double_t *t2,
                 TLinearFitter *fitter);
   void Process9(Double_t *t1,
                Double_t *t2,
@@ -61,7 +64,8 @@ private:
   TLinearFitter* GetOrMakeFitter12(Int_t s1,Int_t s2) {
     //get or make fitter
     if (!fFitterArray12[s1*72+s2])
-      fFitterArray12[s1*72+s2]=new TLinearFitter(12,"x0++x1++x2++x3++x4++x5++x6++x7++x8++x9++x10++x11");
+ //      fFitterArray12[s1*72+s2]=new TLinearFitter(12,"x[0]++x[1]++x[2]++x[3]++x[4]++x[5]++x[6]++x[7]++x[8]++x[9]++x[10]++x[11]");
+      fFitterArray12[s1*72+s2]=new TLinearFitter(13,"hyp12");
     return GetFitter12(s1,s2);
   }
   TLinearFitter* GetOrMakeFitter9(Int_t s1,Int_t s2) {
@@ -76,9 +80,9 @@ private:
       fFitterArray6[s1*72+s2]=new TLinearFitter(6,"x0++x1++x2++x3++x4++x5");
     return GetFitter6(s1,s2);
   }
-  TObjArray fFitterArray12;
-  TObjArray fFitterArray9;
-  TObjArray fFitterArray6;
+  TObjArray fFitterArray12;  // array of fitters
+  TObjArray fFitterArray9;   // array of fitters
+  TObjArray fFitterArray6;   // array of fitters
   Int_t fPoints[72*72];
 
   ClassDef(AliTPCcalibAlign,1)