---

yaml
---
r: 23565
b: "refs/heads/CMSSW_7_0_X"
c: fa1fe5e
h: "refs/heads/CMSSW_7_0_X"
i:
  23563: e9ca564

[refs]

@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_7_0_X": f257566ccdcb74d942875dd7ee406acdb506742b
+"refs/heads/CMSSW_7_0_X": fa1fe5ed3b28110aa934eb767f89bdff8a52615c

trunk/GeneratorInterface/PomwigInterface/BuildFile

@@ -1,17 +1,20 @@
 <use name=boost>
 <use name=FWCore/Framework>
 <use name=SimDataFormats/HepMCProduct>
-<use name=clhep>
+<use name=clhep> 
+<use name=hepmc>
 <use name=herwig6_510>
-
+<use name=lhapdf>
 <flags SEAL_PLUGIN_NAME="GeneratorInterfacePomwigInterface">
 <export>
  <lib name=GeneratorInterfacePomwigInterface>
  <use name=boost>
  <use name=FWCore/Framework>
  <use name=SimDataFormats/HepMCProduct>
  <use name=clhep>
+ <use name=hepmc> 
  <use name=herwig6_510>
+ <use name=lhapdf>
 </export>
 
  <lib name=g2c></lib>

trunk/GeneratorInterface/PomwigInterface/interface/PomwigFilter.h

@@ -0,0 +1,43 @@
+#ifndef POMWIG_SOURCE_EMPTY_FILTER_H
+#define POMWIG_SOURCE_EMPTY_FILTER_H
+
+//
+// Original Author:  Fabian Stoeckli
+//         Created:  Mon Mar 12 17:34:14 CET 2007
+// $Id: Herwig6Filter.h,v 1.1 2007/03/15 10:19:11 fabstoec Exp $
+//
+//
+
+// Filter to remove empty events produced with MC@NLO/HERWIG
+
+// Modified for POMWIG
+
+// system include files
+#include <memory>
+
+// user include files
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/EDFilter.h"
+
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+//
+// class declaration
+//
+
+class PomwigFilter : public edm::EDFilter {
+   public:
+      explicit PomwigFilter(const edm::ParameterSet&);
+      ~PomwigFilter();
+
+   private:
+      virtual void beginJob(const edm::EventSetup&) ;
+      virtual bool filter(edm::Event&, const edm::EventSetup&);
+      virtual void endJob() ;
+
+};
+
+#endif

trunk/GeneratorInterface/PomwigInterface/interface/PomwigSource.h

@@ -1,11 +1,10 @@
 #ifndef PomwigSource_h
 #define PomwigSource_h
 
-/** \class PomwigSource 
+/** \class PomwigSource
  *
  * Generates Pomwig HepMC events
  *
- * Based on Herwig6Source
  ***************************************/
 
 
@@ -14,39 +13,39 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include <map>
 #include <string>
-#include "CLHEP/HepMC/GenEvent.h"
+#include "HepMC/GenEvent.h"
 
 namespace edm
 {
   class PomwigSource : public GeneratedInputSource {
+
   public:
 
-    /// Constructor
     PomwigSource(const ParameterSet &, const InputSourceDescription &);
-    /// Destructor
     virtual ~PomwigSource();
 
 
   private:
 
     virtual bool produce(Event & e);
     void clear();
-    
-    bool hwgive(const std::string& iParm );	
+
+    bool hwgive(const std::string& iParm );
     bool setRngSeeds(int);
-	
+
     HepMC::GenEvent  *evt;
-
-    /// Verbosity flag
     int herwigVerbosity_;
     bool herwigHepMCVerbosity_;
     int herwigLhapdfVerbosity_;
     int maxEventsToPrint_;
     double comenergy;
-    int diffTopology;	
-
     std::string lhapdfSetPath_;
+    bool useJimmy_;
+    bool doMPInteraction_;
     bool printCards_;
+    int numTrials_;
+
+    int diffTopology;	
   };
 }