Initialization of data members. Additional data members for V0 refit (M.Ivanov)

diff --git a/STEER/AliESDV0MI.cxx b/STEER/AliESDV0MI.cxx
index 13d839543cb61225bf1fa1ba2efde837a6a32992..4d6d9c5e0679ffac7b1ae5e01d3c875b6e009fb8 100644 (file)
--- a/STEER/AliESDV0MI.cxx
+++ b/STEER/AliESDV0MI.cxx
@@ -52,6 +52,7 @@ AliESDV0MI::AliESDV0MI() :
   //Dafault constructor
   //
   for (Int_t i=0;i<4;i++){fCausality[i]=0;}
+  for (Int_t i=0;i<6;i++){fClusters[0][i]=0; fClusters[1][i]=0;}
 }
 
 
@@ -65,6 +66,15 @@ void AliESDV0MI::SetCausality(Float_t pb0, Float_t pb1, Float_t pa0, Float_t pa1
   fCausality[2] = pa0;     // probability - track 0 exist close after vertex
   fCausality[3] = pa1;     // probability - track 1 exist close after vertex
 }
+void  AliESDV0MI::SetClusters(Int_t *clp, Int_t *clm)
+{
+  //
+  // Set its clusters indexes
+  //
+  for (Int_t i=0;i<6;i++) fClusters[0][i] = clp[i]; 
+  for (Int_t i=0;i<6;i++) fClusters[1][i] = clm[i]; 
+}
+
 
 void AliESDV0MI::SetP(const AliExternalTrackParam & paramp)  {
   //
@@ -136,10 +146,10 @@ Float_t AliESDV0MI::GetEffMass(UInt_t p1, UInt_t p2){
   Double_t *m1 = fPP;
   Double_t *m2 = fPM;
   //
-  if (fRP[p1]+fRM[p2]<fRP[p2]+fRM[p1]){
-    m1 = fPM;
-    m2 = fPP;
-  }
+  //if (fRP[p1]+fRM[p2]<fRP[p2]+fRM[p1]){
+  //  m1 = fPM;
+  //  m2 = fPP;
+  //}
   //
   Float_t e1    = TMath::Sqrt(mass1*mass1+
                               m1[0]*m1[0]+

diff --git a/STEER/AliESDV0MI.h b/STEER/AliESDV0MI.h
index 4828d08af182a96055d39cf44c27a53cf0843581..8dff114ac2be90987cbc759cc71e589dee56f518 100644 (file)
--- a/STEER/AliESDV0MI.h
+++ b/STEER/AliESDV0MI.h
@@ -66,14 +66,17 @@ public:
   void SetLab(Int_t i, Int_t lab) {fLab[i]=lab;}
   void SetCausality(Float_t pb0, Float_t pb1, Float_t pa0, Float_t pa1);
   const Float_t * GetCausalityP() const {return fCausality;}
+  void SetClusters(Int_t *clp, Int_t *clm);
+  const Int_t * GetClusters(Int_t i) const {return fClusters[i];}
 private:
   AliExternalTrackParam fParamP;
   AliExternalTrackParam fParamM;
   Float_t        fRP[5];         // combined pid positive
   Float_t        fRM[5];         // combined pid positive
   Int_t          fID;
-  Int_t          fLab[2];     //MC label of the partecle
-  Int_t          fIndex[2];   //reconstructed labels of the tracks
+  Int_t          fLab[2];         // MC label of the particle
+  Int_t          fIndex[2];       // reconstructed labels of the tracks
+  Int_t          fClusters[2][6]; //! its clusters 
   //
   //  
   Double_t       fDist1;    //info about closest distance according closest MC - linear DCA
@@ -100,7 +103,7 @@ private:
   Float_t        fPointAngleTh; //point angle theta
   Float_t        fPointAngle;   //point angle full
 
-  ClassDef(AliESDV0MI,2)      // ESD V0 vertex
+  ClassDef(AliESDV0MI,3)      // ESD V0 vertex
 };
 
 

diff --git a/STEER/AliESDv0.cxx b/STEER/AliESDv0.cxx
index bea72f05aa8db27249968ce8e0b7e2559b45e56b..e01c51e314f24f7caa16312962bee713eafb4beb 100644 (file)
--- a/STEER/AliESDv0.cxx
+++ b/STEER/AliESDv0.cxx
@@ -46,8 +46,18 @@ AliESDv0::AliESDv0() :
   //--------------------------------------------------------------------
   // Default constructor  (K0s)
   //--------------------------------------------------------------------
-  fPos[0]=fPos[1]=fPos[2]=0.;
-  fPosCov[0]=fPosCov[1]=fPosCov[2]=fPosCov[3]=fPosCov[4]=fPosCov[5]=0.;
+
+  for (Int_t i=0; i<3; i++) {
+    fPos[i] = 0.;
+    fNmom[i] = 0.;
+    fPmom[i] = 0.;
+  }
+
+  for (Int_t i=0; i<6; i++) {
+    fPosCov[i]= 0.;
+    fNmomCov[i] = 0.;
+    fPmomCov[i] = 0.;
+  }
 }
 
 Double_t AliESDv0::ChangeMassHypothesis(Int_t code) {