Changeset 9ad08ca in git for readers

Timestamp:

Jun 21, 2016, 4:09:24 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d97b2af

Parents:

332025f (diff), c008923 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into dev_01

File:

• readers/DelphesPythia8.cpp (modified) (3 diffs)

readers/DelphesPythia8.cpp

@@ -25 +25 @@
 
 #include "Pythia.h"
+#include "Pythia8Plugins/CombineMatchingInput.h"
 
 #include "TROOT.h"
@@ -224 +225 @@
 
   Pythia8::Pythia *pythia = 0;
+ 
+  // for matching
+  Pythia8::CombineMatchingInput *combined = 0;
+  Pythia8::UserHooks* matching = 0;
 
   if(argc != 4)
@@ -270 +275 @@
     // Initialize Pythia
     pythia = new Pythia8::Pythia;
-    //Pythia8::Event& event = pythia->event;
-    //Pythia8::ParticleData& pdt = pythia->particleData;
+  
+    // jet matching
+    matching = combined->getHook(*pythia);
+    if (!matching)
+    {
+      throw runtime_error("can't do matching");
+    }
+    pythia->setUserHooksPtr(matching);
+ 
 
     if(pythia == NULL)