Removed AliAnalysisUtils-based PV selection, moved to code snippet provided by Robert...

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
index d666229207ec6d79d4851db31e14e18af988dc5c..883bec5ef76dc0ebb5feb33b1602e5d21b7d7f3c 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
@@ -2462,23 +2462,48 @@ void AliAnalysisTaskExtractPerformanceV0::UserExec(Option_t *)
    f2dHistMultiplicityVsVertexZForTrigEvt->Fill( lMultiplicity, lPrimaryVtxPosition[2] );
 
   //------------------------------------------------
-  // Primary Vertex Z position: SKIP
+  // Primary Vertex Requirements Section:
+  //  ---> pp and PbPb: Only requires |z|<10cm
+  //  ---> pPb: all requirements checked at this stage
   //------------------------------------------------
   
-  if(TMath::Abs(lBestPrimaryVtxPos[2]) > 10.0 && fkpAVertexSelection == kFALSE) {
-    AliWarning("Pb / | Z position of Best Prim Vtx | > 10.0 cm ... return !");
+  //Roberto's PV selection criteria, implemented 17th April 2013
+  
+  /* vertex selection */
+  Bool_t fHasVertex = kFALSE;
+  
+  const AliESDVertex *vertex = lESDevent->GetPrimaryVertexTracks();
+  if (vertex->GetNContributors() < 1) {
+    vertex = lESDevent->GetPrimaryVertexSPD();
+    if (vertex->GetNContributors() < 1) fHasVertex = kFALSE;
+    else fHasVertex = kTRUE;
+    TString vtxTyp = vertex->GetTitle();
+    Double_t cov[6]={0};
+    vertex->GetCovarianceMatrix(cov);
+    Double_t zRes = TMath::Sqrt(cov[5]);
+    if (vtxTyp.Contains("vertexer:Z") && (zRes>0.25)) fHasVertex = kFALSE;
+  }
+  else fHasVertex = kTRUE;
+  
+  //Is First event in chunk rejection: Still present!
+  if(fkpAVertexSelection==kTRUE && fHasVertex == kFALSE) {
+    AliWarning("Pb / | PV does not satisfy selection criteria!");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;
   }
+  
+  //Is First event in chunk rejection: Still present!
   if(fkpAVertexSelection==kTRUE && fUtils->IsFirstEventInChunk(lESDevent)) {
     AliWarning("Pb / | This is the first event in the chunk!");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;
   }
-  if(fkpAVertexSelection==kTRUE && !fUtils->IsVertexSelected2013pA(lESDevent)) {
-    AliWarning("Pb / | Vertex not selected by 2013 pA criteria!");
+  
+  //17 April Fix: Always do primary vertex Z selection, after pA vertex selection from Roberto
+  if(TMath::Abs(lBestPrimaryVtxPos[2]) > 10.0) {
+    AliWarning("Pb / | Z position of Best Prim Vtx | > 10.0 cm ... return !");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
index c7de44e2ce90617812b61831f0141421587cb4a6..f9c7e3a3e17bce11d4dcc6688a2f6755bd847225 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
@@ -999,24 +999,50 @@ void AliAnalysisTaskExtractV0::UserExec(Option_t *)
 
    f2dHistMultiplicityVsVertexZForTrigEvt->Fill( lMultiplicity, tPrimaryVtxPosition[2] );
 
-//------------------------------------------------
-// Primary Vertex Z position: SKIP
-//------------------------------------------------
-
-  if(TMath::Abs(lBestPrimaryVtxPos[2]) > 10.0 && fkpAVertexSelection==kFALSE) {
-    AliWarning("Pb / | Z position of Best Prim Vtx | > 10.0 cm ... return !");
+  //------------------------------------------------
+  // Primary Vertex Requirements Section:
+  //  ---> pp and PbPb: Only requires |z|<10cm
+  //  ---> pPb: all requirements checked at this stage
+  //------------------------------------------------
+  
+  //Roberto's PV selection criteria, implemented 17th April 2013
+  
+  /* vertex selection */
+  Bool_t fHasVertex = kFALSE;
+  
+  const AliESDVertex *vertex = lESDevent->GetPrimaryVertexTracks();
+  if (vertex->GetNContributors() < 1) {
+    vertex = lESDevent->GetPrimaryVertexSPD();
+    if (vertex->GetNContributors() < 1) fHasVertex = kFALSE;
+    else fHasVertex = kTRUE;
+    TString vtxTyp = vertex->GetTitle();
+    Double_t cov[6]={0};
+    vertex->GetCovarianceMatrix(cov);
+    Double_t zRes = TMath::Sqrt(cov[5]);
+    if (vtxTyp.Contains("vertexer:Z") && (zRes>0.25)) fHasVertex = kFALSE;
+  }
+  else fHasVertex = kTRUE;
+  
+  //Is First event in chunk rejection: Still present!
+  if(fkpAVertexSelection==kTRUE && fHasVertex == kFALSE) {
+    AliWarning("Pb / | PV does not satisfy selection criteria!");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;
   }
+  
+  //Is First event in chunk rejection: Still present!
   if(fkpAVertexSelection==kTRUE && fUtils->IsFirstEventInChunk(lESDevent)) {
     AliWarning("Pb / | This is the first event in the chunk!");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;
   }
-  if(fkpAVertexSelection==kTRUE && !fUtils->IsVertexSelected2013pA(lESDevent)) {
-    AliWarning("Pb / | Vertex not selected by 2013 pA criteria!");
+  
+  //17 April Fix: Always do primary vertex Z selection, after pA vertex selection from Roberto
+  if(TMath::Abs(lBestPrimaryVtxPos[2]) > 10.0) {
+    if( !fkpAVertexSelection ) AliWarning("Pb / | Z position of Best Prim Vtx | > 10.0 cm ... return !");
+    if( fkpAVertexSelection )  AliWarning("Pb / | pPb case | Z position of Best Prim Vtx | > 10.0 cm ... return !");
     PostData(1, fListHistV0);
     PostData(2, fTree);
     return;