Fixing coverity bugs

[u/mrichter/AliRoot.git] / PHOS / AliPHOSPreprocessor.cxx

diff --git a/PHOS/AliPHOSPreprocessor.cxx b/PHOS/AliPHOSPreprocessor.cxx
index 81276ebf969f8ae6421c3bccaad45ad234e1c0b0..a11849edfb787e1d287a864628fa3adbf02dcacd 100644 (file)
--- a/PHOS/AliPHOSPreprocessor.cxx
+++ b/PHOS/AliPHOSPreprocessor.cxx
@@ -198,8 +198,8 @@ Float_t AliPHOSPreprocessor::HG2LG(Int_t mod, Int_t X, Int_t Z, TFile* f)
   //Calculates High gain to Low gain ratio 
   //for crystal at the position (X,Z) in the PHOS module mod.
   
-  char hname[128];
-  sprintf(hname,"%d_%d_%d",mod,X,Z);
+  char hname[128]; TString shname = "%d_%d_%d"; 
+  snprintf(hname,shname.Length(),shname.Data(),mod,X,Z);
 
   TH1F* h1 = (TH1F*)f->Get(hname);
   if(!h1) return 16.;
@@ -268,7 +268,8 @@ Bool_t AliPHOSPreprocessor::FindBadChannelsEmc()
       continue;
     }
 
-    result[i] *= DoFindBadChannelsEmc(system[i],list,badMap);
+    Bool_t findBadOK = DoFindBadChannelsEmc(system[i],list,badMap);
+    result[i] *= findBadOK;
 
     // Store the bad channels map.
   
@@ -281,7 +282,8 @@ Bool_t AliPHOSPreprocessor::FindBadChannelsEmc()
       path = "HLT";
   
     // Data valid from current run until being updated (validityInfinite=kTRUE)
-    result[i] *= Store(path.Data(), "EmcBadChannels", &badMap, &md, 0, kTRUE);
+    Bool_t storeOK = Store(path.Data(), "EmcBadChannels", &badMap, &md, 0, kTRUE);
+    result[i] *= storeOK;
     
   }
   
@@ -298,7 +300,6 @@ Bool_t AliPHOSPreprocessor::DoFindBadChannelsEmc(Int_t system, TList* list, AliP
 
   TIter iter(list);
   TObjString *source;
-  char hnam[80];
   TH1F* h1=0;
 
   const Float_t fQualityCut = 1.;
@@ -324,9 +325,10 @@ Bool_t AliPHOSPreprocessor::DoFindBadChannelsEmc(Int_t system, TList* list, AliP
       for(Int_t iX=0; iX<64; iX++) {
        for(Int_t iZ=0; iZ<56; iZ++) {
          
-         sprintf(hnam,"%d_%d_%d_%d",mod,iX,iZ,1); // high gain 
+         TString hnam;
+         hnam += mod; hnam += "_"; hnam += iX; hnam += "_"; hnam += iZ; hnam += "_"; hnam += "1";
          h1 = (TH1F*)f.Get(hnam);
-
+         
          if(h1) {
            Double_t mean = h1->GetMean();
            
@@ -544,7 +546,7 @@ Bool_t AliPHOSPreprocessor::DoCalibrateEmc(Int_t system, TList* list, const AliP
          const Int_t md = ((TObjString*)tks->At(0))->GetString().Atoi();
          const Int_t X   = ((TObjString*)tks->At(1))->GetString().Atoi();
          const Int_t Z   = ((TObjString*)tks->At(2))->GetString().Atoi();
-
+         delete tks;
          if(badMap) {
            if(badMap->IsBadChannel(5-md,Z+1,X+1)) {
              AliInfo(Form("Cell mod=%d col=%d row=%d is bad. Histogram %s rejected.",
@@ -571,12 +573,14 @@ Bool_t AliPHOSPreprocessor::DoCalibrateEmc(Int_t system, TList* list, const AliP
     Double_t refMean=hRef->GetMean();
     
     // Calculates relative calibration coefficients for all non-zero channels
+
+    TString shnam = "%d_%d_%d_1";
     
     for(Int_t mod=0; mod<nMod; mod++) {
       for(Int_t col=0; col<nCol; col++) {
        for(Int_t row=0; row<nRow; row++) {
          
-         sprintf(hnam,"%d_%d_%d_1",mod,row,col); // high gain!
+         snprintf(hnam,shnam.Length(),shnam.Data(),mod,row,col); // high gain!
          h2 = (TH2F*)f.Get(hnam);
          
          //TODO: dead channels exclusion!