Switches for SPD vertex and filter bit cut

diff --git a/PWGHF/vertexingHF/AliRDHFCuts.cxx b/PWGHF/vertexingHF/AliRDHFCuts.cxx
index a83ef80cc435fccc258be70776298c36d553086d..43d9584b6008eafa2cf892c09ed34f716287d05f 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCuts.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCuts.cxx
@@ -96,7 +96,9 @@ fMaxPtCandTrackSPDFirst(0.),
 fApplySPDDeadPbPb2011(kFALSE),
 fRemoveTrackletOutliers(kFALSE),
 fCutOnzVertexSPD(0),
-fKinkReject(kFALSE)
+fKinkReject(kFALSE),
+fUseTrackSelectionWithFilterBits(kTRUE),
+fUseEventsWithOnlySPDVertex(kFALSE)
 {
   //
   // Default Constructor
@@ -151,7 +153,9 @@ AliRDHFCuts::AliRDHFCuts(const AliRDHFCuts &source) :
   fApplySPDDeadPbPb2011(source.fApplySPDDeadPbPb2011),
   fRemoveTrackletOutliers(source.fRemoveTrackletOutliers),
   fCutOnzVertexSPD(source.fCutOnzVertexSPD),
-  fKinkReject(source.fKinkReject)
+  fKinkReject(source.fKinkReject),
+  fUseTrackSelectionWithFilterBits(source.fUseTrackSelectionWithFilterBits),
+  fUseEventsWithOnlySPDVertex(source.fUseEventsWithOnlySPDVertex)
 {
   //
   // Copy constructor
@@ -220,6 +224,8 @@ AliRDHFCuts &AliRDHFCuts::operator=(const AliRDHFCuts &source)
   fRemoveTrackletOutliers=source.fRemoveTrackletOutliers;
   fCutOnzVertexSPD=source.fCutOnzVertexSPD;
   fKinkReject=source.fKinkReject;
+  fUseTrackSelectionWithFilterBits=source.fUseTrackSelectionWithFilterBits;
+  fUseEventsWithOnlySPDVertex=source.fUseEventsWithOnlySPDVertex;
 
   if(source.GetTrackCuts()) {delete fTrackCuts; fTrackCuts=new AliESDtrackCuts(*(source.GetTrackCuts()));}
   if(source.fPtBinLimits) SetPtBins(source.fnPtBinLimits,source.fPtBinLimits);
@@ -381,13 +387,15 @@ Bool_t AliRDHFCuts::IsEventSelected(AliVEvent *event) {
     fEvRejectionBits+=1<<kNoVertex;
   }else{
     TString title=vertex->GetTitle();
-    if(title.Contains("Z") && fMinVtxType>1){
-      accept=kFALSE;
-      fEvRejectionBits+=1<<kNoVertex;
-    }
-    else if(title.Contains("3D") && fMinVtxType>2){
-      accept=kFALSE;
-      fEvRejectionBits+=1<<kNoVertex;
+    if(!fUseEventsWithOnlySPDVertex){
+      if(title.Contains("Z") && fMinVtxType>1){
+       accept=kFALSE;
+       fEvRejectionBits+=1<<kNoVertex;
+      }
+      else if(title.Contains("3D") && fMinVtxType>2){
+       accept=kFALSE;
+       fEvRejectionBits+=1<<kNoVertex;
+      }
     }
     if(vertex->GetNContributors()<fMinVtxContr){
       accept=kFALSE;

diff --git a/PWGHF/vertexingHF/AliRDHFCuts.h b/PWGHF/vertexingHF/AliRDHFCuts.h
index 821da043857d6696f7a5edf291bb5829269dff81..f597047ca063d325b4c9a7e6c9bc8ef4a3ab226f 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCuts.h
+++ b/PWGHF/vertexingHF/AliRDHFCuts.h
@@ -119,6 +119,10 @@ class AliRDHFCuts : public AliAnalysisCuts
   void SetUsePID(Bool_t flag=kTRUE) {fUsePID=flag; return;}
   void SetUseAOD049(Bool_t flag=kTRUE) {fUseAOD049=flag; return;}
   void SetKinkRejection(Bool_t flag=kTRUE) {fKinkReject=flag; return;}
+  void SetUseEventsWithOnlySPDVertex(Bool_t flag=kTRUE){ 
+    fUseEventsWithOnlySPDVertex=flag; return;}
+  void SetUseTrackSelectionWithFilterBits(Bool_t flag=kTRUE){ 
+    fUseTrackSelectionWithFilterBits=flag; return;}
   void SetUseCentrality(Int_t flag=1);    // see enum below
   void SetPidHF(AliAODPidHF* pidObj) {
     if(fPidHF) delete fPidHF;
@@ -163,6 +167,8 @@ class AliRDHFCuts : public AliAnalysisCuts
   Bool_t  GetIsUsePID() const {return fUsePID;}
   Bool_t  GetUseAOD049() const {return fUseAOD049;}
   Bool_t  GetUseKinkRejection() const {return fKinkReject;}
+  Bool_t  GetUseEventsWithOnlySPDVertex() const{return fUseEventsWithOnlySPDVertex;}
+  Bool_t  GetUseTrackSelectionWithFilterBits() const{return fUseTrackSelectionWithFilterBits;}
   Bool_t  GetIsPrimaryWithoutDaughters() const {return fRemoveDaughtersFromPrimary;}
   Bool_t GetOptPileUp() const {return fOptPileup;}
   Int_t GetUseCentrality() const {return fUseCentrality;}
@@ -305,8 +311,10 @@ class AliRDHFCuts : public AliAnalysisCuts
   Bool_t fRemoveTrackletOutliers; // flag to apply cut on tracklets vs. centrality for 2011 data
   Int_t fCutOnzVertexSPD; // cut on zSPD vertex to remove outliers in centrality vs. tracklets (0=no cut, 1= cut at 12 cm, 2= cut on difference to z of vtx tracks
   Bool_t fKinkReject; // flag to reject kink daughters
+  Bool_t fUseTrackSelectionWithFilterBits; // flag to enable/disable the check on filter bits
+  Bool_t fUseEventsWithOnlySPDVertex; // flag to enable/disable the usage of events with only SPD vertex
 
-  ClassDef(AliRDHFCuts,25);  // base class for cuts on AOD reconstructed heavy-flavour decays
+  ClassDef(AliRDHFCuts,26);  // base class for cuts on AOD reconstructed heavy-flavour decays
 };
 
 #endif

diff --git a/PWGHF/vertexingHF/AliRDHFCutsD0toKpi.cxx b/PWGHF/vertexingHF/AliRDHFCutsD0toKpi.cxx
index 3458a2d18f2112c9b5237153e9d2113308d031ac..552ab97a9457c834dbb98606e5f22618b701b707 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsD0toKpi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsD0toKpi.cxx
@@ -262,7 +262,7 @@ Int_t AliRDHFCutsD0toKpi::IsSelected(TObject* obj,Int_t selectionLevel,AliAODEve
   if(ptD<fMinPtCand) return 0;
   if(ptD>fMaxPtCand) return 0;
 
-  if(d->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;
 
   // returnvalue: 0 not sel, 1 only D0, 2 only D0bar, 3 both
   Int_t returnvaluePID=3;

diff --git a/PWGHF/vertexingHF/AliRDHFCutsD0toKpipipi.cxx b/PWGHF/vertexingHF/AliRDHFCutsD0toKpipipi.cxx
index 169270463644876b847359deeb99baa21282626a..dd6db6a2868885cc842ccdb5fd04e1330dd1f903 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsD0toKpipipi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsD0toKpipipi.cxx
@@ -207,7 +207,7 @@ Int_t AliRDHFCutsD0toKpipipi::IsSelected(TObject* obj,Int_t selectionLevel) {
   if(ptD<fMinPtCand) return 0;
   if(ptD>fMaxPtCand) return 0;
 
-  if(d->HasBadDaughters()) return 0;  
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;  
 
   // selection on daughter tracks 
   if(selectionLevel==AliRDHFCuts::kAll || 

diff --git a/PWGHF/vertexingHF/AliRDHFCutsDStartoKpipi.cxx b/PWGHF/vertexingHF/AliRDHFCutsDStartoKpipi.cxx
index 8dfe889a4c16ad4e2f8e439af1663fe2ff8e9490..12588c6f63bd5c81b3dc4d5c1408fc809445a3ea 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsDStartoKpipi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsDStartoKpipi.cxx
@@ -283,7 +283,7 @@ Int_t AliRDHFCutsDStartoKpipi::IsSelected(TObject* obj,Int_t selectionLevel) {
     return 0;
   }
 
-  if(dd->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && dd->HasBadDaughters()) return 0;
 
   AliAODTrack *b = (AliAODTrack*)d->GetBachelor();
   if(fTrackCutsSoftPi && fTrackCutsSoftPi->GetRequireTPCRefit()){

diff --git a/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx b/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
index 585c37d14398186ca17047e42b42337bce5a9dce..4bf0a5b7a72c2e1801a7cd175a81aef374512dcd 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsDplustoKpipi.cxx
@@ -402,7 +402,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 || 

diff --git a/PWGHF/vertexingHF/AliRDHFCutsDstoKKpi.cxx b/PWGHF/vertexingHF/AliRDHFCutsDstoKKpi.cxx
index dd86c11ce3120f4b08d843c8ccdbbcccd48cc556..0bc336468032f5d92ac89ef907f23cdcca941d2e 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsDstoKKpi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsDstoKKpi.cxx
@@ -473,7 +473,7 @@ Int_t AliRDHFCutsDstoKKpi::IsSelected(TObject* obj,Int_t selectionLevel, AliAODE
   if(ptD<fMinPtCand) return 0;
   if(ptD>fMaxPtCand) return 0;
 
-  if(d->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;
   
 
   // selection on daughter tracks 

diff --git a/PWGHF/vertexingHF/AliRDHFCutsJpsitoee.cxx b/PWGHF/vertexingHF/AliRDHFCutsJpsitoee.cxx
index 58c213bac5f389432a21ea140dce37835fb88cde..5673bdda8401bccaff7c5b8f49a6cf0835133454 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsJpsitoee.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsJpsitoee.cxx
@@ -170,7 +170,7 @@ Int_t AliRDHFCutsJpsitoee::IsSelected(TObject* obj,Int_t selectionLevel) {
     return 0;
   }
 
-  if(d->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;
 
 
   // selection on daughter tracks 

diff --git a/PWGHF/vertexingHF/AliRDHFCutsLctopKpi.cxx b/PWGHF/vertexingHF/AliRDHFCutsLctopKpi.cxx
index a244d8de744fee7f7768eae16a3f6a59446e8d26..8c74afc7cce120fe7edeba5eacf80ef3853fa4ba 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCutsLctopKpi.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCutsLctopKpi.cxx
@@ -273,7 +273,7 @@ Int_t AliRDHFCutsLctopKpi::IsSelected(TObject* obj,Int_t selectionLevel,AliAODEv
   if(d->Pt()<fMinPtCand) return 0;
   if(d->Pt()>fMaxPtCand) return 0;
 
-  if(d->HasBadDaughters()) return 0;
+  if(fUseTrackSelectionWithFilterBits && d->HasBadDaughters()) return 0;
 
   if(selectionLevel==AliRDHFCuts::kAll ||
      selectionLevel==AliRDHFCuts::kCandidate||