- prevent accessing a null pointer in case the calo cluster branch does not exist

[u/mrichter/AliRoot.git] / STEER / AOD / AliAODEvent.h

diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h
index 6cfed747ac5be2dc1fcf56bbed0c50caccf64cdc..0d5f2e9bed1ea43563b57c51a7a9ff8badda7d6b 100644 (file)
--- a/STEER/AOD/AliAODEvent.h
+++ b/STEER/AOD/AliAODEvent.h
@@ -184,8 +184,8 @@ class AliAODEvent : public AliVEvent {
 
   // -- EMCAL and PHOS Cluster
   TClonesArray *GetCaloClusters()          const { return fCaloClusters; }
-  Int_t         GetNumberOfCaloClusters()  const { return fCaloClusters->GetEntriesFast(); }
-  AliAODCaloCluster *GetCaloCluster(Int_t nCluster) const { return (AliAODCaloCluster*)fCaloClusters->UncheckedAt(nCluster); }
+  Int_t         GetNumberOfCaloClusters()  const { return fCaloClusters?fCaloClusters->GetEntriesFast():0; }
+  AliAODCaloCluster *GetCaloCluster(Int_t nCluster) const { return fCaloClusters?(AliAODCaloCluster*)fCaloClusters->UncheckedAt(nCluster):0x0; }
   Int_t         AddCaloCluster(const AliAODCaloCluster* clus)
   {new((*fCaloClusters)[fCaloClusters->GetEntriesFast()]) AliAODCaloCluster(*clus); return fCaloClusters->GetEntriesFast()-1;}
   AliAODCaloTrigger *GetCaloTrigger(TString calo) const