From 4c84f4755238eb6786d66eaf878ded61e45597fc Mon Sep 17 00:00:00 2001 From: cvetan Date: Wed, 21 Nov 2007 16:44:13 +0000 Subject: [PATCH] Calculation of the covariance matrix of the AliAlignObj obtained in the track-residual classes (A.Rossi) --- STEER/AliTrackResidualsChi2.cxx | 45 ++++++++++++++++++++++++++++++- STEER/AliTrackResidualsFast.cxx | 32 +++++++++++++++++++--- STEER/AliTrackResidualsLinear.cxx | 19 ++++++++++--- 3 files changed, 89 insertions(+), 7 deletions(-) diff --git a/STEER/AliTrackResidualsChi2.cxx b/STEER/AliTrackResidualsChi2.cxx index 794b3c93aed..0d8c70c7b57 100644 --- a/STEER/AliTrackResidualsChi2.cxx +++ b/STEER/AliTrackResidualsChi2.cxx @@ -26,6 +26,8 @@ #include "AliTrackPointArray.h" #include "AliTrackResidualsChi2.h" + + void TrackResidualsChi2Fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *x, Int_t iflag); @@ -91,8 +93,47 @@ Bool_t AliTrackResidualsChi2::Minimize() Double_t amin,edm,errdef; Int_t nvpar,nparx,icstat; icstat = fitter->GetStats(amin,edm,errdef,nvpar,nparx); - fChi2 = amin; fNdf -= nvpar; + //Construct the covariance matrix for AlignObj + Double_t *cov=fitter->GetCovarianceMatrix(); + Int_t unfixedparam=6; + Int_t fixedparamat[6]={0,0,0,0,0,0}; + if(fBFixed[0]==kTRUE){ + unfixedparam--; + fixedparamat[0]=1; + } + for(Int_t j=1;j<6;j++){ + if(fBFixed[j]==kTRUE){ + unfixedparam--; + fixedparamat[j]=fixedparamat[j-1]+1; + } + else fixedparamat[j]=fixedparamat[j-1]; + } + + Double_t cov2[36]; + for(Int_t i=0;i<6;i++){ + for(Int_t j=0;j<6;j++){ + if(fBFixed[i]==kTRUE||fBFixed[j]==kTRUE){ + cov2[i+6*j]=0.; + } + else cov2[i+6*j]=cov[i-fixedparamat[i]+6*(j-fixedparamat[j])]; + + } + } + + 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]=cov2[i+6*j]; + } + } + + // printf("covar 2: %.10f \n %.10f ; %.10f ; \n; %.10f; %.10f; %.10f; \n %.10f; %.10f; %.10f; %.10f; \n %.10f ; %.10f ; %.10f ; %.10f ; %.10f \n %.10f ; %.10f ; %.10f ; %.10f ; %.10f ; %.10f ;\n",covmatrarray[0],covmatrarray[1],covmatrarray[2],covmatrarray[3],covmatrarray[4],covmatrarray[5],covmatrarray[6],covmatrarray[7],covmatrarray[8],covmatrarray[9],covmatrarray[10],covmatrarray[11],covmatrarray[12],covmatrarray[13],covmatrarray[14],covmatrarray[15],covmatrarray[16],covmatrarray[17],covmatrarray[18],covmatrarray[19],covmatrarray[20]); + + + fAlignObj->SetCorrMatrix(covmatrarray); + fChi2 = amin; fNdf -= nvpar; + return kTRUE; } @@ -123,3 +164,5 @@ void AliTrackResidualsChi2::Chi2(Int_t & /* npar */, Double_t * /* gin */, Doubl } f = chi2; } + + diff --git a/STEER/AliTrackResidualsFast.cxx b/STEER/AliTrackResidualsFast.cxx index b804e8c6af9..a9cadf965dd 100644 --- a/STEER/AliTrackResidualsFast.cxx +++ b/STEER/AliTrackResidualsFast.cxx @@ -30,6 +30,9 @@ #include "AliTrackPointArray.h" #include "AliTrackResidualsFast.h" +#include +#include + ClassImp(AliTrackResidualsFast) //______________________________________________________________________________ @@ -127,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); @@ -140,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(); @@ -216,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; } + + + diff --git a/STEER/AliTrackResidualsLinear.cxx b/STEER/AliTrackResidualsLinear.cxx index 9501f969fdc..3f5278f88eb 100644 --- a/STEER/AliTrackResidualsLinear.cxx +++ b/STEER/AliTrackResidualsLinear.cxx @@ -283,7 +283,7 @@ Bool_t AliTrackResidualsLinear::Update() } - // + fChi2 = fFitter->GetChisquare(); fNdf -= 6; TVectorD vector(7); @@ -296,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; } + + -- 2.43.0