Fix aclic compilation.

[u/mrichter/AliRoot.git] / STEER / AliTrackResidualsLinear.cxx

diff --git a/STEER/AliTrackResidualsLinear.cxx b/STEER/AliTrackResidualsLinear.cxx
index 7f34d031188e499246e614c3016af4a921d02cbe..3f5278f88eb3504c65e06c793cacb7dabc7c7855 100644 (file)
--- a/STEER/AliTrackResidualsLinear.cxx
+++ b/STEER/AliTrackResidualsLinear.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 //-----------------------------------------------------------------
 //   Implementation of the derived class for track residuals
 //   based on linear chi2 minimization 
@@ -27,7 +29,7 @@
 //
 //-----------------------------------------------------------------
 
-#include <TMinuit.h>
+#include <TMath.h>
 #include <TGeoMatrix.h>
 
 #include "AliLog.h"
@@ -49,8 +51,6 @@ AliTrackResidualsLinear::AliTrackResidualsLinear():
 {
   // Default constructor
   for (Int_t ipar=0; ipar<6; ipar++){
-    fBFixed[ipar] = kFALSE;
-    fFixed[ipar]  = 0;;
     fParams[ipar]  = 0;
   }  
   for (Int_t icov=0; icov<36; icov++){ fCovar[icov]=0;}
@@ -65,8 +65,6 @@ AliTrackResidualsLinear::AliTrackResidualsLinear(Int_t ntracks):
 {
   // Constructor
   for (Int_t ipar=0; ipar<6; ipar++){
-    fBFixed[ipar] = kFALSE;
-    fFixed[ipar]  = 0;
     fParams[ipar]  = 0;
   }
   for (Int_t icov=0; icov<36; icov++){ fCovar[icov]=0;}
@@ -82,8 +80,6 @@ AliTrackResidualsLinear::AliTrackResidualsLinear(const AliTrackResidualsLinear &
   // Copy constructor
   //..
   for (Int_t ipar=0; ipar<6; ipar++){
-    fBFixed[ipar]  = res.fBFixed[ipar];
-    fFixed[ipar]   = res.fFixed[ipar];
     fParams[ipar]  = res.fParams[ipar];
   }
   for (Int_t icov=0; icov<36; icov++){ fCovar[icov]= res.fCovar[icov];}
@@ -287,7 +283,7 @@ Bool_t AliTrackResidualsLinear::Update()
   }
     
 
-  //
+ 
   fChi2 = fFitter->GetChisquare();
   fNdf -= 6;
   TVectorD vector(7);
@@ -300,14 +296,27 @@ Bool_t AliTrackResidualsLinear::Update()
   fParams[5] = vector[6];
   TMatrixD covar(7,7);
   fFitter->GetCovarianceMatrix(covar);
-  for (Int_t i0=0; i0 <6; i0++)
+  
+  for (Int_t i0=0; i0 <6; i0++){
     for (Int_t j0=0; j0 <6; j0++){
       fCovar[i0*6+j0] = covar(i0+1,j0+1);
     }
-  //
+  }
+  Double_t covmatrarray[21];
+  for(Int_t j=0;j<6;j++){
+    for(Int_t i=j;i<6;i++){
+      covmatrarray[i*(i+1)/2+j]=fCovar[i+6*j];
+    }
+  }
+
+ 
   fAlignObj->SetPars(fParams[0], fParams[1], fParams[2],
                     TMath::RadToDeg()*fParams[3],
                     TMath::RadToDeg()*fParams[4],
                     TMath::RadToDeg()*fParams[5]);
+  fAlignObj->SetCorrMatrix(covmatrarray);
+  
   return kTRUE;
 }
+
+