]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Coverity fixes.
authorpolicheh <policheh@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 2 Feb 2011 11:36:23 +0000 (11:36 +0000)
committerpolicheh <policheh@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 2 Feb 2011 11:36:23 +0000 (11:36 +0000)
PHOS/AliPHOSPreprocessor.cxx
PHOS/AliPHOSRcuDA1.cxx

index 9a3a395179ce97ad5966297891fb4a75dc0085d9..5b222bcae29afeea9611714383a6ddcb237250bc 100644 (file)
@@ -300,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.;
@@ -326,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();
            
index 4803c6d8354505de819ff54e6d7306a51222cd58..652cf426a4e0013e982b044faaecf026632673b2 100644 (file)
@@ -163,8 +163,8 @@ void AliPHOSRcuDA1::FillHistograms(Float_t e[64][56][2], Float_t t[64][56][2])
   // the correspondent array entry should be filled by zero.
   // WARNING: this function should be called once per event!
 
-  char hname[128];
-  char htitl[128];
+  TString hname;
+  TString htitle;
 
   for(Int_t iX=0; iX<64; iX++) {
     for (Int_t iZ=0; iZ<56; iZ++) {
@@ -179,9 +179,11 @@ void AliPHOSRcuDA1::FillHistograms(Float_t e[64][56][2], Float_t t[64][56][2])
        }
        else
          {
-           sprintf(hname,"%d_%d_%d",fMod,iX,iZ);
-           sprintf(htitl,"HG/LG ratio for crystal %d_%d_%d",fMod,iX,iZ);
-           fHgLgRatio[iX][iZ] = new TH1F(hname,htitl,400,14.,18.);
+           hname.Clear(); htitle.Clear();
+           hname += fMod; hname += "_"; hname += iX; hname += "_"; hname += iZ;
+           htitle += "HG/LG ratio for crystal "; htitle += hname;
+           
+           fHgLgRatio[iX][iZ] = new TH1F(hname,htitle,400,14.,18.);
 //         printf("iX=%d iZ=%d,e[iX][iZ][1]=%.3f,e[iX][iZ][0]=%.3f\n",
 //                iX,iZ,e[iX][iZ][1],e[iX][iZ][0]);
            fHgLgRatio[iX][iZ]->Fill(e[iX][iZ][1]/e[iX][iZ][0]);
@@ -197,18 +199,22 @@ void AliPHOSRcuDA1::FillHistograms(Float_t e[64][56][2], Float_t t[64][56][2])
 
        if(fTimeEnergy[iX][iZ][iGain]) 
          fTimeEnergy[iX][iZ][iGain]->Fill(e[iX][iZ][iGain],t[iX][iZ][iGain]);
-       else {
-         sprintf(hname,"%d_%d_%d_%d",fMod,iX,iZ,iGain);
-         sprintf(htitl,"Energy vs TOF for crystal %d_%d_%d and gain %d",fMod,iX,iZ,iGain);
-         fTimeEnergy[iX][iZ][iGain] = new TH2F(hname,htitl,100,0.,1024.,50,0.,50.);
-         fTimeEnergy[iX][iZ][iGain]->Fill(e[iX][iZ][iGain],t[iX][iZ][iGain]);
-         fHistoArray.Add(fTimeEnergy[iX][iZ][iGain]);
-       }
+       else 
+         {
+           hname.Clear(); htitle.Clear();
+           hname += fMod; hname += "_"; hname += iX; hname += "_"; hname += iZ;
+           htitle = "Energy vs TOF for crystal "; htitle += hname; htitle += " and gain "; htitle += iGain;
+           hname += "_"; hname += iGain;
+           
+           fTimeEnergy[iX][iZ][iGain] = new TH2F(hname,htitle,100,0.,1024.,50,0.,50.);
+           fTimeEnergy[iX][iZ][iGain]->Fill(e[iX][iZ][iGain],t[iX][iZ][iGain]);
+           fHistoArray.Add(fTimeEnergy[iX][iZ][iGain]);
+         }
       }
-
+      
     }
   }
-
+  
 }
 
 //-------------------------------------------------------------------
@@ -234,9 +240,9 @@ void AliPHOSRcuDA1::SetWriteToFile(Bool_t write)
   }
 
   if(!fHistoFile) {
-    char rootname[128];
-    sprintf(rootname,"%s.root",GetName());
-    fHistoFile =  new TFile(rootname,"update");
+    TString rootname(GetName());
+    rootname += ".root";
+    fHistoFile =  new TFile(rootname.Data(),"update");
   } 
   
   fWriteToFile = write;