including EMCal geometry explicitly as an input parameter

[u/mrichter/AliRoot.git] / PWGGA / EMCALTasks / macros / AddTaskEMCALIsoPhoton.C

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
index 8a5c80f411bde88c38ebbe8919e342b2adafb065..ca57a1d7bca3377734e3e33ced6c1fa70107dec6 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
@@ -3,7 +3,8 @@
 AliAnalysisTaskEMCALIsoPhoton *AddTaskEMCALIsoPhoton(
                                                     TString period = "LHC11d",
                                                     TString trigbitname = "kEMC7",
-                                                    TString pathstrsel = "/"
+                                                    TString pathstrsel = "/",
+                                                    TString geoname="EMCAL_COMPLETEV1"
                                                     )
 {
   // Get the pointer to the existing analysis manager via the static access method.
@@ -42,27 +43,7 @@ AliAnalysisTaskEMCALIsoPhoton *AddTaskEMCALIsoPhoton(
   cutsp->SetEtaRange(-1.0,1.0);
   ana->SetPrimTrackCuts(cutsp);
   ana->SetPeriod(period.Data());
-  if(period.Contains("11")){
-    ana->SetGeoName("EMCAL_COMPLETEV1");
-    //ana->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2011.root");
-  }
-  else{
-    if(period.Contains("12")){
-      if(isMC){
-       ana->SetGeoName("EMCAL_COMPLETEV1");
-       //ana->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2011.root");
-      }
-      else{
-       ana->SetGeoName("EMCAL_COMPLETE12SMV1");
-       //ana->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2012.root");
-      }
-    }
-    else{
-    ana->SetGeoName("EMCAL_FIRSTYEARV1");
-    //ana->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2010.root");
-    }
-  }
-  
+  ana->SetGeoName(geoname.Data());  
   mgr->AddTask(ana);
   TString containername = "histosEMCALIsoPhoton";
   if(pathstrsel != "/"){