change location of geometry.root file

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
index 74c1b8eb00bc5153b5dfa2bbf91d2359cb14c5fb..c9c98b7d4449ede3001339f98773d5a1e96ebb27 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
@@ -362,7 +362,7 @@ void AliCaloTrackReader::Init()
   if(fImportGeometryFromFile && !gGeoManager) 
   {
     if(fImportGeometryFilePath=="") // If not specified, set a default location
-    fImportGeometryFilePath = "$ALICE_ROOT/PWGGA/EMCALTasks/macros/geometry.root"; // "$ALICE_ROOT/EVE/alice-data/default_geo.root"
+    fImportGeometryFilePath = "$ALICE_ROOT/OADB/EMCAL/geometry_2011.root"; // "$ALICE_ROOT/EVE/alice-data/default_geo.root"
 
     printf("AliCaloTrackReader::Init() - Import %s\n",fImportGeometryFilePath.Data());
     TGeoManager::Import(fImportGeometryFilePath) ; // default need file "geometry.root" in local dir!!!!

diff --git a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
index acdeaa87fdfd8af77fb6646b4a2f59ebf818d133..0365ea4a8966e40111ce7899804f360166d88723 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
+++ b/PWGGA/CaloTrackCorrelations/macros/AddTaskCaloTrackCorr.C
@@ -386,8 +386,9 @@ AliCaloTrackReader * ConfigureReader()
     reader->SetEventPlaneMethod("V0");
   }
   
-  reader->SetImportGeometryFromFile(kTRUE);
-  
+  if(kYears==2010) reader->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2010.root");
+  else             reader->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2011.root");
+    
   if(kPrint) reader->Print("");
   
   return reader;

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
index 73d8abb7e878c631f032c8c07840c58079ab986b..b78b087e721dac9c2c1c110ebe8a0fe7773f7b7f 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALClusterize.cxx
@@ -1,4 +1,4 @@
-/**************************************************************************
+ /**************************************************************************
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -1010,7 +1010,7 @@ void AliAnalysisTaskEMCALClusterize::Init()
   // Init geometry, I do not like much to do it like this ...
   if(fImportGeometryFromFile && !gGeoManager) 
   {
-    if (fImportGeometryFilePath == "") fImportGeometryFilePath = "$ALICE_ROOT/PWGGA/EMCALTasks/macros/geometry.root" ; // "$ALICE_ROOT/EVE/alice-data/default_geo.root"
+    if (fImportGeometryFilePath == "") fImportGeometryFilePath = "$ALICE_ROOT/PWGGA/OADB/EMCAL/geometry_2011.root" ; // "$ALICE_ROOT/EVE/alice-data/default_geo.root"
     printf("AliAnalysisTaskEMCALClusterize::Init() - Import %s\n",fImportGeometryFilePath.Data());
     TGeoManager::Import(fImportGeometryFilePath) ; 
   }

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C
index aad7705d91697bb8a7cf072fafbfd8bd225e5e0b..f365d15e9f7d6b27036e299f3442e1fecb877f70 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEMCALClusterize.C
@@ -173,8 +173,8 @@ AliAnalysisTaskEMCALClusterize* AddTaskEMCALClusterize(
   //Alignment matrices
   //-------------------------------------------------------
 
-  clusterize->SetImportGeometryFromFile(kTRUE); // import geometry.root file
-  
+  clusterize->SetImportGeometryFromFile(kTRUE,"$ALICE_ROOT/OADB/EMCAL/geometry_2011.root"); // change only in case 2010 to geometry_2010.root
+
   if(!bMC)
   {    
     clusterize->SwitchOnLoadOwnGeometryMatrices();