Index: /trunk/Makefile
===================================================================
--- /trunk/Makefile	(revision 14)
+++ /trunk/Makefile	(revision 15)
@@ -387,5 +387,5 @@
 tmp/modules/MadGraphCDFConeJetFinder.$(ObjSuf): \
 	modules/MadGraphCDFConeJetFinder.$(SrcSuf) \
-	modules/MadGraphConeJetFinder.h \
+	modules/MadGraphCDFConeJetFinder.h \
 	ExRootAnalysis/ExRootClasses.h \
 	ExRootAnalysis/ExRootFactory.h \
Index: /trunk/matching_plots_card.tcl
===================================================================
--- /trunk/matching_plots_card.tcl	(revision 14)
+++ /trunk/matching_plots_card.tcl	(revision 15)
@@ -85,5 +85,5 @@
   set ECut 1.0
   set DCut 2500.0
-  
+
   set ParticleNumberMin 2
 }
@@ -94,8 +94,9 @@
 
 module MadGraphMatchingTreeWriter treewriter {
-  set InputPartonArrayJets "partonjetfinder/candidates"
-  set InputHadronArrayJets "hadronjetfinder/candidates"
-  set InputArrayMatching "partonjetfinder/matching"
-  set InputArrayPartons "initstateselection/candidates"
+  add Branch {PartonJet ExRootGenJet "partonjetfinder/candidates"}
+  add Branch {HadronJet ExRootGenJet "hadronjetfinder/candidates"}
+  add Branch {Match ExRootMatching "partonjetfinder/matching"}
+  add Branch {Parton ExRootGenParticle "initstateselection/candidates"}
+
   set JetPTMin 20.0
   set JetEtaMax 4.5