Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Apr 5, 2019 · 34c7728 · 34c7728
2 parents 0d6dee3 + 0b320c3
commit 34c7728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/GeneratorInterface/LHEInterface/test/DummyLHEAnalyzer.cc b/GeneratorInterface/LHEInterface/test/DummyLHEAnalyzer.cc
@@ -23,7 +23,6 @@ class DummyLHEAnalyzer : public EDAnalyzer {
 public:
   explicit DummyLHEAnalyzer( const ParameterSet & cfg ) :
     dumpHeader_( cfg.getUntrackedParameter<bool>("dumpHeader",false) ),
-    src_( cfg.getParameter<InputTag>( "src" ) ),
     tokenLHERunInfo_(consumes<LHERunInfoProduct,edm::InRun>(cfg.getUntrackedParameter<edm::InputTag>("moduleLabel", std::string("source")) ) ),
     tokenLHEEvent_(consumes<LHEEventProduct>(cfg.getUntrackedParameter<edm::InputTag>("moduleLabel", std::string("source")) ) )
   {
@@ -32,7 +31,6 @@ class DummyLHEAnalyzer : public EDAnalyzer {
   void analyze( const Event & iEvent, const EventSetup & iSetup ) override {
 
     edm::Handle<LHEEventProduct> evt;
-    //iEvent.getByLabel(src_, evt);
     iEvent.getByToken(tokenLHEEvent_, evt);
 
     const lhef::HEPEUP hepeup_ = evt->hepeup();
@@ -119,7 +117,6 @@ class DummyLHEAnalyzer : public EDAnalyzer {
 
   }
 
-  InputTag src_;
   edm::EDGetTokenT<LHERunInfoProduct> tokenLHERunInfo_;
   edm::EDGetTokenT<LHEEventProduct> tokenLHEEvent_;
 

diff --git a/GeneratorInterface/LHEInterface/test/dumpLHE_cfg.py b/GeneratorInterface/LHEInterface/test/dumpLHE_cfg.py
@@ -11,7 +11,8 @@
 )
 
 process.dummy = cms.EDAnalyzer("DummyLHEAnalyzer",
-    src = cms.InputTag("source")
+    moduleLabel = cms.untracked.InputTag("externalLHEProducer"),
+    dumpHeader = cms.untracked.bool(True)
 )
 
 process.p = cms.Path(process.dummy)