From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 2 Jul 2012 12:48:05 +0000 (+0000)
Subject: update from Salvatore
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=121eb68834303113959bf9659a9dcb4943c5b9fd;hp=3eb0297a9275f0a47351acbbf8d72a2965511283;p=u%2Fmrichter%2FAliRoot.git

update from Salvatore
---

diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
index 711e20e57a3..dc06e810c89 100644
--- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
+++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.cxx
@@ -31,6 +31,7 @@ ClassImp(AliAnalysisTaskSAJF)
 //________________________________________________________________________
 AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() : 
   AliAnalysisTaskEmcalJet("AliAnalysisTaskSAJF", kTRUE),
+  fMCAna(kFALSE),
   fMinRC2LJ(1.0),
   fEmbJetsName("EmbJets"),
   fEmbTracksName(""),
@@ -100,6 +101,7 @@ AliAnalysisTaskSAJF::AliAnalysisTaskSAJF() :
 //________________________________________________________________________
 AliAnalysisTaskSAJF::AliAnalysisTaskSAJF(const char *name) : 
   AliAnalysisTaskEmcalJet(name, kTRUE),
+  fMCAna(kFALSE),
   fMinRC2LJ(1.0),
   fEmbJetsName("EmbJets"),
   fEmbTracksName(""),
@@ -728,7 +730,7 @@ void AliAnalysisTaskSAJF::DoClusterLoop()
       continue;
     }  
 
-    if (!AcceptCluster(cluster, kTRUE)) 
+    if (!AcceptCluster(cluster, fMCAna)) 
       continue;
 
     if (cluster->Chi2() == 100)
@@ -761,7 +763,7 @@ void AliAnalysisTaskSAJF::DoTrackLoop()
 
     AliVTrack* vtrack = dynamic_cast<AliVTrack*>(track); 
     
-    if (vtrack && !AcceptTrack(vtrack, kTRUE)) 
+    if (vtrack && !AcceptTrack(vtrack, fMCAna)) 
       continue;
 
     if (track->GetLabel() == 100)
@@ -988,7 +990,7 @@ void AliAnalysisTaskSAJF::GetRigidCone(Float_t &pt, Float_t &ptrigid, Float_t &e
 	continue;
       }  
       
-      if (!AcceptCluster(cluster))
+      if (!AcceptCluster(cluster, fMCAna))
 	continue;
       
       TLorentzVector nPart;
@@ -1015,7 +1017,7 @@ void AliAnalysisTaskSAJF::GetRigidCone(Float_t &pt, Float_t &ptrigid, Float_t &e
 	continue; 
       }
       
-      if (!AcceptTrack(track)) 
+      if (!AcceptTrack(track, fMCAna)) 
 	continue;
       
       Float_t tracketa = track->Eta();
diff --git a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
index 50bfab6ebb6..b8f447a82c3 100644
--- a/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
+++ b/PWGGA/EMCALJetTasks/UserTasks/AliAnalysisTaskSAJF.h
@@ -27,7 +27,8 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
   void                        SetRandClusName(const char *n)                       { fRandCaloName            = n          ; }
   void                        SetEmbTracksName(const char *n)                      { fEmbTracksName           = n          ; }
   void                        SetEmbClusName(const char *n)                        { fEmbCaloName             = n          ; }
-  void                        SetRhoName(const char *n)                            { fRhoName                 = n          ; }        
+  void                        SetRhoName(const char *n)                            { fRhoName                 = n          ; }
+  void                        SetMC(Bool_t m)                                      { fMCAna                   = m          ; }
 
  protected:
   void                        ExecOnce()                                                                                    ;
@@ -41,6 +42,7 @@ class AliAnalysisTaskSAJF : public AliAnalysisTaskEmcalJet {
   void                        GetRigidCone(Float_t &pt, Float_t &ptrigid, Float_t &eta, Float_t &phi, 
 					   AliEmcalJet *jet = 0, TClonesArray* tracks = 0, TClonesArray* clusters = 0) const;
 
+  Bool_t                      fMCAna;                      // =true MC analysis (toy model)
   Float_t                     fMinRC2LJ;                   // Minimum distance random cone to leading jet
   TString                     fEmbJetsName;                // Name of embedded jet collection
   TString                     fEmbTracksName;              // Name of embedded track collection