From Salvatore

[u/mrichter/AliRoot.git] / PWG / EMCAL / AliAnalysisTaskEmcalDev.cxx

diff --git a/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx b/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
index cc237595e88fa0e32f0069b335ee609cccc006f3..4b201a81b149b823a78e87ba7d781e9b41a8533b 100644 (file)
--- a/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
+++ b/PWG/EMCAL/AliAnalysisTaskEmcalDev.cxx
@@ -369,10 +369,12 @@ void AliAnalysisTaskEmcalDev::ExecOnce()
     cont->SetParticleArray(InputEvent());
   }
 
-  fTracks = GetParticleArray(0);
-  if(!fTracks && fParticleCollArray.GetEntriesFast()>0) {
-    AliError(Form("%s: Could not retrieve first track branch!", GetName()));
-    return;
+  if (fParticleCollArray.GetEntriesFast()>0) {
+    fTracks = GetParticleArray(0);
+    if(!fTracks) {
+      AliError(Form("%s: Could not retrieve first track branch!", GetName()));
+      return;
+    }
   }
 
   //Load all requested cluster branches - each container knows name already
@@ -380,11 +382,13 @@ void AliAnalysisTaskEmcalDev::ExecOnce()
     AliClusterContainer *cont = static_cast<AliClusterContainer*>(fClusterCollArray.At(i));
     cont->SetClusterArray(InputEvent());
   }
-  if(fClusterCollArray.GetEntriesFast()>0)
+
+  if(fClusterCollArray.GetEntriesFast()>0) {
     fCaloClusters = GetClusterArray(0);
-  if(!fCaloClusters && fClusterCollArray.GetEntriesFast()>0) {
-    AliError(Form("%s: Could not retrieve first cluster branch!", GetName()));
-    return;
+    if(!fCaloClusters) {
+      AliError(Form("%s: Could not retrieve first cluster branch!", GetName()));
+      return;
+    }
   }
 
   if (!fCaloCellsName.IsNull() && !fCaloCells) {
@@ -585,7 +589,7 @@ Bool_t AliAnalysisTaskEmcalDev::RetrieveEventObjects()
   if (fBeamType == kAA || fBeamType == kpA ) {
     AliCentrality *aliCent = InputEvent()->GetCentrality();
     if (aliCent) {
-      fCent = aliCent->GetCentralityPercentile(fCentEst.Data()); 
+      fCent = aliCent->GetCentralityPercentile(fCentEst.Data());
       if(fNcentBins==4) {
        if      (fCent >=  0 && fCent <   10) fCentBin = 0;
        else if (fCent >= 10 && fCent <   30) fCentBin = 1;
@@ -603,10 +607,6 @@ Bool_t AliAnalysisTaskEmcalDev::RetrieveEventObjects()
          AliWarning(Form("%s: fCentBin too large: cent = %f fCentBin = %d. Assuming 99", GetName(),fCent,fCentBin));
          fCentBin = fNcentBins-1;
        }
-       if(fCentBin>=fNcentBins) {
-         AliWarning(Form("%s: fCentBin too large: cent = %f fCentBin = %d. Assuming 99", GetName(),fCent,fCentBin));
-         fCentBin = fNcentBins-1;
-       }
       }
     } else {
       AliWarning(Form("%s: Could not retrieve centrality information! Assuming 99", GetName()));