Merge branch 'feature-movesplit'

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

diff --git a/PWG/EMCAL/AliEmcalSetupTask.cxx b/PWG/EMCAL/AliEmcalSetupTask.cxx
index 2003f6ef145652b76595a542ed19607a929dee88..d4994a806c6f5c4d304ba46631a7e42c1ba6c64a 100644 (file)
--- a/PWG/EMCAL/AliEmcalSetupTask.cxx
+++ b/PWG/EMCAL/AliEmcalSetupTask.cxx
@@ -148,6 +148,13 @@ void AliEmcalSetupTask::Setup(Int_t runno)
     geoname = "EMCAL_COMPLETEV1";
   } else if ((runno>170593) && (runno<=193766)) {
     year = 2012;
+    geoname = "EMCAL_COMPLETE12SMV1";
+  } else if ((runno>193766) && (runno <= 199161)) {
+    geoname = "EMCAL_COMPLETE12SMV1";
+    year = 2013;
+  } else if (runno>199161) { //MV: is this the last run of run 1?
+    geoname = "EMCAL_COMPLETE12SMV1_DCAL_8SM";
+    year = 2015;
   }
   AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(geoname);
   if (!geom) {
@@ -155,7 +162,7 @@ void AliEmcalSetupTask::Setup(Int_t runno)
     return;
   }
 
-  if (runno<=0)
+  if (runno<0)  // Run number 0 can occur for MC
     return;
 
   // Setup CDB manager