]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/vertexingHF/AliAnalysisVertexingHF.cxx
Coverity
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisVertexingHF.cxx
index 6faee5d56cff37fa1536a44d37af7aeb4720994b..1db45fcb0ebfaff139f30456e7d5e7fe91272cf2 100644 (file)
 // class AliAnalysisTaskSEVertexingHF. 
 // An example of usage in the macro AliAnalysisTaskSEVertexingHFTest.C.
 //
-//  Contact: andrea.dainese@lnl.infn.it
+//  Contact: andrea.dainese@pd.infn.it
 //  Contributors: E.Bruna, G.E.Bruno, A.Dainese, C.Di Gliglio,
 //                F.Prino, R.Romita, X.M.Zhang
 //----------------------------------------------------------------------------
+#include <Riostream.h>
 #include <TFile.h>
 #include <TDatabasePDG.h>
 #include <TString.h>
+#include <TList.h>
 #include "AliLog.h"
 #include "AliVEvent.h"
 #include "AliVVertex.h"
 #include "AliAODRecoDecayHF3Prong.h"
 #include "AliAODRecoDecayHF4Prong.h"
 #include "AliAODRecoCascadeHF.h"
+#include "AliRDHFCutsD0toKpi.h"
+#include "AliRDHFCutsJpsitoee.h"
+#include "AliRDHFCutsDplustoKpipi.h"
+#include "AliRDHFCutsDstoKKpi.h"
+#include "AliRDHFCutsLctopKpi.h"
+#include "AliRDHFCutsLctoV0.h"
+#include "AliRDHFCutsD0toKpipipi.h"
+#include "AliRDHFCutsDStartoKpipi.h"
 #include "AliAnalysisFilter.h"
 #include "AliAnalysisVertexingHF.h"
+#include "AliMixedEvent.h"
+#include "AliESDv0.h"
+#include "AliAODv0.h"
 
 ClassImp(AliAnalysisVertexingHF)
 
 //----------------------------------------------------------------------------
 AliAnalysisVertexingHF::AliAnalysisVertexingHF():
 fInputAOD(kFALSE),
+fAODMapSize(0),
 fAODMap(0),
 fBzkG(0.),
 fSecVtxWithKF(kFALSE),
@@ -65,25 +79,40 @@ fJPSItoEle(kTRUE),
 f3Prong(kTRUE),
 f4Prong(kTRUE),
 fDstar(kTRUE),
+fCascades(kTRUE),
 fLikeSign(kFALSE),
+fMixEvent(kFALSE),
 fTrackFilter(0x0),
 fTrackFilterSoftPi(0x0),
-fFindVertexForDstar(kTRUE)
+fCutsD0toKpi(0x0),
+fCutsJpsitoee(0x0),
+fCutsDplustoKpipi(0x0),
+fCutsDstoKKpi(0x0),
+fCutsLctopKpi(0x0),
+fCutsLctoV0(0x0),
+fCutsD0toKpipipi(0x0),
+fCutsDStartoKpipi(0x0),
+fListOfCuts(0x0),
+fFindVertexForDstar(kTRUE),
+fFindVertexForCascades(kTRUE),
+fMassCutBeforeVertexing(kFALSE),
+fMassCalc2(0),
+fMassCalc3(0),
+fMassCalc4(0)
 {
   // Default constructor
 
-  SetD0toKpiCuts();
-  SetBtoJPSICuts();
-  SetDplusCuts();
-  SetDsCuts();
-  SetLcCuts();
-  SetDstarCuts();
-  SetD0to4ProngsCuts();
+  Double_t d02[2],d03[3],d04[4];
+  fMassCalc2 = new AliAODRecoDecay(0x0,2,0,d02);
+  fMassCalc3 = new AliAODRecoDecay(0x0,3,1,d03);
+  fMassCalc4 = new AliAODRecoDecay(0x0,4,0,d04);
+
 }
 //--------------------------------------------------------------------------
 AliAnalysisVertexingHF::AliAnalysisVertexingHF(const AliAnalysisVertexingHF &source) : 
 TNamed(source),
 fInputAOD(source.fInputAOD),
+fAODMapSize(source.fAODMapSize),
 fAODMap(source.fAODMap),
 fBzkG(source.fBzkG),
 fSecVtxWithKF(source.fSecVtxWithKF),
@@ -95,21 +124,30 @@ fJPSItoEle(source.fJPSItoEle),
 f3Prong(source.f3Prong),
 f4Prong(source.f4Prong),
 fDstar(source.fDstar),
+fCascades(source.fCascades),
 fLikeSign(source.fLikeSign),
+fMixEvent(source.fMixEvent),
 fTrackFilter(source.fTrackFilter),
 fTrackFilterSoftPi(source.fTrackFilterSoftPi),
-fFindVertexForDstar(source.fFindVertexForDstar)
+fCutsD0toKpi(source.fCutsD0toKpi),
+fCutsJpsitoee(source.fCutsJpsitoee),
+fCutsDplustoKpipi(source.fCutsDplustoKpipi),
+fCutsDstoKKpi(source.fCutsDstoKKpi),
+fCutsLctopKpi(source.fCutsLctopKpi),
+fCutsLctoV0(source.fCutsLctoV0),
+fCutsD0toKpipipi(source.fCutsD0toKpipipi),
+fCutsDStartoKpipi(source.fCutsDStartoKpipi),
+fListOfCuts(source.fListOfCuts),
+fFindVertexForDstar(source.fFindVertexForDstar),
+fFindVertexForCascades(source.fFindVertexForCascades),
+fMassCutBeforeVertexing(source.fMassCutBeforeVertexing),
+fMassCalc2(source.fMassCalc2),
+fMassCalc3(source.fMassCalc3),
+fMassCalc4(source.fMassCalc4)
 {
   //
   // Copy constructor
   //
-  for(Int_t i=0; i<9; i++)  fD0toKpiCuts[i]=source.fD0toKpiCuts[i];
-  for(Int_t i=0; i<9; i++)  fBtoJPSICuts[i]=source.fBtoJPSICuts[i];
-  for(Int_t i=0; i<12; i++) fDplusCuts[i]=source.fDplusCuts[i];
-  for(Int_t i=0; i<13; i++) fDsCuts[i]=source.fDsCuts[i];
-  for(Int_t i=0; i<12; i++) fLcCuts[i]=source.fLcCuts[i];
-  for(Int_t i=0; i<5; i++)  fDstarCuts[i]=source.fDstarCuts[i];
-  for(Int_t i=0; i<9; i++)  fD0to4ProngsCuts[i]=source.fD0to4ProngsCuts[i];
 }
 //--------------------------------------------------------------------------
 AliAnalysisVertexingHF &AliAnalysisVertexingHF::operator=(const AliAnalysisVertexingHF &source)
@@ -119,6 +157,7 @@ AliAnalysisVertexingHF &AliAnalysisVertexingHF::operator=(const AliAnalysisVerte
   //
   if(&source == this) return *this;
   fInputAOD = source.fInputAOD;
+  fAODMapSize = source.fAODMapSize;
   fBzkG = source.fBzkG;
   fSecVtxWithKF = source.fSecVtxWithKF;
   fRecoPrimVtxSkippingTrks = source.fRecoPrimVtxSkippingTrks;
@@ -129,18 +168,26 @@ AliAnalysisVertexingHF &AliAnalysisVertexingHF::operator=(const AliAnalysisVerte
   f3Prong = source.f3Prong;
   f4Prong = source.f4Prong;
   fDstar = source.fDstar;
+  fCascades = source.fCascades;
   fLikeSign = source.fLikeSign;
+  fMixEvent = source.fMixEvent;
   fTrackFilter = source.fTrackFilter;
   fTrackFilterSoftPi = source.fTrackFilterSoftPi;
+  fCutsD0toKpi = source.fCutsD0toKpi;
+  fCutsJpsitoee = source.fCutsJpsitoee;
+  fCutsDplustoKpipi = source.fCutsDplustoKpipi;
+  fCutsDstoKKpi = source.fCutsDstoKKpi;
+  fCutsLctopKpi = source.fCutsLctopKpi;
+  fCutsLctoV0 = source.fCutsLctoV0;
+  fCutsD0toKpipipi = source.fCutsD0toKpipipi;
+  fCutsDStartoKpipi = source.fCutsDStartoKpipi;
+  fListOfCuts = source.fListOfCuts;
   fFindVertexForDstar = source.fFindVertexForDstar;
-
-  for(Int_t i=0; i<9; i++)  fD0toKpiCuts[i]=source.fD0toKpiCuts[i];
-  for(Int_t i=0; i<9; i++)  fBtoJPSICuts[i]=source.fBtoJPSICuts[i];
-  for(Int_t i=0; i<12; i++) fDplusCuts[i]=source.fDplusCuts[i];
-  for(Int_t i=0; i<13; i++) fDsCuts[i]=source.fDsCuts[i];
-  for(Int_t i=0; i<12; i++) fLcCuts[i]=source.fLcCuts[i];
-  for(Int_t i=0; i<5; i++)  fDstarCuts[i]=source.fDstarCuts[i];
-  for(Int_t i=0; i<9; i++)  fD0to4ProngsCuts[i]=source.fD0to4ProngsCuts[i];
+  fFindVertexForCascades = source.fFindVertexForCascades;
+  fMassCutBeforeVertexing = source.fMassCutBeforeVertexing;
+  fMassCalc2 = source.fMassCalc2;
+  fMassCalc3 = source.fMassCalc3;
+  fMassCalc4 = source.fMassCalc4;
 
   return *this;
 }
@@ -150,6 +197,64 @@ AliAnalysisVertexingHF::~AliAnalysisVertexingHF() {
   if(fV1) { delete fV1; fV1=0; }
   if(fTrackFilter) { delete fTrackFilter; fTrackFilter=0; }
   if(fTrackFilterSoftPi) { delete fTrackFilterSoftPi; fTrackFilterSoftPi=0; }
+  if(fCutsD0toKpi) { delete fCutsD0toKpi; fCutsD0toKpi=0; }
+  if(fCutsJpsitoee) { delete fCutsJpsitoee; fCutsJpsitoee=0; }
+  if(fCutsDplustoKpipi) { delete fCutsDplustoKpipi; fCutsDplustoKpipi=0; }
+  if(fCutsDstoKKpi) { delete fCutsDstoKKpi; fCutsDstoKKpi=0; }
+  if(fCutsLctopKpi) { delete fCutsLctopKpi; fCutsLctopKpi=0; }
+  if(fCutsLctoV0) { delete fCutsLctoV0; fCutsLctoV0=0; }
+  if(fCutsD0toKpipipi) { delete fCutsD0toKpipipi; fCutsD0toKpipipi=0; }
+  if(fCutsDStartoKpipi) { delete fCutsDStartoKpipi; fCutsDStartoKpipi=0; }
+  if(fAODMap) { delete fAODMap; fAODMap=0; }
+  if(fMassCalc2) { delete fMassCalc2; fMassCalc2=0; }
+  if(fMassCalc3) { delete fMassCalc3; fMassCalc3=0; }
+  if(fMassCalc4) { delete fMassCalc4; fMassCalc4=0; }
+}
+//----------------------------------------------------------------------------
+TList *AliAnalysisVertexingHF::FillListOfCuts() {
+  // Fill list of analysis cuts
+
+  TList *list = new TList();
+  list->SetOwner();
+  list->SetName("ListOfCuts");
+  
+  if(fCutsD0toKpi) {
+    AliRDHFCutsD0toKpi *cutsD0toKpi = new AliRDHFCutsD0toKpi(*fCutsD0toKpi);
+    list->Add(cutsD0toKpi);
+  }
+  if(fCutsJpsitoee) {
+    AliRDHFCutsJpsitoee *cutsJpsitoee = new AliRDHFCutsJpsitoee(*fCutsJpsitoee);
+    list->Add(cutsJpsitoee);
+  }
+  if(fCutsDplustoKpipi) {
+    AliRDHFCutsDplustoKpipi *cutsDplustoKpipi = new AliRDHFCutsDplustoKpipi(*fCutsDplustoKpipi);
+    list->Add(cutsDplustoKpipi);
+  }
+  if(fCutsDstoKKpi) {
+    AliRDHFCutsDstoKKpi *cutsDstoKKpi = new AliRDHFCutsDstoKKpi(*fCutsDstoKKpi);
+    list->Add(cutsDstoKKpi);
+  }
+  if(fCutsLctopKpi) {
+    AliRDHFCutsLctopKpi *cutsLctopKpi = new AliRDHFCutsLctopKpi(*fCutsLctopKpi);
+    list->Add(cutsLctopKpi);
+  }
+  if(fCutsLctoV0){
+    AliRDHFCutsLctoV0 *cutsLctoV0 = new AliRDHFCutsLctoV0(*fCutsLctoV0);
+    list->Add(cutsLctoV0);
+  }
+  if(fCutsD0toKpipipi) {
+    AliRDHFCutsD0toKpipipi *cutsD0toKpipipi = new AliRDHFCutsD0toKpipipi(*fCutsD0toKpipipi);
+    list->Add(cutsD0toKpipipi);
+  }
+  if(fCutsDStartoKpipi) {
+    AliRDHFCutsDStartoKpipi *cutsDStartoKpipi = new AliRDHFCutsDStartoKpipi(*fCutsDStartoKpipi);
+    list->Add(cutsDStartoKpipi);
+  }
+  
+  // keep a pointer to the list
+  fListOfCuts = list;
+
+  return list;
 }
 //----------------------------------------------------------------------------
 void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
@@ -159,15 +264,24 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
                                            TClonesArray *aodCharm3ProngTClArr,
                                            TClonesArray *aodCharm4ProngTClArr,
                                            TClonesArray *aodDstarTClArr,
-                                           TClonesArray *aodLikeSignTClArr)
+                                           TClonesArray *aodCascadesTClArr,
+                                           TClonesArray *aodLikeSign2ProngTClArr,
+                                           TClonesArray *aodLikeSign3ProngTClArr)
 {
   // Find heavy-flavour vertex candidates
   // Input:  ESD or AOD
   // Output: AOD (additional branches added)
 
+  if(!fMixEvent){
+    TString evtype = event->IsA()->GetName();
+    fInputAOD = ((evtype=="AliAODEvent") ? kTRUE : kFALSE);
+  } // if we do mixing AliVEvent is a AliMixedEvent
 
-  TString evtype = event->IsA()->GetName();
-  fInputAOD = ((evtype=="AliAODEvent") ? kTRUE : kFALSE);
+  if(fInputAOD) {
+    AliDebug(2,"Creating HF candidates from AOD");
+  } else {
+    AliDebug(2,"Creating HF candidates from ESD");
+  }
 
   if(!aodVerticesHFTClArr) {
     printf("ERROR: no aodVerticesHFTClArr");
@@ -193,13 +307,21 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     printf("ERROR: no aodDstarTClArr");
     return;
   }
-  if(fLikeSign && !aodLikeSignTClArr) {
-    printf("ERROR: no aodLikeSignTClArr");
+  if(fCascades && !aodCascadesTClArr){
+    printf("ERROR: no aodCascadesTClArr ");
+    return;
+  }
+  if(fLikeSign && !aodLikeSign2ProngTClArr) {
+    printf("ERROR: no aodLikeSign2ProngTClArr");
+    return;
+  }
+  if(fLikeSign && f3Prong && !aodLikeSign3ProngTClArr) {
+    printf("ERROR: no aodLikeSign2ProngTClArr");
     return;
   }
 
   // delete candidates from previous event and create references
-  Int_t iVerticesHF=0,iD0toKpi=0,iJPSItoEle=0,i3Prong=0,i4Prong=0,iDstar=0,iLikeSign=0;
+  Int_t iVerticesHF=0,iD0toKpi=0,iJPSItoEle=0,i3Prong=0,i4Prong=0,iDstar=0,iCascades=0,iLikeSign2Prong=0,iLikeSign3Prong=0;
   aodVerticesHFTClArr->Delete();
   iVerticesHF = aodVerticesHFTClArr->GetEntriesFast();
   TClonesArray &verticesHFRef = *aodVerticesHFTClArr;
@@ -223,16 +345,27 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     aodDstarTClArr->Delete();
     iDstar = aodDstarTClArr->GetEntriesFast();
   }
-  if(fLikeSign)   {                                
-    aodLikeSignTClArr->Delete();                     
-    iLikeSign = aodLikeSignTClArr->GetEntriesFast(); 
+  if(fCascades) {
+    aodCascadesTClArr->Delete();
+    iCascades = aodCascadesTClArr->GetEntriesFast();
+  }
+  if(fLikeSign) {                                
+    aodLikeSign2ProngTClArr->Delete();                     
+    iLikeSign2Prong = aodLikeSign2ProngTClArr->GetEntriesFast(); 
+  }  
+  if(fLikeSign && f3Prong) {                                
+    aodLikeSign3ProngTClArr->Delete();                     
+    iLikeSign3Prong = aodLikeSign3ProngTClArr->GetEntriesFast(); 
   }  
-  TClonesArray &aodD0toKpiRef      = *aodD0toKpiTClArr;
-  TClonesArray &aodJPSItoEleRef    = *aodJPSItoEleTClArr;
-  TClonesArray &aodCharm3ProngRef  = *aodCharm3ProngTClArr;
-  TClonesArray &aodCharm4ProngRef  = *aodCharm4ProngTClArr;
-  TClonesArray &aodDstarRef        = *aodDstarTClArr;
-  TClonesArray &aodLikeSignRef     = *aodLikeSignTClArr;
+
+  TClonesArray &aodD0toKpiRef        = *aodD0toKpiTClArr;
+  TClonesArray &aodJPSItoEleRef      = *aodJPSItoEleTClArr;
+  TClonesArray &aodCharm3ProngRef    = *aodCharm3ProngTClArr;
+  TClonesArray &aodCharm4ProngRef    = *aodCharm4ProngTClArr;
+  TClonesArray &aodDstarRef          = *aodDstarTClArr;
+  TClonesArray &aodCascadesRef       = *aodCascadesTClArr;
+  TClonesArray &aodLikeSign2ProngRef = *aodLikeSign2ProngTClArr;
+  TClonesArray &aodLikeSign3ProngRef = *aodLikeSign3ProngTClArr;
 
 
   AliAODRecoDecayHF2Prong *io2Prong  = 0;
@@ -240,19 +373,26 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
   AliAODRecoDecayHF4Prong *io4Prong  = 0;
   AliAODRecoCascadeHF     *ioCascade = 0;
 
-  Int_t    iTrkP1,iTrkP2,iTrkN1,iTrkN2,iTrkSoftPi,trkEntries;
-  Double_t xdummy,ydummy,dcap1n1,dcap1n2,dcap2n1,dcap1p2,dcan1n2,dcap2n2,dcaCasc;
+  Int_t    iTrkP1,iTrkP2,iTrkN1,iTrkN2,iTrkSoftPi,trkEntries,iv0,nv0;
+  Double_t xdummy,ydummy,dcap1n1,dcap1n2,dcap2n1,dcap1p2,dcan1n2,dcap2n2,dcaV0,dcaCasc;
   Bool_t   okD0=kFALSE,okJPSI=kFALSE,ok3Prong=kFALSE,ok4Prong=kFALSE;
   Bool_t   okDstar=kFALSE,okD0fromDstar=kFALSE;
+  Bool_t   okCascades=kFALSE;
   AliESDtrack *postrack1 = 0;
   AliESDtrack *postrack2 = 0;
   AliESDtrack *negtrack1 = 0;
   AliESDtrack *negtrack2 = 0;
   AliESDtrack *trackPi   = 0;
-  Double_t dcaMax = fD0toKpiCuts[1];
-  if(dcaMax < fBtoJPSICuts[1]) dcaMax=fBtoJPSICuts[1];
-  if(dcaMax < fDplusCuts[11])  dcaMax=fDplusCuts[11];
-  if(dcaMax < fD0to4ProngsCuts[1])  dcaMax=fD0to4ProngsCuts[1];
+  //   AliESDtrack *posV0track = 0;
+  //   AliESDtrack *negV0track = 0;
+  Float_t dcaMax = fCutsD0toKpi->GetDCACut();
+  if(fCutsJpsitoee) dcaMax=TMath::Max(dcaMax,fCutsJpsitoee->GetDCACut());
+  if(fCutsDplustoKpipi) dcaMax=TMath::Max(dcaMax,fCutsDplustoKpipi->GetDCACut());
+  if(fCutsDstoKKpi) dcaMax=TMath::Max(dcaMax,fCutsDstoKKpi->GetDCACut());
+  if(fCutsLctopKpi) dcaMax=TMath::Max(dcaMax,fCutsLctopKpi->GetDCACut());
+  if(fCutsD0toKpipipi) dcaMax=TMath::Max(dcaMax,fCutsD0toKpipipi->GetDCACut());
+  if(fCutsDStartoKpipi) dcaMax=TMath::Max(dcaMax,fCutsDStartoKpipi->GetDCACut());
+  
   AliDebug(2,Form(" dca cut set to %f cm",dcaMax));
 
 
@@ -262,22 +402,16 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
   trkEntries = (Int_t)event->GetNumberOfTracks();
   AliDebug(1,Form(" Number of tracks: %d",trkEntries));
 
-  if(trkEntries<2) {
+  nv0 = (Int_t)event->GetNumberOfV0s();
+  AliDebug(1,Form(" Number of V0s: %d",nv0));
+
+  if( trkEntries<2 && (trkEntries<1 || nv0<1) ) {
     AliDebug(1,Form(" Not enough tracks: %d",trkEntries));
     return;
   }
-    
-  const AliVVertex *primary = event->GetPrimaryVertex();
-  if(!primary) {
-    AliDebug(1," No primary vertex from tracks");
-    return;
-  }
-  TString primTitle = primary->GetTitle();
-  if(!primTitle.Contains("VertexerTracks") ||
-     primary->GetNContributors()<=0) {
-    AliDebug(1," No primary vertex from tracks");
-    return;
-  }
+
+  // event selection
+  if(!fCutsD0toKpi->IsEventSelected(event)) return;
 
   // call function that applies sigle-track selection,
   // for displaced tracks and soft pions (both charges) for D*,
@@ -285,38 +419,205 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
   TObjArray seleTrksArray(trkEntries);
   UChar_t  *seleFlags = new UChar_t[trkEntries]; // bit 0: displaced, bit 1: softpi
   Int_t     nSeleTrks=0;
-  SelectTracksAndCopyVertex(event,seleTrksArray,nSeleTrks,seleFlags);
+  Int_t *evtNumber    = new Int_t[trkEntries];
+  SelectTracksAndCopyVertex(event,trkEntries,seleTrksArray,nSeleTrks,seleFlags,evtNumber);
     
-  AliDebug(1,Form(" Selected tracks: %d",nSeleTrks));
+  //AliDebug(1,Form(" Selected tracks: %d",nSeleTrks));
+  printf(" Selected tracks: %d\n",nSeleTrks);
     
   TObjArray *twoTrackArray1    = new TObjArray(2);
   TObjArray *twoTrackArray2    = new TObjArray(2);
+  TObjArray *twoTrackArrayV0   = new TObjArray(2);
   TObjArray *twoTrackArrayCasc = new TObjArray(2);
   TObjArray *threeTrackArray   = new TObjArray(3);
   TObjArray *fourTrackArray    = new TObjArray(4);
   
   Double_t dispersion;
-  Bool_t isLikeSignPair=kFALSE;
+  Bool_t isLikeSign2Prong=kFALSE,isLikeSign3Prong=kFALSE;
 
   AliAODRecoDecayHF   *rd = 0;
   AliAODRecoCascadeHF *rc = 0;
+  AliAODv0            *v0 = 0;
+  AliESDv0         *esdV0 = 0;
+
+  Bool_t massCutOK=kTRUE;
 
   // LOOP ON  POSITIVE  TRACKS
   for(iTrkP1=0; iTrkP1<nSeleTrks; iTrkP1++) {
 
     if(iTrkP1%1==0) AliDebug(1,Form("  1st loop on pos: track number %d of %d",iTrkP1,nSeleTrks));  
+    //if(iTrkP1%1==0) printf("  1st loop on pos: track number %d of %d\n",iTrkP1,nSeleTrks);  
 
     // get track from tracks array
     postrack1 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkP1);
 
     if(!TESTBIT(seleFlags[iTrkP1],kBitDispl)) continue;
 
+    // Make cascades with V0+track
+    // 
+    if(fCascades) {
+      // loop on V0's
+      for(iv0=0; iv0<nv0; iv0++){
+
+       AliDebug(1,Form("   loop on v0s for track number %d and v0 number %d",iTrkP1,iv0));     
+
+       // Get the V0 
+       if(fInputAOD) {
+         v0 = ((AliAODEvent*)event)->GetV0(iv0);
+       } else {
+         esdV0 = ((AliESDEvent*)event)->GetV0(iv0);
+       }
+       if ( (!v0 || !v0->IsA()->InheritsFrom("AliAODv0") ) && 
+            (!esdV0 || !esdV0->IsA()->InheritsFrom("AliESDv0") ) ) continue;
+       
+
+       // Get the tracks that form the V0
+       //  ( parameters at primary vertex )
+       //   and define an AliExternalTrackParam out of them
+       AliExternalTrackParam * posV0track;
+       AliExternalTrackParam * negV0track;
+
+       if(fInputAOD){
+          AliAODTrack *posVV0track = (AliAODTrack*)(v0->GetDaughter(0));
+         AliAODTrack *negVV0track = (AliAODTrack*)(v0->GetDaughter(1));
+         if( !posVV0track || !negVV0track ) continue;
+         //
+         // Apply some basic V0 daughter criteria
+         //
+         // bachelor must not be a v0-track                                                                  
+         if (posVV0track->GetID() == postrack1->GetID() ||
+             negVV0track->GetID() == postrack1->GetID()) continue;
+         // reject like-sign v0                                                                              
+         if ( posVV0track->Charge() == negVV0track->Charge() ) continue;
+         // avoid ghost TPC tracks                                                                           
+         if(!(posVV0track->GetStatus() & AliESDtrack::kTPCrefit) ||
+            !(negVV0track->GetStatus() & AliESDtrack::kTPCrefit)) continue;
+         // Get AliExternalTrackParam out of the AliAODTracks
+         Double_t xyz[3], pxpypz[3], cv[21]; Short_t sign;
+         posVV0track->PxPyPz(pxpypz);                    posVV0track->XvYvZv(xyz);
+         posVV0track->GetCovarianceXYZPxPyPz(cv);        sign=posVV0track->Charge();
+         posV0track = new AliExternalTrackParam(xyz,pxpypz,cv,sign);
+         negVV0track->PxPyPz(pxpypz);                    negVV0track->XvYvZv(xyz);
+         negVV0track->GetCovarianceXYZPxPyPz(cv);        sign=negVV0track->Charge();
+         negV0track = new AliExternalTrackParam(xyz,pxpypz,cv,sign);
+       }  else {
+         AliESDtrack *posVV0track = (AliESDtrack*)(event->GetTrack( esdV0->GetPindex() ));
+          AliESDtrack *negVV0track = (AliESDtrack*)(event->GetTrack( esdV0->GetNindex() ));
+         if( !posVV0track || !negVV0track ) continue;
+         //
+         // Apply some basic V0 daughter criteria
+         //
+         // bachelor must not be a v0-track                                                                  
+         if (posVV0track->GetID() == postrack1->GetID() ||
+             negVV0track->GetID() == postrack1->GetID()) continue;
+         // reject like-sign v0                                                                              
+         if ( posVV0track->Charge() == negVV0track->Charge() ) continue;
+         // avoid ghost TPC tracks                                                                           
+         if(!(posVV0track->GetStatus() & AliESDtrack::kTPCrefit) ||
+            !(negVV0track->GetStatus() & AliESDtrack::kTPCrefit)) continue;
+         //  reject kinks (only necessary on AliESDtracks)
+         if (posVV0track->GetKinkIndex(0)>0  || negVV0track->GetKinkIndex(0)>0) continue;
+         // Get AliExternalTrackParam out of the AliESDtracks  
+         posV0track = new AliExternalTrackParam(*posVV0track);
+         negV0track = new AliExternalTrackParam(*negVV0track);
+
+         // Define the AODv0 from ESDv0 if reading ESDs
+         v0 = TransformESDv0toAODv0(esdV0,twoTrackArrayV0);
+       }
+       if( !posV0track || !negV0track ){
+         AliDebug(1,Form(" Couldn't get the V0 daughters"));
+         continue;
+       }
+
+       // fill in the v0 two-external-track-param array
+       twoTrackArrayV0->AddAt(posV0track,0);
+       twoTrackArrayV0->AddAt(negV0track,1);
+
+       // Get the V0 dca
+       dcaV0 = v0->DcaV0Daughters();
+
+       // Define the V0 (neutral) track
+       AliNeutralTrackParam *trackV0;
+       if(fInputAOD) {
+         const AliVTrack *trackVV0 = dynamic_cast<const AliVTrack*>(v0);
+         if(trackVV0) trackV0 = new AliNeutralTrackParam(trackVV0);
+       } else {  
+         Double_t xyz[3], pxpypz[3];
+         esdV0->XvYvZv(xyz);
+         esdV0->PxPyPz(pxpypz);
+         Double_t cv[21]; for(int i=0; i<21; i++) cv[i]=0;
+         trackV0 = new AliNeutralTrackParam(xyz,pxpypz,cv,0);
+       }
+       // Fill in the object array to create the cascade
+       twoTrackArrayCasc->AddAt(postrack1,0);
+       twoTrackArrayCasc->AddAt(trackV0,1);
+
+       // Compute the cascade vertex
+       AliAODVertex *vertexCasc = 0;
+       if(fFindVertexForCascades) {  
+         // DCA between the two tracks
+         dcaCasc = postrack1->GetDCA(trackV0,fBzkG,xdummy,ydummy);
+         // Vertexing+   
+         vertexCasc = ReconstructSecondaryVertex(twoTrackArrayCasc,dispersion,kFALSE);
+       } else {
+         // assume Cascade decays at the primary vertex
+         Double_t pos[3],cov[6],chi2perNDF;
+         fV1->GetXYZ(pos);
+         fV1->GetCovMatrix(cov);
+         chi2perNDF = fV1->GetChi2toNDF();
+         vertexCasc = new AliAODVertex(pos,cov,chi2perNDF,0x0,-1,AliAODVertex::kUndef,2);
+         dcaCasc = 0.;
+       }
+       if(!vertexCasc) {
+         delete posV0track; posV0track=NULL;
+         delete negV0track; negV0track=NULL;
+         delete trackV0; trackV0=NULL;
+         if(!fInputAOD) {delete v0; v0=NULL;}
+         twoTrackArrayCasc->Clear();
+         continue; 
+       }
+
+       // Create and store the Cascade if passed the cuts
+       ioCascade = MakeCascade(twoTrackArrayCasc,event,vertexCasc,v0,dcaCasc,okCascades);
+       if(okCascades && ioCascade) {
+         AliDebug(1,Form("Storing a cascade object... "));
+         // add the vertex and the cascade to the AOD
+         AliAODVertex *vCasc = new(verticesHFRef[iVerticesHF++])AliAODVertex(*vertexCasc);
+         rc = new(aodCascadesRef[iCascades++])AliAODRecoCascadeHF(*ioCascade);
+         rc->SetSecondaryVtx(vCasc);
+         vCasc->SetParent(rc);
+         rc->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+         if(!fInputAOD) vCasc->AddDaughter(v0); // just to fill ref #0 ??
+         AddRefs(vCasc,rc,event,twoTrackArrayCasc); // add the track (proton)
+         vCasc->AddDaughter(v0); // fill the 2prong V0 
+       }
+
+       // Clean up 
+       delete posV0track; posV0track=NULL;
+       delete negV0track; negV0track=NULL;
+       delete trackV0; trackV0=NULL;
+       twoTrackArrayV0->Clear();
+       twoTrackArrayCasc->Clear();
+       if(ioCascade) { delete ioCascade; ioCascade=NULL; }
+       if(vertexCasc) { delete vertexCasc; vertexCasc=NULL; }
+       if(!fInputAOD) {delete v0; v0=NULL;}
+
+      } // end loop on V0's
+    } 
+  
+    // If there is less than 2 particles continue
+    if(trkEntries<2) {
+      AliDebug(1,Form(" Not enough tracks: %d",trkEntries));
+      continue;
+    }
+
     if(postrack1->Charge()<0 && !fLikeSign) continue;
 
     // LOOP ON  NEGATIVE  TRACKS
     for(iTrkN1=0; iTrkN1<nSeleTrks; iTrkN1++) {
 
       if(iTrkN1%1==0) AliDebug(1,Form("    1st loop on neg: track number %d of %d",iTrkN1,nSeleTrks));  
+      //if(iTrkN1%1==0) printf("    1st loop on neg: track number %d of %d\n",iTrkN1,nSeleTrks);  
 
       if(iTrkN1==iTrkP1) continue;
 
@@ -327,13 +628,21 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
       if(!TESTBIT(seleFlags[iTrkN1],kBitDispl)) continue;
 
+      if(fMixEvent) {
+       if(evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+      }
+
       if(postrack1->Charge()==negtrack1->Charge()) { // like-sign 
-       isLikeSignPair=kTRUE;
+       isLikeSign2Prong=kTRUE;
        if(!fLikeSign)    continue;
        if(iTrkN1<iTrkP1) continue; // this is needed to avoid double-counting of like-sign
       } else { // unlike-sign
-       isLikeSignPair=kFALSE;
+       isLikeSign2Prong=kFALSE;
        if(postrack1->Charge()<0 || negtrack1->Charge()>0) continue;  // this is needed to avoid double-counting of unlike-sign
+       if(fMixEvent) {
+         if(evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+       }
+       
       }
 
       // back to primary vertex
@@ -359,29 +668,31 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
       
        io2Prong = Make2Prong(twoTrackArray1,event,vertexp1n1,dcap1n1,okD0,okJPSI,okD0fromDstar);
       
-       if((fD0toKpi && okD0) || (fJPSItoEle && okJPSI) || (isLikeSignPair && (okD0 || okJPSI))) {
+       if((fD0toKpi && okD0) || (fJPSItoEle && okJPSI) || (isLikeSign2Prong && (okD0 || okJPSI))) {
          // add the vertex and the decay to the AOD
          AliAODVertex *v2Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*vertexp1n1);
-         if(fInputAOD) AddDaughterRefs(v2Prong,event,twoTrackArray1);
-         if(!isLikeSignPair) {
+         if(!isLikeSign2Prong) {
            if(okD0) {  
              rd = new(aodD0toKpiRef[iD0toKpi++])AliAODRecoDecayHF2Prong(*io2Prong);
              rd->SetSecondaryVtx(v2Prong);
              v2Prong->SetParent(rd);
+             AddRefs(v2Prong,rd,event,twoTrackArray1);
            }
            if(okJPSI) {
              rd = new(aodJPSItoEleRef[iJPSItoEle++])AliAODRecoDecayHF2Prong(*io2Prong);
              rd->SetSecondaryVtx(v2Prong);
              if(!okD0) v2Prong->SetParent(rd); // it cannot have two mothers ...
+             AddRefs(v2Prong,rd,event,twoTrackArray1);
            }
-         } else { // isLikeSignPair
-           rd = new(aodLikeSignRef[iLikeSign++])AliAODRecoDecayHF2Prong(*io2Prong);
+         } else { // isLikeSign2Prong
+           rd = new(aodLikeSign2ProngRef[iLikeSign2Prong++])AliAODRecoDecayHF2Prong(*io2Prong);
            rd->SetSecondaryVtx(v2Prong);
            v2Prong->SetParent(rd);
+           AddRefs(v2Prong,rd,event,twoTrackArray1);
          }
        }
        // D* candidates
-       if(fDstar && okD0fromDstar && !isLikeSignPair) {
+       if(fDstar && okD0fromDstar && !isLikeSign2Prong) {
          // write references in io2Prong
          if(fInputAOD) {
            AddDaughterRefs(vertexp1n1,event,twoTrackArray1);
@@ -401,6 +712,12 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
            if(!TESTBIT(seleFlags[iTrkSoftPi],kBitSoftPi)) continue;
 
+           if(fMixEvent) {
+             if(evtNumber[iTrkP1]==evtNumber[iTrkSoftPi] || 
+                evtNumber[iTrkN1]==evtNumber[iTrkSoftPi] || 
+                evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+           }
+
            if(iTrkSoftPi%1==0) AliDebug(1,Form("    1st loop on pi_s: track number %d of %d",iTrkSoftPi,nSeleTrks));  
 
            trackD0->PropagateToDCA(fV1,fBzkG,kVeryBig);
@@ -440,39 +757,36 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
              // add the D0 to the AOD (if not already done)
              if(!okD0) {
                AliAODVertex *v2Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*vertexp1n1);
-               if(fInputAOD) AddDaughterRefs(v2Prong,event,twoTrackArray1);
                rd = new(aodD0toKpiRef[iD0toKpi++])AliAODRecoDecayHF2Prong(*io2Prong);
                rd->SetSecondaryVtx(v2Prong);
                v2Prong->SetParent(rd);
+               AddRefs(v2Prong,rd,event,twoTrackArray1);
                okD0=kTRUE; // this is done to add it only once
              }
              // add the vertex and the cascade to the AOD
              AliAODVertex *vCasc = new(verticesHFRef[iVerticesHF++])AliAODVertex(*vertexCasc); 
-             if(fInputAOD) {
-               AddDaughterRefs(vCasc,event,twoTrackArrayCasc); // add the pion
-             } else {
-               vCasc->AddDaughter(rd); // just to fill ref #0 
-             }
-             vCasc->AddDaughter(rd); // add the D0 (in ref #1)
              rc = new(aodDstarRef[iDstar++])AliAODRecoCascadeHF(*ioCascade);
              rc->SetSecondaryVtx(vCasc);
              vCasc->SetParent(rc);
+             if(!fInputAOD) vCasc->AddDaughter(rd); // just to fill ref #0 
+             AddRefs(vCasc,rc,event,twoTrackArrayCasc);
+             vCasc->AddDaughter(rd); // add the D0 (in ref #1)
            }
            twoTrackArrayCasc->Clear();
            trackPi=0; 
-           delete ioCascade; ioCascade=NULL;
+           if(ioCascade) {delete ioCascade; ioCascade=NULL;}
            delete vertexCasc; vertexCasc=NULL;
          } // end loop on soft pi tracks
 
          if(trackD0) {delete trackD0; trackD0=NULL;}
 
        }
-
-       delete io2Prong; io2Prong=NULL;
+       if(io2Prong) {delete io2Prong; io2Prong=NULL;}
       }      
 
       twoTrackArray1->Clear(); 
-      if((!f3Prong && !f4Prong) || isLikeSignPair)  { 
+      if( (!f3Prong && !f4Prong) || 
+         (isLikeSign2Prong && !f3Prong) ) { 
        negtrack1=0; 
        delete vertexp1n1; 
        continue; 
@@ -493,6 +807,27 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
        if(!TESTBIT(seleFlags[iTrkP2],kBitDispl)) continue;
 
+       if(fMixEvent) {
+         if(evtNumber[iTrkP1]==evtNumber[iTrkP2] || 
+            evtNumber[iTrkN1]==evtNumber[iTrkP2] ||
+            evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+       }
+
+       if(isLikeSign2Prong) { // like-sign pair -> have to build only like-sign triplet 
+         if(postrack1->Charge()>0) { // ok: like-sign triplet (+++)
+           isLikeSign3Prong=kTRUE;
+         } else { // not ok
+           continue;
+         }
+       } else { // normal triplet (+-+)
+         isLikeSign3Prong=kFALSE; 
+         if(fMixEvent) {
+           if(evtNumber[iTrkP1]==evtNumber[iTrkP2] || 
+              evtNumber[iTrkN1]==evtNumber[iTrkP2] ||
+              evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+         }
+       }
+
        // back to primary vertex
        postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
        postrack2->PropagateToDCA(fV1,fBzkG,kVeryBig);
@@ -503,6 +838,30 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
        if(dcap2n1>dcaMax) { postrack2=0; continue; }
        dcap1p2 = postrack2->GetDCA(postrack1,fBzkG,xdummy,ydummy);
        if(dcap1p2>dcaMax) { postrack2=0; continue; }
+
+       // check invariant mass cuts for D+,Ds,Lc
+        massCutOK=kTRUE;
+       if(f3Prong) {
+         if(postrack2->Charge()>0) {
+           threeTrackArray->AddAt(postrack1,0);
+           threeTrackArray->AddAt(negtrack1,1);
+           threeTrackArray->AddAt(postrack2,2);
+         } else {
+           threeTrackArray->AddAt(negtrack1,0);
+           threeTrackArray->AddAt(postrack1,1);
+           threeTrackArray->AddAt(postrack2,2);
+         }
+         if(fMassCutBeforeVertexing)
+           massCutOK = SelectInvMass(threeTrackArray);
+       }
+
+       if(f3Prong && !massCutOK) {
+         threeTrackArray->Clear();
+         if(!f4Prong) { 
+           postrack2=0; 
+           continue;
+         } 
+       } 
        
        // Vertexing
        twoTrackArray2->AddAt(postrack2,0);
@@ -511,31 +870,39 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
        if(!vertexp2n1) { 
          twoTrackArray2->Clear();
          postrack2=0; 
-         continue; 
+         continue;
        }
 
        // 3 prong candidates
-       if(f3Prong) { 
-
-         threeTrackArray->AddAt(postrack1,0);
-         threeTrackArray->AddAt(negtrack1,1);
-         threeTrackArray->AddAt(postrack2,2);
+       if(f3Prong && massCutOK) { 
 
          AliAODVertex* secVert3PrAOD = ReconstructSecondaryVertex(threeTrackArray,dispersion);
          io3Prong = Make3Prong(threeTrackArray,event,secVert3PrAOD,dispersion,vertexp1n1,vertexp2n1,dcap1n1,dcap2n1,dcap1p2,ok3Prong);
          if(ok3Prong) {
            AliAODVertex *v3Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
-           if(fInputAOD) AddDaughterRefs(v3Prong,event,threeTrackArray);
-           rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
-           rd->SetSecondaryVtx(v3Prong);
-           v3Prong->SetParent(rd);
+           if(!isLikeSign3Prong) {
+             rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             AddRefs(v3Prong,rd,event,threeTrackArray);
+           } else { // isLikeSign3Prong
+             rd = new(aodLikeSign3ProngRef[iLikeSign3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             AddRefs(v3Prong,rd,event,threeTrackArray);
+           }
          }
          if(io3Prong) {delete io3Prong; io3Prong=NULL;} 
          if(secVert3PrAOD) {delete secVert3PrAOD; secVert3PrAOD=NULL;} 
        }
 
        // 4 prong candidates
-       if(f4Prong) {
+       if(f4Prong 
+          // don't make 4 prong with like-sign pairs and triplets
+          && !isLikeSign2Prong && !isLikeSign3Prong
+          // track-to-track dca cuts already now
+          && dcap1n1 < fCutsD0toKpipipi->GetDCACut()
+          && dcap2n1 < fCutsD0toKpipipi->GetDCACut()) {
 
          // back to primary vertex
          postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
@@ -560,6 +927,14 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
            if(negtrack2->Charge()>0) continue;
 
            if(!TESTBIT(seleFlags[iTrkN2],kBitDispl)) continue;
+           if(fMixEvent){ 
+             if(evtNumber[iTrkP1]==evtNumber[iTrkN2] || 
+                evtNumber[iTrkN1]==evtNumber[iTrkN2] || 
+                evtNumber[iTrkP2]==evtNumber[iTrkN2] ||
+                evtNumber[iTrkP1]==evtNumber[iTrkN1] ||
+                evtNumber[iTrkP1]==evtNumber[iTrkP2] ||
+                evtNumber[iTrkN1]==evtNumber[iTrkP2]) continue;
+           }
 
            // back to primary vertex
            postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
@@ -567,24 +942,36 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
            negtrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
            negtrack2->PropagateToDCA(fV1,fBzkG,kVeryBig);
            dcap1n2 = postrack1->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
-           if(dcap1n2>dcaMax) { negtrack2=0; continue; }
+           if(dcap1n2 > fCutsD0toKpipipi->GetDCACut()) { negtrack2=0; continue; }
             dcap2n2 = postrack2->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
-            if(dcap2n2>dcaMax) { negtrack2=0; continue; }
+            if(dcap2n2 > fCutsD0toKpipipi->GetDCACut()) { negtrack2=0; continue; }
+
 
-           // Vertexing
            fourTrackArray->AddAt(postrack1,0);
            fourTrackArray->AddAt(negtrack1,1);
            fourTrackArray->AddAt(postrack2,2);
            fourTrackArray->AddAt(negtrack2,3);
 
+           // check invariant mass cuts for D0
+           massCutOK=kTRUE;
+           if(fMassCutBeforeVertexing) 
+             massCutOK = SelectInvMass(fourTrackArray);
+           
+           if(!massCutOK) {
+             fourTrackArray->Clear(); 
+             negtrack2=0; 
+             continue; 
+           }
+
+           // Vertexing
            AliAODVertex* secVert4PrAOD = ReconstructSecondaryVertex(fourTrackArray,dispersion);
            io4Prong = Make4Prong(fourTrackArray,event,secVert4PrAOD,vertexp1n1,vertexp1n1p2,dcap1n1,dcap1n2,dcap2n1,dcap2n2,ok4Prong);
            if(ok4Prong) {
              AliAODVertex *v4Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert4PrAOD);
-             if(fInputAOD) AddDaughterRefs(v4Prong,event,fourTrackArray);
              rd = new(aodCharm4ProngRef[i4Prong++])AliAODRecoDecayHF4Prong(*io4Prong);
              rd->SetSecondaryVtx(v4Prong);
              v4Prong->SetParent(rd);
+             AddRefs(v4Prong,rd,event,fourTrackArray);
            }
 
            if(io4Prong) {delete io4Prong; io4Prong=NULL;} 
@@ -606,7 +993,7 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
       twoTrackArray2->Clear();
       
-      // 2nd LOOP  ON  NEGATIVE  TRACKS (for 3 prong +--)
+      // 2nd LOOP  ON  NEGATIVE  TRACKS (for 3 prong -+-)
       for(iTrkN2=iTrkN1+1; iTrkN2<nSeleTrks; iTrkN2++) {
 
        if(iTrkN2==iTrkP1 || iTrkN2==iTrkP2 || iTrkN2==iTrkN1) continue;
@@ -620,6 +1007,22 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
        if(!TESTBIT(seleFlags[iTrkN2],kBitDispl)) continue;
 
+       if(fMixEvent) {
+         if(evtNumber[iTrkP1]==evtNumber[iTrkN2] || 
+            evtNumber[iTrkN1]==evtNumber[iTrkN2] ||
+            evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+       }
+
+       if(isLikeSign2Prong) { // like-sign pair -> have to build only like-sign triplet 
+         if(postrack1->Charge()<0) { // ok: like-sign triplet (---)
+           isLikeSign3Prong=kTRUE;
+         } else { // not ok
+           continue;
+         }
+       } else { // normal triplet (-+-)
+         isLikeSign3Prong=kFALSE;
+       }
+
        // back to primary vertex
        postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
        negtrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
@@ -630,6 +1033,21 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
        if(dcap1n2>dcaMax) { negtrack2=0; continue; }
        dcan1n2 = negtrack1->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
        if(dcan1n2>dcaMax) { negtrack2=0; continue; }
+
+       threeTrackArray->AddAt(negtrack1,0);
+       threeTrackArray->AddAt(postrack1,1);
+       threeTrackArray->AddAt(negtrack2,2);
+
+       // check invariant mass cuts for D+,Ds,Lc
+        massCutOK=kTRUE;
+       if(fMassCutBeforeVertexing && f3Prong) 
+         massCutOK = SelectInvMass(threeTrackArray);
+
+       if(!massCutOK) { 
+         threeTrackArray->Clear();
+         negtrack2=0; 
+         continue; 
+       }
        
        // Vertexing
        twoTrackArray2->AddAt(postrack1,0);
@@ -643,26 +1061,31 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
        }
 
        if(f3Prong) { 
-         threeTrackArray->AddAt(negtrack1,0);
-         threeTrackArray->AddAt(postrack1,1);
-         threeTrackArray->AddAt(negtrack2,2);
          AliAODVertex* secVert3PrAOD = ReconstructSecondaryVertex(threeTrackArray,dispersion);
          io3Prong = Make3Prong(threeTrackArray,event,secVert3PrAOD,dispersion,vertexp1n1,vertexp1n2,dcap1n1,dcap1n2,dcan1n2,ok3Prong);
          if(ok3Prong) {
            AliAODVertex *v3Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
-           if(fInputAOD) AddDaughterRefs(v3Prong,event,threeTrackArray);
-           rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
-           rd->SetSecondaryVtx(v3Prong);
-           v3Prong->SetParent(rd);
+           if(!isLikeSign3Prong) {
+             rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             AddRefs(v3Prong,rd,event,threeTrackArray);
+           } else { // isLikeSign3Prong
+             rd = new(aodLikeSign3ProngRef[iLikeSign3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             AddRefs(v3Prong,rd,event,threeTrackArray);
+           }
          }
          if(io3Prong) {delete io3Prong; io3Prong=NULL;} 
          if(secVert3PrAOD) {delete secVert3PrAOD; secVert3PrAOD=NULL;}
        }
-
+       threeTrackArray->Clear();
        negtrack2 = 0;
        delete vertexp1n2;
 
       } // end 2nd loop on negative tracks
+      
       twoTrackArray2->Clear();
       
       negtrack1 = 0;
@@ -695,32 +1118,73 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     AliDebug(1,Form(" D*->D0pi in event = %d;\n",
                    (Int_t)aodDstarTClArr->GetEntriesFast()));
   }
+  if(fCascades){
+    AliDebug(1,Form(" cascades -> v0 + track in event = %d;\n",
+                   (Int_t)aodCascadesTClArr->GetEntriesFast()));
+  }
   if(fLikeSign) {
-    AliDebug(1,Form(" Like-sign pairs in event = %d;\n",
-                   (Int_t)aodLikeSignTClArr->GetEntriesFast()));
+    AliDebug(1,Form(" Like-sign 2Prong in event = %d;\n",
+                   (Int_t)aodLikeSign2ProngTClArr->GetEntriesFast()));
+  }
+  if(fLikeSign && f3Prong) {
+    AliDebug(1,Form(" Like-sign 3Prong in event = %d;\n",
+                   (Int_t)aodLikeSign3ProngTClArr->GetEntriesFast()));
   }
     
 
   twoTrackArray1->Delete();  delete twoTrackArray1;
   twoTrackArray2->Delete();  delete twoTrackArray2;
   twoTrackArrayCasc->Delete();  delete twoTrackArrayCasc;
+  twoTrackArrayV0->Delete();  delete twoTrackArrayV0;
   threeTrackArray->Clear(); 
   threeTrackArray->Delete(); delete threeTrackArray;
   fourTrackArray->Delete();  delete fourTrackArray;
   delete [] seleFlags; seleFlags=NULL;
+  if(evtNumber) {delete [] evtNumber; evtNumber=NULL;}
 
   if(fInputAOD) {
     seleTrksArray.Delete(); 
-    if(fAODMap) { delete [] fAODMap; fAODMap=NULL; }
+    if(fAODMap) { delete fAODMap; fAODMap=NULL; }
   }
 
   return;
 }
 //----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::AddDaughterRefs(AliAODVertex *v,AliVEvent *event,
-                                            TObjArray *trkArray) const
+void AliAnalysisVertexingHF::AddRefs(AliAODVertex *v,AliAODRecoDecayHF *rd,
+                                    const AliVEvent *event,
+                                    const TObjArray *trkArray) const
 {
   // Add the AOD tracks as daughters of the vertex (TRef)
+  // Also add the references to the primary vertex and to the cuts
+
+  if(fInputAOD) {
+    AddDaughterRefs(v,event,trkArray);
+    rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+  }
+
+  /*
+  rd->SetListOfCutsRef((TList*)fListOfCuts);
+  //fListOfCuts->Print();
+  cout<<fListOfCuts<<endl;
+  TList *l=(TList*)rd->GetListOfCuts();
+  cout<<l<<endl;
+  if(l) {l->Print(); }else{printf("error\n");}
+  */
+
+  return;
+}      
+//----------------------------------------------------------------------------
+void AliAnalysisVertexingHF::AddDaughterRefs(AliAODVertex *v,
+                                            const AliVEvent *event,
+                                            const TObjArray *trkArray) const
+{
+  // Add the AOD tracks as daughters of the vertex (TRef)
+
+  Int_t nDg = v->GetNDaughters();
+  TObject *dg = 0;
+  if(nDg) dg = v->GetDaughter(0);
+  
+  if(dg) return; // daughters already added
 
   Int_t nTrks = trkArray->GetEntriesFast();
 
@@ -739,6 +1203,78 @@ void AliAnalysisVertexingHF::AddDaughterRefs(AliAODVertex *v,AliVEvent *event,
 
   return;
 }      
+//---------------------------------------------------------------------------
+void AliAnalysisVertexingHF::FixReferences(AliAODEvent *aod)  
+{
+  // Checks that the references to the daughter tracks are properly
+  // assigned and reassigns them if needed
+  //
+
+
+  TClonesArray *inputArray=(TClonesArray*)aod->GetList()->FindObject("VerticesHF");
+  if(!inputArray) return;
+
+  AliAODTrack *track = 0;
+  AliAODVertex *vertex = 0;
+
+  Bool_t needtofix=kFALSE;
+  for(Int_t iv=0; iv<inputArray->GetEntriesFast(); iv++) {
+    vertex = (AliAODVertex*)inputArray->UncheckedAt(iv);
+    for(Int_t id=0; id<vertex->GetNDaughters(); id++) {
+      track = (AliAODTrack*)vertex->GetDaughter(id);
+      if(!track->GetStatus()) needtofix=kTRUE;
+    }
+    if(needtofix) break;
+  }
+
+  if(!needtofix) return;
+
+
+  printf("Fixing references\n");
+
+  fAODMapSize = 100000;
+  fAODMap = new Int_t[fAODMapSize];
+
+  for(Int_t i=0; i<aod->GetNumberOfTracks(); i++) {
+    track = aod->GetTrack(i);
+
+    // skip pure ITS SA tracks
+    if(track->GetStatus()&AliESDtrack::kITSpureSA) continue;
+
+    // skip tracks without ITS
+    if(!(track->GetStatus()&AliESDtrack::kITSin)) continue;
+
+    // TEMPORARY: check that the cov matrix is there
+    Double_t covtest[21];
+    if(!track->GetCovarianceXYZPxPyPz(covtest)) continue;
+    //
+
+    fAODMap[(Int_t)track->GetID()] = i;
+  }
+
+
+  Int_t ids[4]={-1,-1,-1,-1};
+  for(Int_t iv=0; iv<inputArray->GetEntriesFast(); iv++) {
+    Bool_t cascade=kFALSE;
+    vertex = (AliAODVertex*)inputArray->UncheckedAt(iv);
+    Int_t id=0;
+    Int_t nDgs = vertex->GetNDaughters();
+    for(id=0; id<nDgs; id++) {
+      track = (AliAODTrack*)vertex->GetDaughter(id);
+      if(track->Charge()==0) {cascade=kTRUE; continue;} // cascade
+      ids[id]=(Int_t)track->GetID();
+      vertex->RemoveDaughter(track);
+    }
+    if(cascade) continue;
+    for(id=0; id<nDgs; id++) {
+      track = aod->GetTrack(fAODMap[ids[id]]);
+      vertex->AddDaughter(track);
+    }
+    
+  }
+
+  return;
+}
 //----------------------------------------------------------------------------
 AliAODRecoCascadeHF* AliAnalysisVertexingHF::MakeCascade(
                                   TObjArray *twoTrackArray,AliVEvent *event,
@@ -779,13 +1315,12 @@ AliAODRecoCascadeHF* AliAnalysisVertexingHF::MakeCascade(
   }
   // select D*->D0pi
   if(fDstar) {
-    Bool_t testD0=kTRUE;
-    okDstar = tmpCascade->SelectDstar(fDstarCuts,fD0fromDstarCuts,testD0);
+    okDstar = (Bool_t)fCutsDStartoKpipi->IsSelected(tmpCascade,AliRDHFCuts::kCandidate);
   }
   tmpCascade->GetSecondaryVtx()->RemoveDaughters();
   tmpCascade->UnsetOwnPrimaryVtx(); 
   delete tmpCascade; tmpCascade=NULL;
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
     rd2Prong->UnsetOwnPrimaryVtx();
   }
   if(primVertexAOD) {delete primVertexAOD; primVertexAOD=NULL;}
@@ -793,6 +1328,62 @@ AliAODRecoCascadeHF* AliAnalysisVertexingHF::MakeCascade(
   
   return theCascade;
 }
+
+
+//----------------------------------------------------------------------------
+AliAODRecoCascadeHF* AliAnalysisVertexingHF::MakeCascade(
+                                  TObjArray *twoTrackArray,AliVEvent *event,
+                                  AliAODVertex *secVert,
+                                  AliAODv0 *v0,
+                                  Double_t dca,
+                                  Bool_t &okCascades) const
+{
+  //
+  // Make the cascade as a 2Prong decay and check if it passes 
+  // cascades reconstruction cuts
+  
+  //  AliDebug(2,Form("         building the cascade"));
+  okCascades= kFALSE; 
+  Bool_t dummy1,dummy2,dummy3;
+
+  // We use Make2Prong to construct the AliAODRecoCascadeHF
+  // (which inherits from AliAODRecoDecayHF2Prong) 
+  AliAODRecoCascadeHF *theCascade = 
+    (AliAODRecoCascadeHF*)Make2Prong(twoTrackArray,event,secVert,dca,
+                                    dummy1,dummy2,dummy3);
+  if(!theCascade) return 0x0;
+
+  // bachelor track and charge
+  AliESDtrack *trackBachelor = (AliESDtrack*)twoTrackArray->UncheckedAt(0);
+  theCascade->SetCharge(trackBachelor->Charge());
+
+  //--- selection cuts
+  //
+  AliAODRecoCascadeHF *tmpCascade = new AliAODRecoCascadeHF(*theCascade);  
+  tmpCascade->GetSecondaryVtx()->AddDaughter(trackBachelor);
+  tmpCascade->GetSecondaryVtx()->AddDaughter(v0);
+  AliAODVertex *primVertexAOD=0;
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+    // take event primary vertex
+    primVertexAOD = PrimaryVertex(); 
+    if(!primVertexAOD) primVertexAOD = (AliAODVertex*)event->GetPrimaryVertex(); 
+    tmpCascade->SetOwnPrimaryVtx(primVertexAOD);
+  }
+
+  // select Cascades
+  if(fCascades && fInputAOD){
+    okCascades = (Bool_t)fCutsLctoV0->IsSelected(tmpCascade,AliRDHFCuts::kCandidate);
+  }
+  else { AliDebug(2,Form("The cascade is contructed from ESDs, no cuts are applied")); okCascades=kTRUE; }// no cuts implemented from ESDs
+  tmpCascade->GetSecondaryVtx()->RemoveDaughters();
+  tmpCascade->UnsetOwnPrimaryVtx(); 
+  delete tmpCascade; tmpCascade=NULL;
+  if(primVertexAOD) {delete primVertexAOD; primVertexAOD=NULL;}
+  //---
+  
+  return theCascade;
+}
+
 //-----------------------------------------------------------------------------
 AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
                                   TObjArray *twoTrackArray,AliVEvent *event,
@@ -807,7 +1398,6 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
   okD0=kFALSE; okJPSI=kFALSE; okD0fromDstar=kFALSE;
 
   Double_t px[2],py[2],pz[2],d0[2],d0err[2];
-
   AliESDtrack *postrack = (AliESDtrack*)twoTrackArray->UncheckedAt(0);
   AliESDtrack *negtrack = (AliESDtrack*)twoTrackArray->UncheckedAt(1);
 
@@ -831,11 +1421,11 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
     AliDebug(2," candidate didn't pass mass cut");
     return 0x0;    
   }
-  
   // primary vertex to be used by this candidate
   AliAODVertex *primVertexAOD  = PrimaryVertex(twoTrackArray,event);
   if(!primVertexAOD) return 0x0;
 
+
   Double_t d0z0[2],covd0z0[3];
   postrack->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
   d0[0] = d0z0[0];
@@ -849,24 +1439,25 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
   the2Prong->SetOwnPrimaryVtx(primVertexAOD);
   UShort_t id[2]={(UShort_t)postrack->GetID(),(UShort_t)negtrack->GetID()};
   the2Prong->SetProngIDs(2,id);
+  delete primVertexAOD; primVertexAOD=NULL;
+
+  if(postrack->Charge()!=0 && negtrack->Charge()!=0) { // don't apply these cuts if it's a Dstar 
+    // select D0->Kpi
+    if(fD0toKpi)   okD0 = (Bool_t)fCutsD0toKpi->IsSelected(the2Prong,AliRDHFCuts::kCandidate);
+    //if(fDebug && fD0toKpi) printf("   %d\n",(Int_t)okD0);
+    // select J/psi from B
+    if(fJPSItoEle)   okJPSI = (Bool_t)fCutsJpsitoee->IsSelected(the2Prong,AliRDHFCuts::kCandidate);
+    //if(fDebug && fJPSItoEle) printf("   %d\n",(Int_t)okJPSI);
+    // select D0->Kpi from Dstar
+    if(fDstar)   okD0fromDstar = (Bool_t)fCutsDStartoKpipi->IsD0FromDStarSelected(the2Prong->Pt(),the2Prong,AliRDHFCuts::kCandidate);
+    //if(fDebug && fDstar) printf("   %d\n",(Int_t)okD0fromDstar);
+  }
 
-  
-  // select D0->Kpi
-  Int_t checkD0,checkD0bar;
-  if(fD0toKpi)   okD0          = the2Prong->SelectD0(fD0toKpiCuts,checkD0,checkD0bar);
-  //if(fDebug && fD0toKpi) printf("   %d\n",(Int_t)okD0);
-  // select J/psi from B
-  Int_t checkJPSI;
-  if(fJPSItoEle) okJPSI        = the2Prong->SelectBtoJPSI(fBtoJPSICuts,checkJPSI);
-  //if(fDebug && fJPSItoEle) printf("   %d\n",(Int_t)okJPSI);
-  // select D0->Kpi from Dstar
-  if(fDstar)     okD0fromDstar = the2Prong->SelectD0(fD0fromDstarCuts,checkD0,checkD0bar);
-  //if(fDebug && fDstar) printf("   %d\n",(Int_t)okD0fromDstar);
 
   // remove the primary vertex (was used only for selection)
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
     the2Prong->UnsetOwnPrimaryVtx();
-    delete primVertexAOD; primVertexAOD=NULL;
   }
   
   // get PID info from ESD
@@ -887,7 +1478,7 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
 AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
                              TObjArray *threeTrackArray,AliVEvent *event,
                             AliAODVertex *secVert,Double_t dispersion,
-                            AliAODVertex *vertexp1n1,AliAODVertex *vertexp2n1,
+                            const AliAODVertex *vertexp1n1,const AliAODVertex *vertexp2n1,
                             Double_t dcap1n1,Double_t dcap2n1,Double_t dcap1p2,
                             Bool_t &ok3Prong) const
 {
@@ -919,6 +1510,7 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
 
   // invariant mass cut for D+, Ds, Lc
   Bool_t okMassCut=kFALSE;
+  if(fMassCutBeforeVertexing) okMassCut=kTRUE; // mass cut already done and passed 
   if(!okMassCut && f3Prong) if(SelectInvMass(2,3,px,py,pz)) okMassCut=kTRUE;
   if(!okMassCut) {
     AliDebug(2," candidate didn't pass mass cut");
@@ -946,26 +1538,27 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
   Double_t dca[3]={dcap1n1,dcap2n1,dcap1p2};
   Double_t dist12=TMath::Sqrt((vertexp1n1->GetX()-pos[0])*(vertexp1n1->GetX()-pos[0])+(vertexp1n1->GetY()-pos[1])*(vertexp1n1->GetY()-pos[1])+(vertexp1n1->GetZ()-pos[2])*(vertexp1n1->GetZ()-pos[2]));
   Double_t dist23=TMath::Sqrt((vertexp2n1->GetX()-pos[0])*(vertexp2n1->GetX()-pos[0])+(vertexp2n1->GetY()-pos[1])*(vertexp2n1->GetY()-pos[1])+(vertexp2n1->GetZ()-pos[2])*(vertexp2n1->GetZ()-pos[2]));
-  Short_t charge=(Short_t)(postrack1->Charge()*postrack2->Charge()*negtrack->Charge());
+  Short_t charge=(Short_t)(postrack1->Charge()+postrack2->Charge()+negtrack->Charge());
   AliAODRecoDecayHF3Prong *the3Prong = new AliAODRecoDecayHF3Prong(secVert,px,py,pz,d0,d0err,dca,dispersion,dist12,dist23,charge);
   the3Prong->SetOwnPrimaryVtx(primVertexAOD);
   UShort_t id[3]={(UShort_t)postrack1->GetID(),(UShort_t)negtrack->GetID(),(UShort_t)postrack2->GetID()};
   the3Prong->SetProngIDs(3,id);
 
+  delete primVertexAOD; primVertexAOD=NULL;
 
   // select D+->Kpipi, Ds->KKpi, Lc->pKpi
   if(f3Prong) {
     ok3Prong = kFALSE;
-    Int_t ok1,ok2;
-    if(the3Prong->SelectDplus(fDplusCuts))   ok3Prong = kTRUE;
-    if(the3Prong->SelectDs(fDsCuts,ok1,ok2)) ok3Prong = kTRUE;
-    if(the3Prong->SelectLc(fLcCuts,ok1,ok2)) ok3Prong = kTRUE;
+    
+    if(fCutsDplustoKpipi->IsSelected(the3Prong,AliRDHFCuts::kCandidate)) ok3Prong = kTRUE;
+    if(fCutsDstoKKpi->IsSelected(the3Prong,AliRDHFCuts::kCandidate)) ok3Prong = kTRUE;
+    if(fCutsLctopKpi->IsSelected(the3Prong,AliRDHFCuts::kCandidate)) ok3Prong = kTRUE;
+    
   }
   //if(fDebug) printf("ok3Prong: %d\n",(Int_t)ok3Prong);
 
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
     the3Prong->UnsetOwnPrimaryVtx();
-    delete primVertexAOD; primVertexAOD=NULL;
   }
 
   // get PID info from ESD
@@ -990,8 +1583,8 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
 AliAODRecoDecayHF4Prong* AliAnalysisVertexingHF::Make4Prong(
                              TObjArray *fourTrackArray,AliVEvent *event,
                              AliAODVertex *secVert,
-                             AliAODVertex *vertexp1n1,
-                             AliAODVertex *vertexp1n1p2,
+                             const AliAODVertex *vertexp1n1,
+                             const AliAODVertex *vertexp1n1p2,
                              Double_t dcap1n1,Double_t dcap1n2,
                             Double_t dcap2n1,Double_t dcap2n2,
                              Bool_t &ok4Prong) const
@@ -1026,12 +1619,16 @@ AliAODRecoDecayHF4Prong* AliAnalysisVertexingHF::Make4Prong(
   px[3] = momentum[0]; py[3] = momentum[1]; pz[3] = momentum[2];
 
   // invariant mass cut for rho or D0 (try to improve coding here..)
-  //Bool_t okMassCut=kFALSE;
-  //if(!okMassCut) if(SelectInvMass(2,3,px,py,pz)) okMassCut=kTRUE;
-  //if(!okMassCut) {
-  //  if(fDebug) printf(" candidate didn't pass mass cut\n");
-  //  return 0x0;
-  // }
+  Bool_t okMassCut=kFALSE;
+  if(fMassCutBeforeVertexing) okMassCut=kTRUE; // mass cut already done and passed 
+  if(!okMassCut && !(fCutsD0toKpipipi->GetUsePID())) {      //no PID, to be implemented with PID
+    if(SelectInvMass(4,4,px,py,pz)) okMassCut=kTRUE;
+  }
+  if(!okMassCut) {
+    //if(fDebug) printf(" candidate didn't pass mass cut\n");
+    //printf(" candidate didn't pass mass cut\n");
+    return 0x0;
+  }
 
   // primary vertex to be used by this candidate
   AliAODVertex *primVertexAOD  = PrimaryVertex(fourTrackArray,event);
@@ -1064,24 +1661,13 @@ AliAODRecoDecayHF4Prong* AliAnalysisVertexingHF::Make4Prong(
   UShort_t id[4]={(UShort_t)postrack1->GetID(),(UShort_t)negtrack1->GetID(),(UShort_t)postrack2->GetID(),(UShort_t)negtrack2->GetID()};
   the4Prong->SetProngIDs(4,id);
 
-  // invariant mass cut for rho or D0 (try to improve coding here..)
-  Bool_t okMassCut=kFALSE;
-  if(!okMassCut && fD0to4ProngsCuts[8]==0.){      //no PID, to be implemented with PID
-    if(SelectInvMass(4,4,px,py,pz)) okMassCut=kTRUE;
-  }
-  if(!okMassCut) {
-    //if(fDebug) printf(" candidate didn't pass mass cut\n");
-    //printf(" candidate didn't pass mass cut\n");
-    return 0x0;
-  }
+  delete primVertexAOD; primVertexAOD=NULL;
 
+  ok4Prong=(Bool_t)fCutsD0toKpipipi->IsSelected(the4Prong,AliRDHFCuts::kCandidate);
 
-  Int_t checkD0,checkD0bar;
-  ok4Prong=the4Prong->SelectD0(fD0to4ProngsCuts,checkD0,checkD0bar);
 
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
     the4Prong->UnsetOwnPrimaryVtx();
-    delete primVertexAOD; primVertexAOD=NULL;
   }
 
  
@@ -1107,7 +1693,7 @@ AliAODRecoDecayHF4Prong* AliAnalysisVertexingHF::Make4Prong(
   return the4Prong;
 }
 //-----------------------------------------------------------------------------
-AliAODVertex* AliAnalysisVertexingHF::PrimaryVertex(TObjArray *trkArray,
+AliAODVertex* AliAnalysisVertexingHF::PrimaryVertex(const TObjArray *trkArray,
                                                    AliVEvent *event) const
 {
   // Returns primary vertex to be used for this candidate
@@ -1134,14 +1720,14 @@ AliAODVertex* AliAnalysisVertexingHF::PrimaryVertex(TObjArray *trkArray,
        Float_t diamondcovxy[3];
        event->GetDiamondCovXY(diamondcovxy);
        Double_t pos[3]={event->GetDiamondX(),event->GetDiamondY(),0.};
-       Double_t cov[6]={diamondcovxy[0],diamondcovxy[1],diamondcovxy[2],0.,0.,10.};
+       Double_t cov[6]={diamondcovxy[0],diamondcovxy[1],diamondcovxy[2],0.,0.,10.*10.};
        AliESDVertex *diamond = new AliESDVertex(pos,cov,1.,1);
        vertexer->SetVtxStart(diamond);
        delete diamond; diamond=NULL;
        if(strstr(fV1->GetTitle(),"VertexerTracksWithConstraintOnlyFitter")) 
          vertexer->SetOnlyFitter();
       }
-      Int_t skipped[10];
+      Int_t skipped[1000];
       Int_t nTrksToSkip=0,id;
       AliExternalTrackParam *t = 0;
       for(Int_t i=0; i<nTrks; i++) {
@@ -1150,6 +1736,20 @@ AliAODVertex* AliAnalysisVertexingHF::PrimaryVertex(TObjArray *trkArray,
        if(id<0) continue;
        skipped[nTrksToSkip++] = id;
       }
+      // TEMPORARY FIX
+      // For AOD, skip also tracks without covariance matrix
+      if(fInputAOD) {
+       Double_t covtest[21];
+       for(Int_t j=0; j<event->GetNumberOfTracks(); j++) {
+         AliVTrack *vtrack = (AliVTrack*)event->GetTrack(j);
+         if(!vtrack->GetCovarianceXYZPxPyPz(covtest)) {
+           id = (Int_t)vtrack->GetID();
+           if(id<0) continue;
+           skipped[nTrksToSkip++] = id;
+         }
+       }
+      }
+      //
       vertexer->SetSkipTracks(nTrksToSkip,skipped);
       vertexESD = (AliESDVertex*)vertexer->FindPrimaryVertex(event); 
       
@@ -1214,93 +1814,39 @@ void AliAnalysisVertexingHF::PrintStatus() const {
   if(fRmTrksFromPrimVtx) printf("RmTrksFromPrimVtx\n");
   if(fD0toKpi) {
     printf("Reconstruct D0->Kpi candidates with cuts:\n");
-    printf("    |M-MD0| [GeV]    < %f\n",fD0toKpiCuts[0]);
-    printf("    dca    [cm]  < %f\n",fD0toKpiCuts[1]);
-    printf("    cosThetaStar     < %f\n",fD0toKpiCuts[2]);
-    printf("    pTK     [GeV/c]    > %f\n",fD0toKpiCuts[3]);
-    printf("    pTpi    [GeV/c]    > %f\n",fD0toKpiCuts[4]);
-    printf("    |d0K|  [cm]  < %f\n",fD0toKpiCuts[5]);
-    printf("    |d0pi| [cm]  < %f\n",fD0toKpiCuts[6]);
-    printf("    d0d0  [cm^2] < %f\n",fD0toKpiCuts[7]);
-    printf("    cosThetaPoint    > %f\n",fD0toKpiCuts[8]);
+    if(fCutsD0toKpi) fCutsD0toKpi->PrintAll();
   }
   if(fDstar) {
+    printf("Reconstruct D*->D0pi candidates with cuts:\n");
     if(fFindVertexForDstar) {
       printf("    Reconstruct a secondary vertex for the D*\n");
     } else {
       printf("    Assume the D* comes from the primary vertex\n");
     }
-    printf("    |M-MD*| [GeV]    < %f\n",fDstarCuts[0]);
-    printf("    |M_Kpipi-M_Kpi-(MD*-MD0)| [GeV]  < %f\n",fDstarCuts[1]);
-    printf("    pTpisoft [GeV/c]    > %f\n",fDstarCuts[2]);
-    printf("    pTpisoft [GeV/c]    < %f\n",fDstarCuts[3]);
-    printf("    Theta(pisoft,D0plane) < %f\n",fDstarCuts[4]);
-    printf("Reconstruct D*->D0pi candidates with cuts:\n");
-    printf("   D0 from D* cuts:\n");
-    printf("    |M-MD0| [GeV]    < %f\n",fD0fromDstarCuts[0]);
-    printf("    dca    [cm]  < %f\n",fD0fromDstarCuts[1]);
-    printf("    cosThetaStar     < %f\n",fD0fromDstarCuts[2]);
-    printf("    pTK     [GeV/c]    > %f\n",fD0fromDstarCuts[3]);
-    printf("    pTpi    [GeV/c]    > %f\n",fD0fromDstarCuts[4]);
-    printf("    |d0K|  [cm]  < %f\n",fD0fromDstarCuts[5]);
-    printf("    |d0pi| [cm]  < %f\n",fD0fromDstarCuts[6]);
-    printf("    d0d0  [cm^2] < %f\n",fD0fromDstarCuts[7]);
-    printf("    cosThetaPoint    > %f\n",fD0fromDstarCuts[8]);
+    if(fCutsDStartoKpipi) fCutsDStartoKpipi->PrintAll();
   }
   if(fJPSItoEle) {
     printf("Reconstruct J/psi from B candidates with cuts:\n");
-    printf("    |M-MJPSI| [GeV]    < %f\n",fBtoJPSICuts[0]);
-    printf("    dca    [cm]  < %f\n",fBtoJPSICuts[1]);
-    printf("    cosThetaStar     < %f\n",fBtoJPSICuts[2]);
-    printf("    pTP     [GeV/c]    > %f\n",fBtoJPSICuts[3]);
-    printf("    pTN    [GeV/c]    > %f\n",fBtoJPSICuts[4]);
-    printf("    |d0P|  [cm]  < %f\n",fBtoJPSICuts[5]);
-    printf("    |d0N| [cm]  < %f\n",fBtoJPSICuts[6]);
-    printf("    d0d0  [cm^2] < %f\n",fBtoJPSICuts[7]);
-    printf("    cosThetaPoint    > %f\n",fBtoJPSICuts[8]);
+    if(fCutsJpsitoee) fCutsJpsitoee->PrintAll();
   }
   if(f3Prong) {
     printf("Reconstruct 3 prong candidates.\n");
     printf("  D+->Kpipi cuts:\n");
-    printf("    |M-MD+| [GeV]    < %f\n",fDplusCuts[0]);
-    printf("    pTK     [GeV/c]    > %f\n",fDplusCuts[1]);
-    printf("    pTPi    [GeV/c]    > %f\n",fDplusCuts[2]);
-    printf("    |d0K|  [cm]  > %f\n",fDplusCuts[3]);
-    printf("    |d0Pi| [cm]  > %f\n",fDplusCuts[4]);
-    printf("    dist12    [cm]  < %f\n",fDplusCuts[5]);
-    printf("    sigmavert [cm]   < %f\n",fDplusCuts[6]);
-    printf("    dist prim-sec [cm] > %f\n",fDplusCuts[7]);
-    printf("    pM=Max{pT1,pT2,pT3} [GeV/c] > %f\n",fDplusCuts[8]);
-    printf("    cosThetaPoint    > %f\n",fDplusCuts[9]);
-    printf("    Sum d0^2 [cm^2]  > %f\n",fDplusCuts[10]);
-    printf("    dca cut [cm]  < %f\n",fDplusCuts[11]);
+    if(fCutsDplustoKpipi) fCutsDplustoKpipi->PrintAll();
     printf("  Ds->KKpi cuts:\n");
-    printf("    |M-MDs| [GeV]    < %f\n",fDsCuts[0]);
-    printf("    pTK     [GeV/c]    > %f\n",fDsCuts[1]);
-    printf("    pTPi    [GeV/c]    > %f\n",fDsCuts[2]);
-    printf("    |d0K|  [cm]  > %f\n",fDsCuts[3]);
-    printf("    |d0Pi| [cm]  > %f\n",fDsCuts[4]);
-    printf("    dist12    [cm]  < %f\n",fDsCuts[5]);
-    printf("    sigmavert [cm]   < %f\n",fDsCuts[6]);
-    printf("    dist prim-sec [cm] > %f\n",fDsCuts[7]);
-    printf("    pM=Max{pT1,pT2,pT3} [GeV/c] > %f\n",fDsCuts[8]);
-    printf("    cosThetaPoint    > %f\n",fDsCuts[9]);
-    printf("    Sum d0^2 [cm^2]  > %f\n",fDsCuts[10]);
-    printf("    dca cut [cm]  < %f\n",fDsCuts[11]);
-    printf("    Inv. Mass  phi/K0* [GeV]  < %f\n",fDsCuts[12]);
+    if(fCutsDstoKKpi) fCutsDstoKKpi->PrintAll();
     printf("  Lc->pKpi cuts:\n");
-    printf("    |M-MLc| [GeV]    < %f\n",fLcCuts[0]);
-    printf("    pTP     [GeV/c]    > %f\n",fLcCuts[1]);
-    printf("    pTPi and pTK [GeV/c]    > %f\n",fLcCuts[2]);
-    printf("    |d0P|  [cm]  > %f\n",fLcCuts[3]);
-    printf("    |d0Pi| and |d0K| [cm]  > %f\n",fLcCuts[4]);
-    printf("    dist12    [cm]  < %f\n",fLcCuts[5]);
-    printf("    sigmavert [cm]   < %f\n",fLcCuts[6]);
-    printf("    dist prim-sec [cm] > %f\n",fLcCuts[7]);
-    printf("    pM=Max{pT1,pT2,pT3} [GeV/c] > %f\n",fLcCuts[8]);
-    printf("    cosThetaPoint    > %f\n",fLcCuts[9]);
-    printf("    Sum d0^2 [cm^2]  > %f\n",fLcCuts[10]);
-    printf("    dca cut [cm]  < %f\n",fLcCuts[11]);
+    if(fCutsLctopKpi) fCutsLctopKpi->PrintAll();
+  }
+  if(f4Prong) {
+    printf("Reconstruct 4 prong candidates.\n");
+    printf("  D0->Kpipipi cuts:\n");
+    if(fCutsD0toKpipipi) fCutsD0toKpipipi->PrintAll();
+  }
+  if(fCascades) {
+    printf("Reconstruct cascades candidates formed with v0s.\n");
+    printf("  Lc -> k0s P & Lc -> L Pi cuts:\n");
+    if(fCutsLctoV0) fCutsLctoV0->PrintAll();
   }
 
   return;
@@ -1362,6 +1908,58 @@ AliAODVertex* AliAnalysisVertexingHF::ReconstructSecondaryVertex(TObjArray *trkA
   return vertexAOD;
 }
 //-----------------------------------------------------------------------------
+Bool_t AliAnalysisVertexingHF::SelectInvMass(TObjArray *trkArray) const {
+  // Invariant mass cut on tracks
+
+  Int_t nProngs=trkArray->GetEntriesFast();
+  Int_t retval=kFALSE;
+
+  Double_t momentum[3];
+  Double_t px3[3],py3[3],pz3[3];
+  Double_t px4[4],py4[4],pz4[4];
+  AliESDtrack *postrack1=0;
+  AliESDtrack *postrack2=0;
+  AliESDtrack *negtrack1=0;
+  AliESDtrack *negtrack2=0;
+
+  switch(nProngs) {
+  case 3:
+    // invariant mass cut for D+, Ds, Lc
+    postrack1 = (AliESDtrack*)trkArray->UncheckedAt(0);
+    negtrack1  = (AliESDtrack*)trkArray->UncheckedAt(1);
+    postrack2 = (AliESDtrack*)trkArray->UncheckedAt(2);
+    postrack1->GetPxPyPz(momentum);
+    px3[0] = momentum[0]; py3[0] = momentum[1]; pz3[0] = momentum[2]; 
+    negtrack1->GetPxPyPz(momentum);
+    px3[1] = momentum[0]; py3[1] = momentum[1]; pz3[1] = momentum[2]; 
+    postrack2->GetPxPyPz(momentum);
+    px3[2] = momentum[0]; py3[2] = momentum[1]; pz3[2] = momentum[2]; 
+    retval = SelectInvMass(2,3,px3,py3,pz3);
+    break;
+  case 4:
+    // invariant mass cut for D0->4prong
+    postrack1 = (AliESDtrack*)trkArray->UncheckedAt(0);
+    negtrack1 = (AliESDtrack*)trkArray->UncheckedAt(1);
+    postrack2 = (AliESDtrack*)trkArray->UncheckedAt(2);
+    negtrack2 = (AliESDtrack*)trkArray->UncheckedAt(3);
+    postrack1->GetPxPyPz(momentum);
+    px4[0] = momentum[0]; py4[0] = momentum[1]; pz4[0] = momentum[2];
+    negtrack1->GetPxPyPz(momentum);
+    px4[1] = momentum[0]; py4[1] = momentum[1]; pz4[1] = momentum[2];
+    postrack2->GetPxPyPz(momentum);
+    px4[2] = momentum[0]; py4[2] = momentum[1]; pz4[2] = momentum[2];
+    negtrack2->GetPxPyPz(momentum);
+    px4[3] = momentum[0]; py4[3] = momentum[1]; pz4[3] = momentum[2];
+    retval = SelectInvMass(4,4,px4,py4,pz4);
+    break;
+  default:
+    printf("SelectInvMass(): wrong decay selection\n");
+    break;
+  }
+
+  return retval;
+}
+//-----------------------------------------------------------------------------
 Bool_t AliAnalysisVertexingHF::SelectInvMass(Int_t decay,
                                             Int_t nprongs,
                                             Double_t *px,
@@ -1369,12 +1967,6 @@ Bool_t AliAnalysisVertexingHF::SelectInvMass(Int_t decay,
                                             Double_t *pz) const {
   // Check invariant mass cut
 
-  Short_t dummycharge=0;
-  Double_t *dummyd0 = new Double_t[nprongs];
-  for(Int_t ip=0;ip<nprongs;ip++) dummyd0[ip]=0.;
-  AliAODRecoDecay *rd = new AliAODRecoDecay(0x0,nprongs,dummycharge,px,py,pz,dummyd0);
-  delete [] dummyd0; dummyd0=NULL;
-
   UInt_t pdg2[2],pdg3[3],pdg4[4];
   Double_t mPDG,minv;
 
@@ -1382,80 +1974,83 @@ Bool_t AliAnalysisVertexingHF::SelectInvMass(Int_t decay,
   switch (decay) 
     { 
     case 0:                  // D0->Kpi
+      fMassCalc2->SetPxPyPzProngs(nprongs,px,py,pz);
       pdg2[0]=211; pdg2[1]=321;
       mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
-      minv = rd->InvMass(nprongs,pdg2);
-      if(TMath::Abs(minv-mPDG)<fD0toKpiCuts[0]) retval=kTRUE;
+      minv = fMassCalc2->InvMass(nprongs,pdg2);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpi->GetMassCut()) retval=kTRUE;
       pdg2[0]=321; pdg2[1]=211;
-      minv = rd->InvMass(nprongs,pdg2);
-      if(TMath::Abs(minv-mPDG)<fD0toKpiCuts[0]) retval=kTRUE;
+      minv = fMassCalc2->InvMass(nprongs,pdg2);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpi->GetMassCut()) retval=kTRUE;
       break;
     case 1:                  // JPSI->ee
+      fMassCalc2->SetPxPyPzProngs(nprongs,px,py,pz);
       pdg2[0]=11; pdg2[1]=11;
       mPDG=TDatabasePDG::Instance()->GetParticle(443)->Mass();
-      minv = rd->InvMass(nprongs,pdg2);
-      if(TMath::Abs(minv-mPDG)<fBtoJPSICuts[0]) retval=kTRUE;
+      minv = fMassCalc2->InvMass(nprongs,pdg2);
+      if(TMath::Abs(minv-mPDG)<fCutsJpsitoee->GetMassCut()) retval=kTRUE;
       break;
     case 2:                  // D+->Kpipi
+      fMassCalc3->SetPxPyPzProngs(nprongs,px,py,pz);
       pdg3[0]=211; pdg3[1]=321; pdg3[2]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(411)->Mass();
-      minv = rd->InvMass(nprongs,pdg3);
-      if(TMath::Abs(minv-mPDG)<fDplusCuts[0]) retval=kTRUE;
+      minv = fMassCalc3->InvMass(nprongs,pdg3);
+      if(TMath::Abs(minv-mPDG)<fCutsDplustoKpipi->GetMassCut()) retval=kTRUE;
                             // Ds+->KKpi
       pdg3[0]=321; pdg3[1]=321; pdg3[2]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(431)->Mass();
-      minv = rd->InvMass(nprongs,pdg3);
-      if(TMath::Abs(minv-mPDG)<fDsCuts[0]) retval=kTRUE;
+      minv = fMassCalc3->InvMass(nprongs,pdg3);
+      if(TMath::Abs(minv-mPDG)<fCutsDstoKKpi->GetMassCut()) retval=kTRUE;
       pdg3[0]=211; pdg3[1]=321; pdg3[2]=321;
-      minv = rd->InvMass(nprongs,pdg3);
-      if(TMath::Abs(minv-mPDG)<fDsCuts[0]) retval=kTRUE;
+      minv = fMassCalc3->InvMass(nprongs,pdg3);
+      if(TMath::Abs(minv-mPDG)<fCutsDstoKKpi->GetMassCut()) retval=kTRUE;
                             // Lc->pKpi
       pdg3[0]=2212; pdg3[1]=321; pdg3[2]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(4122)->Mass();
-      minv = rd->InvMass(nprongs,pdg3);
-      if(TMath::Abs(minv-mPDG)<fLcCuts[0]) retval=kTRUE;
+      minv = fMassCalc3->InvMass(nprongs,pdg3);
+      if(TMath::Abs(minv-mPDG)<fCutsLctopKpi->GetMassCut()) retval=kTRUE;
       pdg3[0]=211; pdg3[1]=321; pdg3[2]=2212;
-      minv = rd->InvMass(nprongs,pdg3);
-      if(TMath::Abs(minv-mPDG)<fLcCuts[0]) retval=kTRUE; 
+      minv = fMassCalc3->InvMass(nprongs,pdg3);
+      if(TMath::Abs(minv-mPDG)<fCutsLctopKpi->GetMassCut()) retval=kTRUE;
       break;
     case 3:                  // D*->D0pi
-      pdg2[0]=421; pdg2[1]=211;
+      fMassCalc2->SetPxPyPzProngs(nprongs,px,py,pz);
+      pdg2[0]=211; pdg2[1]=421; // in twoTrackArrayCasc we put the pion first
       mPDG=TDatabasePDG::Instance()->GetParticle(413)->Mass();
-      minv = rd->InvMass(nprongs,pdg2);
-      if(TMath::Abs(minv-mPDG)<fDstarCuts[0]) retval=kTRUE;
+      minv = fMassCalc2->InvMass(nprongs,pdg2);
+      if(TMath::Abs(minv-mPDG)<fCutsDStartoKpipi->GetMassCut()) retval=kTRUE;
       break;
-    case 4:                 // D0->K3pi without PID
+    case 4:                 // D0->Kpipipi without PID
+      fMassCalc4->SetPxPyPzProngs(nprongs,px,py,pz);
       pdg4[0]=321; pdg4[1]=211; pdg4[2]=211; pdg4[3]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
-      minv = rd->InvMass(nprongs,pdg4);
-      if(TMath::Abs(minv-mPDG)<fD0to4ProngsCuts[0])
-       retval=kTRUE;
+      minv = fMassCalc4->InvMass(nprongs,pdg4);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpipipi->GetMassCut()) retval=kTRUE;
       pdg4[0]=211; pdg4[1]=321; pdg4[2]=211; pdg4[3]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
-      minv = rd->InvMass(nprongs,pdg4);
-      if(TMath::Abs(minv-mPDG)<fD0to4ProngsCuts[0]) retval=kTRUE;
+      minv = fMassCalc4->InvMass(nprongs,pdg4);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpipipi->GetMassCut()) retval=kTRUE;
       pdg4[0]=211; pdg4[1]=211; pdg4[2]=321; pdg4[3]=211;
       mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
-      minv = rd->InvMass(nprongs,pdg4);
-      if(TMath::Abs(minv-mPDG)<fD0to4ProngsCuts[0]) retval=kTRUE;
+      minv = fMassCalc4->InvMass(nprongs,pdg4);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpipipi->GetMassCut()) retval=kTRUE;
       pdg4[0]=211; pdg4[1]=211; pdg4[2]=211; pdg4[3]=321;
       mPDG=TDatabasePDG::Instance()->GetParticle(421)->Mass();
-      minv = rd->InvMass(nprongs,pdg4);
-      if(TMath::Abs(minv-mPDG)<fD0to4ProngsCuts[0]) retval=kTRUE;
+      minv = fMassCalc4->InvMass(nprongs,pdg4);
+      if(TMath::Abs(minv-mPDG)<fCutsD0toKpipipi->GetMassCut()) retval=kTRUE;
       break;
     default:
       printf("SelectInvMass(): wrong decay selection\n");
       break;
     }
 
-  delete rd; rd=NULL;
-
   return retval;
 }
 //-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
+void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(const AliVEvent *event,
+                                                      Int_t trkEntries,
                                   TObjArray &seleTrksArray,Int_t &nSeleTrks,
-                                                      UChar_t *seleFlags)
+                                  UChar_t *seleFlags,Int_t *evtNumber)
 {
   // Apply single-track preselection.
   // Fill a TObjArray with selected tracks (for displaced vertices or
@@ -1466,7 +2061,7 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
   const AliVVertex *vprimary = event->GetPrimaryVertex();
 
   if(fV1) { delete fV1; fV1=NULL; }
-  if(fAODMap) { delete [] fAODMap; fAODMap=NULL; }
+  if(fAODMap) { delete fAODMap; fAODMap=NULL; }
 
   Int_t nindices=0;
   UShort_t *indices = 0;
@@ -1479,7 +2074,8 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
     vprimary->GetCovarianceMatrix(cov);
     fV1 = new AliESDVertex(pos,cov,100.,100,vprimary->GetName());
     indices = new UShort_t[event->GetNumberOfTracks()];
-    fAODMap = new Int_t[100000];
+    fAODMapSize = 100000;
+    fAODMap = new Int_t[fAODMapSize];
   }
 
 
@@ -1489,7 +2085,14 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
  
   // transfer ITS tracks from event to arrays
   for(Int_t i=0; i<entries; i++) {
-    AliVTrack *track = (AliVTrack*)event->GetTrack(i);
+    AliVTrack *track;
+    track = (AliVTrack*)event->GetTrack(i);
+
+    // skip pure ITS SA tracks
+    if(track->GetStatus()&AliESDtrack::kITSpureSA) continue;
+
+    // skip tracks without ITS
+    if(!(track->GetStatus()&AliESDtrack::kITSin)) continue;
 
     // TEMPORARY: check that the cov matrix is there
     Double_t covtest[21];
@@ -1514,7 +2117,26 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
 
     // single track selection
     okDisplaced=kFALSE; okSoftPi=kFALSE;
-    if(SingleTrkCuts(esdt,okDisplaced,okSoftPi)) {
+    if(fMixEvent && i<trkEntries){
+      evtNumber[i]=((AliMixedEvent*)event)->EventIndex(i);
+      const AliVVertex* eventVtx=((AliMixedEvent*)event)->GetEventVertex(i);
+      Double_t vtxPos[3],primPos[3],primCov[6],trasl[3];
+      eventVtx->GetXYZ(vtxPos);
+      vprimary->GetXYZ(primPos);
+      eventVtx->GetCovarianceMatrix(primCov);
+      for(Int_t ind=0;ind<3;ind++){
+       trasl[ind]=vtxPos[ind]-primPos[ind];
+      }
+      
+      Bool_t isTransl=esdt->Translate(trasl,primCov);
+      if(!isTransl) {
+       delete esdt;
+       esdt = NULL;
+       continue;
+      }
+    }
+
+    if(SingleTrkCuts(esdt,okDisplaced,okSoftPi) && nSeleTrks<trkEntries) {
       seleTrksArray.AddLast(esdt);
       seleFlags[nSeleTrks]=0;
       if(okDisplaced) SETBIT(seleFlags[nSeleTrks],kBitDispl);
@@ -1544,240 +2166,6 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
   if(indices) { delete [] indices; indices=NULL; }
 
 
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0toKpiCuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8) 
-{
-  // Set the cuts for D0 selection
-  fD0toKpiCuts[0] = cut0;
-  fD0toKpiCuts[1] = cut1;
-  fD0toKpiCuts[2] = cut2;
-  fD0toKpiCuts[3] = cut3;
-  fD0toKpiCuts[4] = cut4;
-  fD0toKpiCuts[5] = cut5;
-  fD0toKpiCuts[6] = cut6;
-  fD0toKpiCuts[7] = cut7;
-  fD0toKpiCuts[8] = cut8;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0toKpiCuts(const Double_t cuts[9]) 
-{
-  // Set the cuts for D0 selection
-
-  for(Int_t i=0; i<9; i++) fD0toKpiCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0fromDstarCuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8) 
-{
-  // Set the cuts for D0 from D* selection
-  fD0fromDstarCuts[0] = cut0;
-  fD0fromDstarCuts[1] = cut1;
-  fD0fromDstarCuts[2] = cut2;
-  fD0fromDstarCuts[3] = cut3;
-  fD0fromDstarCuts[4] = cut4;
-  fD0fromDstarCuts[5] = cut5;
-  fD0fromDstarCuts[6] = cut6;
-  fD0fromDstarCuts[7] = cut7;
-  fD0fromDstarCuts[8] = cut8;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0fromDstarCuts(const Double_t cuts[9]) 
-{
-  // Set the cuts for D0 from D* selection
-
-  for(Int_t i=0; i<9; i++) fD0fromDstarCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDstarCuts(Double_t cut0,Double_t cut1,
-                                          Double_t cut2,Double_t cut3,
-                                          Double_t cut4)
-{
-  // Set the cuts for D* selection
-  fDstarCuts[0] = cut0;
-  fDstarCuts[1] = cut1;
-  fDstarCuts[2] = cut2;
-  fDstarCuts[3] = cut3;
-  fDstarCuts[4] = cut4;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDstarCuts(const Double_t cuts[5])
-{
-  // Set the cuts for D* selection
-
-  for(Int_t i=0; i<5; i++) fDstarCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetBtoJPSICuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8) 
-{
-  // Set the cuts for J/psi from B selection
-  fBtoJPSICuts[0] = cut0;
-  fBtoJPSICuts[1] = cut1;
-  fBtoJPSICuts[2] = cut2;
-  fBtoJPSICuts[3] = cut3;
-  fBtoJPSICuts[4] = cut4;
-  fBtoJPSICuts[5] = cut5;
-  fBtoJPSICuts[6] = cut6;
-  fBtoJPSICuts[7] = cut7;
-  fBtoJPSICuts[8] = cut8;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetBtoJPSICuts(const Double_t cuts[9]) 
-{
-  // Set the cuts for J/psi from B selection
-
-  for(Int_t i=0; i<9; i++) fBtoJPSICuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDplusCuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8,
-                                  Double_t cut9,Double_t cut10,Double_t cut11)
-{
-  // Set the cuts for Dplus->Kpipi selection
-  fDplusCuts[0] = cut0;
-  fDplusCuts[1] = cut1;
-  fDplusCuts[2] = cut2;
-  fDplusCuts[3] = cut3;
-  fDplusCuts[4] = cut4;
-  fDplusCuts[5] = cut5;
-  fDplusCuts[6] = cut6;
-  fDplusCuts[7] = cut7;
-  fDplusCuts[8] = cut8;
-  fDplusCuts[9] = cut9;
-  fDplusCuts[10] = cut10;
-  fDplusCuts[11] = cut11;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDplusCuts(const Double_t cuts[12]) 
-{
-  // Set the cuts for Dplus->Kpipi selection
-
-  for(Int_t i=0; i<12; i++) fDplusCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDsCuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8,
-                                  Double_t cut9,Double_t cut10,
-                                  Double_t cut11,Double_t cut12)
-{
-  // Set the cuts for Ds->KKpi selection
-  fDsCuts[0] = cut0;
-  fDsCuts[1] = cut1;
-  fDsCuts[2] = cut2;
-  fDsCuts[3] = cut3;
-  fDsCuts[4] = cut4;
-  fDsCuts[5] = cut5;
-  fDsCuts[6] = cut6;
-  fDsCuts[7] = cut7;
-  fDsCuts[8] = cut8;
-  fDsCuts[9] = cut9;
-  fDsCuts[10] = cut10;
-  fDsCuts[11] = cut11;
-  fDsCuts[12] = cut12;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetDsCuts(const Double_t cuts[13]) 
-{
-  // Set the cuts for Ds->KKpi selection
-
-  for(Int_t i=0; i<13; i++) fDsCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetLcCuts(Double_t cut0,Double_t cut1,
-                                  Double_t cut2,Double_t cut3,Double_t cut4,
-                                  Double_t cut5,Double_t cut6,
-                                  Double_t cut7,Double_t cut8,
-                                  Double_t cut9,Double_t cut10,Double_t cut11)
-{
-  // Set the cuts for Lc->pKpi selection
-  fLcCuts[0] = cut0;
-  fLcCuts[1] = cut1;
-  fLcCuts[2] = cut2;
-  fLcCuts[3] = cut3;
-  fLcCuts[4] = cut4;
-  fLcCuts[5] = cut5;
-  fLcCuts[6] = cut6;
-  fLcCuts[7] = cut7;
-  fLcCuts[8] = cut8;
-  fLcCuts[9] = cut9;
-  fLcCuts[10] = cut10;
-  fLcCuts[11] = cut11;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetLcCuts(const Double_t cuts[12]) 
-{
-  // Set the cuts for Lc->pKpi selection
-
-  for(Int_t i=0; i<12; i++) fLcCuts[i] = cuts[i];
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0to4ProngsCuts(Double_t cut0,Double_t cut1,
-                                   Double_t cut2,Double_t cut3,Double_t cut4,
-                                   Double_t cut5,Double_t cut6,
-                                   Double_t cut7,Double_t cut8)
-{
-  // Set the cuts for D0->Kpipipi selection
-
-  fD0to4ProngsCuts[0] = cut0;
-  fD0to4ProngsCuts[1] = cut1;
-  fD0to4ProngsCuts[2] = cut2;
-  fD0to4ProngsCuts[3] = cut3;
-  fD0to4ProngsCuts[4] = cut4;
-  fD0to4ProngsCuts[5] = cut5;
-  fD0to4ProngsCuts[6] = cut6;
-  fD0to4ProngsCuts[7] = cut7;
-  fD0to4ProngsCuts[8] = cut8;
-
-  return;
-}
-//-----------------------------------------------------------------------------
-void AliAnalysisVertexingHF::SetD0to4ProngsCuts(const Double_t cuts[9])
-{
-  // Set the cuts for D0->Kpipipi selection
-
-  for(Int_t i=0; i<9; i++) fD0to4ProngsCuts[i] = cuts[i];
-
   return;
 }
 //-----------------------------------------------------------------------------
@@ -1797,6 +2185,7 @@ Bool_t AliAnalysisVertexingHF::SingleTrkCuts(AliESDtrack *trk,
     selectInfo = fTrackFilter->IsSelected(trk);
   }
   if(selectInfo) okDisplaced=kTRUE;
+
   // Track selection, soft pions
   selectInfo = 0; 
   if(fDstar && fTrackFilterSoftPi) {
@@ -1808,4 +2197,62 @@ Bool_t AliAnalysisVertexingHF::SingleTrkCuts(AliESDtrack *trk,
 
   return kFALSE;
 }
+
+
+//-----------------------------------------------------------------------------
+AliAODv0* AliAnalysisVertexingHF::TransformESDv0toAODv0(AliESDv0 *esdV0, TObjArray *twoTrackArrayV0){
+  //
+  // Transform ESDv0 to AODv0
+  //
+  //  this function takes the ESDv0 vertex, computes the DCA variables from the ESDv0
+  //  and creates an AODv0 out of them
+  //
+  Double_t vertex[3]; esdV0->GetXYZ(vertex[0],vertex[1],vertex[2]);
+  AliAODVertex *vertexV0 = new AliAODVertex(vertex,esdV0->GetChi2V0(),AliAODVertex::kV0,2);
+
+  // create the v0 neutral track to compute the DCA to the primary vertex
+  Double_t xyz[3], pxpypz[3];
+  esdV0->XvYvZv(xyz);
+  esdV0->PxPyPz(pxpypz);
+  Double_t cv[21]; for(int i=0; i<21; i++) cv[i]=0;
+  AliNeutralTrackParam *trackesdV0 = new AliNeutralTrackParam(xyz,pxpypz,cv,0);
+  if(!trackesdV0) {
+    delete vertexV0;
+    return 0;
+  }
+  Double_t d0z0[2],covd0z0[3];
+  AliAODVertex *primVertexAOD = PrimaryVertex(); 
+  trackesdV0->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  Double_t dcaV0ToPrimVertex = TMath::Sqrt(covd0z0[0]);
+  // get the v0 daughters to compute their DCA to the v0 vertex and get their momentum
+  Double_t dcaV0DaughterToPrimVertex[2];  
+  AliExternalTrackParam *posV0track = (AliExternalTrackParam*)twoTrackArrayV0->UncheckedAt(0);
+  AliExternalTrackParam *negV0track = (AliExternalTrackParam*)twoTrackArrayV0->UncheckedAt(1);
+  if( !posV0track || !negV0track) {
+    if(trackesdV0) {delete trackesdV0; trackesdV0=NULL;}
+    delete vertexV0;
+    delete primVertexAOD;
+    return 0;
+  }
+  posV0track->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  //  if ( covd0z0[0]<=0.) dcaV0DaughterToPrimVertex[0] = 0;
+  //  else 
+  dcaV0DaughterToPrimVertex[0] = TMath::Sqrt(covd0z0[0]);
+  negV0track->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);  
+  //  if ( covd0z0[0]<=0.)dcaV0DaughterToPrimVertex[1] = 0;
+  //  else 
+  dcaV0DaughterToPrimVertex[1] = TMath::Sqrt(covd0z0[0]);
+  Double_t dcaV0Daughters = esdV0->GetDcaV0Daughters();
+  Double_t pmom[3],nmom[3];
+  esdV0->GetNPxPyPz(nmom[0],nmom[1],nmom[2]);
+  esdV0->GetPPxPyPz(pmom[0],pmom[1],pmom[2]);
+
+  AliAODv0 *aodV0 = new AliAODv0(vertexV0,dcaV0Daughters,dcaV0ToPrimVertex,pmom,nmom,dcaV0DaughterToPrimVertex);
+  aodV0->SetOnFlyStatus(esdV0->GetOnFlyStatus());
+
+  if(trackesdV0) {delete trackesdV0; trackesdV0=NULL;}
+  if(primVertexAOD) {delete primVertexAOD; primVertexAOD=NULL;}
+
+  return aodV0;
+}
 //-----------------------------------------------------------------------------