Set EMCAL+DCAL geometry for 2015

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

diff --git a/PWG/EMCAL/AliEmcalSetupTask.cxx b/PWG/EMCAL/AliEmcalSetupTask.cxx
index 2003f6ef145652b76595a542ed19607a929dee88..f3562aa20011c52e00f8a6f0521b51753d013424 100644 (file)
--- a/PWG/EMCAL/AliEmcalSetupTask.cxx
+++ b/PWG/EMCAL/AliEmcalSetupTask.cxx
@@ -138,8 +138,8 @@ void AliEmcalSetupTask::Setup(Int_t runno)
   // Setup everything
 
   // Setup AliEMCALGeometry corresponding to year
-  TString geoname("EMCAL_COMPLETE12SMV1");
-  Int_t year = 2013;
+  TString geoname("EMCAL_COMPLETE12SMV1_DCAL_8SM");
+  Int_t year = 2015;
   if (runno>0 && runno<=139517) {
     year = 2010;
     geoname = "EMCAL_FIRSTYEARV1";
@@ -148,6 +148,9 @@ void AliEmcalSetupTask::Setup(Int_t runno)
     geoname = "EMCAL_COMPLETEV1";
   } else if ((runno>170593) && (runno<=193766)) {
     year = 2012;
+  } else if ((runno>193766) && (runno <= 199161)) {
+    geoname = "EMCAL_COMPLETE12SMV1";
+    year = 2013;
   }
   AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(geoname);
   if (!geom) {
@@ -155,7 +158,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