From 822c9944b2e1630028b189aeb17396580489f132 Mon Sep 17 00:00:00 2001
From: mcosenti <mcosenti@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 26 Jul 2013 14:29:37 +0000
Subject: [PATCH] change in the load of matrices

---
 .../AliAnalysisTaskEMCALIsoPhoton.cxx         | 25 +++++++++++--------
 .../AliAnalysisTaskEMCALIsoPhoton.h           |  3 ++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
index bb02ee4f3a7..a634ac47cf6 100644
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
@@ -33,6 +33,7 @@
 #include "AliVTrack.h"
 #include "AliV0vertexer.h"
 #include "AliVCluster.h"
+#include "AliOADBContainer.h"
 
 #include <iostream>
 using std::cout;
@@ -304,6 +305,7 @@ void AliAnalysisTaskEMCALIsoPhoton::UserExec(Option_t *)
     printf("ERROR: event not available\n");
     return;
   }
+  Int_t   runnumber = InputEvent()->GetRunNumber() ;
   fESD = dynamic_cast<AliESDEvent*>(event);
   fAOD = dynamic_cast<AliAODEvent*>(event);
   
@@ -359,16 +361,19 @@ void AliAnalysisTaskEMCALIsoPhoton::UserExec(Option_t *)
       fSelPrimTracks->Add(track);
   }
 
-  if(!fIsTrain){
-    for(Int_t mod=0; mod < (fGeom->GetEMCGeometry())->GetNumberOfSuperModules(); mod++){
-      if(fGeoName=="EMCAL_FIRSTYEARV1" && mod>3)
-        break;
-      /*if(fESD)
-	  fGeom->SetMisalMatrix(fESD->GetEMCALMatrix(mod), mod);
-	  else*/
-	if(event->GetEMCALMatrix(mod))
-	    fGeom->SetMisalMatrix(event->GetEMCALMatrix(mod), mod);
-    }
+  AliOADBContainer emcGeoMat("AliEMCALgeo");
+  emcGeoMat.InitFromFile(Form("$ALICE_ROOT/OADB/EMCAL/EMCALlocal2master.root"),"AliEMCALgeo");
+  TObjArray *matEMCAL=(TObjArray*)emcGeoMat.GetObject(runnumber,"EmcalMatrices");
+
+  for(Int_t mod=0; mod < (fGeom->GetEMCGeometry())->GetNumberOfSuperModules(); mod++){
+    if(fGeoName=="EMCAL_FIRSTYEARV1" && mod>3)
+      break;
+    /*if(fESD)
+      fGeom->SetMisalMatrix(fESD->GetEMCALMatrix(mod), mod);
+      else*/
+    // if(event->GetEMCALMatrix(mod))
+    fGeomMatrix[mod] = (TGeoHMatrix*) matEMCAL->At(mod);
+    fGeom->SetMisalMatrix(fGeomMatrix[mod] , mod);
   }
   if(fESD){
     AliESDtrackCuts *fTrackCuts = new AliESDtrackCuts();
diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
index 3e5e600eb4f..8d5b19a2b35 100644
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
@@ -20,6 +20,7 @@ class AliVCluster;
 class AliMCEvent;
 class AliStack;
 class TParticle;
+class TGeoHMatrix;
 
 #include "AliAnalysisTaskSE.h"
 
@@ -87,7 +88,7 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
   AliAODEvent *fAOD;      //! AOD object
   AliMCEvent  *fMCEvent;  //! MC event object
   AliStack    *fStack;    //!MC particles stack object
-
+  TGeoHMatrix *fGeomMatrix[12];//! Geometry misalignment matrices for EMCal
   TList       *fOutputList; //! Output list
   //histograms for events with 1+ track pt>1
   TH1F        *fEvtSel;                    //!evt selection counter: 0=all trg, 1=pv cut 
-- 
2.43.0