Modification for the new ESD event structure

diff --git a/test/merge/test.C b/test/merge/test.C
index b1006ec8b1848514948607dc969947852a47459e..287934fed81ee540646af2ed0abe9407f8c93912 100644 (file)
--- a/test/merge/test.C
+++ b/test/merge/test.C
@@ -15,7 +15,7 @@
 #include <TParticle.h>
 
 // AliRoot include files
 #include <TParticle.h>
 
 // AliRoot include files

-#include "AliESD.h"
+#include "AliESDEvent.h"

 #include "AliRunLoader.h"
 #include "AliRun.h"
 #include "AliStack.h"
 #include "AliRunLoader.h"
 #include "AliRun.h"
 #include "AliStack.h"


@@ -35,10 +35,9 @@ void test(const char * sdir ="signal",
   name += "/AliESDs.root";
   TFile * fSig = TFile::Open(name.Data());
   TTree * tSig = (TTree*)fSig->Get("esdTree");
   name += "/AliESDs.root";
   TFile * fSig = TFile::Open(name.Data());
   TTree * tSig = (TTree*)fSig->Get("esdTree");

-  TBranch * bSig = tSig->GetBranch("ESD");  

 
 

-  AliESD * esdSig = 0; // The signal ESD object is put here
-  bSig->SetAddress(&esdSig);
+  AliESDEvent * esdSig = new AliESDEvent();// The signal ESD object is put here
+  esdSig->ReadFromTree(tSig);

 
   // Run loader (signal events)
   name = sdir;
 
   // Run loader (signal events)
   name = sdir;


@@ -76,7 +75,7 @@ void test(const char * sdir ="signal",
     cout << "Underlying event " << ievUnd << endl;
 
     // Get signal ESD
     cout << "Underlying event " << ievUnd << endl;
 
     // Get signal ESD

-    bSig->GetEntry(iev);
+    tSig->GetEntry(iev);

     // Get signal kinematics
     rlSig->GetEvent(iev);
     // Get underlying kinematics
     // Get signal kinematics
     rlSig->GetEvent(iev);
     // Get underlying kinematics