added geo path and updated macro to be able to specify input

diff --git a/PWG/EMCAL/AliEmcalSetupTask.cxx b/PWG/EMCAL/AliEmcalSetupTask.cxx
index 3187b356ef7cc47737be65ab858ae34f183ea254..b8a4c3f9df3c1b3592791bcf2169e7853dc9e837 100644 (file)
--- a/PWG/EMCAL/AliEmcalSetupTask.cxx
+++ b/PWG/EMCAL/AliEmcalSetupTask.cxx
@@ -35,7 +35,7 @@ AliEmcalSetupTask::AliEmcalSetupTask(const char *name) :
   AliAnalysisTaskSE(name),
   fOcdbPath(),
   fOadbPath("$ALICE_ROOT/OADB/EMCAL"),
-  fGeoPath("."),
+  fGeoPath("$ALICE_ROOT/OADB/EMCAL"),
   fIsInit(kFALSE)
 {
   // Constructor.
@@ -66,14 +66,15 @@ void AliEmcalSetupTask::UserExec(Option_t *)
 
   Int_t runno = InputEvent()->GetRunNumber();
   TString geoname("EMCAL_COMPLETE12SMV1");
-  Int_t year = 2012;
+  Int_t year = 2013;
   if (runno<=139517) {
     year = 2010;
     geoname = "EMCAL_FIRSTYEARV1";
-  }
-  else if ((runno>139517) && (runno<=170593)) {
+  } else if ((runno>139517) && (runno<=170593)) {
     year = 2011;
     geoname = "EMCAL_COMPLETEV1";
+  } else if ((runno>170593) && (runno<=193766)) {
+    year = 2012;
   }
 
   AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(geoname);

diff --git a/PWG/EMCAL/macros/AddTaskEmcalSetup.C b/PWG/EMCAL/macros/AddTaskEmcalSetup.C
index c58d70b475e062a28f36f96f3da0d11aba393efe..f8eb8ea95280a2d4986b6347cdfdfabfaeb72139 100644 (file)
--- a/PWG/EMCAL/macros/AddTaskEmcalSetup.C
+++ b/PWG/EMCAL/macros/AddTaskEmcalSetup.C
@@ -1,6 +1,10 @@
 // $Id$
 
-AliEmcalSetupTask* AddTaskEmcalSetup()
+AliEmcalSetupTask* AddTaskEmcalSetup(
+  const char *geop = 0,
+  const char *oadp = 0,
+  const char *ocdp = 0 
+)
 {  
   // Get the pointer to the existing analysis manager via the static access method.
   //==============================================================================
@@ -23,6 +27,9 @@ AliEmcalSetupTask* AddTaskEmcalSetup()
   // Init the task and do settings
   //-------------------------------------------------------
   AliEmcalSetupTask *eTask = new AliEmcalSetupTask("EmcalSetupTask");
+  if (geop) eTask->SetGeoPath(geop);
+  if (oadp) eTask->SetOadbPath(oadp);
+  if (ocdp) eTask->SetOcdbPath(ocdp);
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers