From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 16 Jun 2011 13:22:10 +0000 (+0000)
Subject: added embed mode
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=cfd7d5b20d9d2b7f10e3856dd410d468495a2668

added embed mode
---

diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
index 0f1d4f0be4f..b59cf3290b0 100644
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.cxx
@@ -73,6 +73,7 @@ AliAnalysisTaskEMCALPi0PbPb::AliAnalysisTaskEMCALPi0PbPb(const char *name)
     fMinL0Time(-1),
     fMaxL0Time(1024),
     fMcMode(0),
+    fEmbedMode(0),
     fGeom(0),
     fReco(0),
     fDoPSel(kTRUE),
@@ -199,6 +200,7 @@ void AliAnalysisTaskEMCALPi0PbPb::UserCreateOutputObjects()
   cout << " fMinL0Time:     " << fMinL0Time << endl;
   cout << " fMaxL0Time:     " << fMaxL0Time << endl;
   cout << " fMcMode:        " << fMcMode << endl;
+  cout << " fEmbedMode:     " << fEmbedMode << endl;
   cout << " fGeom:          " << fGeom << endl;
   cout << " fReco:          " << fReco << endl;
   cout << " fDoPSel:        " << fDoPSel << endl;
@@ -247,7 +249,7 @@ void AliAnalysisTaskEMCALPi0PbPb::UserCreateOutputObjects()
         TClass::GetClass("AliStaTrigger")->IgnoreTObjectStreamer();
       fTriggers = new TClonesArray("AliStaTrigger");
       fNtuple->Branch("l0prim", &fTriggers, 16*1024, 99);
-      if (fMcMode) {
+      if (fMcMode||fEmbedMode) {
         if (TClass::GetClass("AliStaPart"))
           TClass::GetClass("AliStaPart")->IgnoreTObjectStreamer();
         fMcParts = new TClonesArray("AliStaPart");
@@ -698,7 +700,7 @@ void AliAnalysisTaskEMCALPi0PbPb::UserExec(Option_t *)
     fSelTracks->Clear();
     fSelPrimTracks->Clear();
     fTriggers->Clear();
-    if (fMcMode)
+    if (fMcParts)
       fMcParts->Clear();
   }
 
@@ -857,7 +859,7 @@ void AliAnalysisTaskEMCALPi0PbPb::CalcClusterProps()
   }
 
   TObjArray filtMcParts;
-  if (fMcMode) {
+  if (fMcParts) {
     Int_t nmc = fMcParts->GetEntries();
     for (Int_t i=0; i<nmc; ++i) {
       AliStaPart *pa = static_cast<AliStaPart*>(fMcParts->At(i));
@@ -1015,7 +1017,7 @@ void AliAnalysisTaskEMCALPi0PbPb::CalcClusterProps()
     }
 
     //mc matching
-    if (fMcMode) {
+    if (fMcParts) {
       Int_t nmc = filtMcParts.GetEntries();
       Double_t diffR2 = 1e9;
       AliStaPart *msta = 0;
@@ -1390,7 +1392,7 @@ void AliAnalysisTaskEMCALPi0PbPb::CalcMcInfo()
 {
   // Get Mc truth particle information.
 
-  if (!fMcMode)
+  if (!fMcParts)
     return;
 
   fMcParts->Clear();
@@ -1696,7 +1698,7 @@ void AliAnalysisTaskEMCALPi0PbPb::FillMcHists()
 {
   // Fill additional MC information histograms.
 
-  if (!fMcMode)
+  if (!fMcParts)
     return;
 
   // check if aod or esd mc mode and the fill histos
diff --git a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
index 819c9ec5672..43e97eb64d0 100644
--- a/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
+++ b/PWG4/CaloCalib/AliAnalysisTaskEMCALPi0PbPb.h
@@ -51,6 +51,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   void         SetL0TimeRange(Int_t l, Int_t h)               { fMinL0Time=l; fMaxL0Time=h; }
   void         SetMarkCells(const char *n)                    { fMarkCells     = n;         }
   void         SetMcMode(Bool_t b)                            { fMcMode        = b;         }
+  void         SetEmbedMode(Bool_t b)                         { fEmbedMode     = b;         }
   void         SetMinClusEnergy(Double_t e)                   { fMinE          = e;         }
   void         SetMinEcc(Double_t ecc)                        { fMinEcc        = ecc;       }
   void         SetMinErat(Double_t erat)                      { fMinErat       = erat;      }
@@ -122,6 +123,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   Int_t                  fMinL0Time;              // minimum accepted time for trigger
   Int_t                  fMaxL0Time;              // maximum accepted time for trigger
   Bool_t                 fMcMode;                 // monte carlo mode
+  Bool_t                 fEmbedMode;              // embedding mode
   AliEMCALGeoUtils      *fGeom;                   // geometry utils
   AliEMCALRecoUtils     *fReco;                   // reco utils
   Bool_t                 fDoPSel;                 // if false then accept all events
@@ -196,7 +198,7 @@ class AliAnalysisTaskEMCALPi0PbPb : public AliAnalysisTaskSE {
   AliAnalysisTaskEMCALPi0PbPb(const AliAnalysisTaskEMCALPi0PbPb&);            // not implemented
   AliAnalysisTaskEMCALPi0PbPb &operator=(const AliAnalysisTaskEMCALPi0PbPb&); // not implemented
 
-  ClassDef(AliAnalysisTaskEMCALPi0PbPb, 9) // Analysis task for neutral pions in Pb+Pb
+  ClassDef(AliAnalysisTaskEMCALPi0PbPb, 10) // Analysis task for neutral pions in Pb+Pb
 };
 #endif