Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/PWG/EMCAL/AliEmcalSetupTask.cxx b/PWG/EMCAL/AliEmcalSetupTask.cxx
index 8055bb156676498237fb1232e29b16eb3227ed0a..b98ea434cd369954ec59a97a503f5df40b588a00 100644 (file)
--- a/PWG/EMCAL/AliEmcalSetupTask.cxx
+++ b/PWG/EMCAL/AliEmcalSetupTask.cxx
@@ -135,13 +135,10 @@ void AliEmcalSetupTask::Setup(Int_t runno)
 {
   // Setup everything
 
-  if (runno<=0)
-    return;
-
   // Setup AliEMCALGeometry corresponding to year
   TString geoname("EMCAL_COMPLETE12SMV1");
   Int_t year = 2013;
-  if (runno<=139517) {
+  if (runno>0 && runno<=139517) {
     year = 2010;
     geoname = "EMCAL_FIRSTYEARV1";
   } else if ((runno>139517) && (runno<=170593)) {
@@ -156,6 +153,9 @@ void AliEmcalSetupTask::Setup(Int_t runno)
     return;
   }
 
+  if (runno<=0)
+    return;
+
   // Setup CDB manager
   AliCDBManager *man = 0;
   man = AliCDBManager::Instance();