Remove duplicate text from merge

cms-sw · Dec 26, 2019 · d6c2452 · d6c2452
1 parent c545dec
commit d6c2452
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc b/GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc
@@ -375,21 +375,6 @@ void ExternalLHEProducer::endRunProduce(edm::Run& run, edm::EventSetup const& es
     run.put(std::move(product));
   }
 
-  nextEvent();
-  if (partonLevel) {
-    throw edm::Exception(edm::errors::EventGenerationFailure)
-        << "Error in ExternalLHEProducer::endRunProduce().  "
-        << "Event loop is over, but there are still lhe events to process."
-        << "This could happen if lhe file contains more events than requested.  This is never expected to happen.";
-  }
-
-  reader_.reset();
-
-  if (unlink(outputFile_.c_str())) {
-    throw cms::Exception("OutputDeleteError") << "Unable to delete original script output file " << outputFile_
-                                              << " (errno=" << errno << ", " << strerror(errno) << ").";
-  }
-
   nextEvent();
   if (partonLevel) {
     throw edm::Exception(edm::errors::EventGenerationFailure) << "Error in ExternalLHEProducer::endRunProduce().  "

diff --git a/GeneratorInterface/LHEInterface/test/test_Weights_cfg.py b/GeneratorInterface/LHEInterface/test/test_Weights_cfg.py
@@ -50,7 +50,7 @@
 
 process.externalLHEProducer = cms.EDProducer("ExternalLHEProducer",
                                              #args = cms.vstring('/afs/cern.ch/user/k/kelong/work/public/DummyGridpacks/WLLJJ_WToLNu_EWK_4F_MLL-60_slc6_amd64_gcc481_CMSSW_7_1_30_tarball_Dummy.tgz'),
-                                             args = cms.vstring('/afs/cern.ch/user/k/kelong/work/public/DummyGridpacks/ZZ_4L_NNPDF30_13TeV_tarballDummy.tar.gz'),
+                                             args = cms.vstring('/afs/cern.ch/user/k/kelong/work/public/DummyGridpacks/VVV_aQGCfs_dummy.tgz'),
                                              nEvents = cms.untracked.uint32(10),
     numberOfParameters = cms.uint32(1),
     outputFile = cms.string('cmsgrid_final.lhe'),