Removing printout (Davide)

[u/mrichter/AliRoot.git] / PWGHF / vertexingHF / AliRDHFCutsDplustoKpipi.cxx

diff --git a/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx b/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
index 7d97bcd7f0697bd5e291ae0f21de2a72ba801257..5a100da57093d1e1653b5eae07e577787b4b0928 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
@@ -290,6 +290,11 @@ Bool_t AliRDHFCutsDplustoKpipi::IsInFiducialAcceptance(Double_t pt, Double_t y)
   // Checking if Dplus is in fiducial acceptance region 
   //
 
+  if(fMaxRapidityCand>-998.){
+    if(TMath::Abs(y) > fMaxRapidityCand) return kFALSE;
+    else return kTRUE;
+  }
+
   if(pt > 5.) {
     // applying cut for pt > 5 GeV
     AliDebug(2,Form("pt of D+ = %f (> 5), cutting at |y| < 0.8",pt)); 
@@ -402,7 +407,7 @@ Int_t AliRDHFCutsDplustoKpipi::IsSelected(TObject* obj,Int_t selectionLevel, Ali
   if(pt<fMinPtCand) return 0;
   if(pt>fMaxPtCand) return 0;
 
-  if(d->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;
   
   // selection on candidate
   if(selectionLevel==AliRDHFCuts::kAll || 
@@ -410,7 +415,7 @@ Int_t AliRDHFCutsDplustoKpipi::IsSelected(TObject* obj,Int_t selectionLevel, Ali
     
     //recalculate vertex w/o daughters
     AliAODVertex *origownvtx=0x0;
-    if(fRemoveDaughtersFromPrimary) {
+    if(fRemoveDaughtersFromPrimary && !fUseMCVertex) {
       if(d->GetOwnPrimaryVtx()) origownvtx=new AliAODVertex(*d->GetOwnPrimaryVtx());
       if(!RecalcOwnPrimaryVtx(d,aod)) {
        CleanOwnPrimaryVtx(d,aod,origownvtx);
@@ -418,6 +423,14 @@ Int_t AliRDHFCutsDplustoKpipi::IsSelected(TObject* obj,Int_t selectionLevel, Ali
       }
     }
 
+    if(fUseMCVertex) {
+      if(d->GetOwnPrimaryVtx()) origownvtx=new AliAODVertex(*d->GetOwnPrimaryVtx());
+      if(!SetMCPrimaryVtx(d,aod)) {
+       CleanOwnPrimaryVtx(d,aod,origownvtx);
+       return 0;
+      }
+    }
+
     Int_t ptbin=PtBin(pt);
     if (ptbin==-1) {
       CleanOwnPrimaryVtx(d,aod,origownvtx);
@@ -638,6 +651,7 @@ void AliRDHFCutsDplustoKpipi::SetStandardCutsPP2010() {
   SetPtBins(nptbins+1,ptbins);
   SetCuts(nvars,nptbins,anacutsval);
   SetUsePID(kTRUE);
+  fPidHF->SetOldPid(kTRUE);
   SetRemoveDaughtersFromPrim(kTRUE);
   
   PrintAll();
@@ -646,6 +660,9 @@ void AliRDHFCutsDplustoKpipi::SetStandardCutsPP2010() {
   delete [] anacutsval;
   anacutsval=NULL;
 
+  delete esdTrackCuts;
+  esdTrackCuts=NULL;
+
   return;
 }
 
@@ -769,6 +786,7 @@ void AliRDHFCutsDplustoKpipi::SetStandardCutsPbPb2010() {
   SetPtBins(nptbins+1,ptbins);
   SetCuts(nvars,nptbins,anacutsval);
   SetUsePID(kTRUE);
+  fPidHF->SetOldPid(kTRUE);
   SetMinCentrality(1E-10);
   SetMaxCentrality(20.);
   SetUseCentrality(AliRDHFCuts::kCentV0M);
@@ -783,6 +801,9 @@ void AliRDHFCutsDplustoKpipi::SetStandardCutsPbPb2010() {
   delete [] ptbins;
   ptbins=NULL;
 
+  delete esdTrackCuts;
+  esdTrackCuts=NULL;
+
   return;
 }
 
@@ -799,6 +820,9 @@ void AliRDHFCutsDplustoKpipi::SetStandardCutsPbPb2011() {
   EnableCentralTrigger();
   EnableSemiCentralTrigger();
 
+  // new PID
+  fPidHF->SetOldPid(kFALSE);
+
 } 
 //--------------------------------------------------------------------------