]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSV0Finder.cxx
Fixes for Coverity defects
[u/mrichter/AliRoot.git] / ITS / AliITSV0Finder.cxx
index 21be8aaad23e25653ff479b5662ef5b31fd9e5ee..67368542eebc96bd9c31e8a5db9cb472986401c6 100644 (file)
 #include "AliITSReconstructor.h"\r
 #include "AliITStrackerMI.h"\r
 #include "AliITSV0Finder.h"\r
+#include "AliKFParticle.h"\r
+#include "AliKFVertex.h"\r
 \r
 ClassImp(AliITSV0Finder)\r
 \r
-AliITSV0Finder::AliITSV0Finder() {\r
+\r
+AliITSV0Finder::AliITSV0Finder():\r
+fDebugStreamer(0)\r
+ {\r
   //Default constructor\r
-}\r
+\r
+   if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0)\r
+     fDebugStreamer = new TTreeSRedirector("ITSdebug.root");\r
+} \r
+\r
 //------------------------------------------------------------------------\r
 void AliITSV0Finder::UpdateTPCV0(const AliESDEvent *event,\r
                                   AliITStrackerMI *tracker)\r
@@ -51,6 +60,8 @@ void AliITSV0Finder::UpdateTPCV0(const AliESDEvent *event,
   //\r
   //try to update, or reject TPC  V0s\r
   //\r
+  const Float_t kMinTgl2= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinTgl2();\r
+\r
   TObjArray *trackHypothesys = tracker->GetTrackHypothesys();\r
 \r
   Int_t nv0s = event->GetNumberOfV0s();\r
@@ -126,7 +137,7 @@ void AliITSV0Finder::UpdateTPCV0(const AliESDEvent *event,
     if (clayer < 5 ){ // calculate chi2 after vertex\r
       Float_t chi2p = 0, chi2m=0;  \r
       //\r
-      if (trackp&&TMath::Abs(trackp->GetTgl())<1.){\r
+      if (trackp&&TMath::Abs(trackp->GetTgl())<kMinTgl2){\r
        for (Int_t ilayer=clayer;ilayer<6;ilayer++){\r
          if (trackp->GetClIndex(ilayer)>=0){\r
            chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+\r
@@ -140,7 +151,7 @@ void AliITSV0Finder::UpdateTPCV0(const AliESDEvent *event,
        chi2p = 0;\r
       }\r
       //\r
-      if (trackm&&TMath::Abs(trackm->GetTgl())<1.){\r
+      if (trackm&&TMath::Abs(trackm->GetTgl())<kMinTgl2){\r
        for (Int_t ilayer=clayer;ilayer<6;ilayer++){\r
          if (trackm->GetClIndex(ilayer)>=0){\r
            chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+\r
@@ -170,20 +181,60 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
   //          max distance DCA between 2 tracks cut \r
   //          maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist);\r
   //\r
-  const Float_t kMaxDist0      = 0.1;    \r
-  const Float_t kMaxDist1      = 0.1;     \r
-  const Float_t kMaxDist       = 1;\r
-  const Float_t kMinPointAngle  = 0.85;\r
-  const Float_t kMinPointAngle2 = 0.99;\r
-  const Float_t kMinR           = 0.5;\r
-  const Float_t kMaxR           = 220;\r
-  //const Float_t kCausality0Cut   = 0.19;\r
-  //const Float_t kLikelihood01Cut = 0.25;\r
-  //const Float_t kPointAngleCut   = 0.9996;\r
-  const Float_t kCausality0Cut   = 0.19;\r
-  const Float_t kLikelihood01Cut = 0.45;\r
-  const Float_t kLikelihood1Cut  = 0.5;\r
-  const Float_t kCombinedCut     = 0.55;\r
+  const Float_t kMaxDist0 = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxDist0();\r
+  const Float_t kMaxDist1 = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxDist1();\r
+  const Float_t kMaxDist = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxDist();\r
+  const Float_t kMinPointAngle = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinPointAngle();\r
+  const Float_t kMinPointAngle2 = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinPointAngle2();\r
+  const Float_t kMinR = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinR();\r
+  const Float_t kMaxR = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxR();\r
+  const Float_t kMinPABestConst = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinPABestConst();\r
+  const Float_t kMaxRBestConst = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxRBestConst();\r
+  const Float_t kCausality0Cut = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetCausality0Cut();\r
+  const Float_t kLikelihood01Cut = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetLikelihood01Cut();\r
+  const Float_t kLikelihood1Cut = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetLikelihood1Cut();\r
+  const Float_t kCombinedCut = AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetCombinedCut();\r
+  const Float_t kMinClFullTrk= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinClFullTrk();\r
+  const Float_t kMinTgl0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinTgl0();\r
+  const Float_t kMinRTgl0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinRTgl0();\r
+\r
+  const Float_t kMinNormDistForbTgl0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForbTgl0();\r
+  const Float_t kMinClForb0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinClForb0();\r
+  const Float_t kMinNormDistForb1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForb1();\r
+  const Float_t kMinNormDistForb2= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForb2();\r
+  const Float_t kMinNormDistForb3= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForb3();\r
+  const Float_t kMinNormDistForb4= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForb4();\r
+  const Float_t kMinNormDistForb5= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForb5();\r
+  const Float_t kMinNormDistForbProt= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinNormDistForbProt();\r
+  const Float_t kMaxPidProbPionForb= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxPidProbPionForb();\r
+\r
+  const Float_t kMinRTPCdensity= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinRTPCdensity();\r
+  const Float_t kMaxRTPCdensity0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxRTPCdensity0();\r
+  const Float_t kMaxRTPCdensity10= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxRTPCdensity10();\r
+  const Float_t kMaxRTPCdensity20= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxRTPCdensity20();\r
+  const Float_t kMaxRTPCdensity30= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxRTPCdensity30();\r
+\r
+\r
+  const Float_t kMinTPCdensity= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinTPCdensity();\r
+  const Float_t kMinTgl1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinTgl1();\r
+\r
+  const Float_t kMinchi2before0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinchi2before0();\r
+  const Float_t kMinchi2before1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinchi2before1();\r
+  const Float_t kMinchi2after0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinchi2after0();\r
+  const Float_t kMinchi2after1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMinchi2after1();\r
+  const Float_t kAddchi2SharedCl= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetAddchi2SharedCl();\r
+  const Float_t kAddchi2NegCl0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetAddchi2NegCl0();\r
+  const Float_t kAddchi2NegCl1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetAddchi2NegCl1();\r
+\r
+  const Float_t kSigp0Par0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigp0Par0();\r
+  const Float_t kSigp0Par1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigp0Par1();\r
+  const Float_t kSigp0Par2= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigp0Par2();\r
+\r
+  const Float_t kSigpPar0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigpPar0();\r
+  const Float_t kSigpPar1= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigpPar1();\r
+  const Float_t kSigpPar2= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetSigpPar2();\r
+  const Float_t kMaxDcaLh0= AliITSReconstructor::GetRecoParam()->GetESDV0Params()->GetMaxDcaLh0();\r
+\r
 \r
   TObjArray *trackHypothesys = tracker->GetTrackHypothesys();\r
   TObjArray *bestHypothesys  = tracker->GetBestHypothesys();\r
@@ -201,6 +252,9 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
   TObjArray trackarray(ntracks+2);     //array with tracks - with vertex constrain\r
   TObjArray trackarrayc(ntracks+2);    //array of "best    tracks" - without vertex constrain\r
   TObjArray trackarrayl(ntracks+2);    //array of "longest tracks" - without vertex constrain\r
+  //Change from Bool_t to Int_t for optimization\r
+  //  Int_t forbN=0;\r
+  //  Int_t * forbidden   = new Int_t [ntracks+2];\r
   Bool_t * forbidden   = new Bool_t [ntracks+2];\r
   Int_t   *itsmap      = new Int_t  [ntracks+2];\r
   Float_t *dist        = new Float_t[ntracks+2];\r
@@ -223,6 +277,7 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
   //\r
   for (Int_t itrack=0;itrack<ntracks+2;itrack++) {\r
     itsmap[itrack]        = -1;\r
+    //    forbidden[itrack]     = 0;\r
     forbidden[itrack]     = kFALSE;\r
     maxr[itrack]          = kMaxR;\r
     minr[itrack]          = kMinR;\r
@@ -271,7 +326,7 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);\r
       if (!trackh->GetConstrain()) continue;\r
       if (!bestConst) bestConst = trackh;\r
-      if (trackh->GetNumberOfClusters()>5.0){\r
+      if (trackh->GetNumberOfClusters()>kMinClFullTrk ){\r
        bestConst  = trackh;                         // full track -  with minimal chi2\r
        break;\r
       }\r
@@ -285,7 +340,7 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       if (trackh->GetConstrain()) continue;\r
       if (!best)     best     = trackh;\r
       if (!bestLong) bestLong = trackh;\r
-      if (trackh->GetNumberOfClusters()>5.0){\r
+      if (trackh->GetNumberOfClusters()>kMinClFullTrk){\r
        bestLong  = trackh;                         // full track -  with minimal chi2\r
        break;\r
       }\r
@@ -300,6 +355,8 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
     new (&trackat0) AliITStrackMI(*bestLong);\r
     Double_t xx,yy,zz,alpha; \r
     if (!bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz)) continue;\r
+    \r
+\r
     alpha = TMath::ATan2(yy,xx);    \r
     //    if (!trackat0.Propagate(alpha,0)) continue;    \r
     trackat0.Propagate(alpha,0); //PH The check on the return value is temporarily disabled (bug 45751) \r
@@ -334,14 +391,20 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
        normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);\r
        normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));\r
        normdist[itsindex]  = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);\r
-       if (TMath::Abs(trackat0.GetTgl())>1.05){\r
-         if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE;\r
-         if (normdist[itsindex]>3) {\r
-           minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]);\r
+       if (TMath::Abs(trackat0.GetTgl())>kMinTgl0){\r
+         if (normdist[itsindex]<kMinNormDistForbTgl0){\r
+           //      forbN=1;\r
+           //      forbidden[itsindex]+=1<<forbN;\r
+           forbidden[itsindex]=kTRUE;\r
+         }\r
+         if (normdist[itsindex]>kMinNormDistForbTgl0) {\r
+           minr[itsindex] = TMath::Max(kMinRTgl0,minr[itsindex]);\r
          }\r
        }\r
       }\r
     }\r
+\r
+\r
     //\r
     //-----------------------------------------------------------\r
     //Forbid primary track candidates - \r
@@ -354,15 +417,39 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
     //treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1");\r
     //-----------------------------------------------------------\r
     if (bestConst){\r
-      if (bestLong->GetNumberOfClusters()<4       && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5)               forbidden[itsindex]=kTRUE;\r
-      if (normdist[itsindex]<3 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5)               forbidden[itsindex]=kTRUE;\r
-      if (normdist[itsindex]<2 && bestConst->GetClIndex(0)>=0 && bestConst->GetClIndex(1)>=0 ) forbidden[itsindex]=kTRUE;\r
-      if (normdist[itsindex]<1 && bestConst->GetClIndex(0)>=0)                              forbidden[itsindex]=kTRUE;\r
-      if (normdist[itsindex]<4 && bestConst->GetNormChi2(0)<2)                             forbidden[itsindex]=kTRUE;\r
-      if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1)                             forbidden[itsindex]=kTRUE;      \r
+      if (bestLong->GetNumberOfClusters()<4 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>kMinClForb0){\r
+       //      forbN=2;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
+      if (normdist[itsindex]<kMinNormDistForb1 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5){\r
+       //      forbN=3;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
+      if (normdist[itsindex]<kMinNormDistForb2 && bestConst->GetClIndex(0)>=0 && bestConst->GetClIndex(1)>=0 ){\r
+       //      forbN=4;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
+      if (normdist[itsindex]<kMinNormDistForb3 && bestConst->GetClIndex(0)>=0){\r
+       //      forbN=5;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
+      if (normdist[itsindex]<kMinNormDistForb4 && bestConst->GetNormChi2(0)<2){\r
+       //      forbN=6;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
+      if (normdist[itsindex]<kMinNormDistForb5 && bestConst->GetNormChi2(0)<1){\r
+       //      forbN=7;\r
+       //      forbidden[itsindex]+=1<<forbN;\r
+       forbidden[itsindex]=kTRUE;\r
+      }\r
       if (bestConst->GetNormChi2(0)<2.5) {\r
-       minPointAngle[itsindex]= 0.9999;\r
-       maxr[itsindex]         = 10;\r
+       minPointAngle[itsindex]= kMinPABestConst;\r
+       maxr[itsindex]         = kMaxRBestConst;\r
       }\r
     }\r
     //\r
@@ -382,22 +469,28 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       normdist[itsindex]*=-1;\r
     }\r
     if (isProton){\r
-      if (normdist[itsindex]>2) forbidden[itsindex]=kFALSE;    \r
+      if (normdist[itsindex]>kMinNormDistForbProt) forbidden[itsindex]=kFALSE; \r
       normdist[itsindex]*=-1;\r
     }\r
 \r
+    // We allow all tracks that are not pions\r
+    if( (pid[1]+pid[2])< kMaxPidProbPionForb ){\r
+      forbidden[itsindex]=kFALSE;\r
+    }\r
+\r
     //\r
     // Causality cuts in TPC volume\r
     //\r
-    if (esdtrack->GetTPCdensity(0,10) >0.6)  maxr[itsindex] = TMath::Min(Float_t(110),maxr[itsindex]);\r
-    if (esdtrack->GetTPCdensity(10,30)>0.6)  maxr[itsindex] = TMath::Min(Float_t(120),maxr[itsindex]);\r
-    if (esdtrack->GetTPCdensity(20,40)>0.6)  maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]);\r
-    if (esdtrack->GetTPCdensity(30,50)>0.6)  maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]);\r
+    if (esdtrack->GetTPCdensity(0,10) >kMinTPCdensity)  maxr[itsindex] = TMath::Min(Float_t(kMaxRTPCdensity0),maxr[itsindex]);\r
+    if (esdtrack->GetTPCdensity(10,30)>kMinTPCdensity)  maxr[itsindex] = TMath::Min(Float_t(kMaxRTPCdensity10),maxr[itsindex]);\r
+    if (esdtrack->GetTPCdensity(20,40)>kMinTPCdensity)  maxr[itsindex] = TMath::Min(Float_t(kMaxRTPCdensity20),maxr[itsindex]);\r
+    if (esdtrack->GetTPCdensity(30,50)>kMinTPCdensity)  maxr[itsindex] = TMath::Min(Float_t(kMaxRTPCdensity30),maxr[itsindex]);\r
     //\r
-    if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100;    \r
+    if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=kMinRTPCdensity;    \r
     //\r
     //\r
-    if (kFALSE){\r
+\r
+    if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0){\r
       cstream<<"Track"<<\r
        "Tr0.="<<best<<\r
        "Tr1.="<<((bestConst)? bestConst:dummy)<<\r
@@ -423,25 +516,33 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
   //\r
   // first iterration of V0 finder\r
   //\r
+  // AM Comment out for optimization\r
+  //  Int_t rejectBase=0;\r
+  //  Int_t cutN=0;\r
+\r
   for (Int_t iesd0=0;iesd0<ntracks;iesd0++){\r
     Int_t itrack0 = itsmap[iesd0];\r
+    //-AM comment for optimization and store the forbidden value in the debug streamer\r
     if (forbidden[itrack0]) continue;\r
     AliITStrackMI * btrack0 = (AliITStrackMI*)trackarray.At(itrack0);\r
     if (!btrack0) continue;    \r
-    if (btrack0->GetSign()>0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;\r
     AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0);\r
     //\r
     for (Int_t iesd1=iesd0+1;iesd1<ntracks;iesd1++){\r
       Int_t itrack1 = itsmap[iesd1];\r
+      //-AM comment for optimization and store the forbidden value in the debug streamer\r
       if (forbidden[itrack1]) continue;\r
 \r
       AliITStrackMI * btrack1 = (AliITStrackMI*)trackarray.At(itrack1); \r
       if (!btrack1) continue;\r
-      if (btrack1->GetSign()<0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;\r
+\r
+      if ( (btrack0->GetSign()==btrack1->GetSign()) && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;\r
+\r
       Bool_t isGold = kFALSE;\r
       if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){\r
        isGold = kTRUE;\r
       }\r
+      //      rejectBase=0;\r
       AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1);\r
       AliHelix &h1 = helixes[itrack0];\r
       AliHelix &h2 = helixes[itrack1];\r
@@ -453,7 +554,11 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       //\r
       Double_t phase[2][2],radius[2];\r
       Int_t  points = h1.GetRPHIintersections(h2, phase, radius);\r
-      if    (points==0)  continue;\r
+      if    (points==0) {\r
+       //      cutN=1;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
       Double_t delta[2]={1000000,1000000};        \r
       rmin = radius[0];\r
       h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]);\r
@@ -473,12 +578,28 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
        radiusC  = TMath::Sqrt(radius[1]);\r
        iphase=1;\r
       }\r
-      if (radiusC<TMath::Max(minr[itrack0],minr[itrack1]))    continue;\r
-      if (radiusC>TMath::Min(maxr[itrack0],maxr[itrack1]))     continue; \r
+      if (radiusC<TMath::Max(minr[itrack0],minr[itrack1])){\r
+       //      cutN=2;\r
+       //rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
+      if (radiusC>TMath::Min(maxr[itrack0],maxr[itrack1])){\r
+       //      cutN=3;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      } \r
       Float_t maxDist  = TMath::Min(kMaxDist,Float_t(kMaxDist0+radiusC*kMaxDist1));      \r
-      if (distance>maxDist) continue;\r
+      if (distance>maxDist){\r
+       //      cutN=4;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
       Float_t pointAngle = h1.GetPointAngle(h2,phase[iphase],primvertex);\r
-      if (pointAngle<TMath::Max(minPointAngle[itrack0],minPointAngle[itrack1])) continue;\r
+      if (pointAngle<TMath::Max(minPointAngle[itrack0],minPointAngle[itrack1])) {\r
+       //      cutN=5;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
       //\r
       //\r
       //      Double_t distance = TestV0(h1,h2,pvertex,rmin);\r
@@ -496,16 +617,103 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       }      \r
       //\r
       //\r
+      \r
+\r
\r
       pvertex->SetParamN(*track0);\r
       pvertex->SetParamP(*track1);\r
       pvertex->Update(primvertex);\r
       pvertex->SetClusters(track0->ClIndex(),track1->ClIndex());  // register clusters\r
 \r
-      if (pvertex->GetRr()<kMinR) continue;\r
-      if (pvertex->GetRr()>kMaxR) continue;\r
-      if (pvertex->GetV0CosineOfPointingAngle()<kMinPointAngle) continue;\r
+      // Define gamma, K0, lambda and lambda_bar from the decay particles and calculate the chi2      \r
+      AliKFVertex vertexKF;\r
+\r
+      vertexKF.X() = tracker->GetX();\r
+      vertexKF.Y() = tracker->GetY();\r
+      vertexKF.Z() = tracker->GetZ();\r
+      vertexKF.Covariance(0,0) = tracker->GetSigmaX()*tracker->GetSigmaX();\r
+      vertexKF.Covariance(1,2) = tracker->GetSigmaY()*tracker->GetSigmaY();\r
+      vertexKF.Covariance(2,2) = tracker->GetSigmaZ()*tracker->GetSigmaZ();\r
+      \r
+      AliKFParticle elecKF( *(pvertex->GetParamN()) ,11);\r
+      AliKFParticle posiKF( *(pvertex->GetParamP()) ,-11);\r
+      AliKFParticle pipKF( *(pvertex->GetParamN()) , 211);\r
+      AliKFParticle pinKF( *(pvertex->GetParamP()) ,-211);\r
+      AliKFParticle protKF( *(pvertex->GetParamP()) ,2212);\r
+      AliKFParticle aproKF ( *(pvertex->GetParamN()) ,-2212);\r
+\r
+\r
+      // Gamma\r
+      AliKFParticle gamKF(elecKF,posiKF);\r
+      gamKF.SetProductionVertex(vertexKF);\r
+\r
+      Float_t gamKFchi2 = 1000;\r
+      if ( gamKF.GetNDF()!=0 ){\r
+       gamKFchi2 = gamKF.GetChi2()/gamKF.GetNDF();\r
+      }\r
+\r
+      Float_t massG=0.;\r
+      Float_t sigmaMG=0.001;\r
+      gamKF.SetMassConstraint(massG,sigmaMG);\r
+\r
+      Float_t gamKFchi2C = 1000;\r
+      if ( gamKF.GetNDF()!=0 ){\r
+       gamKFchi2C = gamKF.GetChi2()/gamKF.GetNDF();\r
+      }\r
+\r
+      //K0 short\r
+      AliKFParticle k0KF(pipKF,pinKF);\r
+      k0KF.SetProductionVertex(vertexKF);\r
+\r
+      Float_t k0KFchi2 = 1000;\r
+      if ( k0KF.GetNDF()!=0 ){\r
+       k0KFchi2 = k0KF.GetChi2()/k0KF.GetNDF();\r
+      }\r
+\r
+      //Lambda\r
+      AliKFParticle lambdaKF(protKF,pinKF);\r
+      lambdaKF.SetProductionVertex(vertexKF);\r
+\r
+      Float_t lambdaKFchi2 = 1000;\r
+      if ( lambdaKF.GetNDF()!=0 ){\r
+       lambdaKFchi2 = lambdaKF.GetChi2()/lambdaKF.GetNDF();\r
+      }\r
+\r
+      //Lambda_bar\r
+      AliKFParticle alambKF(aproKF,pipKF);\r
+      alambKF.SetProductionVertex(vertexKF);\r
+\r
+      Float_t alambKFchi2 = 1000;\r
+      if ( alambKF.GetNDF()!=0 ){\r
+       alambKFchi2 = alambKF.GetChi2()/alambKF.GetNDF();\r
+      }\r
+\r
+\r
+\r
+\r
+\r
+      if (pvertex->GetRr()<kMinR){\r
+       //      cutN=6;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
+      if (pvertex->GetRr()>kMaxR){\r
+       //      cutN=7;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
+      if (pvertex->GetV0CosineOfPointingAngle()<kMinPointAngle){\r
+       //      cutN=8;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
 //Bo:      if (pvertex->GetDist2()>maxDist) continue;\r
-      if (pvertex->GetDcaV0Daughters()>maxDist) continue;\r
+\r
+      if (pvertex->GetDcaV0Daughters()>maxDist){\r
+       //      cutN=9;\r
+       //      rejectBase+=1<<cutN;\r
+       continue;\r
+      }\r
 //Bo:        pvertex->SetLab(0,track0->GetLabel());\r
 //Bo:        pvertex->SetLab(1,track1->GetLabel());\r
       pvertex->SetIndex(0,track0->GetESDtrack()->GetID());\r
@@ -517,12 +725,12 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       //\r
       //\r
       TObjArray * array0b     = (TObjArray*)bestHypothesys->At(itrack0);\r
-      if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1) {\r
+      if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<kMinTgl1) {\r
        tracker->SetCurrentEsdTrack(itrack0);\r
        tracker->FollowProlongationTree((AliITStrackMI*)originalTracks->At(itrack0),itrack0, kFALSE);\r
       }\r
       TObjArray * array1b    = (TObjArray*)bestHypothesys->At(itrack1);\r
-      if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1) { \r
+      if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<kMinTgl1) { \r
        tracker->SetCurrentEsdTrack(itrack1);\r
        tracker->FollowProlongationTree((AliITStrackMI*)originalTracks->At(itrack1),itrack1, kFALSE);\r
       }\r
@@ -532,10 +740,10 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       AliITStrackMI * track0l = (AliITStrackMI*)originalTracks->At(itrack0);\r
       AliITStrackMI * track1l = (AliITStrackMI*)originalTracks->At(itrack1);\r
       \r
-      Float_t minchi2before0=16;\r
-      Float_t minchi2before1=16;\r
-      Float_t minchi2after0 =16;\r
-      Float_t minchi2after1 =16;\r
+      Float_t minchi2before0=kMinchi2before0;\r
+      Float_t minchi2before1=kMinchi2before1;\r
+      Float_t minchi2after0 =kMinchi2after0;\r
+      Float_t minchi2after1 =kMinchi2after1;\r
       Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]);  //I.B.\r
       Int_t maxLayer = tracker->GetNearestLayer(xrp);                   //I.B.\r
       \r
@@ -560,14 +768,14 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
            for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){\r
              sumn+=1.;       \r
              if (btrack->GetClIndex(ilayer)<0){\r
-               sumchi2+=25;\r
+               sumchi2+=kAddchi2NegCl0;\r
                continue;\r
              }else{\r
                Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);\r
                for (Int_t itrack=0;itrack<4;itrack++){\r
                  AliITStrackerMI::AliITSlayer &layer=tracker->GetLayer(ilayer);\r
                  if (layer.GetClusterTracks(itrack,c)>=0 && layer.GetClusterTracks(itrack,c)!=itrack0){\r
-                   sumchi2+=18.;  //shared cluster\r
+                   sumchi2+=kAddchi2SharedCl;  //shared cluster\r
                    break;\r
                  }\r
                }\r
@@ -605,14 +813,14 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
            for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){\r
              sumn+=1.;\r
              if (btrack->GetClIndex(ilayer)<0){\r
-               sumchi2+=30;\r
+               sumchi2+=kAddchi2NegCl1;\r
                continue;\r
              }else{\r
                Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);\r
                for (Int_t itrack=0;itrack<4;itrack++){\r
                  AliITStrackerMI::AliITSlayer &layer=tracker->GetLayer(ilayer);\r
                  if (layer.GetClusterTracks(itrack,c)>=0 && layer.GetClusterTracks(itrack,c)!=itrack1){\r
-                   sumchi2+=18.;  //shared cluster\r
+                   sumchi2+=kAddchi2SharedCl;  //shared cluster\r
                    break;\r
                  }\r
                }\r
@@ -701,12 +909,20 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       //\r
       //  Likelihood calculations  - apply cuts\r
       //         \r
\r
+      // AM - Comment out for optimization and store the v0OK value\r
+      //      Int_t v0OK = 0;\r
+      //      Int_t cutOKN=0;\r
       Bool_t v0OK = kTRUE;\r
+\r
+\r
       Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4];\r
       p12        += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4];\r
       p12         = TMath::Sqrt(p12);                             // "mean" momenta\r
-      Float_t    sigmap0   = 0.0001+0.001/(0.1+pvertex->GetRr()); \r
-      Float_t    sigmap    = 0.5*sigmap0*(0.6+0.4*p12);           // "resolution: of point angle - as a function of radius and momenta\r
+\r
+      Float_t    sigmap0   = kSigp0Par0+kSigp0Par1/(kSigp0Par2+pvertex->GetRr()); \r
+      Float_t    sigmap    = kSigpPar0*sigmap0*(kSigpPar1+kSigpPar2*p12);           // "resolution: of point angle - as a function of radius and momenta\r
+\r
 \r
       Float_t causalityA  = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);\r
       Float_t causalityB  = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Double_t(0.7))*\r
@@ -714,25 +930,42 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
       //\r
       //Bo:      Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);\r
       Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma();\r
-      Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5);\r
+      Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<kMaxDcaLh0)*(lDistNorm<5);\r
 \r
       Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+\r
        0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+\r
        0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+\r
        0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01);\r
       //\r
-      if (causalityA<kCausality0Cut)                                          v0OK = kFALSE;\r
-      if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut)              v0OK = kFALSE;\r
-      if (likelihood1<kLikelihood1Cut)                                        v0OK = kFALSE;\r
-      if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut) v0OK = kFALSE;\r
-      \r
+      if (causalityA<kCausality0Cut){\r
+       //      cutOKN=1;\r
+       //      v0OK += 1<<cutOKN;\r
+       v0OK = kFALSE;\r
+      }\r
+      if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut){\r
+       //      cutOKN=2;\r
+       //      v0OK += 1<<cutOKN;\r
+       v0OK = kFALSE;\r
+      }\r
+      if (likelihood1<kLikelihood1Cut){\r
+       //      cutOKN=3;\r
+       //      v0OK += 1<<cutOKN;\r
+       v0OK = kFALSE;\r
+      }\r
+      if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut){\r
+       //      cutOKN=4;\r
+       //      v0OK += 1<<cutOKN;\r
+       v0OK = kFALSE;\r
+      }\r
       //\r
       //\r
-      if (kFALSE){     \r
+      if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0){     \r
        Bool_t gold = TMath::Abs(TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel()))==1;\r
        cstream<<"It0"<<\r
          "Tr0.="<<track0<<                       //best without constrain\r
          "Tr1.="<<track1<<                       //best without constrain  \r
+         "posiKF.="<<&posiKF<<                       //KF from track0\r
+         "elecKF.="<<&elecKF<<                       //KF from track1\r
          "Tr0B.="<<track0b<<                     //best without constrain  after vertex\r
          "Tr1B.="<<track1b<<                     //best without constrain  after vertex \r
          "Tr0C.="<<htrackc0<<                    //best with constrain     if exist\r
@@ -743,16 +976,28 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
          "Esd1.="<<track1->GetESDtrack()<<           // esd track1 params\r
          "V0.="<<pvertex<<                       //vertex properties\r
          "V0b.="<<&vertex2<<                       //vertex properties at "best" track\r
+         "gamKF.="<<&gamKF<<                          //KF from pvertex\r
+         "k0KF.="<<&k0KF<<                          //KF from pvertex\r
+         "lambdaKF.="<<&lambdaKF<<                          //KF from pvertex\r
+         "alambKF.="<<&lambdaKF<<                          //KF from pvertex\r
+         "gamKFchi2="<<gamKFchi2<<    //Normalized chi2 from KF assuming gamma momther\r
+         "gamKFchi2C="<<gamKFchi2C<<    //Normalized chi2 from KF assuming gamma mother+mass constraint\r
+         "k0KFchi2="<<k0KFchi2<<    //Normalized chi2 from KF assuming K0 mother\r
+         "lambdaKFchi2="<<lambdaKFchi2<<    //Normalized chi2 from KF assuming Lambda mother\r
+         "alambKFchi2="<<alambKFchi2<<    //Normalized chi2 from KF assuming lambda_bar mother\r
          "ND0="<<normdist[itrack0]<<             //normalize distance for track0\r
          "ND1="<<normdist[itrack1]<<             //normalize distance for track1\r
          "Gold="<<gold<<                         //\r
-         //      "RejectBase="<<rejectBase<<             //rejection in First itteration\r
+         // "RejectBase="<<rejectBase<<             //rejection in First itteration\r
          "OK="<<v0OK<<\r
          "rmin="<<rmin<<\r
          "sigmad="<<sigmad<<\r
+         "Forbid0="<<forbidden[itrack0]<<\r
+         "Forbid1="<<forbidden[itrack1]<<\r
          "\n";\r
       }      \r
-      //if (rejectBase) continue;\r
+      //      if (rejectBase>0) continue;\r
+      //if (forbidden[itrack0]>0 ||forbidden[itrack1]>0) continue; \r
       //\r
       pvertex->SetStatus(0);\r
       //      if (rejectBase) {\r
@@ -762,6 +1007,7 @@ void AliITSV0Finder::FindV02(AliESDEvent *event,
        //Bo:     pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID());\r
        pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg\r
        pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos\r
+       //      if (v0OK==0){\r
        if (v0OK){\r
          //      AliV0vertex vertexjuri(*track0,*track1);\r
          //      vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());\r
@@ -820,7 +1066,7 @@ void AliITSV0Finder::RefitV02(const AliESDEvent *event,
        v0temp.SetParamN(tpc0);\r
        v0temp.SetParamP(tpc1);\r
        v0temp.Update(primvertex);\r
-       if (kFALSE) cstream<<"Refit"<<\r
+       if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0) cstream<<"Refit"<<\r
          "V0.="<<v0mi<<\r
          "V0refit.="<<&v0temp<<\r
          "Tr0.="<<&tpc0<<\r
@@ -842,7 +1088,7 @@ void AliITSV0Finder::RefitV02(const AliESDEvent *event,
        v0temp.SetParamN(tpc0);\r
        v0temp.SetParamP(tpc1);\r
        v0temp.Update(primvertex);\r
-       if (kFALSE) cstream<<"Refit"<<\r
+       if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0) cstream<<"Refit"<<\r
          "V0.="<<v0mi<<\r
          "V0refit.="<<&v0temp<<\r
          "Tr0.="<<&tpc0<<\r
@@ -865,7 +1111,7 @@ void AliITSV0Finder::RefitV02(const AliESDEvent *event,
       v0temp.SetParamN(tpc0);\r
       v0temp.SetParamP(tpc1);\r
       v0temp.Update(primvertex);\r
-      if (kFALSE) cstream<<"Refit"<<\r
+      if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0) cstream<<"Refit"<<\r
        "V0.="<<v0mi<<\r
        "V0refit.="<<&v0temp<<\r
        "Tr0.="<<&tpc0<<\r
@@ -881,3 +1127,16 @@ void AliITSV0Finder::RefitV02(const AliESDEvent *event,
   }\r
 }\r
 //------------------------------------------------------------------------\r
+\r
+\r
+AliITSV0Finder::~AliITSV0Finder()\r
+{\r
+  //\r
+  //destructor\r
+  //\r
+  if (fDebugStreamer) {\r
+    //fDebugStreamer->Close();\r
+    delete fDebugStreamer;\r
+  }\r
+\r
+}\r