fixing some minor coverty reports

diff --git a/JETAN/AliAnalysisTaskJetCluster.cxx b/JETAN/AliAnalysisTaskJetCluster.cxx
index af7f148761efaad90c9c862f0296ac2295750fc2..bfdcd39f9b05203abc35d015aae53b475889a575 100644 (file)
--- a/JETAN/AliAnalysisTaskJetCluster.cxx
+++ b/JETAN/AliAnalysisTaskJetCluster.cxx
@@ -668,9 +668,8 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
     
     // correlation of leading jet with tracks
     TIterator *recIter = recParticles.MakeIterator();
     
     // correlation of leading jet with tracks
     TIterator *recIter = recParticles.MakeIterator();

-    AliVParticle *tmpRecTrack = (AliVParticle*)(recIter->Next());  
-    

     recIter->Reset();
     recIter->Reset();

+    AliVParticle *tmpRecTrack = 0;

     while((tmpRecTrack = (AliVParticle*)(recIter->Next()))){
       Float_t tmpPt = tmpRecTrack->Pt();
       // correlation
     while((tmpRecTrack = (AliVParticle*)(recIter->Next()))){
       Float_t tmpPt = tmpRecTrack->Pt();
       // correlation


@@ -679,7 +678,6 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
       Float_t dPhi = phi - tmpPhi;
       if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
       if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
       Float_t dPhi = phi - tmpPhi;
       if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
       if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      

-      //      Float_t dEta = eta - tmpRecTrack->Eta();

       fh2TracksLeadingJetPhiPt->Fill(dPhi,pt);
       fh2TracksLeadingJetPhiPtW->Fill(dPhi,pt,tmpPt);
     }  
       fh2TracksLeadingJetPhiPt->Fill(dPhi,pt);
       fh2TracksLeadingJetPhiPtW->Fill(dPhi,pt,tmpPt);
     }  


@@ -848,7 +846,6 @@ void AliAnalysisTaskJetCluster::UserExec(Option_t */*option*/)
        Float_t dPhi = phi - tmpPhi;
        if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
        if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      
        Float_t dPhi = phi - tmpPhi;
        if(dPhi>TMath::Pi())dPhi = dPhi - 2.*TMath::Pi();
        if(dPhi<(-1.*TMath::Pi()))dPhi = dPhi + 2.*TMath::Pi();      

-       //      Float_t dEta = eta - tmpRecTrack->Eta();

        fh2TracksLeadingJetPhiPtRan->Fill(dPhi,pt);
        fh2TracksLeadingJetPhiPtWRan->Fill(dPhi,pt,tmpPt);
       }  
        fh2TracksLeadingJetPhiPtRan->Fill(dPhi,pt);
        fh2TracksLeadingJetPhiPtWRan->Fill(dPhi,pt,tmpPt);
       }  


@@ -938,7 +935,7 @@ Int_t  AliAnalysisTaskJetCluster::GetListOfTracks(TList *list,Int_t type){
     TClonesArray *tca = dynamic_cast<TClonesArray*>(aod->FindListObject(AliAODMCParticle::StdBranchName()));
     if(!tca)return iCount;
     for(int it = 0;it < tca->GetEntriesFast();++it){
     TClonesArray *tca = dynamic_cast<TClonesArray*>(aod->FindListObject(AliAODMCParticle::StdBranchName()));
     if(!tca)return iCount;
     for(int it = 0;it < tca->GetEntriesFast();++it){

-      AliAODMCParticle *part = dynamic_cast<AliAODMCParticle*>(tca->At(it));
+      AliAODMCParticle *part = (AliAODMCParticle*)(tca->At(it));

       if(!part->IsPhysicalPrimary())continue;
       if(type == kTrackAODMCAll){
        list->Add(part);
       if(!part->IsPhysicalPrimary())continue;
       if(type == kTrackAODMCAll){
        list->Add(part);

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 662027616bce7a0645a408878aa369f76a65cd31..664acd40df27dbbe84ac884cb7a38ad6dcedc863 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -137,20 +137,23 @@ void AliAnalysisTaskJets::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());
        // 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());

-       TObjArray* extArray = aodH->GetExtensions();
-       if (extArray) {
-         TIter next(extArray);
-         while ((fAODExtension=(AliAODExtension*)next())){
-           TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
-           if(fDebug>10){
-             Printf("%s:%d Dumping..",(char*)__FILE__,__LINE__);
-             fAODExtension->GetAOD()->Dump();
-           }
-           if(obj){
+       fAODExtension = 0;
+       if(aodH){
+         TObjArray* extArray = aodH->GetExtensions();
+         if (extArray) {
+           TIter next(extArray);
+           while ((fAODExtension=(AliAODExtension*)next())){
+             TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
+             if(fDebug>10){
+               Printf("%s:%d Dumping..",(char*)__FILE__,__LINE__);
+               fAODExtension->GetAOD()->Dump();
+             }
+             if(obj){

              if(fDebug>1)Printf("AODExtension found for %s",fNonStdBranch.Data());
              break;
              if(fDebug>1)Printf("AODExtension found for %s",fNonStdBranch.Data());
              break;

+             }
+             fAODExtension = 0;

            }
            }

-           fAODExtension = 0;

          }
        }
        if(fAODExtension)fJetFinder->ConnectAODNonStd(fAODExtension->GetAOD(), fNonStdBranch.Data()); 
          }
        }
        if(fAODExtension)fJetFinder->ConnectAODNonStd(fAODExtension->GetAOD(), fNonStdBranch.Data()); 

diff --git a/JETAN/AliJetAODReader.cxx b/JETAN/AliJetAODReader.cxx
index 597cf7defa23629ef605eedb68a34b263f67b540..21256b4a7f50f1f06236345450722fd49261f78c 100644 (file)
--- a/JETAN/AliJetAODReader.cxx
+++ b/JETAN/AliJetAODReader.cxx
@@ -119,9 +119,7 @@ void AliJetAODReader::OpenInputFiles()
        if (a>=naod) continue;
        
        if (strstr(name,pattern)){
        if (a>=naod) continue;
        
        if (strstr(name,pattern)){

-          char path[256];
-          sprintf(path,"%s/%s/aod.root",dirName,name);
-          fChain->AddFile(path);
+          fChain->AddFile(Form("%s/%s/aod.root",dirName,name));

           a++;
        }
    }
           a++;
        }
    }

diff --git a/JETAN/AliJetBkg.cxx b/JETAN/AliJetBkg.cxx
index 3ca4147e9397dcfedbb2a0ccba8afd1ffb7c2f72..69185cb7158006735b168537778e23f21bb8cd23 100644 (file)
--- a/JETAN/AliJetBkg.cxx
+++ b/JETAN/AliJetBkg.cxx
@@ -397,7 +397,7 @@ Float_t AliJetBkg::BkgFastJetCone(TClonesArray* fAODJets)
   Float_t rCone=0.4;
   
   if(nJ==1) { 
   Float_t rCone=0.4;
   
   if(nJ==1) { 

-    AliAODJet *jettmp = dynamic_cast<AliAODJet*>(fAODJets->At(0));
+    AliAODJet *jettmp = (AliAODJet*)(fAODJets->At(0));

     jeteta=jettmp->Eta();
     jetphi=jettmp->Phi();
     acc=EmcalAcceptance(jeteta,jetphi,rCone);
     jeteta=jettmp->Eta();
     jetphi=jettmp->Phi();
     acc=EmcalAcceptance(jeteta,jetphi,rCone);


@@ -407,8 +407,8 @@ Float_t AliJetBkg::BkgFastJetCone(TClonesArray* fAODJets)
 
   
   if(nJ>=2) { 
 
   
   if(nJ>=2) { 

-    AliAODJet *jettmp = dynamic_cast<AliAODJet*>(fAODJets->At(0));
-    AliAODJet *jettmp1 = dynamic_cast<AliAODJet*>(fAODJets->At(1));
+    AliAODJet *jettmp = (AliAODJet*)(fAODJets->At(0));
+    AliAODJet *jettmp1 = (AliAODJet*)(fAODJets->At(1));

     jeteta=jettmp->Eta();
     jetphi=jettmp->Phi();
     jeteta1=jettmp1->Eta();
     jeteta=jettmp->Eta();
     jetphi=jettmp->Phi();
     jeteta1=jettmp1->Eta();

diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx
index d60df728f94b6ac764d36a8e1e80a64ce53a5c81..547730358ee52fc59096e7a2524858c0ed12e09f 100755 (executable)
--- a/JETAN/AliJetESDReader.cxx
+++ b/JETAN/AliJetESDReader.cxx
@@ -122,9 +122,7 @@ void AliJetESDReader::OpenInputFiles()
        
        if (strstr(name,pattern)){
         printf("Adding %s\n",name);
        
        if (strstr(name,pattern)){
         printf("Adding %s\n",name);

-        char path[256];
-        sprintf(path,"%s/%s/AliESDs.root",dirName,name);
-        fChain->AddFile(path);
+        fChain->AddFile(Form("%s/%s/AliESDs.root",dirName,name));

         a++;
        }
    }
         a++;
        }
    }

diff --git a/JETAN/AliUA1JetFinderV1.cxx b/JETAN/AliUA1JetFinderV1.cxx
index a2105f4cb0f69784714ef2439d58ee5ea4c8131b..d5735797b333931387d007c815ddadd5f72b5632 100644 (file)
--- a/JETAN/AliUA1JetFinderV1.cxx
+++ b/JETAN/AliUA1JetFinderV1.cxx
@@ -97,7 +97,7 @@ void AliUA1JetFinderV1::FindJets()
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
   TClonesArray *lvArray = fReader->GetMomentumArray();
   Int_t nIn =  lvArray->GetEntries();
   AliUA1JetHeaderV1* header = (AliUA1JetHeaderV1*) fHeader;
   TClonesArray *lvArray = fReader->GetMomentumArray();
   Int_t nIn =  lvArray->GetEntries();

-  if (nIn == 0) return;
+  if (nIn <= 0) return;

 
   // local arrays for input
   // ToDo: check memory fragmentation, maybe better to 
 
   // local arrays for input
   // ToDo: check memory fragmentation, maybe better to 


@@ -108,6 +108,9 @@ void AliUA1JetFinderV1::FindJets()
   Float_t* phiT  = new Float_t[nIn];
   Int_t*   injet = new Int_t[nIn];
 
   Float_t* phiT  = new Float_t[nIn];
   Int_t*   injet = new Int_t[nIn];
 

+  memset(ptT,0,sizeof(Float_t)*nIn);
+  memset(etaT,0,sizeof(Float_t)*nIn);
+  memset(phiT,0,sizeof(Float_t)*nIn);

 
 
   // load input vectors and calculate total energy in array
 
 
   // load input vectors and calculate total energy in array