]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG3/vertexingHF/AliAnalysisVertexingHF.cxx
dNdPt analysis
[u/mrichter/AliRoot.git] / PWG3 / vertexingHF / AliAnalysisVertexingHF.cxx
index ea22bc7d34582ee2b424ccd101551b8c30a7b1bf..f8a84dec53df045646170d837af1098addc90d1d 100644 (file)
@@ -20,8 +20,9 @@
 // class AliAnalysisTaskSEVertexingHF. 
 // An example of usage in the macro AliAnalysisTaskSEVertexingHFTest.C.
 //
-//  Origin: E.Bruna, G.E.Bruno, A.Dainese, F.Prino, R.Romita
-//  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 <TFile.h>
 #include <TDatabasePDG.h>
 #include "AliVVertex.h"
 #include "AliVTrack.h"
 #include "AliVertexerTracks.h"
-#include "AliKFParticle.h"
+#include "AliKFVertex.h"
 #include "AliESDEvent.h"
 #include "AliESDVertex.h"
+#include "AliExternalTrackParam.h"
+#include "AliNeutralTrackParam.h"
 #include "AliESDtrack.h"
+#include "AliESDtrackCuts.h"
 #include "AliAODEvent.h"
 #include "AliAODRecoDecay.h"
 #include "AliAODRecoDecayHF.h"
 #include "AliAODRecoDecayHF2Prong.h"
 #include "AliAODRecoDecayHF3Prong.h"
 #include "AliAODRecoDecayHF4Prong.h"
+#include "AliAODRecoCascadeHF.h"
+#include "AliAnalysisFilter.h"
 #include "AliAnalysisVertexingHF.h"
+#include "AliMixedEvent.h"
 
 ClassImp(AliAnalysisVertexingHF)
 
 //----------------------------------------------------------------------------
 AliAnalysisVertexingHF::AliAnalysisVertexingHF():
 fInputAOD(kFALSE),
+fAODMapSize(0),
 fAODMap(0),
 fBzkG(0.),
 fSecVtxWithKF(kFALSE),
@@ -58,11 +66,12 @@ fD0toKpi(kTRUE),
 fJPSItoEle(kTRUE),
 f3Prong(kTRUE),
 f4Prong(kTRUE),
-fITSrefit(kFALSE),
-fBothSPD(kTRUE),
-fMinITSCls(5),
-fMinPtCut(0.),
-fMind0rphiCut(0.)
+fDstar(kTRUE),
+fLikeSign(kFALSE),
+fMixEvent(kFALSE),
+fTrackFilter(0x0),
+fTrackFilterSoftPi(0x0),
+fFindVertexForDstar(kTRUE)
 {
   // Default constructor
 
@@ -71,11 +80,14 @@ fMind0rphiCut(0.)
   SetDplusCuts();
   SetDsCuts();
   SetLcCuts();
+  SetDstarCuts();
+  SetD0to4ProngsCuts();
 }
 //--------------------------------------------------------------------------
 AliAnalysisVertexingHF::AliAnalysisVertexingHF(const AliAnalysisVertexingHF &source) : 
 TNamed(source),
 fInputAOD(source.fInputAOD),
+fAODMapSize(source.fAODMapSize),
 fAODMap(source.fAODMap),
 fBzkG(source.fBzkG),
 fSecVtxWithKF(source.fSecVtxWithKF),
@@ -86,11 +98,12 @@ fD0toKpi(source.fD0toKpi),
 fJPSItoEle(source.fJPSItoEle),
 f3Prong(source.f3Prong),
 f4Prong(source.f4Prong),
-fITSrefit(source.fITSrefit),
-fBothSPD(source.fBothSPD),
-fMinITSCls(source.fMinITSCls),
-fMinPtCut(source.fMinPtCut),
-fMind0rphiCut(source.fMind0rphiCut)
+fDstar(source.fDstar),
+fLikeSign(source.fLikeSign),
+fMixEvent(source.fMixEvent),
+fTrackFilter(source.fTrackFilter),
+fTrackFilterSoftPi(source.fTrackFilterSoftPi),
+fFindVertexForDstar(source.fFindVertexForDstar)
 {
   //
   // Copy constructor
@@ -98,8 +111,10 @@ fMind0rphiCut(source.fMind0rphiCut)
   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<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)
@@ -109,6 +124,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;
@@ -118,17 +134,20 @@ AliAnalysisVertexingHF &AliAnalysisVertexingHF::operator=(const AliAnalysisVerte
   fJPSItoEle = source.fJPSItoEle;
   f3Prong = source.f3Prong;
   f4Prong = source.f4Prong;
-  fITSrefit = source.fITSrefit;
-  fBothSPD = source.fBothSPD;
-  fMinITSCls = source.fMinITSCls;
-  fMinPtCut = source.fMinPtCut;
-  fMind0rphiCut = source.fMind0rphiCut;
+  fDstar = source.fDstar;
+  fLikeSign = source.fLikeSign;
+  fMixEvent = source.fMixEvent;
+  fTrackFilter = source.fTrackFilter;
+  fTrackFilterSoftPi = source.fTrackFilterSoftPi;
+  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<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];
 
   return *this;
 }
@@ -136,6 +155,9 @@ AliAnalysisVertexingHF &AliAnalysisVertexingHF::operator=(const AliAnalysisVerte
 AliAnalysisVertexingHF::~AliAnalysisVertexingHF() {
   // Destructor
   if(fV1) { delete fV1; fV1=0; }
+  if(fTrackFilter) { delete fTrackFilter; fTrackFilter=0; }
+  if(fTrackFilterSoftPi) { delete fTrackFilterSoftPi; fTrackFilterSoftPi=0; }
+  if(fAODMap) { delete fAODMap; fAODMap=0; }
 }
 //----------------------------------------------------------------------------
 void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
@@ -143,21 +165,31 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
                                            TClonesArray *aodD0toKpiTClArr,
                                            TClonesArray *aodJPSItoEleTClArr,
                                            TClonesArray *aodCharm3ProngTClArr,
-                                           TClonesArray *aodCharm4ProngTClArr)
+                                           TClonesArray *aodCharm4ProngTClArr,
+                                           TClonesArray *aodDstarTClArr,
+                                           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");
     return;
   }
-  if(fD0toKpi && !aodD0toKpiTClArr) {
+  if((fD0toKpi || fDstar) && !aodD0toKpiTClArr) {
     printf("ERROR: no aodD0toKpiTClArr");
     return;
   }
@@ -173,13 +205,25 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     printf("ERROR: no aodCharm4ProngTClArr");
     return;
   }
+  if(fDstar && !aodDstarTClArr) {
+    printf("ERROR: no aodDstarTClArr");
+    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;
+  Int_t iVerticesHF=0,iD0toKpi=0,iJPSItoEle=0,i3Prong=0,i4Prong=0,iDstar=0,iLikeSign2Prong=0,iLikeSign3Prong=0;
   aodVerticesHFTClArr->Delete();
   iVerticesHF = aodVerticesHFTClArr->GetEntriesFast();
   TClonesArray &verticesHFRef = *aodVerticesHFTClArr;
-  if(fD0toKpi)   {
+  if(fD0toKpi || fDstar)   {
     aodD0toKpiTClArr->Delete();
     iD0toKpi = aodD0toKpiTClArr->GetEntriesFast();
   }
@@ -195,27 +239,46 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     aodCharm4ProngTClArr->Delete();
     i4Prong = aodCharm4ProngTClArr->GetEntriesFast();
   }
-  TClonesArray &aodD0toKpiRef     = *aodD0toKpiTClArr;
-  TClonesArray &aodJPSItoEleRef   = *aodJPSItoEleTClArr;
-  TClonesArray &aodCharm3ProngRef = *aodCharm3ProngTClArr;
-  TClonesArray &aodCharm4ProngRef = *aodCharm4ProngTClArr;
-  
-
-  AliAODRecoDecayHF2Prong *io2Prong = 0;
-  AliAODRecoDecayHF3Prong *io3Prong = 0;
-  AliAODRecoDecayHF4Prong *io4Prong = 0;
-
-  Int_t    iTrkP1,iTrkP2,iTrkN1,iTrkN2,trkEntries;
-  Int_t    nTrksP=0,nTrksN=0;
-  Double_t xdummy,ydummy,dcap1n1,dcap1n2,dcap2n1,dcap1p2,dcan1n2;
+  if(fDstar) {
+    aodDstarTClArr->Delete();
+    iDstar = aodDstarTClArr->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 &aodLikeSign2ProngRef = *aodLikeSign2ProngTClArr;
+  TClonesArray &aodLikeSign3ProngRef = *aodLikeSign3ProngTClArr;
+
+
+  AliAODRecoDecayHF2Prong *io2Prong  = 0;
+  AliAODRecoDecayHF3Prong *io3Prong  = 0;
+  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;
   Bool_t   okD0=kFALSE,okJPSI=kFALSE,ok3Prong=kFALSE,ok4Prong=kFALSE;
+  Bool_t   okDstar=kFALSE,okD0fromDstar=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];
   AliDebug(2,Form(" dca cut set to %f cm",dcaMax));
 
 
@@ -235,45 +298,89 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     AliDebug(1," No primary vertex from tracks");
     return;
   }
-  TString primTitle = primary->GetTitle();
-  if(!primTitle.Contains("VertexerTracks")) {
+
+  TString primTitle=primary->GetTitle();
+  if(!primTitle.Contains("VertexerTracks") ||
+     primary->GetNContributors()<=0) {
     AliDebug(1," No primary vertex from tracks");
     return;
   }
+  
 
   // call function that applies sigle-track selection,
-  // separates positives and negatives,
+  // for displaced tracks and soft pions (both charges) for D*,
   // and retrieves primary vertex
-  TObjArray trksP(trkEntries/2);
-  TObjArray trksN(trkEntries/2);
-  SelectTracksAndCopyVertex(event,trksP,nTrksP,trksN,nTrksN);
+  TObjArray seleTrksArray(trkEntries);
+  UChar_t  *seleFlags = new UChar_t[trkEntries]; // bit 0: displaced, bit 1: softpi
+  Int_t     nSeleTrks=0;
+  Int_t *evtNumber    = new Int_t[trkEntries];
+  SelectTracksAndCopyVertex(event,seleTrksArray,nSeleTrks,seleFlags,evtNumber);
     
-  AliDebug(1,Form(" Pos. tracks: %d    Neg. tracks: %d",nTrksP,nTrksN));
+  AliDebug(1,Form(" Selected tracks: %d",nSeleTrks));
     
-  TObjArray *twoTrackArray1  = new TObjArray(2);
-  TObjArray *twoTrackArray2  = new TObjArray(2);
-  TObjArray *threeTrackArray = new TObjArray(3);
-  TObjArray *fourTrackArray  = new TObjArray(4);
+  TObjArray *twoTrackArray1    = new TObjArray(2);
+  TObjArray *twoTrackArray2    = new TObjArray(2);
+  TObjArray *twoTrackArrayCasc = new TObjArray(2);
+  TObjArray *threeTrackArray   = new TObjArray(3);
+  TObjArray *fourTrackArray    = new TObjArray(4);
   
   Double_t dispersion;
+  Bool_t isLikeSign2Prong=kFALSE,isLikeSign3Prong=kFALSE;
+
+  AliAODRecoDecayHF   *rd = 0;
+  AliAODRecoCascadeHF *rc = 0;
 
   // LOOP ON  POSITIVE  TRACKS
-  for(iTrkP1=0; iTrkP1<nTrksP; iTrkP1++) {
-    if(iTrkP1%1==0) AliDebug(1,Form("  Processing positive track number %d of %d",iTrkP1,nTrksP));  
+  for(iTrkP1=0; iTrkP1<nSeleTrks; iTrkP1++) {
+
+    if(iTrkP1%1==0) AliDebug(1,Form("  1st loop on pos: track number %d of %d",iTrkP1,nSeleTrks));  
+
     // get track from tracks array
-    postrack1 = (AliESDtrack*)trksP.UncheckedAt(iTrkP1);
-      
+    postrack1 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkP1);
+
+    if(!TESTBIT(seleFlags[iTrkP1],kBitDispl)) continue;
+
+    if(postrack1->Charge()<0 && !fLikeSign) continue;
+
     // LOOP ON  NEGATIVE  TRACKS
-    for(iTrkN1=0; iTrkN1<nTrksN; iTrkN1++) {
-      if(iTrkN1%1==0) AliDebug(1,Form("    Processing negative track number %d of %d",iTrkN1,nTrksN));  
+    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==iTrkP1) continue;
+
       // get track from tracks array
-      negtrack1 = (AliESDtrack*)trksN.UncheckedAt(iTrkN1);
+      negtrack1 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkN1);
+
+      if(negtrack1->Charge()>0 && !fLikeSign) continue;
+
+      if(!TESTBIT(seleFlags[iTrkN1],kBitDispl)) continue;
+
+      if(fMixEvent) {
+       if(evtNumber[iTrkP1]==evtNumber[iTrkN1]) continue;
+      }
+
+      if(postrack1->Charge()==negtrack1->Charge()) { // like-sign 
+       isLikeSign2Prong=kTRUE;
+       if(!fLikeSign)    continue;
+       if(iTrkN1<iTrkP1) continue; // this is needed to avoid double-counting of like-sign
+      } else { // unlike-sign
+       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
       postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
       negtrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
+
       // DCA between the two tracks
       dcap1n1 = postrack1->GetDCA(negtrack1,fBzkG,xdummy,ydummy);
       if(dcap1n1>dcaMax) { negtrack1=0; continue; }
+
       // Vertexing
       twoTrackArray1->AddAt(postrack1,0);
       twoTrackArray1->AddAt(negtrack1,1);
@@ -283,27 +390,137 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
        negtrack1=0; 
        continue; 
       }
-      if(fD0toKpi || fJPSItoEle) { 
-       io2Prong = Make2Prong(twoTrackArray1,event,vertexp1n1,dcap1n1,okD0,okJPSI);
-       if(okD0 || okJPSI) {
-         AliAODVertex *v = new(verticesHFRef[iVerticesHF++])AliAODVertex(*vertexp1n1);
-         if(fInputAOD) AddDaughterRefs(v,event,twoTrackArray1);
-         if(okD0) {  
-           AliAODRecoDecayHF2Prong *rd = new(aodD0toKpiRef[iD0toKpi++])AliAODRecoDecayHF2Prong(*io2Prong);
-           rd->SetSecondaryVtx(v);
-           v->SetParent(rd);
+
+      // 2 prong candidate
+      if(fD0toKpi || fJPSItoEle || fDstar || fLikeSign) { 
+      
+       io2Prong = Make2Prong(twoTrackArray1,event,vertexp1n1,dcap1n1,okD0,okJPSI,okD0fromDstar);
+      
+       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(!isLikeSign2Prong) {
+           if(okD0) {  
+             rd = new(aodD0toKpiRef[iD0toKpi++])AliAODRecoDecayHF2Prong(*io2Prong);
+             rd->SetSecondaryVtx(v2Prong);
+             v2Prong->SetParent(rd);
+             if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+           }
+           if(okJPSI) {
+             rd = new(aodJPSItoEleRef[iJPSItoEle++])AliAODRecoDecayHF2Prong(*io2Prong);
+             rd->SetSecondaryVtx(v2Prong);
+             if(!okD0) v2Prong->SetParent(rd); // it cannot have two mothers ...
+             if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+           }
+         } else { // isLikeSign2Prong
+           rd = new(aodLikeSign2ProngRef[iLikeSign2Prong++])AliAODRecoDecayHF2Prong(*io2Prong);
+           rd->SetSecondaryVtx(v2Prong);
+           v2Prong->SetParent(rd);
+           if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
          }
-         if(okJPSI) {
-           AliAODRecoDecayHF2Prong *rd = new(aodJPSItoEleRef[iJPSItoEle++])AliAODRecoDecayHF2Prong(*io2Prong);
-           rd->SetSecondaryVtx(v);
-           if(!okD0) v->SetParent(rd); // do something better here...
+       }
+       // D* candidates
+       if(fDstar && okD0fromDstar && !isLikeSign2Prong) {
+         // write references in io2Prong
+         if(fInputAOD) {
+           AddDaughterRefs(vertexp1n1,event,twoTrackArray1);
+         } else {
+           vertexp1n1->AddDaughter(postrack1);
+           vertexp1n1->AddDaughter(negtrack1);
          }
+         io2Prong->SetSecondaryVtx(vertexp1n1);
+         //printf("--->  %d %d %d %d %d\n",vertexp1n1->GetNDaughters(),iTrkP1,iTrkN1,postrack1->Charge(),negtrack1->Charge());
+         // create a track from the D0
+         AliNeutralTrackParam *trackD0 = new AliNeutralTrackParam(io2Prong);
+
+         // LOOP ON TRACKS THAT PASSED THE SOFT PION CUTS
+         for(iTrkSoftPi=0; iTrkSoftPi<nSeleTrks; iTrkSoftPi++) {
+
+           if(iTrkSoftPi==iTrkP1 || iTrkSoftPi==iTrkN1) continue;
+
+           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);
+           if(trackD0->GetSigmaY2()<0. || trackD0->GetSigmaZ2()<0.) continue; // this is insipired by the AliITStrackV2::Invariant() checks
+
+           // get track from tracks array
+           trackPi = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkSoftPi);
+           trackPi->PropagateToDCA(fV1,fBzkG,kVeryBig);
+
+           twoTrackArrayCasc->AddAt(trackPi,0);
+           twoTrackArrayCasc->AddAt(trackD0,1);
+
+           AliAODVertex *vertexCasc = 0;
+
+           if(fFindVertexForDstar) {
+             // DCA between the two tracks
+             dcaCasc = trackPi->GetDCA(trackD0,fBzkG,xdummy,ydummy);
+             // Vertexing
+             vertexCasc = ReconstructSecondaryVertex(twoTrackArrayCasc,dispersion,kFALSE);
+           } else {
+             // assume Dstar 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) { 
+             twoTrackArrayCasc->Clear();
+             trackPi=0; 
+             continue; 
+           }
+
+            ioCascade = MakeCascade(twoTrackArrayCasc,event,vertexCasc,io2Prong,dcaCasc,okDstar);
+            if(okDstar) {
+             // 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);
+               if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+               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) rc->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+           }
+           twoTrackArrayCasc->Clear();
+           trackPi=0; 
+           if(ioCascade) {delete ioCascade; ioCascade=NULL;}
+           delete vertexCasc; vertexCasc=NULL;
+         } // end loop on soft pi tracks
+
+         if(trackD0) {delete trackD0; trackD0=NULL;}
+
        }
-       io2Prong=NULL;
-      }
-      
+       if(io2Prong) {delete io2Prong; io2Prong=NULL;}
+      }      
+
       twoTrackArray1->Clear(); 
-      if(!f3Prong && !f4Prong)  { 
+      if( (!f3Prong && !f4Prong) || 
+         (isLikeSign2Prong && !f3Prong) ) { 
        negtrack1=0; 
        delete vertexp1n1; 
        continue; 
@@ -311,13 +528,46 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
 
        
       // 2nd LOOP  ON  POSITIVE  TRACKS 
-      for(iTrkP2=iTrkP1+1; iTrkP2<nTrksP; iTrkP2++) {
+      for(iTrkP2=iTrkP1+1; iTrkP2<nSeleTrks; iTrkP2++) {
+
+       if(iTrkP2==iTrkP1 || iTrkP2==iTrkN1) continue;
+
+       if(iTrkP2%1==0) AliDebug(1,Form("    2nd loop on pos: track number %d of %d",iTrkP2,nSeleTrks));  
+
        // get track from tracks array
-       postrack2 = (AliESDtrack*)trksP.UncheckedAt(iTrkP2);
+       postrack2 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkP2);
+
+       if(postrack2->Charge()<0) continue; 
+
+       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);
        negtrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
+       //printf("********** %d %d %d\n",postrack1->GetID(),postrack2->GetID(),negtrack1->GetID());
+
        dcap2n1 = postrack2->GetDCA(negtrack1,fBzkG,xdummy,ydummy);
        if(dcap2n1>dcaMax) { postrack2=0; continue; }
        dcap1p2 = postrack2->GetDCA(postrack1,fBzkG,xdummy,ydummy);
@@ -330,67 +580,163 @@ 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(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);
+         }
+
          AliAODVertex* secVert3PrAOD = ReconstructSecondaryVertex(threeTrackArray,dispersion);
          io3Prong = Make3Prong(threeTrackArray,event,secVert3PrAOD,dispersion,vertexp1n1,vertexp2n1,dcap1n1,dcap2n1,dcap1p2,ok3Prong);
          if(ok3Prong) {
-           AliAODVertex *v = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
-           if(fInputAOD) AddDaughterRefs(v,event,threeTrackArray);
-           AliAODRecoDecayHF3Prong *rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
-           rd->SetSecondaryVtx(v);
-           v->SetParent(rd);
+           AliAODVertex *v3Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
+           if(fInputAOD) AddDaughterRefs(v3Prong,event,threeTrackArray);
+           if(!isLikeSign3Prong) {
+             rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+           } else { // isLikeSign3Prong
+             rd = new(aodLikeSign3ProngRef[iLikeSign3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+           }
          }
-         if(io3Prong) io3Prong=NULL; 
+         if(io3Prong) {delete io3Prong; io3Prong=NULL;} 
+         if(secVert3PrAOD) {delete secVert3PrAOD; secVert3PrAOD=NULL;} 
        }
-       if(f4Prong) {
+
+       // 4 prong candidates
+       if(f4Prong 
+          // don't make 4 prong with like-sign pairs and triplets
+          && !isLikeSign2Prong && !isLikeSign3Prong
+          // track-to-track dca cuts already now
+          && dcap1n1 < fD0to4ProngsCuts[1]
+          && dcap2n1 < fD0to4ProngsCuts[1]) {
+
+         // back to primary vertex
+         postrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
+         postrack2->PropagateToDCA(fV1,fBzkG,kVeryBig);
+         negtrack1->PropagateToDCA(fV1,fBzkG,kVeryBig);
+         // Vertexing for these 3 (can be taken from above?)
+          threeTrackArray->AddAt(postrack1,0);
+          threeTrackArray->AddAt(negtrack1,1);
+          threeTrackArray->AddAt(postrack2,2);
+          AliAODVertex* vertexp1n1p2 = ReconstructSecondaryVertex(threeTrackArray,dispersion);
+
          // 3rd LOOP  ON  NEGATIVE  TRACKS (for 4 prong) 
-         for(iTrkN2=iTrkN1+1; iTrkN2<nTrksN; iTrkN2++) {
+         for(iTrkN2=iTrkN1+1; iTrkN2<nSeleTrks; iTrkN2++) {
+
+           if(iTrkN2==iTrkP1 || iTrkN2==iTrkP2 || iTrkN2==iTrkN1) continue;
+
+           if(iTrkN2%1==0) AliDebug(1,Form("    3rd loop on neg: track number %d of %d",iTrkN2,nSeleTrks));  
+
            // get track from tracks array
-           negtrack2 = (AliESDtrack*)trksN.UncheckedAt(iTrkN2);
+           negtrack2 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkN2);
+
+           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);
            postrack2->PropagateToDCA(fV1,fBzkG,kVeryBig);
            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 > fD0to4ProngsCuts[1]) { negtrack2=0; continue; }
+            dcap2n2 = postrack2->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
+            if(dcap2n2 > fD0to4ProngsCuts[1]) { negtrack2=0; continue; }
+
            // Vertexing
            fourTrackArray->AddAt(postrack1,0);
            fourTrackArray->AddAt(negtrack1,1);
            fourTrackArray->AddAt(postrack2,2);
            fourTrackArray->AddAt(negtrack2,3);
+
            AliAODVertex* secVert4PrAOD = ReconstructSecondaryVertex(fourTrackArray,dispersion);
-           io4Prong = Make4Prong(fourTrackArray,event,secVert4PrAOD,vertexp1n1,vertexp2n1,dcap1n1,dcap1n2,dcap2n1,ok4Prong);
+           io4Prong = Make4Prong(fourTrackArray,event,secVert4PrAOD,vertexp1n1,vertexp1n1p2,dcap1n1,dcap1n2,dcap2n1,dcap2n2,ok4Prong);
            if(ok4Prong) {
-             AliAODVertex *v = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert4PrAOD);
-             if(fInputAOD) AddDaughterRefs(v,event,fourTrackArray);
-             AliAODRecoDecayHF4Prong *rd = new(aodCharm4ProngRef[i4Prong++])AliAODRecoDecayHF4Prong(*io4Prong);
-             rd->SetSecondaryVtx(v);
-             v->SetParent(rd);
+             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);
+             if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
            }
-           if(io4Prong) io4Prong=NULL; 
+
+           if(io4Prong) {delete io4Prong; io4Prong=NULL;} 
+           if(secVert4PrAOD) {delete secVert4PrAOD; secVert4PrAOD=NULL;} 
            fourTrackArray->Clear();
            negtrack2 = 0;
+
          } // end loop on negative tracks
+
+          threeTrackArray->Clear();
+         delete vertexp1n1p2;
+
        }
+
        postrack2 = 0;
        delete vertexp2n1;
+
       } // end 2nd loop on positive tracks
+
       twoTrackArray2->Clear();
       
-      // 2nd LOOP  ON  NEGATIVE  TRACKS 
-      for(iTrkN2=iTrkN1+1; iTrkN2<nTrksN; iTrkN2++) {
+      // 2nd LOOP  ON  NEGATIVE  TRACKS (for 3 prong -+-)
+      for(iTrkN2=iTrkN1+1; iTrkN2<nSeleTrks; iTrkN2++) {
+
+       if(iTrkN2==iTrkP1 || iTrkN2==iTrkP2 || iTrkN2==iTrkN1) continue;
+
+       if(iTrkN2%1==0) AliDebug(1,Form("    2nd loop on neg: track number %d of %d",iTrkN2,nSeleTrks));  
+
        // get track from tracks array
-       negtrack2 = (AliESDtrack*)trksN.UncheckedAt(iTrkN2);
+       negtrack2 = (AliESDtrack*)seleTrksArray.UncheckedAt(iTrkN2);
+
+       if(negtrack2->Charge()>0) continue;
+
+       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);
        negtrack2->PropagateToDCA(fV1,fBzkG,kVeryBig);
+       //printf("********** %d %d %d\n",postrack1->GetID(),negtrack1->GetID(),negtrack2->GetID());
+
        dcap1n2 = postrack1->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
        if(dcap1n2>dcaMax) { negtrack2=0; continue; }
        dcan1n2 = negtrack1->GetDCA(negtrack2,fBzkG,xdummy,ydummy);
@@ -406,6 +752,7 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
          negtrack2=0; 
          continue; 
        }
+
        if(f3Prong) { 
          threeTrackArray->AddAt(negtrack1,0);
          threeTrackArray->AddAt(postrack1,1);
@@ -413,17 +760,28 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
          AliAODVertex* secVert3PrAOD = ReconstructSecondaryVertex(threeTrackArray,dispersion);
          io3Prong = Make3Prong(threeTrackArray,event,secVert3PrAOD,dispersion,vertexp1n1,vertexp1n2,dcap1n1,dcap1n2,dcan1n2,ok3Prong);
          if(ok3Prong) {
-           AliAODVertex *v = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
-           if(fInputAOD) AddDaughterRefs(v,event,threeTrackArray);
-           AliAODRecoDecayHF3Prong *rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
-           rd->SetSecondaryVtx(v);
-           v->SetParent(rd);
+           AliAODVertex *v3Prong = new(verticesHFRef[iVerticesHF++])AliAODVertex(*secVert3PrAOD);
+           if(fInputAOD) AddDaughterRefs(v3Prong,event,threeTrackArray);
+           if(!isLikeSign3Prong) {
+             rd = new(aodCharm3ProngRef[i3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+           } else { // isLikeSign3Prong
+             rd = new(aodLikeSign3ProngRef[iLikeSign3Prong++])AliAODRecoDecayHF3Prong(*io3Prong);
+             rd->SetSecondaryVtx(v3Prong);
+             v3Prong->SetParent(rd);
+             if(fInputAOD) rd->SetPrimaryVtxRef((AliAODVertex*)event->GetPrimaryVertex());
+           }
          }
-         if(io3Prong) io3Prong=NULL; 
+         if(io3Prong) {delete io3Prong; io3Prong=NULL;} 
+         if(secVert3PrAOD) {delete secVert3PrAOD; secVert3PrAOD=NULL;}
        }
+
        negtrack2 = 0;
        delete vertexp1n2;
+
       } // end 2nd loop on negative tracks
+      
       twoTrackArray2->Clear();
       
       negtrack1 = 0;
@@ -434,6 +792,8 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
   }  // end 1st loop on positive tracks
 
 
+  AliDebug(1,Form(" Total HF vertices in event = %d;",
+                 (Int_t)aodVerticesHFTClArr->GetEntriesFast()));
   if(fD0toKpi) {
     AliDebug(1,Form(" D0->Kpi in event = %d;",
                    (Int_t)aodD0toKpiTClArr->GetEntriesFast()));
@@ -450,17 +810,32 @@ void AliAnalysisVertexingHF::FindCandidates(AliVEvent *event,
     AliDebug(1,Form(" Charm->4Prong in event = %d;\n",
                    (Int_t)aodCharm4ProngTClArr->GetEntriesFast()));
   }
+  if(fDstar) {
+    AliDebug(1,Form(" D*->D0pi in event = %d;\n",
+                   (Int_t)aodDstarTClArr->GetEntriesFast()));
+  }
+  if(fLikeSign) {
+    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;
   threeTrackArray->Clear(); 
   threeTrackArray->Delete(); delete threeTrackArray;
   fourTrackArray->Delete();  delete fourTrackArray;
+  delete [] seleFlags; seleFlags=NULL;
+  if(evtNumber) {delete [] evtNumber; evtNumber=NULL;}
 
   if(fInputAOD) {
-    trksP.Delete();
-    trksN.Delete();
+    seleTrksArray.Delete(); 
+    if(fAODMap) { delete fAODMap; fAODMap=NULL; }
   }
 
   return;
@@ -473,13 +848,15 @@ void AliAnalysisVertexingHF::AddDaughterRefs(AliAODVertex *v,AliVEvent *event,
 
   Int_t nTrks = trkArray->GetEntriesFast();
 
-  AliESDtrack *esdTrack = 0;
+  AliExternalTrackParam *track = 0;
   AliAODTrack *aodTrack = 0;
   Int_t id;
 
   for(Int_t i=0; i<nTrks; i++) {
-    esdTrack = (AliESDtrack*)trkArray->UncheckedAt(i);
-    id = (Int_t)esdTrack->GetID();
+    track = (AliExternalTrackParam*)trkArray->UncheckedAt(i);
+    id = (Int_t)track->GetID();
+    //printf("---> %d\n",id);
+    if(id<0) continue; // this track is a AliAODRecoDecay
     aodTrack = (AliAODTrack*)event->GetTrack(fAODMap[id]);
     v->AddDaughter(aodTrack);
   }
@@ -487,21 +864,75 @@ void AliAnalysisVertexingHF::AddDaughterRefs(AliAODVertex *v,AliVEvent *event,
   return;
 }      
 //----------------------------------------------------------------------------
+AliAODRecoCascadeHF* AliAnalysisVertexingHF::MakeCascade(
+                                  TObjArray *twoTrackArray,AliVEvent *event,
+                                  AliAODVertex *secVert,
+                                  AliAODRecoDecayHF2Prong *rd2Prong,
+                                  Double_t dca,
+                                  Bool_t &okDstar) const
+{
+  // Make the cascade as a 2Prong decay and check if it passes Dstar
+  // reconstruction cuts
+
+  okDstar = 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;
+
+  // charge
+  AliESDtrack *trackPi = (AliESDtrack*)twoTrackArray->UncheckedAt(0);
+  theCascade->SetCharge(trackPi->Charge());
+
+  //--- selection cuts
+  //
+  AliAODRecoCascadeHF *tmpCascade = new AliAODRecoCascadeHF(*theCascade);
+  tmpCascade->GetSecondaryVtx()->AddDaughter(trackPi);
+  tmpCascade->GetSecondaryVtx()->AddDaughter(rd2Prong);
+  AliAODVertex *primVertexAOD=0;
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) {
+    // take event primary vertex
+    primVertexAOD = PrimaryVertex(); 
+    tmpCascade->SetOwnPrimaryVtx(primVertexAOD);
+    rd2Prong->SetOwnPrimaryVtx(primVertexAOD);
+  }
+  // select D*->D0pi
+  if(fDstar) {
+    Bool_t testD0=kTRUE;
+    okDstar = tmpCascade->SelectDstar(fDstarCuts,fD0fromDstarCuts,testD0);
+  }
+  tmpCascade->GetSecondaryVtx()->RemoveDaughters();
+  tmpCascade->UnsetOwnPrimaryVtx(); 
+  delete tmpCascade; tmpCascade=NULL;
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
+    rd2Prong->UnsetOwnPrimaryVtx();
+  }
+  if(primVertexAOD) {delete primVertexAOD; primVertexAOD=NULL;}
+  //---
+  
+  return theCascade;
+}
+//-----------------------------------------------------------------------------
 AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
-                                  TObjArray *twoTrackArray1,AliVEvent *event,
+                                  TObjArray *twoTrackArray,AliVEvent *event,
                                   AliAODVertex *secVert,Double_t dca,
-                                  Bool_t &okD0,Bool_t &okJPSI) const
+                                  Bool_t &okD0,Bool_t &okJPSI,
+                                  Bool_t &okD0fromDstar) const
 {
   // Make 2Prong candidates and check if they pass D0toKpi or BtoJPSI
   // reconstruction cuts
   // G.E.Bruno (J/psi), A.Dainese (D0->Kpi)
 
-  okD0=kFALSE; okJPSI=kFALSE;
+  okD0=kFALSE; okJPSI=kFALSE; okD0fromDstar=kFALSE;
 
   Double_t px[2],py[2],pz[2],d0[2],d0err[2];
-
-  AliESDtrack *postrack = (AliESDtrack*)twoTrackArray1->UncheckedAt(0);
-  AliESDtrack *negtrack = (AliESDtrack*)twoTrackArray1->UncheckedAt(1);
+  AliESDtrack *postrack = (AliESDtrack*)twoTrackArray->UncheckedAt(0);
+  AliESDtrack *negtrack = (AliESDtrack*)twoTrackArray->UncheckedAt(1);
 
   // propagate tracks to secondary vertex, to compute inv. mass
   postrack->PropagateToDCA(secVert,fBzkG,kVeryBig);
@@ -518,15 +949,16 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
   Bool_t okMassCut=kFALSE;
   if(!okMassCut && fD0toKpi)   if(SelectInvMass(0,2,px,py,pz)) okMassCut=kTRUE;
   if(!okMassCut && fJPSItoEle) if(SelectInvMass(1,2,px,py,pz)) okMassCut=kTRUE;
+  if(!okMassCut && fDstar)     if(SelectInvMass(3,2,px,py,pz)) okMassCut=kTRUE;
   if(!okMassCut) {
     AliDebug(2," candidate didn't pass mass cut");
     return 0x0;    
   }
-
   // primary vertex to be used by this candidate
-  AliAODVertex *primVertexAOD  = OwnPrimaryVertex(twoTrackArray1,event);
+  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];
@@ -534,38 +966,43 @@ AliAODRecoDecayHF2Prong *AliAnalysisVertexingHF::Make2Prong(
   negtrack->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
   d0[1] = d0z0[0];
   d0err[1] = TMath::Sqrt(covd0z0[0]);
-
+  
   // create the object AliAODRecoDecayHF2Prong
   AliAODRecoDecayHF2Prong *the2Prong = new AliAODRecoDecayHF2Prong(secVert,px,py,pz,d0,d0err,dca);
   the2Prong->SetOwnPrimaryVtx(primVertexAOD);
   UShort_t id[2]={(UShort_t)postrack->GetID(),(UShort_t)negtrack->GetID()};
   the2Prong->SetProngIDs(2,id);
+  delete primVertexAOD; primVertexAOD=NULL;
 
-
+  
   // select D0->Kpi
   Int_t checkD0,checkD0bar;
-  if(fD0toKpi) okD0 = the2Prong->SelectD0(fD0toKpiCuts,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(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);
 
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) the2Prong->UnsetOwnPrimaryVtx();
-
-  if(okD0 || okJPSI) {
-    // get PID info from ESD
-    Double_t esdpid0[5];
-    postrack->GetESDpid(esdpid0);
-    Double_t esdpid1[5];
-    negtrack->GetESDpid(esdpid1);
-    Double_t esdpid[10];
-    for(Int_t i=0;i<5;i++) {
-      esdpid[i]   = esdpid0[i];
-      esdpid[5+i] = esdpid1[i];
-    }
-    the2Prong->SetPID(2,esdpid);
+  // remove the primary vertex (was used only for selection)
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
+    the2Prong->UnsetOwnPrimaryVtx();
   }
+  
+  // get PID info from ESD
+  Double_t esdpid0[5]={0.,0.,0.,0.,0.};
+  if(postrack->GetStatus()&AliESDtrack::kESDpid) postrack->GetESDpid(esdpid0);
+  Double_t esdpid1[5]={0.,0.,0.,0.,0.};
+  if(negtrack->GetStatus()&AliESDtrack::kESDpid) negtrack->GetESDpid(esdpid1);
+  Double_t esdpid[10];
+  for(Int_t i=0;i<5;i++) {
+    esdpid[i]   = esdpid0[i];
+    esdpid[5+i] = esdpid1[i];
+  }
+  the2Prong->SetPID(2,esdpid);
 
   return the2Prong;  
 }
@@ -583,7 +1020,7 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
 
 
   ok3Prong=kFALSE;
-  if(!secVert) return 0x0; 
+  if(!secVert || !vertexp1n1 || !vertexp2n1) return 0x0; 
 
   Double_t px[3],py[3],pz[3],d0[3],d0err[3];
   Double_t momentum[3];
@@ -612,7 +1049,7 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
   }
 
   // primary vertex to be used by this candidate
-  AliAODVertex *primVertexAOD  = OwnPrimaryVertex(threeTrackArray,event);
+  AliAODVertex *primVertexAOD  = PrimaryVertex(threeTrackArray,event);
   if(!primVertexAOD) return 0x0;
 
   Double_t d0z0[2],covd0z0[3];
@@ -638,6 +1075,7 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
   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) {
@@ -649,47 +1087,47 @@ AliAODRecoDecayHF3Prong* AliAnalysisVertexingHF::Make3Prong(
   }
   //if(fDebug) printf("ok3Prong: %d\n",(Int_t)ok3Prong);
 
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) the3Prong->UnsetOwnPrimaryVtx();
-
-  if(ok3Prong) {
-    // get PID info from ESD
-    Double_t esdpid0[5];
-    postrack1->GetESDpid(esdpid0);
-    Double_t esdpid1[5];
-    negtrack->GetESDpid(esdpid1);
-    Double_t esdpid2[5];
-    postrack2->GetESDpid(esdpid2);
-
-    Double_t esdpid[15];
-    for(Int_t i=0;i<5;i++) {
-      esdpid[i]   = esdpid0[i];
-      esdpid[5+i] = esdpid1[i];
-      esdpid[10+i] = esdpid2[i];
-    }
-    the3Prong->SetPID(3,esdpid);
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
+    the3Prong->UnsetOwnPrimaryVtx();
+  }
+
+  // get PID info from ESD
+  Double_t esdpid0[5]={0.,0.,0.,0.,0.};
+  if(postrack1->GetStatus()&AliESDtrack::kESDpid) postrack1->GetESDpid(esdpid0);
+  Double_t esdpid1[5]={0.,0.,0.,0.,0.};
+  if(negtrack->GetStatus()&AliESDtrack::kESDpid) negtrack->GetESDpid(esdpid1);
+  Double_t esdpid2[5]={0.,0.,0.,0.,0.};
+  if(postrack2->GetStatus()&AliESDtrack::kESDpid) postrack2->GetESDpid(esdpid2);
+  
+  Double_t esdpid[15];
+  for(Int_t i=0;i<5;i++) {
+    esdpid[i]    = esdpid0[i];
+    esdpid[5+i]  = esdpid1[i];
+    esdpid[10+i] = esdpid2[i];
   }
+  the3Prong->SetPID(3,esdpid);
 
   return the3Prong;
 }
 //----------------------------------------------------------------------------
 AliAODRecoDecayHF4Prong* AliAnalysisVertexingHF::Make4Prong(
                              TObjArray *fourTrackArray,AliVEvent *event,
-                            AliAODVertex *secVert,
-                            AliAODVertex *vertexp1n1,AliAODVertex *vertexp2n1,
-                            Double_t dcap1n1,Double_t dcap1n2,Double_t dcap2n1,
-                            Bool_t &ok4Prong) const
+                             AliAODVertex *secVert,
+                             AliAODVertex *vertexp1n1,
+                             AliAODVertex *vertexp1n1p2,
+                             Double_t dcap1n1,Double_t dcap1n2,
+                            Double_t dcap2n1,Double_t dcap2n2,
+                             Bool_t &ok4Prong) const
 {
   // Make 4Prong candidates and check if they pass D0toKpipipi
   // reconstruction cuts
   // G.E.Bruno, R.Romita
 
   ok4Prong=kFALSE;
-  if(!secVert) return 0x0; 
+  if(!secVert || !vertexp1n1 || !vertexp1n1p2) return 0x0; 
 
   Double_t px[4],py[4],pz[4],d0[4],d0err[4];//d0z[3];
 
-  px[0]=dcap1n1*dcap1n2*dcap2n1; // TO BE CHANGED (done just to removed compilation warning about dca... not used)
-
   AliESDtrack *postrack1 = (AliESDtrack*)fourTrackArray->UncheckedAt(0);
   AliESDtrack *negtrack1 = (AliESDtrack*)fourTrackArray->UncheckedAt(1);
   AliESDtrack *postrack2 = (AliESDtrack*)fourTrackArray->UncheckedAt(2);
@@ -711,78 +1149,87 @@ 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(!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;
+  }
 
   // primary vertex to be used by this candidate
-  AliAODVertex *primVertexAOD  = OwnPrimaryVertex(fourTrackArray,event);
+  AliAODVertex *primVertexAOD  = PrimaryVertex(fourTrackArray,event);
   if(!primVertexAOD) return 0x0;
 
-  /*
-    Double_t d0z0[2],covd0z0[3];
-    postrack1->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
-    negtrack1->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
-    postrack2->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
-    negtrack2->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
-  */
+  Double_t d0z0[2],covd0z0[3];
+  postrack1->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  d0[0]=d0z0[0];
+  d0err[0] = TMath::Sqrt(covd0z0[0]);
+  negtrack1->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  d0[1]=d0z0[0];
+  d0err[1] = TMath::Sqrt(covd0z0[0]);
+  postrack2->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  d0[2]=d0z0[0];
+  d0err[2] = TMath::Sqrt(covd0z0[0]);
+  negtrack2->PropagateToDCA(primVertexAOD,fBzkG,kVeryBig,d0z0,covd0z0);
+  d0[3]=d0z0[0];
+  d0err[3] = TMath::Sqrt(covd0z0[0]);
+
 
   // create the object AliAODRecoDecayHF4Prong
   Double_t pos[3]; primVertexAOD->GetXYZ(pos);
-  Double_t dca[6]={0.,0.,0.,0.,0.,0.}; //  modify it
+  Double_t dca[6]={dcap1n1,0.,dcap1n2,dcap2n1,0.,dcap2n2};
   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]));
-  Double_t dist14=0.; // to be implemented
-  Double_t dist34=0.; // to be implemented
+  Double_t dist3=TMath::Sqrt((vertexp1n1p2->GetX()-pos[0])*(vertexp1n1p2->GetX()-pos[0])+(vertexp1n1p2->GetY()-pos[1])*(vertexp1n1p2->GetY()-pos[1])+(vertexp1n1p2->GetZ()-pos[2])*(vertexp1n1p2->GetZ()-pos[2]));
+  Double_t dist4=TMath::Sqrt((secVert->GetX()-pos[0])*(secVert->GetX()-pos[0])+(secVert->GetY()-pos[1])*(secVert->GetY()-pos[1])+(secVert->GetZ()-pos[2])*(secVert->GetZ()-pos[2]));
   Short_t charge=0;
-  AliAODRecoDecayHF4Prong *the4Prong = new AliAODRecoDecayHF4Prong(secVert,px,py,pz,d0,d0err,dca,dist12,dist23,dist14,dist34,charge);
+  AliAODRecoDecayHF4Prong *the4Prong = new AliAODRecoDecayHF4Prong(secVert,px,py,pz,d0,d0err,dca,dist12,dist3,dist4,charge);
   the4Prong->SetOwnPrimaryVtx(primVertexAOD);
   UShort_t id[4]={(UShort_t)postrack1->GetID(),(UShort_t)negtrack1->GetID(),(UShort_t)postrack2->GetID(),(UShort_t)negtrack2->GetID()};
   the4Prong->SetProngIDs(4,id);
 
+  delete primVertexAOD; primVertexAOD=NULL;
 
-  // use the following two lines once AliAODRecoDecayHF4Prong::SelectD0 is available
-  // select D0->Kpipipi
-  //Int_t checkD0,checkD0bar;   
-  // ok4Prong=the4Prong->SelectD0(fD04pCuts,checkD0,checkD0bar); 
-  ok4Prong=kFALSE;  //for the time being ...
+  Int_t checkD0,checkD0bar;
+  ok4Prong=the4Prong->SelectD0(fD0to4ProngsCuts,checkD0,checkD0bar);
 
-  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) the4Prong->UnsetOwnPrimaryVtx();
+  if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx && !fMixEvent) {
+    the4Prong->UnsetOwnPrimaryVtx();
+  }
 
   // get PID info from ESD
-  Double_t esdpid0[5];
-  postrack1->GetESDpid(esdpid0);
-  Double_t esdpid1[5];
-  negtrack1->GetESDpid(esdpid1);
-  Double_t esdpid2[5];
-  postrack2->GetESDpid(esdpid2);
-  Double_t esdpid3[5];
-  negtrack2->GetESDpid(esdpid3);
+  Double_t esdpid0[5]={0.,0.,0.,0.,0.};
+  if(postrack1->GetStatus()&AliESDtrack::kESDpid) postrack1->GetESDpid(esdpid0);
+  Double_t esdpid1[5]={0.,0.,0.,0.,0.};
+  if(negtrack1->GetStatus()&AliESDtrack::kESDpid) negtrack1->GetESDpid(esdpid1);
+  Double_t esdpid2[5]={0.,0.,0.,0.,0.};
+  if(postrack2->GetStatus()&AliESDtrack::kESDpid) postrack2->GetESDpid(esdpid2);
+  Double_t esdpid3[5]={0.,0.,0.,0.,0.};
+  if(negtrack2->GetStatus()&AliESDtrack::kESDpid) negtrack2->GetESDpid(esdpid3);
 
   Double_t esdpid[20];
   for(Int_t i=0;i<5;i++) {
-    esdpid[i]   = esdpid0[i];
-    esdpid[5+i] = esdpid1[i];
+    esdpid[i]    = esdpid0[i];
+    esdpid[5+i]  = esdpid1[i];
     esdpid[10+i] = esdpid2[i];
     esdpid[15+i] = esdpid3[i];
   }
   the4Prong->SetPID(4,esdpid);
-
+  
   return the4Prong;
 }
 //-----------------------------------------------------------------------------
-AliAODVertex* AliAnalysisVertexingHF::OwnPrimaryVertex(TObjArray *trkArray,
-                                                      AliVEvent *event) const
+AliAODVertex* AliAnalysisVertexingHF::PrimaryVertex(TObjArray *trkArray,
+                                                   AliVEvent *event) const
 {
-  // Returns primary vertex specific to this candidate
+  // Returns primary vertex to be used for this candidate
  
   AliESDVertex *vertexESD = 0;
   AliAODVertex *vertexAOD = 0;
 
-  Int_t nTrks = trkArray->GetEntriesFast();
 
   if(!fRecoPrimVtxSkippingTrks && !fRmTrksFromPrimVtx) { 
     // primary vertex from the input event
@@ -792,6 +1239,7 @@ AliAODVertex* AliAnalysisVertexingHF::OwnPrimaryVertex(TObjArray *trkArray,
   } else {
     // primary vertex specific to this candidate
 
+    Int_t nTrks = trkArray->GetEntriesFast();
     AliVertexerTracks *vertexer = new AliVertexerTracks(event->GetMagneticField());
 
     if(fRecoPrimVtxSkippingTrks) { 
@@ -808,13 +1256,30 @@ AliAODVertex* AliAnalysisVertexingHF::OwnPrimaryVertex(TObjArray *trkArray,
        if(strstr(fV1->GetTitle(),"VertexerTracksWithConstraintOnlyFitter")) 
          vertexer->SetOnlyFitter();
       }
-      Int_t skipped[10];
-      AliESDtrack *t = 0;
+      Int_t skipped[1000];
+      Int_t nTrksToSkip=0,id;
+      AliExternalTrackParam *t = 0;
       for(Int_t i=0; i<nTrks; i++) {
-       t = (AliESDtrack*)trkArray->UncheckedAt(i);
-       skipped[i] = (Int_t)t->GetID();
+       t = (AliExternalTrackParam*)trkArray->UncheckedAt(i);
+       id = (Int_t)t->GetID();
+       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)t->GetID();
+           if(id<0) continue;
+           skipped[nTrksToSkip++] = id;
+         }
+       }
       }
-      vertexer->SetSkipTracks(nTrks,skipped);
+      //
+      vertexer->SetSkipTracks(nTrksToSkip,skipped);
       vertexESD = (AliESDVertex*)vertexer->FindPrimaryVertex(event); 
       
     } else if(fRmTrksFromPrimVtx) { 
@@ -828,7 +1293,11 @@ AliAODVertex* AliAnalysisVertexingHF::OwnPrimaryVertex(TObjArray *trkArray,
        t = (AliESDtrack*)trkArray->UncheckedAt(i);
        esdTrack = new AliESDtrack(*t);
        rmArray.AddLast(esdTrack);
-       rmId[i]=(UShort_t)esdTrack->GetID();
+       if(esdTrack->GetID()>=0) {
+         rmId[i]=(UShort_t)esdTrack->GetID();
+       } else {
+         rmId[i]=9999;
+       }
       }
       Float_t diamondxy[2]={event->GetDiamondX(),event->GetDiamondY()};
       vertexESD = vertexer->RemoveTracksFromVertex(fV1,&rmArray,rmId,diamondxy);
@@ -863,12 +1332,8 @@ AliAODVertex* AliAnalysisVertexingHF::OwnPrimaryVertex(TObjArray *trkArray,
 void AliAnalysisVertexingHF::PrintStatus() const {
   // Print parameters being used
 
-  printf("Preselections:\n");
-  printf("    fITSrefit   = %d\n",(Int_t)fITSrefit);
-  printf("    fBothSPD   = %d\n",(Int_t)fBothSPD);
-  printf("    fMinITSCls   = %d\n",fMinITSCls);
-  printf("    fMinPtCut   = %f GeV/c\n",fMinPtCut);
-  printf("    fMind0rphiCut   = %f cm\n",fMind0rphiCut);
+  //printf("Preselections:\n");
+  //   fTrackFilter->Dump();
   if(fSecVtxWithKF) {
     printf("Secondary vertex with Kalman filter package (AliKFParticle)\n");
   } else {
@@ -888,6 +1353,29 @@ void AliAnalysisVertexingHF::PrintStatus() const {
     printf("    d0d0  [cm^2] < %f\n",fD0toKpiCuts[7]);
     printf("    cosThetaPoint    > %f\n",fD0toKpiCuts[8]);
   }
+  if(fDstar) {
+    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(fJPSItoEle) {
     printf("Reconstruct J/psi from B candidates with cuts:\n");
     printf("    |M-MJPSI| [GeV]    < %f\n",fBtoJPSICuts[0]);
@@ -942,14 +1430,13 @@ void AliAnalysisVertexingHF::PrintStatus() const {
     printf("    cosThetaPoint    > %f\n",fLcCuts[9]);
     printf("    Sum d0^2 [cm^2]  > %f\n",fLcCuts[10]);
     printf("    dca cut [cm]  < %f\n",fLcCuts[11]);
-    printf("  Ds->KKpi cuts:\n");
   }
 
   return;
 }
 //-----------------------------------------------------------------------------
 AliAODVertex* AliAnalysisVertexingHF::ReconstructSecondaryVertex(TObjArray *trkArray,
-                                                                Double_t &dispersion) const
+                                                                Double_t &dispersion,Bool_t useTRefArray) const
 {
   // Secondary vertex reconstruction with AliVertexerTracks or AliKFParticle
 
@@ -975,7 +1462,7 @@ AliAODVertex* AliAnalysisVertexingHF::ReconstructSecondaryVertex(TObjArray *trkA
 
     AliKFParticle::SetField(fBzkG);
 
-    AliKFParticle vertexKF;
+    AliKFVertex vertexKF;
 
     Int_t nTrks = trkArray->GetEntriesFast();
     for(Int_t i=0; i<nTrks; i++) {
@@ -983,8 +1470,10 @@ AliAODVertex* AliAnalysisVertexingHF::ReconstructSecondaryVertex(TObjArray *trkA
       AliKFParticle daughterKF(*esdTrack,211);
       vertexKF.AddDaughter(daughterKF);
     }
-    vertexESD = new AliESDVertex();
-    vertexKF.CopyToESDVertex(*vertexESD);
+    vertexESD = new AliESDVertex(vertexKF.Parameters(),
+                                vertexKF.CovarianceMatrix(),
+                                vertexKF.GetChi2(),
+                                vertexKF.GetNContributors());
 
   }
 
@@ -996,8 +1485,8 @@ AliAODVertex* AliAnalysisVertexingHF::ReconstructSecondaryVertex(TObjArray *trkA
   dispersion = vertexESD->GetDispersion();
   delete vertexESD; vertexESD=NULL;
 
-  vertexAOD = new AliAODVertex(pos,cov,chi2perNDF);
-  vertexAOD->SetType(AliAODVertex::kUndef); // to be changed
+  Int_t nprongs= (useTRefArray ? 0 : trkArray->GetEntriesFast());
+  vertexAOD = new AliAODVertex(pos,cov,chi2perNDF,0x0,-1,AliAODVertex::kUndef,nprongs);
 
   return vertexAOD;
 }
@@ -1013,9 +1502,9 @@ Bool_t AliAnalysisVertexingHF::SelectInvMass(Int_t decay,
   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;
+  delete [] dummyd0; dummyd0=NULL;
 
-  UInt_t pdg2[2],pdg3[3];
+  UInt_t pdg2[2],pdg3[3],pdg4[4];
   Double_t mPDG,minv;
 
   Bool_t retval=kFALSE;
@@ -1058,28 +1547,55 @@ Bool_t AliAnalysisVertexingHF::SelectInvMass(Int_t decay,
       minv = rd->InvMass(nprongs,pdg3);
       if(TMath::Abs(minv-mPDG)<fLcCuts[0]) retval=kTRUE; 
       break;
+    case 3:                  // D*->D0pi
+      pdg2[0]=421; pdg2[1]=211;
+      mPDG=TDatabasePDG::Instance()->GetParticle(413)->Mass();
+      minv = rd->InvMass(nprongs,pdg2);
+      if(TMath::Abs(minv-mPDG)<fDstarCuts[0]) retval=kTRUE;
+      break;
+    case 4:                 // D0->K3pi without PID
+      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;
+      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;
+      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;
+      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;
+      break;
     default:
+      printf("SelectInvMass(): wrong decay selection\n");
       break;
     }
 
-  delete rd;
+  delete rd; rd=NULL;
 
   return retval;
 }
 //-----------------------------------------------------------------------------
 void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
-                                         TObjArray &trksP,Int_t &nTrksP,
-                                         TObjArray &trksN,Int_t &nTrksN)
+                                  TObjArray &seleTrksArray,Int_t &nSeleTrks,
+                                  UChar_t *seleFlags,Int_t *evtNumber)
 {
-  // Fill two TObjArrays with positive and negative tracks and 
-  // apply single-track preselection.
+  // Apply single-track preselection.
+  // Fill a TObjArray with selected tracks (for displaced vertices or
+  // soft pion from D*). Selection flag stored in seleFlags.
   // Create the AliESDVertex object (convert from AliAODVertex if necessary)
   // In case of AOD input, also fill fAODMap for track index<->ID
 
   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;
@@ -1092,23 +1608,24 @@ 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];
   }
 
 
-    for(Int_t itr=0; itr<event->GetNumberOfTracks(); itr++) {
-
-    }
-
-
-  nTrksP=0,nTrksN=0;
-
   Int_t entries = (Int_t)event->GetNumberOfTracks();
+  Bool_t okDisplaced=kFALSE,okSoftPi=kFALSE;
+  nSeleTrks=0;
  
   // transfer ITS tracks from event to arrays
   for(Int_t i=0; i<entries; i++) {
+    AliVTrack *track;
+    track = (AliVTrack*)event->GetTrack(i);
 
-    AliVTrack *track = (AliVTrack*)event->GetTrack(i);
+    // TEMPORARY: check that the cov matrix is there
+    Double_t covtest[21];
+    if(!track->GetCovarianceXYZPxPyPz(covtest)) continue;
+    //
 
     if(fInputAOD) {
       AliAODTrack *aodt = (AliAODTrack*)track;
@@ -1118,27 +1635,8 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
       fAODMap[(Int_t)aodt->GetID()] = i;
     }
 
-    // require refit in ITS 
-    UInt_t status = track->GetStatus();
-    if(fITSrefit && !(status&AliESDtrack::kITSrefit)) {
-      AliDebug(2,Form("track %d is not kITSrefit",i));
-      continue;
-    }
-
-    Int_t ncls0=0;
-    for(Int_t l=0;l<6;l++) if(TESTBIT(track->GetITSClusterMap(),l)) ncls0++;
-
-    // require minimum # of ITS points    
-    if(ncls0<fMinITSCls)  {
-      AliDebug(2,Form("track %d has %d ITS cls",i,ncls0));
-      continue;
-    }
-    // require points on the 2 pixel layers
-    if(fBothSPD) 
-      if(!TESTBIT(track->GetITSClusterMap(),0) || 
-        !TESTBIT(track->GetITSClusterMap(),1)) continue;
-
     AliESDtrack *esdt = 0;
+
     if(!fInputAOD) {
       esdt = (AliESDtrack*)track;
     } else {
@@ -1146,19 +1644,37 @@ void AliAnalysisVertexingHF::SelectTracksAndCopyVertex(AliVEvent *event,
     }
 
     // single track selection
-    if(!SingleTrkCuts(*esdt)) {
+    okDisplaced=kFALSE; okSoftPi=kFALSE;
+    if(fMixEvent){
+      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)) {
+      seleTrksArray.AddLast(esdt);
+      seleFlags[nSeleTrks]=0;
+      if(okDisplaced) SETBIT(seleFlags[nSeleTrks],kBitDispl);
+      if(okSoftPi)    SETBIT(seleFlags[nSeleTrks],kBitSoftPi);
+      nSeleTrks++;
+    } else {
       if(fInputAOD) delete esdt; 
       esdt = NULL;
       continue;
-    }
-
-    if(track->Charge()<0) { // negative track
-      trksN.AddLast(esdt);
-      nTrksN++;
-    } else {                 // positive track
-      trksP.AddLast(esdt);
-      nTrksP++;
-    }
+    } 
 
   } // end loop on tracks
 
@@ -1209,6 +1725,57 @@ void AliAnalysisVertexingHF::SetD0toKpiCuts(const Double_t cuts[9])
   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,
@@ -1335,21 +1902,60 @@ void AliAnalysisVertexingHF::SetLcCuts(const Double_t cuts[12])
   return;
 }
 //-----------------------------------------------------------------------------
-Bool_t AliAnalysisVertexingHF::SingleTrkCuts(AliESDtrack& trk) const 
+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;
+}
+//-----------------------------------------------------------------------------
+Bool_t AliAnalysisVertexingHF::SingleTrkCuts(AliESDtrack *trk,
+                                            Bool_t &okDisplaced,Bool_t &okSoftPi) const 
 {
   // Check if track passes some kinematical cuts  
 
-  if(trk.Pt() < fMinPtCut) {
-    //printf("pt %f\n",1./trk.GetParameter()[4]);
-    return kFALSE;
+  // this is needed to store the impact parameters
+  trk->RelateToVertex(fV1,fBzkG,kVeryBig);
+
+  UInt_t selectInfo;
+  //
+  // Track selection, displaced tracks
+  selectInfo = 0; 
+  if(fTrackFilter) {
+    selectInfo = fTrackFilter->IsSelected(trk);
   }
-  Double_t d0z0[2],covd0z0[3];
-  trk.PropagateToDCA(fV1,fBzkG,kVeryBig,d0z0,covd0z0);
-  if(TMath::Abs(d0z0[0]) < fMind0rphiCut) {
-    //printf("d0rphi %f\n",TMath::Abs(d0z0[0]));
-    return kFALSE;
+  if(selectInfo) okDisplaced=kTRUE;
+  // Track selection, soft pions
+  selectInfo = 0; 
+  if(fDstar && fTrackFilterSoftPi) {
+    selectInfo = fTrackFilterSoftPi->IsSelected(trk);
   }
+  if(selectInfo) okSoftPi=kTRUE;
+
+  if(okDisplaced || okSoftPi) return kTRUE;
 
-  return kTRUE;
+  return kFALSE;
 }
 //-----------------------------------------------------------------------------