Initialisation corrected.

[u/mrichter/AliRoot.git] / ANALYSIS / AliESDpidCuts.cxx

diff --git a/ANALYSIS/AliESDpidCuts.cxx b/ANALYSIS/AliESDpidCuts.cxx
index b34403b1deda0fd0af94a93768311f746fb2552c..e2573e5620fe59bc648cd9eda10a4a14560a1be2 100644 (file)
--- a/ANALYSIS/AliESDpidCuts.cxx
+++ b/ANALYSIS/AliESDpidCuts.cxx
@@ -170,8 +170,8 @@ Long64_t AliESDpidCuts::Merge(TCollection *coll){
   //\r
   // Merge Cut objects\r
   //\r
-  if(coll) return 0;\r
-  if(coll->IsEmpty()) return 1;\r
+  if(!coll) return 0;\r
+  if(coll->IsEmpty())   return 1;\r
   if(!HasHistograms())  return 0;\r
   \r
   TIterator *iter = coll->MakeIterator();\r
@@ -214,15 +214,15 @@ void AliESDpidCuts::DefineHistograms(Color_t color){
   }\r
   Char_t hname[256], htitle[256];\r
   for(Int_t imode = 0; imode < 2; imode++){\r
-    sprintf(hname, "fHclusterRatio%s", imode ? "After" : "Before");\r
-    sprintf(htitle, "TPC cluster Ratio %s cuts;Ratio;Entries", imode ? "after" : "before");\r
+    snprintf(hname, 256, "fHclusterRatio%s", imode ? "After" : "Before");\r
+    snprintf(htitle, 256, "TPC cluster Ratio %s cuts;Ratio;Entries", imode ? "after" : "before");\r
     fHclusterRatio[imode] = new TH1F(hname, htitle, 20, 0., 1.);\r
     for(Int_t ispec = 0; ispec < AliPID::kSPECIES; ispec++){\r
-      sprintf(hname, "fHnSigma%sTPC%s", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
-      sprintf(htitle, "TPC sigma for %s %s cuts;sigma;Entries", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
+      snprintf(hname, 256, "fHnSigma%sTPC%s", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
+      snprintf(htitle, 256, "TPC sigma for %s %s cuts;sigma;Entries", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
       fHnSigmaTPC[ispec][imode] = new TH1F(hname, htitle, 200, -10., 10.);\r
-      sprintf(hname, "fHnSigma%sTOF%s", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
-      sprintf(htitle, "TOF sigma for %s %s cuts;sigma;Entries", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
+      snprintf(hname, 256, "fHnSigma%sTOF%s", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
+      snprintf(htitle, 256, "TOF sigma for %s %s cuts;sigma;Entries", AliPID::ParticleName(ispec), imode ? "after" : "before");\r
       fHnSigmaTOF[ispec][imode] = new TH1F(hname, htitle, 200, -10., 10.);\r
     }\r
   }\r
@@ -239,8 +239,10 @@ Bool_t AliESDpidCuts::AcceptTrack(const AliESDtrack *track, const AliESDEvent *e
     kCutNsigmaTOF\r
   };\r
   Long64_t cutRequired=0, cutFullfiled = 0;\r
-  if(fTOFsigmaCutRequired && event == 0) \r
+  if(fTOFsigmaCutRequired && event == 0)  {\r
     AliError("No event pointer. Need event pointer for T0 for TOF cut");\r
+    return (0);\r
+  }\r
   Double_t clusterRatio = track->GetTPCNclsF() ? static_cast<Float_t>(track->GetTPCNcls())/static_cast<Float_t>(track->GetTPCNclsF()) : 1.;\r
   if(fCutTPCclusterRatio > 0.){\r
     SETBIT(cutRequired, kCutClusterRatioTPC);\r
@@ -262,7 +264,7 @@ Bool_t AliESDpidCuts::AcceptTrack(const AliESDtrack *track, const AliESDEvent *e
   track->GetIntegratedTimes(times);\r
   for(Int_t ispec = 0; ispec < AliPID::kSPECIES; ispec++){\r
     \r
-    if(hasTOFpid) nsigmaTOF[ispec] = nsigma = fESDpid->NumberOfSigmasTOF(track,(AliPID::EParticleType)ispec, event->GetT0());\r
+    if(hasTOFpid && event) nsigmaTOF[ispec] = nsigma = fESDpid->NumberOfSigmasTOF(track,(AliPID::EParticleType)ispec, event->GetT0());\r
     if(!(fTOFsigmaCutRequired && 1 << ispec)) continue;\r
     SETBIT(cutRequired, kCutNsigmaTOF);\r
     if(track->GetOuterParam()->P() >= fMinMomentumTOF){\r