coverity, coding

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
index f2207ce2d96e2e21ff971bc4686310701e1f724f..299622dc78316bc2add921ffc939f4173dd86de6 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
@@ -289,8 +289,8 @@ AliGenEventHeader* AliCaloTrackReader::GetGenEventHeader() const
   }
   else 
   {
+    //printf("AliCaloTrackReader::GetGenEventHeader() - MC header not available! \n");
     return 0;
-    printf("AliCaloTrackReader::GetGenEventHeader() - MC header not available! \n");
   }
 }
 

diff --git a/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
index 3b1db03d75895ebc3c0b568d9005f84fde673e48..fb90d2dce3d4000cada8a7b767ba1c8272bd159c 100644 (file)
--- a/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
+++ b/PWGGA/CaloTasks/AliAnalysisTaskCaloFilter.cxx
@@ -598,22 +598,19 @@ void AliAnalysisTaskCaloFilter::FillAODCaloTrigger()
 {
   // AOD CaloTrigger copy
   
+  if( !AODEvent() || !fAODEvent ) return;
+  
   AliAODCaloTrigger* triggerEM   = AODEvent()->GetCaloTrigger("EMCAL");
   AliAODCaloTrigger* triggerPH   = AODEvent()->GetCaloTrigger("PHOS");
-
+  
+  // Copy from AODs
+  
   AliAODCaloTrigger* inTriggerEM = fAODEvent ->GetCaloTrigger("EMCAL");
   AliAODCaloTrigger* inTriggerPH = fAODEvent ->GetCaloTrigger("PHOS");
   
-  // Copy from AODs
-  if(fAODEvent)
-  {
-    if(inTriggerPH && (fCaloFilter==kBoth || fCaloFilter==kPHOS))  *triggerPH = *inTriggerPH;
-    
-    if(inTriggerEM && (fCaloFilter==kBoth || fCaloFilter==kEMCAL)) *triggerEM = *inTriggerEM;
-    
-    return;
-  }
+  if(inTriggerPH && (fCaloFilter==kBoth || fCaloFilter==kPHOS))  *triggerPH = *inTriggerPH;
   
+  if(inTriggerEM && (fCaloFilter==kBoth || fCaloFilter==kEMCAL)) *triggerEM = *inTriggerEM;  
 }  
 
 //______________________________________________

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
index 006dda7da0a072c9e2a7a672634e5db819d17b22..d85d646485701aea95e669619b72a05978c78dbb 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
@@ -1598,7 +1598,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
   Int_t netabins    = GetHistogramRanges()->GetHistoEtaBins();          Float_t etamax    = GetHistogramRanges()->GetHistoEtaMax();          Float_t etamin    = GetHistogramRanges()->GetHistoEtaMin();       
   Int_t nmassbins   = GetHistogramRanges()->GetHistoMassBins();         Float_t massmax   = GetHistogramRanges()->GetHistoMassMax();          Float_t massmin   = GetHistogramRanges()->GetHistoMassMin();
   Int_t nasymbins   = GetHistogramRanges()->GetHistoAsymmetryBins();    Float_t asymmax   = GetHistogramRanges()->GetHistoAsymmetryMax();    Float_t asymmin   = GetHistogramRanges()->GetHistoAsymmetryMin();
-  Int_t nPoverEbins = GetHistogramRanges()->GetHistoPOverEBins();       Float_t EOverPmax = GetHistogramRanges()->GetHistoPOverEMax();       Float_t EOverPmin = GetHistogramRanges()->GetHistoPOverEMin();
+  Int_t nPoverEbins = GetHistogramRanges()->GetHistoPOverEBins();       Float_t eOverPmax = GetHistogramRanges()->GetHistoPOverEMax();       Float_t eOverPmin = GetHistogramRanges()->GetHistoPOverEMin();
   Int_t ndedxbins   = GetHistogramRanges()->GetHistodEdxBins();         Float_t dedxmax   = GetHistogramRanges()->GetHistodEdxMax();         Float_t dedxmin   = GetHistogramRanges()->GetHistodEdxMin();
   Int_t ndRbins     = GetHistogramRanges()->GetHistodRBins();           Float_t dRmax     = GetHistogramRanges()->GetHistodRMax();           Float_t dRmin     = GetHistogramRanges()->GetHistodRMin();
   Int_t ntimebins   = GetHistogramRanges()->GetHistoTimeBins();         Float_t timemax   = GetHistogramRanges()->GetHistoTimeMax();         Float_t timemin   = GetHistogramRanges()->GetHistoTimeMin();       
@@ -2094,7 +2094,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
       outputContainer->Add(fhEtaPhiECharged);  
     }
     
-    fh1EOverP = new TH2F("h1EOverP","TRACK matches E/p",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fh1EOverP = new TH2F("h1EOverP","TRACK matches E/p",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fh1EOverP->SetYTitle("E/p");
     fh1EOverP->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fh1EOverP);
@@ -2114,7 +2114,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fh2EledEdx->SetYTitle("<dE/dx>");
     outputContainer->Add(fh2EledEdx) ;
     
-    fh1EOverPR02 = new TH2F("h1EOverPR02","TRACK matches E/p, all",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fh1EOverPR02 = new TH2F("h1EOverPR02","TRACK matches E/p, all",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fh1EOverPR02->SetYTitle("E/p");
     fh1EOverPR02->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fh1EOverPR02);        
@@ -2651,7 +2651,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     
     //Track Matching 
     
-    fhMCEle1EOverP = new TH2F("hMCEle1EOverP","TRACK matches E/p, MC electrons",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCEle1EOverP = new TH2F("hMCEle1EOverP","TRACK matches E/p, MC electrons",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCEle1EOverP->SetYTitle("E/p");
     fhMCEle1EOverP->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCEle1EOverP);
@@ -2665,7 +2665,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhMCEle2MatchdEdx->SetYTitle("<dE/dx>");
     outputContainer->Add(fhMCEle2MatchdEdx);
     
-    fhMCChHad1EOverP = new TH2F("hMCChHad1EOverP","TRACK matches E/p, MC charged hadrons",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCChHad1EOverP = new TH2F("hMCChHad1EOverP","TRACK matches E/p, MC charged hadrons",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCChHad1EOverP->SetYTitle("E/p");
     fhMCChHad1EOverP->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCChHad1EOverP);
@@ -2679,7 +2679,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhMCChHad2MatchdEdx->SetYTitle("<dE/dx>");
     outputContainer->Add(fhMCChHad2MatchdEdx);
     
-    fhMCNeutral1EOverP = new TH2F("hMCNeutral1EOverP","TRACK matches E/p, MC neutrals",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCNeutral1EOverP = new TH2F("hMCNeutral1EOverP","TRACK matches E/p, MC neutrals",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCNeutral1EOverP->SetYTitle("E/p");
     fhMCNeutral1EOverP->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCNeutral1EOverP);
@@ -2693,17 +2693,17 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhMCNeutral2MatchdEdx->SetYTitle("<dE/dx>");
     outputContainer->Add(fhMCNeutral2MatchdEdx);
     
-    fhMCEle1EOverPR02 = new TH2F("hMCEle1EOverPR02","TRACK matches E/p, MC electrons",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCEle1EOverPR02 = new TH2F("hMCEle1EOverPR02","TRACK matches E/p, MC electrons",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCEle1EOverPR02->SetYTitle("E/p");
     fhMCEle1EOverPR02->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCEle1EOverPR02);
     
-    fhMCChHad1EOverPR02 = new TH2F("hMCChHad1EOverPR02","TRACK matches E/p, MC charged hadrons",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCChHad1EOverPR02 = new TH2F("hMCChHad1EOverPR02","TRACK matches E/p, MC charged hadrons",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCChHad1EOverPR02->SetYTitle("E/p");
     fhMCChHad1EOverPR02->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCChHad1EOverPR02);
     
-    fhMCNeutral1EOverPR02 = new TH2F("hMCNeutral1EOverPR02","TRACK matches E/p, MC neutrals",nptbins,ptmin,ptmax, nPoverEbins,EOverPmin,EOverPmax);
+    fhMCNeutral1EOverPR02 = new TH2F("hMCNeutral1EOverPR02","TRACK matches E/p, MC neutrals",nptbins,ptmin,ptmax, nPoverEbins,eOverPmin,eOverPmax);
     fhMCNeutral1EOverPR02->SetYTitle("E/p");
     fhMCNeutral1EOverPR02->SetXTitle("p_{T} (GeV/c)");
     outputContainer->Add(fhMCNeutral1EOverPR02);

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
index 3cd4bfd83214b93b82f29aee183ea827a7a8cda0..af13a15dd9ef22a5e072b62fa857b7bb8a1fd38f 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaParticleIsolation.cxx
@@ -400,7 +400,7 @@ void AliAnaParticleIsolation::FillTrackMatchingShowerShapeControlHistograms(cons
       }
       
       //printf("ParticleIsolation: dPhi %f, dEta %f\n",dR,dZ);
-      if(fhTrackMatchedDEta && TMath::Abs(dR) < 999)
+      if(fhTrackMatchedDEta[isolated] && TMath::Abs(dR) < 999)
       {
         fhTrackMatchedDEta[isolated]->Fill(energy,dZ);
         fhTrackMatchedDPhi[isolated]->Fill(energy,dR);
@@ -1850,11 +1850,11 @@ void  AliAnaParticleIsolation::MakeAnalysisFillHistograms()
     fhPhiUEConeSumPt->Fill(pt, phiUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*TMath::Pi()));
     fhEtaUEConeSumPt->Fill(pt, etaUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*0.6));
 
-    Double_t SumPhiUESub = coneptsum-(phiUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*TMath::Pi()));
-    Double_t SumEtaUESub = coneptsum-(etaUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*0.6));
+    Double_t sumPhiUESub = coneptsum-(phiUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*TMath::Pi()));
+    Double_t sumEtaUESub = coneptsum-(etaUEptsum*(TMath::Pi()*conesize*conesize)/(2*conesize*2*0.6));
 
-    fhConeSumPtPhiUESub->Fill(pt,SumPhiUESub);
-    fhConeSumPtEtaUESub->Fill(pt,SumEtaUESub);
+    fhConeSumPtPhiUESub->Fill(pt,sumPhiUESub);
+    fhConeSumPtEtaUESub->Fill(pt,sumEtaUESub);
      
  
     if(GetDebug() > 1) printf("AliAnaParticleIsolation::MakeAnalysisFillHistograms() - Particle %d Energy Sum in Isolation Cone %2.2f\n", iaod, coneptsum);