Move to numbers of atoms for gas mixture

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

diff --git a/STEER/AliESDV0MI.cxx b/STEER/AliESDV0MI.cxx
index baa66a489d7ce1eb59bfdba60c4e95e11ac15ea4..4d9ae028ec860b67fb9a86cb02ae5f9393be820e 100644 (file)
--- a/STEER/AliESDV0MI.cxx
+++ b/STEER/AliESDV0MI.cxx
@@ -66,9 +66,16 @@ AliESDV0MI::AliESDV0MI() :
   //
   //Dafault constructor
   //
-  for (Int_t i=0;i<4;i++){fCausality[i]=0;}
+  for (Int_t i=0;i<5;i++){
+    fRP[i]=fRM[i]=0;
+  }
+  fLab[0]=fLab[1]=-1;
+  fIndex[0]=fIndex[1]=-1;
   for (Int_t i=0;i<6;i++){fClusters[0][i]=0; fClusters[1][i]=0;}
-  for (Int_t i=0;i<2;i++){fNormDCAPrim[0]=0;fNormDCAPrim[1]=0;}
+  fNormDCAPrim[0]=fNormDCAPrim[1]=0;
+  for (Int_t i=0;i<3;i++){fPP[i]=fPM[i]=fXr[i]=fAngle[i]=0;}
+  for (Int_t i=0;i<3;i++){fOrder[i]=0;}
+  for (Int_t i=0;i<4;i++){fCausality[i]=0;}
 }
 
 Double_t AliESDV0MI::GetSigmaY(){
@@ -77,7 +84,7 @@ Double_t AliESDV0MI::GetSigmaY(){
   //
   const Double_t * cp  = fParamP.GetCovariance();
   const Double_t * cm  = fParamM.GetCovariance();
-  Double_t sigmay = cp[0]+cm[0]+ cp[5]*(fParamP.X()-fRr)*(fParamP.X()-fRr)+ cm[5]*(fParamM.X()-fRr)*(fParamM.X()-fRr);
+  Double_t sigmay = cp[0]+cm[0]+ cp[5]*(fParamP.GetX()-fRr)*(fParamP.GetX()-fRr)+ cm[5]*(fParamM.GetX()-fRr)*(fParamM.GetX()-fRr);
   return (sigmay>0) ? TMath::Sqrt(sigmay):100;
 }
 
@@ -87,7 +94,7 @@ Double_t AliESDV0MI::GetSigmaZ(){
   //
   const Double_t * cp  = fParamP.GetCovariance();
   const Double_t * cm  = fParamM.GetCovariance();
-  Double_t sigmaz = cp[2]+cm[2]+ cp[9]*(fParamP.X()-fRr)*(fParamP.X()-fRr)+ cm[9]*(fParamM.X()-fRr)*(fParamM.X()-fRr);
+  Double_t sigmaz = cp[2]+cm[2]+ cp[9]*(fParamP.GetX()-fRr)*(fParamP.GetX()-fRr)+ cm[9]*(fParamM.GetX()-fRr)*(fParamM.GetX()-fRr);
   return (sigmaz>0) ? TMath::Sqrt(sigmaz):100;
 }
 
@@ -103,8 +110,8 @@ Double_t AliESDV0MI::GetSigmaD0(){
   const Double_t * cp      = fParamP.GetCovariance();
   const Double_t * cm      = fParamM.GetCovariance();
   Double_t sigmaD0   = cp[0]+cm[0]+cp[2]+cm[2]+fgkParams.fPSigmaOffsetD0*fgkParams.fPSigmaOffsetD0;
-  sigmaD0           += ((fParamP.X()-fRr)*(fParamP.X()-fRr))*(cp[5]+cp[9]);
-  sigmaD0           += ((fParamM.X()-fRr)*(fParamM.X()-fRr))*(cm[5]+cm[9]);
+  sigmaD0           += ((fParamP.GetX()-fRr)*(fParamP.GetX()-fRr))*(cp[5]+cp[9]);
+  sigmaD0           += ((fParamM.GetX()-fRr)*(fParamM.GetX()-fRr))*(cm[5]+cm[9]);
   return (sigmaD0>0)? TMath::Sqrt(sigmaD0):100;
 }
 
@@ -431,7 +438,7 @@ void  AliESDV0MI::Update(Float_t vertex[3])
   if (points>0){
     phelix.ParabolicDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
     phelix.ParabolicDCA(mhelix,phase[0][0],phase[0][1],radius[0],delta1);
-    if (TMath::Abs(fParamP.X()-TMath::Sqrt(radius[0])<3) && TMath::Abs(fParamM.X()-TMath::Sqrt(radius[0])<3)){
+    if (TMath::Abs(fParamP.GetX()-TMath::Sqrt(radius[0])<3) && TMath::Abs(fParamM.GetX()-TMath::Sqrt(radius[0])<3)){
       // if we are close to vertex use error parama
       //
       err[1] = fParamP.GetCovariance()[0]+fParamM.GetCovariance()[0]+0.05*0.05
@@ -454,7 +461,7 @@ void  AliESDV0MI::Update(Float_t vertex[3])
   if (points==2){    
     phelix.ParabolicDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
     phelix.ParabolicDCA(mhelix,phase[1][0],phase[1][1],radius[1],delta2);
-    if (TMath::Abs(fParamP.X()-TMath::Sqrt(radius[1])<3) && TMath::Abs(fParamM.X()-TMath::Sqrt(radius[1])<3)){
+    if (TMath::Abs(fParamP.GetX()-TMath::Sqrt(radius[1])<3) && TMath::Abs(fParamM.GetX()-TMath::Sqrt(radius[1])<3)){
       // if we are close to vertex use error paramatrization
       //
       err[1] = fParamP.GetCovariance()[0]+fParamM.GetCovariance()[0]+0.05*0.05