cov fix + some extra features on matrices import

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
index a634ac47cf62a745819c4ea52d85a4dac4a80998..ba45e3912d4466eb03d6981fe0c36b0ab2118f9d 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
@@ -68,6 +68,8 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fNClusForDirPho(0),
   fDirPhoPt(0),
   fHigherPtCone(0),
+  fImportGeometryFromFile(0),
+  fImportGeometryFilePath(""),
   fESD(0),
   fAOD(0),
   fMCEvent(0),
@@ -96,6 +98,7 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton() :
   fHnOutput(0)
 {
   // Default constructor.
+  for(Int_t i = 0; i < 12;    i++)  fGeomMatrix[i] =  0;
 }
 
 //________________________________________________________________________
@@ -125,6 +128,8 @@ AliAnalysisTaskEMCALIsoPhoton::AliAnalysisTaskEMCALIsoPhoton(const char *name) :
   fNClusForDirPho(0),
   fDirPhoPt(0),
   fHigherPtCone(0),
+  fImportGeometryFromFile(0),
+  fImportGeometryFilePath(""),
   fESD(0),
   fAOD(0),
   fMCEvent(0),
@@ -311,7 +316,8 @@ void AliAnalysisTaskEMCALIsoPhoton::UserExec(Option_t *)
   
   fEvtSel->Fill(0);
   if(fDebug)
-    printf("event is ok\n");
+    printf("event is ok,\n run number=%d\n",runnumber);
+
   
   AliVVertex *pv = (AliVVertex*)event->GetPrimaryVertex();
   Bool_t pvStatus = kTRUE;

diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
index 8d5b19a2b35376e3fe34f48df1bfdf57d869026b..feafd3b88a5dd525aabc78fced07f1d4bfa87f21 100644 (file)
--- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
+++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.h
@@ -55,6 +55,9 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
   void                   SetDebugOn(Bool_t d)                   { fDebug              = d;       }
   void                   SetPathStringSelect(char *p)           { fPathStrOpt         = p;       }
   void                   SetEtCut(Double_t ec)                  { fECut               = ec;      }
+  void                   SetImportGeometryFromFile(Bool_t  im, 
+                                           TString pa = "")     { fImportGeometryFromFile = im ; 
+                                                                  fImportGeometryFilePath = pa ; }    
   
  protected:
   TObjArray             *fESDClusters;           //!pointer to EMCal clusters
@@ -81,6 +84,8 @@ class AliAnalysisTaskEMCALIsoPhoton : public AliAnalysisTaskSE {
   Int_t                  fNClusForDirPho;        // number of clusters from prompt photon per event
   Float_t                fDirPhoPt;              // prompt photon pt (assumes only one per event)
   Float_t                fHigherPtCone;          // higher pt inside the cone around the candidate
+  Bool_t                 fImportGeometryFromFile;  // Import geometry settings in geometry.root file
+  TString                fImportGeometryFilePath;  // path fo geometry.root file
 
   
  private:

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C b/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
index 9d64092f86c73bda7b5696a7a230b61a2dc85eba..8a5c80f411bde88c38ebbe8919e342b2adafb065 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEMCALIsoPhoton.C
@@ -42,11 +42,26 @@ AliAnalysisTaskEMCALIsoPhoton *AddTaskEMCALIsoPhoton(
   cutsp->SetEtaRange(-1.0,1.0);
   ana->SetPrimTrackCuts(cutsp);
   ana->SetPeriod(period.Data());
-  if(period.Contains("11"))
+  if(period.Contains("11")){
     ana->SetGeoName("EMCAL_COMPLETEV1");
-  else
+    //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");
+    }
+  }
   
   mgr->AddTask(ana);
   TString containername = "histosEMCALIsoPhoton";