Merge remote-tracking branch 'origin/master' into TPCdev

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / AliJetEmbeddingFromGenTask.cxx

diff --git a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromGenTask.cxx b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromGenTask.cxx
index efb7a11e9c21dd1796fb77533dc73c4123da6154..5b38bd3de63bacecd1f896fcda35ddfc1b1d85c0 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliJetEmbeddingFromGenTask.cxx
+++ b/PWGJE/EMCALJetTasks/AliJetEmbeddingFromGenTask.cxx
@@ -1,4 +1,4 @@
-// $Id: AliJetEmbeddingFromGenTask.cxx 57324 2012-06-21 04:33:52Z loizides $
+// $Id$
 //
 // Jet embedding task.
 //
@@ -72,13 +72,13 @@ Bool_t AliJetEmbeddingFromGenTask::ExecOnce()
   fGen->SetStack(stack);
   fGen->Init();
 
-  if (InputEvent()->FindListObject(fTracksName) == 0) {
+  if (!(InputEvent()->FindListObject(fTracksName))) {
     fOutTracks = new TClonesArray("AliPicoTrack", 1000);
     fOutTracks->SetName(fTracksName);
     InputEvent()->AddObject(fOutTracks);
     fNTracks = 0;
   }
-
+  
   return kTRUE;
 }
 
@@ -87,6 +87,9 @@ void AliJetEmbeddingFromGenTask::Run()
 {
   // Embed particles.
 
+  if(fOutTracks)
+   fOutTracks->Delete();
+
   if (fCopyArray) 
     CopyTracks();
 
@@ -119,6 +122,6 @@ void AliJetEmbeddingFromGenTask::Run()
       continue;
     if (pt>fPtMax)
       continue;
-    AddTrack(pt, eta, phi);
+    AddTrack(pt, eta, phi,0,0,0,0,0,0,part->GetMass());
   }
 }