Fix for RETURN_LOCAL problem reported by Coverity

[u/mrichter/AliRoot.git] / PWG0 / CreateStandardCuts.C

diff --git a/PWG0/CreateStandardCuts.C b/PWG0/CreateStandardCuts.C
index b198f24ce53582470c626e908789eea4e51dda61..2636ca35356380d3af409ae20d07d4cdd857521b 100644 (file)
--- a/PWG0/CreateStandardCuts.C
+++ b/PWG0/CreateStandardCuts.C
@@ -1,63 +1,47 @@
 /* $Id: CreateCuts.C,v 1.5 2008/01/11 08:28:52 jgrosseo Exp $ */
 
-// this macro creates the track and event cuts used in this analysis
+// this macro creates the track cuts used in this analysis
 
-AliESDtrackCuts* CreateTrackCuts(AliPWG0Helper::AnalysisMode analysisMode, Bool_t fieldOn = kTRUE, Bool_t hists = kTRUE)
+AliESDtrackCuts* CreateTrackCuts(AliPWG0Helper::AnalysisMode analysisMode, Bool_t hists = kTRUE)
 {
-  AliESDtrackCuts* esdTrackCuts = new AliESDtrackCuts("AliESDtrackCuts");
-
-  if (hists)
-    esdTrackCuts->DefineHistograms(1);
-
-  // default cuts for ITS+TPC
-  Double_t cov1 = 2;
-  Double_t cov2 = 2;
-  Double_t cov3 = 0.5;
-  Double_t cov4 = 0.5;
-  Double_t cov5 = 2;
-  Double_t nSigma = 4;
-
-  Bool_t tpcRefit = kTRUE;
-  Bool_t sigmaToVertex = kTRUE;
-
-  TString tag("Global tracking");
-
-  // TPC-only cuts
-  if (analysisMode == AliPWG0Helper::kTPC)
+  AliESDtrackCuts* esdTrackCuts = 0;
+  
+  // see https://twiki.cern.ch/twiki/bin/view/ALICE/SelectionOfPrimaryTracksForPp2009DataAnalysis
+  
+  if (analysisMode & AliPWG0Helper::kTPC)
   {
-    tpcRefit = kFALSE;
-    sigmaToVertex = kFALSE;
-
-    tag = "TPC-only tracking";
+    esdTrackCuts = new AliESDtrackCuts("AliESDtrackCuts");
+
+    TString tag("TPC-only tracking");
+
+    esdTrackCuts->SetMaxDCAToVertexZ(3.2);
+    esdTrackCuts->SetMaxDCAToVertexXY(2.4);
+    esdTrackCuts->SetDCAToVertex2D(kTRUE);
+  
+    esdTrackCuts->SetRequireTPCRefit(kTRUE);
+    esdTrackCuts->SetAcceptKinkDaughters(kFALSE);
+    esdTrackCuts->SetMinNClustersTPC(70);
+    esdTrackCuts->SetMaxChi2PerClusterTPC(4);
   }
 
-  // cuts for data without field
-  if (!fieldOn)
+  if (analysisMode & AliPWG0Helper::kTPCITS)
   {
-    cov5 = 1e10;
-    tag += " without field";
+    esdTrackCuts = AliESDtrackCuts::GetStandardITSTPCTrackCuts2009(kTRUE);
+  
+    TString tag("Global tracking");
   }
 
-  esdTrackCuts->SetMaxCovDiagonalElements(cov1, cov2, cov3, cov4, cov5);
-
-  esdTrackCuts->SetRequireSigmaToVertex(sigmaToVertex);
+  if (hists)
+    esdTrackCuts->DefineHistograms(1);
 
-  if (sigmaToVertex) {
-    esdTrackCuts->SetMinNsigmaToVertex(nSigma);
-  }
-  else{
-    //    esdTrackCuts->SetDCAToVertex(3.0);
-    esdTrackCuts->SetDCAToVertexZ(3.0);
-    esdTrackCuts->SetDCAToVertexXY(3.0);
+  // cuts for data without field
+  if (!(analysisMode & AliPWG0Helper::kFieldOn))
+  {
+    tag += " without field";
   }
 
-  esdTrackCuts->SetRequireTPCRefit(tpcRefit);
-  esdTrackCuts->SetAcceptKingDaughters(kFALSE);
-
-  esdTrackCuts->SetMinNClustersTPC(50);
-  esdTrackCuts->SetMaxChi2PerClusterTPC(3.5);
-
   Printf("Created track cuts for: %s", tag.Data());
 
   return esdTrackCuts;
 }
+