Fixed includes and scope of a string

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

diff --git a/ANALYSIS/AliESDv0Cuts.cxx b/ANALYSIS/AliESDv0Cuts.cxx
index d316e9b3abe52a5c563365beef347e97088346c3..8cebf93f88e68b86469e060cbc846531235ec613 100644 (file)
--- a/ANALYSIS/AliESDv0Cuts.cxx
+++ b/ANALYSIS/AliESDv0Cuts.cxx
@@ -343,6 +343,7 @@ void AliESDv0Cuts::EnableNeededBranches(TTree* tree)
 //____________________________________________________________________
 Bool_t
 AliESDv0Cuts::IsSelected(TList* listObj) {
+// Selection cuts
   if(listObj->GetSize()!=4) return kFALSE;
   AliESDv0           *esdV0     = (AliESDv0*)listObj->At(0);
   AliESDtrack        *trackPos  = (AliESDtrack*)listObj->At(1);
@@ -353,7 +354,7 @@ AliESDv0Cuts::IsSelected(TList* listObj) {
 
 //____________________________________________________________________
 Bool_t
-AliESDv0Cuts::AcceptV0(AliESDv0* esdV0, AliESDtrack* trackPos, AliESDtrack* trackNeg, const AliESDVertex* esdVertex) {
+AliESDv0Cuts::AcceptV0(AliESDv0* const esdV0, AliESDtrack* const trackPos, AliESDtrack* const trackNeg, const AliESDVertex* esdVertex) {
   // 
   // figure out if the v0s survives all the v0 cuts defined
   //
@@ -372,7 +373,8 @@ AliESDv0Cuts::AcceptV0(AliESDv0* esdV0, AliESDtrack* trackPos, AliESDtrack* trac
   // fV0s.fOnFlyStatus
 
   Float_t  dcaPosToVertex = 0, dcaNegToVertex = 0;
-  Float_t  tdcaPosToVertex[2], tdcaNegToVertex[2];
+  Float_t  tdcaPosToVertex[2]={999,999};
+  Float_t  tdcaNegToVertex[2]={999,999};
 
   if (trackPos) trackPos->GetImpactParameters(tdcaPosToVertex[0],tdcaPosToVertex[1]);
   if (trackNeg) trackNeg->GetImpactParameters(tdcaNegToVertex[0],tdcaNegToVertex[1]);
@@ -497,7 +499,7 @@ AliESDv0Cuts::AcceptV0(AliESDv0* esdV0, AliESDtrack* trackPos, AliESDtrack* trac
 }
 
 //____________________________________________________________________
-TObjArray* AliESDv0Cuts::GetAcceptedV0s(AliESD* esd)
+TObjArray* AliESDv0Cuts::GetAcceptedV0s(const AliESD* esd)
 {
   //
   // returns an array of all v0s that pass the cuts
@@ -525,7 +527,7 @@ TObjArray* AliESDv0Cuts::GetAcceptedV0s(AliESD* esd)
 }
 
 //____________________________________________________________________
-Int_t AliESDv0Cuts::CountAcceptedV0s(AliESD* esd)
+Int_t AliESDv0Cuts::CountAcceptedV0s(const AliESD* esd)
 {
   //
   // returns an the number of v0s that pass the cuts
@@ -553,7 +555,7 @@ Int_t AliESDv0Cuts::CountAcceptedV0s(AliESD* esd)
 }
 
 //____________________________________________________________________
-TObjArray* AliESDv0Cuts::GetAcceptedV0s(AliESDEvent* esd)
+TObjArray* AliESDv0Cuts::GetAcceptedV0s(const AliESDEvent* esd)
 {
   //
   // returns an array of all v0s that pass the cuts
@@ -581,7 +583,7 @@ TObjArray* AliESDv0Cuts::GetAcceptedV0s(AliESDEvent* esd)
 }
 
 //____________________________________________________________________
-Int_t AliESDv0Cuts::CountAcceptedV0s(AliESDEvent* esd)
+Int_t AliESDv0Cuts::CountAcceptedV0s(const AliESDEvent* esd)
 {
   //
   // returns an the number of v0s that pass the cuts
@@ -642,8 +644,8 @@ Int_t AliESDv0Cuts::CountAcceptedV0s(AliESDEvent* esd)
 
   Char_t str[256];
   for (Int_t i=0; i<2; i++) {
-    if (i==0) sprintf(str," ");
-    else sprintf(str,"_cut");
+    if (i==0) snprintf(str,256, " ");
+    else snprintf(str,256, "_cut");
 
     fhDcaPosToVertex[i]      = new TH1F(Form("dcaPosToVertex%s",str),"",120,0,3);
     fhDcaNegToVertex[i]      = new TH1F(Form("dcaNegToVertex%s",str),"",120,0,3);
@@ -705,7 +707,7 @@ Bool_t AliESDv0Cuts::LoadHistograms(const Char_t* dir)
     else
     {
       gDirectory->cd("after_cuts");
-      sprintf(str,"_cut");
+      snprintf(str,5, "_cut");
     }
 
     fhDcaPosToVertex[i]      = dynamic_cast<TH1F*> (gDirectory->Get(Form("dcaPosToVertex%s",str)     ));