Removed AddDirectory setting

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

diff --git a/STEER/AliTrackResidualsFast.cxx b/STEER/AliTrackResidualsFast.cxx
index 6d5e0c87620997ca5a02b2cf5b683e7d459b11d6..a9cadf965ddc23400c754157eec6b6aa470725d1 100644 (file)
--- a/STEER/AliTrackResidualsFast.cxx
+++ b/STEER/AliTrackResidualsFast.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 (in approximation of
@@ -20,7 +22,7 @@
 //
 //-----------------------------------------------------------------
 
-#include <TMinuit.h>
+#include <TMath.h>
 #include <TGeoMatrix.h>
 
 #include "AliLog.h"
@@ -28,32 +30,36 @@
 #include "AliTrackPointArray.h"
 #include "AliTrackResidualsFast.h"
 
+#include <TMatrixDSym.h>
+#include <TMatrixDSymEigen.h>
+
 ClassImp(AliTrackResidualsFast)
 
 //______________________________________________________________________________
-AliTrackResidualsFast::AliTrackResidualsFast():AliTrackResiduals()
+AliTrackResidualsFast::AliTrackResidualsFast():
+  AliTrackResiduals(),
+  fSumR(0)
 {
   // Default constructor
   for (Int_t i = 0; i < 27; i++) fSum[i] = 0;
-  fSumR = 0;
 }
 
 //______________________________________________________________________________
 AliTrackResidualsFast::AliTrackResidualsFast(Int_t ntracks):
-  AliTrackResiduals(ntracks)
+  AliTrackResiduals(ntracks),
+  fSumR(0)
 {
   // Constructor
   for (Int_t i = 0; i < 27; i++) fSum[i] = 0;
-  fSumR = 0;
 }
  
 //______________________________________________________________________________
 AliTrackResidualsFast::AliTrackResidualsFast(const AliTrackResidualsFast &res):
-  AliTrackResiduals(res)
+  AliTrackResiduals(res),
+  fSumR(res.fSumR)
 {
   // Copy constructor
   for (Int_t i = 0; i < 27; i++) fSum[i] = res.fSum[i];
-  fSumR = res.fSumR;
 }
 
 //______________________________________________________________________________
@@ -72,6 +78,10 @@ Bool_t AliTrackResidualsFast::Minimize()
 {
   // Implementation of fast linear Chi2
   // based minimization of track residuals sum
+  if(fBFixed[0]||fBFixed[1]||fBFixed[2]||fBFixed[3]||fBFixed[4]||fBFixed[5])
+    AliError("Cannot yet fix parameters in this minimizer");
+
+
   for (Int_t i = 0; i < 27; i++) fSum[i] = 0;
   fSumR = 0;
 
@@ -120,7 +130,11 @@ void AliTrackResidualsFast::AddPoints(AliTrackPoint &p, AliTrackPoint &pprime)
   mcovp(1,0) = covp[1]; mcovp(1,1) = covp[3]; mcovp(1,2) = covp[4];
   mcovp(2,0) = covp[2]; mcovp(2,1) = covp[4]; mcovp(2,2) = covp[5];
   TMatrixDSym msum = mcov + mcovp;
+
+
   msum.Invert();
+
+
   if (!msum.IsValid()) return;
 
   TMatrixD        sums(3,1);
@@ -133,7 +147,7 @@ void AliTrackResidualsFast::AddPoints(AliTrackPoint &p, AliTrackPoint &pprime)
   mf(0,0) = 1;      mf(1,0) = 0;       mf(2,0) = 0;
   mf(0,1) = 0;      mf(1,1) = 1;       mf(2,1) = 0;
   mf(0,2) = 0;      mf(1,2) = 0;       mf(2,2) = 1;
-  mf(0,3) = 0;      mf(1,3) =-xyz[2];  mf(2,3) = xyz[1];
+  mf(0,3) = 0;      mf(1,3) = -xyz[2]; mf(2,3) = xyz[1];
   mf(0,4) = xyz[2]; mf(1,4) = 0;       mf(2,4) =-xyz[0];
   mf(0,5) =-xyz[1]; mf(1,5) = xyz[0];  mf(2,5) = 0;
   TMatrixD        mft = mf.T(); mf.T();
@@ -209,17 +223,36 @@ Bool_t AliTrackResidualsFast::Update()
   sums(0,0)    = fSum[21]; sums(0,1) = fSum[22]; sums(0,2) = fSum[23];
   sums(0,3)    = fSum[24]; sums(0,4) = fSum[25]; sums(0,5) = fSum[26];
 
+ 
   smatrix.Invert();
-  if (!smatrix.IsValid()) return kFALSE;
 
+  if (!smatrix.IsValid()) {
+    printf("Minimization Failed! \n");
+    return kFALSE;
+  }
+
+  Double_t covmatrarray[21];
+  
+    for(Int_t i=0;i<6;i++){
+      for(Int_t j=0;j<=i;j++){
+       if(TMath::Abs(smatrix(i,j)/TMath::Sqrt(TMath::Abs(smatrix(i,i)*smatrix(j,j))))>1.01)printf("Too large Correlation number!\n");
+       covmatrarray[i*(i+1)/2+j]=smatrix(i,j);
+      }
+    }
+    
   TMatrixD res = sums*smatrix;
   fAlignObj->SetPars(res(0,0),res(0,1),res(0,2),
                     TMath::RadToDeg()*res(0,3),
                     TMath::RadToDeg()*res(0,4),
                     TMath::RadToDeg()*res(0,5));
+  
+  fAlignObj->SetCorrMatrix(covmatrarray);
   TMatrixD  tmp = res*sums.T();
   fChi2 = fSumR - tmp(0,0);
   fNdf -= 6;
-
+  
   return kTRUE;
 }
+
+
+