]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Fixing coverty reports
authorkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 22 Jan 2011 13:14:32 +0000 (13:14 +0000)
committerkleinb <kleinb@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 22 Jan 2011 13:14:32 +0000 (13:14 +0000)
JETAN/AliAnalysisTaskFastEmbedding.cxx
JETAN/AliAnalysisTaskJetBackgroundSubtract.cxx
JETAN/AliAnalysisTaskJetCluster.cxx
JETAN/AliCdfJetFinder.cxx
JETAN/AliFastJetFinder.cxx
JETAN/AliUA1JetFinderV1.cxx

index c7989212e82d258d89dac6e8edeb318c8748d4b3..7c0aec00c3f5fbaf98c96b566f61b4b1a6918fba 100644 (file)
@@ -272,10 +272,6 @@ void AliAnalysisTaskFastEmbedding::UserCreateOutputObjects()
        }
        fAODevent = new AliAODEvent();
        fAODevent->ReadFromTree(fAODtree);
-       if(!fAODevent){
-           AliError("AOD event not found.");
-           return;
-       }
     } //end: embed mode with AOD
 
 
index b4b32bb7d33dde1c7168029e0c28ef7e99bfa027..5a36e6405bbe4ea30c0e63626e2898054574d904 100644 (file)
@@ -173,7 +173,8 @@ void AliAnalysisTaskJetBackgroundSubtract::UserCreateOutputObjects()
     // case that we have an AOD extension we need to fetch the jets from the extended output
     // we identifay the extension aod event by looking for the branchname
     AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-    fAODExtension = aodH->GetExtension(fNonStdFile.Data());
+
+    fAODExtension = (aodH?aodH->GetExtension(fNonStdFile.Data()):0);
     
     if(!fAODExtension){
       if(fDebug>1)Printf("AODExtension found for %s",fNonStdFile.Data());
@@ -328,7 +329,7 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     if(fDebug&&evBkg)Printf("%s:%d Backgroundbranch %s found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
   }
 
-  if(!evBkg&&(fSubtraction==kArea||fSubtraction==kRhoRecalc)){
+  if(!evBkg&&(fSubtraction==kArea||fSubtraction==kRhoRecalc||fSubtraction==k4Area)){
     if(fDebug){
       Printf("%s:%d Backgroundbranch %s not found",(char*)__FILE__,__LINE__,fBackgroundBranch.Data());
       PrintAODContents();
@@ -361,18 +362,19 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
    Double_t meanarea = 0;
    TLorentzVector backgroundv;
    Float_t cent=0.;
-   cent = fAODOut->GetHeader()->GetCentrality();
-   sigma=evBkg->GetSigma(1); 
+   if(fAODOut)cent = fAODOut->GetHeader()->GetCentrality();
+   if(evBkg)sigma=evBkg->GetSigma(1); 
 
    if(fSubtraction==kArea) rho = evBkg->GetBackground(1);
    if(fSubtraction==k4Area){
-                rho = evBkg->GetBackground(0);
-                sigma=evBkg->GetSigma(0);}
+     rho = evBkg->GetBackground(0);
+     sigma=evBkg->GetSigma(0);
+   }
 
    if(fSubtraction==kRhoRecalc){
      meanarea=evBkg->GetMeanarea(1);
      rho =RecalcRho(bkgClusters,meanarea);
-        }
+   }
    if(fSubtraction==kRhoRC) rho=RhoRC(bkgClustersRC);
    fh2CentvsRho->Fill(cent,rho);
    fh2CentvsSigma->Fill(cent,sigma);
@@ -382,9 +384,9 @@ void AliAnalysisTaskJetBackgroundSubtract::UserExec(Option_t */*option*/)
     TClonesArray* jarrayOut = (TClonesArray*)fOutJetArrayList->At(iJB);
     
     if(!jarray||!jarrayOut){
-    Printf("%s:%d Array not found %d: %p %p",(char*)__FILE__,__LINE__,iJB,jarray->GetName(),jarrayOut->GetName());
-    continue;
-      }
+      Printf("%s:%d Array not found %d: %p %p",(char*)__FILE__,__LINE__,iJB,jarray,jarrayOut);
+      continue;
+    }
     TH2F* h2PtInOut = (TH2F*)fHistList->FindObject(Form("h2PtInPtOut_%d",iJB));
     // loop over all jets
     Int_t nOut = 0;
@@ -549,34 +551,37 @@ Bool_t AliAnalysisTaskJetBackgroundSubtract::RescaleJet4vector(AliAODJet *jet,TL
 
 Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgClusters,Double_t meanarea){
   
-       Double_t ptarea=0.;
-       Int_t count=0;
-       Double_t rho=0.; 
-       const Double_t Rlimit2=0.8*0.8;  //2*jet radius.
-       TClonesArray* jarray=0;
-       
-        for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
-        TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
-        TString jetref=ostr->GetString().Data();
-        if(jetref.Contains("ANTIKT04")){ 
-         jarray = (TClonesArray*)fInJetArrayList->At(iJB);}}
-       if(jarray->GetEntries()>=2){ 
-         AliAODJet *first = (AliAODJet*)(jarray->At(0)); 
-         AliAODJet *second= (AliAODJet*)(jarray->At(1)); 
-         for(Int_t k=0;k<bkgClusters->GetEntriesFast();k++){
-           AliAODJet *clus = (AliAODJet*)(bkgClusters->At(k));
-           if(TMath::Abs(clus->Eta())>0.5) continue;
-           if((clus->EffectiveAreaCharged())<0.1*meanarea) continue; 
-           Double_t distance1=(first->Eta()-clus->Eta())*(first->Eta()-clus->Eta())+
-             (first->Phi()-clus->Phi())*(first->Phi()-clus->Phi());
-           Double_t distance2= (second->Eta()-clus->Eta())*(second->Eta()-clus->Eta())+
-             (second->Phi()-clus->Phi())*(second->Phi()-clus->Phi());
-           if((distance1<Rlimit2)||(distance2<Rlimit2)) continue;    
-           ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
-           count=count+1;}
-         if(count!=0) rho=ptarea/count; 
-       }        
-       return rho;
+  Double_t ptarea=0.;
+  Int_t count=0;
+  Double_t rho=0.; 
+  const Double_t Rlimit2=0.8*0.8;  //2*jet radius.
+  TClonesArray* jarray=0;
+  
+  for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
+    TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
+    TString jetref=ostr->GetString().Data();
+    if(jetref.Contains("ANTIKT04")){ 
+      jarray = (TClonesArray*)fInJetArrayList->At(iJB);
+    }
+  }
+  if(!jarray)return rho;
+  if(jarray->GetEntries()>=2){ 
+    AliAODJet *first = (AliAODJet*)(jarray->At(0)); 
+    AliAODJet *second= (AliAODJet*)(jarray->At(1)); 
+    for(Int_t k=0;k<bkgClusters->GetEntriesFast();k++){
+      AliAODJet *clus = (AliAODJet*)(bkgClusters->At(k));
+      if(TMath::Abs(clus->Eta())>0.5) continue;
+      if((clus->EffectiveAreaCharged())<0.1*meanarea) continue; 
+      Double_t distance1=(first->Eta()-clus->Eta())*(first->Eta()-clus->Eta())+
+       (first->Phi()-clus->Phi())*(first->Phi()-clus->Phi());
+      Double_t distance2= (second->Eta()-clus->Eta())*(second->Eta()-clus->Eta())+
+       (second->Phi()-clus->Phi())*(second->Phi()-clus->Phi());
+      if((distance1<Rlimit2)||(distance2<Rlimit2)) continue;    
+      ptarea=ptarea+clus->Pt()/clus->EffectiveAreaCharged(); 
+      count=count+1;}
+    if(count!=0) rho=ptarea/count; 
+  }        
+  return rho;
 }
 
    Double_t AliAnalysisTaskJetBackgroundSubtract::RhoRC(TClonesArray* bkgClustersRC){
@@ -587,10 +592,14 @@ Double_t AliAnalysisTaskJetBackgroundSubtract::RecalcRho(TClonesArray* bkgCluste
        const Double_t Rlimit2=0.8*0.8;  //2*jet radius.
        TClonesArray* jarray=0;
         for(int iJB = 0;iJB<fInJetArrayList->GetEntries();iJB++){
-        TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
-        TString jetref=ostr->GetString().Data();
-        if(jetref.Contains("ANTIKT04")){ 
-        jarray = (TClonesArray*)fInJetArrayList->At(iJB);}}
+         TObjString *ostr = (TObjString*)fInJetArrayList->At(iJB);
+         TString jetref=ostr->GetString().Data();
+         if(jetref.Contains("ANTIKT04")){ 
+           jarray = (TClonesArray*)fInJetArrayList->At(iJB);
+         }
+       }
+       if(!jarray)return rho;
+
          if(jarray->GetEntries()>=2){ 
           AliAODJet *first = (AliAODJet*)(jarray->At(0)); 
           AliAODJet *second=(AliAODJet*)(jarray->At(1)); 
index e0b74161b561daf88986669410316e043ac07f40..e7969e3a092428ca8e6d324eb7365bda8da320f0 100644 (file)
@@ -1386,13 +1386,14 @@ Int_t  AliAnalysisTaskJetCluster::GetListOfTracks(TList *list,Int_t type){
        return iCount;
       }
       TClonesArray *aodExtraTracks = dynamic_cast<TClonesArray*>(aod->FindListObject("aodExtraTracks"));
+      if(!aodExtraTracks)return iCount;
       for(int it =0; it<aodExtraTracks->GetEntries(); it++) {
        AliVParticle *track = dynamic_cast<AliVParticle*> ((*aodExtraTracks)[it]);
        if (!track) continue;
 
        AliAODTrack *trackAOD = dynamic_cast<AliAODTrack*> (track);
+       if(!trackAOD)continue;
        if(trackAOD->Pt()<fTrackPtCut) continue;
-
        list->Add(trackAOD);
        iCount++;
       }
index 3da21c5cc56fafbb2810717e01335c994f0d22db..f0a7938f5334d740a88d9ee8c383a3d59bd17f2b 100644 (file)
@@ -64,8 +64,8 @@ AliCdfJetFinder::AliCdfJetFinder():
     fAODtracksWrite(0),
     fAnalyseJets(0),
     fRefArr (NULL),
-    fNJets(-9999),
-    fNPart(-9999),
+    fNJets(0),
+    fNPart(0),
     fRadius(0.7),
     fMinJetParticles(1),
     fJetPtCut(0.),
@@ -891,6 +891,9 @@ for(  Int_t part = 0 ; part < fNPart ; part++ )
       }
     }
 
+  delete [] dphipartljet;
+  delete [] zpartljet;
+  delete [] idxpartLJ;
 }
 
 
index f324a21d91e1d793c3ce8192dedb1edfc799217c..4d20f9828185c8b57d3191df6afc00222e279389 100644 (file)
@@ -93,10 +93,11 @@ void AliFastJetFinder::FindJets()
   if(debug)cout<<"----------in AliFastJetFinder::FindJets() ------------------"<<endl;
 
   // check if we are reading AOD jets
+  /* NOT used
   TRefArray *refs = 0;
   Bool_t fromAod = !strcmp(fReader->ClassName(),"AliJetAODReader");
   if (fromAod) { refs = fReader->GetReferences(); }
-  
+  */
   // RUN ALGORITHM  
   // read input particles -----------------------------
 
index 2ea6c0d4b01cad28dbd3941d6c58a2919d668445..ea11fb2fb56d597cbd1136a7d02e71089a5b67d8 100644 (file)
@@ -342,10 +342,10 @@ void AliUA1JetFinderV1::RunAlgoritm(Float_t etbgTotal, Double_t dEtTotal, Int_t&
 
 
   // tmp array of jets form algoritm
-  Float_t etaAlgoJet[kMaxJets];
-  Float_t phiAlgoJet[kMaxJets];
-  Float_t etAlgoJet[kMaxJets];
-  Int_t   ncellsAlgoJet[kMaxJets];
+  Float_t etaAlgoJet[kMaxJets] = {0.0};
+  Float_t phiAlgoJet[kMaxJets] = {0.0};
+  Float_t etAlgoJet[kMaxJets] = {0.0};
+  Int_t   ncellsAlgoJet[kMaxJets] = {0};
 
   //run algorithm//
 
@@ -511,7 +511,7 @@ void AliUA1JetFinderV1::SubtractBackg(const Int_t& nIn, const Int_t&nJ, Float_t&
   //calculate energy inside and outside cones
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
   Float_t rc= header->GetRadius();
-  Float_t etIn[kMaxJets];
+  Float_t etIn[kMaxJets] = {0};
   Float_t etOut = 0;
   for(Int_t jpart = 0; jpart < nIn; jpart++){ // loop for all particles in array
      // if((fReader->GetCutFlag(jpart)) != 1) continue; // pt cut
@@ -580,7 +580,7 @@ void AliUA1JetFinderV1::SubtractBackgStat(const Int_t& nIn, const Int_t&nJ,Float
 
   //calculate energy inside
   Float_t rc= header->GetRadius();
-  Float_t etIn[kMaxJets];
+  Float_t etIn[kMaxJets] = {0.0};
 
   for(Int_t jpart = 0; jpart < nIn; jpart++){ // loop for all particles in array
      //if((fReader->GetCutFlag(jpart)) != 1) continue; // pt cut
@@ -646,16 +646,12 @@ void AliUA1JetFinderV1::SubtractBackgCone(const Int_t& nIn, const Int_t&nJ,Float
    Int_t ndiv = 100;
 
    // jet energy and area arrays
-   char hEtname[256];char hAreaname[256];
-
    for(Int_t mjet=0; mjet<nJ; mjet++){
      if(!fhEtJet[mjet]){ 
-       sprintf(hEtname, "hEtJet%d", mjet); 
-       fhEtJet[mjet] = new TH1F(hEtname,"et dist in eta ",ndiv,etamin,etamax);
+       fhEtJet[mjet] = new TH1F(Form("hEtJet%d", mjet),"et dist in eta ",ndiv,etamin,etamax);
      }
-     if(!fhAreaJet[mjet]){ 
-       sprintf(hAreaname, "hAreaJet%d", mjet);
-       fhAreaJet[mjet] = new TH1F(hAreaname,"area dist in eta ",ndiv,etamin,etamax);       
+     if(!fhAreaJet[mjet]){        
+       fhAreaJet[mjet] = new TH1F(Form("hEtJet%d", mjet),"area dist in eta ",ndiv,etamin,etamax);       
      }
      fhEtJet[mjet]->Reset();
      fhAreaJet[mjet]->Reset();
@@ -765,16 +761,12 @@ void AliUA1JetFinderV1::SubtractBackgRatio(const Int_t& nIn, const Int_t&nJ, Flo
 
    // jet energy and area arrays
    // jet energy and area arrays
-   char hEtname[256];char hAreaname[256];
-
    for(Int_t mjet=0; mjet<nJ; mjet++){
      if(!fhEtJet[mjet]){ 
-       sprintf(hEtname, "hEtJet%d", mjet); 
-       fhEtJet[mjet] = new TH1F(hEtname,"et dist in eta ",ndiv,etamin,etamax);
+       fhEtJet[mjet] = new TH1F(Form("hEtJet%d", mjet),"et dist in eta ",ndiv,etamin,etamax);
      }
      if(!fhAreaJet[mjet]){ 
-       sprintf(hAreaname, "hAreaJet%d", mjet);
-       fhAreaJet[mjet] = new TH1F(hAreaname,"area dist in eta ",ndiv,etamin,etamax);       
+       fhAreaJet[mjet] = new TH1F(Form("hAreaJet%d", mjet),"area dist in eta ",ndiv,etamin,etamax);       
      }
      fhEtJet[mjet]->Reset();
      fhAreaJet[mjet]->Reset();