Fixing coverity defects: 17612, 17611

diff --git a/PWG4/GammaConv/AliAODConversionMother.cxx b/PWG4/GammaConv/AliAODConversionMother.cxx
index a47046f0247d19bf18d4b29c0cdd1647adb95a21..79773db2676a0dc153bc496bec50310934d7acfd 100644 (file)
--- a/PWG4/GammaConv/AliAODConversionMother.cxx
+++ b/PWG4/GammaConv/AliAODConversionMother.cxx
@@ -15,6 +15,8 @@ fChi2(-1),
 fOpeningAngle(-1),
 fAlpha(-1)
 {
+       fLabel[0] = -1;
+       fLabel[1] = -1;
 }
 
 AliAODConversionMother::AliAODConversionMother(AliKFConversionMother *kf):

diff --git a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
index 3e0c3eb8f6b0e16d5e76a23f100019e1673dbd07..6177e74aa2cb970603fd8b0aba48dffd755d4176 100644 (file)
--- a/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
+++ b/PWG4/GammaConv/AliAnalysisTaskGammaConversion.cxx
@@ -3191,12 +3191,14 @@ void AliAnalysisTaskGammaConversion::AddGammaToAOD(AliKFConversionPhoton * kfPar
     //Fill AOD with particles
     TClonesArray *branch=fAODGamma;
     if(branch){
-       new((*branch)[branch->GetEntriesFast()])  AliAODConversionPhoton(kfParticle);
-    }
+               new((*branch)[branch->GetEntriesFast()])  AliAODConversionPhoton(kfParticle);
+    } else {
+               return;
+       }
 
     //Add PID information with ESD tender (AOD implementation is not complete)
 
-    AliAODConversionPhoton *gamma=dynamic_cast<AliAODConversionPhoton*>(fAODGamma->At(fAODGamma->GetEntriesFast()-1));
+    AliAODConversionPhoton *gamma=static_cast<AliAODConversionPhoton*>(fAODGamma->At(fAODGamma->GetEntriesFast()-1));
 
     AliAnalysisManager *man=AliAnalysisManager::GetAnalysisManager();
     AliInputEventHandler* inputHandler = (AliInputEventHandler*) (man->GetInputEventHandler());