X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PWG3%2FvertexingHF%2FAliCFHeavyFlavourTaskMultiVarMultiStep.cxx;h=83a641eda54dc7c4969e2d47cdfe0e1f68f912e8;hb=edc77ca4618054aff7089a6ee4226b6e5a4a21cd;hp=6578d54451427ec96222bf30cd40a20b729aa107;hpb=5806c29019a6a6a17ac7ebade6a1e7ee2b156395;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PWG3/vertexingHF/AliCFHeavyFlavourTaskMultiVarMultiStep.cxx b/PWG3/vertexingHF/AliCFHeavyFlavourTaskMultiVarMultiStep.cxx
index 6578d544514..83a641eda54 100644
--- a/PWG3/vertexingHF/AliCFHeavyFlavourTaskMultiVarMultiStep.cxx
+++ b/PWG3/vertexingHF/AliCFHeavyFlavourTaskMultiVarMultiStep.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 //-----------------------------------------------------------------------
 // Class for HF corrections as a function of many variables
 // 6 Steps introduced: MC, MC Acc, Reco, Reco Acc, Reco Acc + ITS Cl, 
@@ -316,12 +318,12 @@ void AliCFHeavyFlavourTaskMultiVarMultiStep::UserExec(Option_t *)
 
 	for (Int_t iPart=0; iPart<mcArray->GetEntriesFast(); iPart++) { 
 		AliAODMCParticle* mcPart = dynamic_cast<AliAODMCParticle*>(mcArray->At(iPart));
-		if (mcPart->GetPdgCode() == 4) cquarks++; 
-		if (mcPart->GetPdgCode() == -4) cquarks++; 
 		if (!mcPart) {
 			AliWarning("Particle not found in tree, skipping"); 
 			continue;
 		} 
+		if (mcPart->GetPdgCode() == 4) cquarks++; 
+		if (mcPart->GetPdgCode() == -4) cquarks++; 
 		
 		// check the MC-level cuts
 
@@ -1490,6 +1492,7 @@ Int_t AliCFHeavyFlavourTaskMultiVarMultiStep::CheckOrigin(AliAODMCParticle* mcPa
 		istep++;
 		AliDebug(2,Form("mother at step %d = %d", istep, mother));
 		AliAODMCParticle* mcGranma = dynamic_cast<AliAODMCParticle*>(mcArray->At(mother));
+		if(!mcGranma) break;
 		pdgGranma = mcGranma->GetPdgCode();
 		AliDebug(2,Form("Pdg mother at step %d = %d", istep, pdgGranma));
 		Int_t abspdgGranma = TMath::Abs(pdgGranma);