Coverity and warning fixes (Ivana, Gines)

diff --git a/PWG3/muon/AliAnalysisTaskCreateMixedDimuons.cxx b/PWG3/muon/AliAnalysisTaskCreateMixedDimuons.cxx
index ba527d9956989a90e2f9c9febc0fc42cf7d94c48..8d5ebfe8bccc8b1ab5155613ac0546a4404aa57c 100644 (file)
--- a/PWG3/muon/AliAnalysisTaskCreateMixedDimuons.cxx
+++ b/PWG3/muon/AliAnalysisTaskCreateMixedDimuons.cxx
@@ -112,11 +112,6 @@ void AliAnalysisTaskCreateMixedDimuons::UserCreateOutputObjects() {
 
 void AliAnalysisTaskCreateMixedDimuons::UserExec(Option_t *) {
 
-  if (!fInputAOD) {
-    Printf("ERROR: fInputAOD not available\n");
-    return;
-  }
-
   if (!fOutputUserAOD) {
     Printf("ERROR: fOutputUserAOD not available\n");
     return;
@@ -125,8 +120,18 @@ void AliAnalysisTaskCreateMixedDimuons::UserExec(Option_t *) {
   printf("Calling USER EXEC\n\n");
 
   for (Int_t iEv=0; iEv<fBufferSize; iEv++) {
+    if (!fInputAOD[iEv]) {
+      Printf("ERROR: fInputAOD[%d] not available\n",iEv);
+      continue;
+    }
+
     for (Int_t jEv=0; jEv<iEv; jEv++) {
 
+      if (!fInputAOD) {
+    Printf("ERROR: fInputAOD not available\n");
+    return;
+  }
+
       Int_t nTracksEv[2]  = {0};
       Int_t nFWMuonsEv[2] = {0};
       

diff --git a/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.cxx b/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.cxx
index 83e27f8ad1e9e3f020d159a8d37b740d24137e1f..ae969e4efc3316879f0811f1a4178c5e8ad9e556 100644 (file)
--- a/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.cxx
+++ b/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.cxx
@@ -258,8 +258,6 @@ void AliAnalysisTaskDimuonCFContainerBuilder::UserExec(Option_t *)
        AliMCParticle *mcPart  = (AliMCParticle*) fMCEvent->GetTrack(ipart);
   
        TParticle *part = mcPart->Particle(); 
-       TParticle *part0 = mcPart->Particle();
-       TParticle *part1 = mcPart->Particle();
 
        // Mother kinematics
        Double_t e = part->Energy();
@@ -273,11 +271,11 @@ void AliAnalysisTaskDimuonCFContainerBuilder::UserExec(Option_t *)
        
        // Decays kinematics
        Int_t p0 = part->GetDaughter(0);
-       part0 = stack->Particle(p0); 
+       TParticle *part0 = stack->Particle(p0); 
        Int_t pdg0 = part0->GetPdgCode();
  
        Int_t p1 = part->GetDaughter(1);
-       part1 = stack->Particle(p1);
+       TParticle *part1 = stack->Particle(p1);
        Int_t pdg1 = part1->GetPdgCode();
   
        Double_t e0 = part0->Energy();

diff --git a/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.h b/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.h
index bc95d649f54c46249d3bb40a8f03aee2218a05a8..5b5432a90af92d45c6f894092a3a5ef0d421beb9 100644 (file)
--- a/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.h
+++ b/PWG3/muon/AliAnalysisTaskDimuonCFContainerBuilder.h
@@ -42,7 +42,7 @@ class AliAnalysisTaskDimuonCFContainerBuilder : public AliAnalysisTaskSE {
   void   SetThetaSingMuLimits  (Double_t ThetaSingle[])  {fThetaSingMuCut[0]=ThetaSingle[0];fThetaSingMuCut[1]=ThetaSingle[1];}
   void   SetZprimVertLimits    (Double_t Zprimvtx[])     {fzPrimVertexSPD[0]=Zprimvtx[0];fzPrimVertexSPD[1]=Zprimvtx[1];}
   void  SetCutonZvtxSPD        (Bool_t   cut=kFALSE)     {fCutOnzVtxSPD=cut;}
-  void   SetNContributorsLimits        (Double_t NContr[])       {fNContributors[0]=NContr[0];fNContributors[1]=NContr[1];}
+  void   SetNContributorsLimits        (Int_t NContr[])       {fNContributors[0]=NContr[0];fNContributors[1]=NContr[1];}
   void  SetCutonNContributors  (Bool_t   cut=kFALSE)     {fCutOnNContributors=cut;}
   void  SetDistinguishTrigClass(Bool_t   dist=kFALSE)    {fDistinguishTrigClass=dist;}
   void   SetTrigClassMuonName  (TString name = "CMU")    {fTrigClassMuon=name;}

diff --git a/PWG3/muon/AliAnalysisTaskMuonAODCreation.h b/PWG3/muon/AliAnalysisTaskMuonAODCreation.h
index 0c33a3578b2f8447f47b26c481e33e08c6a77484..88fbf81720956045fcaa4e6d055e83dc7bb32b4d 100755 (executable)
--- a/PWG3/muon/AliAnalysisTaskMuonAODCreation.h
+++ b/PWG3/muon/AliAnalysisTaskMuonAODCreation.h
@@ -9,7 +9,6 @@
 
 #include "TMath.h"
 
-#include "AliAnalysisTaskMuonAODCreation.h"
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisManager.h"
 #include "AliAODEvent.h"

diff --git a/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx
index 780fd7e4722fbd76383e1cbff500fd6082ad5cfd..8168c1a22d0c9d2a6498265c5845fc9bbd22be04 100644 (file)
--- a/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx
+++ b/PWG3/muon/AliAnalysisTaskMuonAODfromGeneral.cxx
@@ -133,9 +133,12 @@ void AliAnalysisTaskMuonAODfromGeneral::Exec(Option_t *) {
   header->SetMuonMagFieldScale(-999.); // FIXME
   header->SetCentrality(0);            // FIXME
 
-  Int_t nVertices = 0;
   const AliAODVertex *vtx = fOrgAOD->GetPrimaryVertex();
-  if(vtx)nVertices = 1;
+  if ( !vtx) {
+    // CHECK Gines
+    AliError("Primary vertex is not defined");
+    return;
+  }  
 
   Int_t nDimuons=nMuTracks*(nMuTracks-1)/2;
   
@@ -157,8 +160,7 @@ void AliAnalysisTaskMuonAODfromGeneral::Exec(Option_t *) {
   static int ncal=0;
   static int numtracks=0;
   for (Int_t iTrack=0; iTrack<nMuTracks; iTrack++) {
-       AliAODTrack *aodTrack;
-       primary->AddDaughter( aodTrack=new(tracks[jTracks++])
+       primary->AddDaughter(new(tracks[jTracks++])
        AliAODTrack((*(fOrgAOD->GetTrack(mutrNumb[iTrack])))));
         ncal++;
   }