From 4d4ce2d2bcf24a13f742b83d01fd1ece3c7bed49 Mon Sep 17 00:00:00 2001
From: mcosenti <mcosenti@cern.ch>
Date: Tue, 4 Feb 2014 15:48:25 -0200
Subject: [PATCH] including an old fix for EMCal matrices not applied to this
 code

---
 PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx | 12 +++++++-----
 PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h   |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
index a0f7a119942..943fe8510a7 100644
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
@@ -53,6 +53,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fPrTrCuts(0),
   fGeom(0x0),
   fGeoName("EMCAL_COMPLETEV1"),
+  fOADBContainer(0),
   fPeriod("LHC11c"),
   fTrigBit("kEMC7"),
   fIsTrain(0),
@@ -113,6 +114,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton(const char *name) :
   fPrTrCuts(0),
   fGeom(0x0),
   fGeoName("EMCAL_COMPLETEV1"),
+  fOADBContainer(0),
   fPeriod("LHC11c"),
   fTrigBit("kEMC7"),
   fIsTrain(0),
@@ -180,7 +182,9 @@ void AliAnalysisTaskEMCALIsoPhoton::UserCreateOutputObjects()
   fOutputList->SetOwner();// Container cleans up all histos (avoids leaks in merging) 
   
   fGeom = AliEMCALGeometry::GetInstance(fGeoName.Data());
-  
+  fOADBContainer = new AliOADBContainer("AliEMCALgeo");
+  fOADBContainer->InitFromFile(Form("$ALICE_ROOT/OADB/EMCAL/EMCALlocal2master.root"),"AliEMCALgeo");
+ 
   fEvtSel = new TH1F("hEvtSel","Event selection counter (0=all trg, 1=pvz cut) ;evt cut ;dN/dcut}",2,0,2);
   fOutputList->Add(fEvtSel);
   
@@ -378,10 +382,7 @@ void AliAnalysisTaskEMCALIsoPhoton::UserExec(Option_t *)
       fSelPrimTracks->Add(track);
   }
 
-  AliOADBContainer emcGeoMat("AliEMCALgeo");
-  emcGeoMat.InitFromFile(Form("$ALICE_ROOT/OADB/EMCAL/EMCALlocal2master.root"),"AliEMCALgeo");
-  TObjArray *matEMCAL=(TObjArray*)emcGeoMat.GetObject(runnumber,"EmcalMatrices");
-
+  TObjArray *matEMCAL=(TObjArray*)fOADBContainer->GetObject(runnumber,"EmcalMatrices");
   for(Int_t mod=0; mod < (fGeom->GetEMCGeometry())->GetNumberOfSuperModules(); mod++){
     if(fGeoName=="EMCAL_FIRSTYEARV1" && mod>3)
       break;
@@ -392,6 +393,7 @@ void AliAnalysisTaskEMCALIsoPhoton::UserExec(Option_t *)
     fGeomMatrix[mod] = (TGeoHMatrix*) matEMCAL->At(mod);
     fGeom->SetMisalMatrix(fGeomMatrix[mod] , mod);
   }
+
   if(fESD){
     AliESDtrackCuts *fTrackCuts = new AliESDtrackCuts();
     fTrackMult = fTrackCuts->GetReferenceMultiplicity(fESD);//kTrackletsITSTPC ,0.5); 
diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
index feafd3b88a5..9d5e6042163 100644
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
@@ -10,6 +10,7 @@ class THnSparse;
 class TList;
 class TObjArray;
 class AliEMCALGeometry;
+class AliOADBContainer;
 class AliESDCaloCells;
 class AliESDEvent;
 class AliESDtrack;
@@ -69,6 +70,7 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
   AliESDtrackCuts       *fPrTrCuts;              //pointer to hold the prim track cuts
   AliEMCALGeometry      *fGeom;                  // geometry utils
   TString                fGeoName;               // geometry name (def = EMCAL_FIRSTYEARV1)
+  AliOADBContainer      *fOADBContainer;         //!OADB container used to load misalignment matrices
   TString                fPeriod;                // string to the LHC period
   TString                fTrigBit;               // string to the trigger bit name
   Bool_t                 fIsTrain;               // variable to set train mode
-- 
2.43.0