Merge pull request #24833 from SanghyunKo/wf535fix

Fix Relval steps for GEN workflow 535
cms-sw · Oct 11, 2018 · a7c1b9e · a7c1b9e
2 parents 3a9e729 + a78c7d3
commit a7c1b9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/Configuration/Generator/python/TT_13TeV_Pow_Herwig7_cff.py b/Configuration/Generator/python/TT_13TeV_Pow_Herwig7_cff.py
@@ -1,14 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-import FWCore.ParameterSet.Config as cms
-
-externalLHEProducer = cms.EDProducer("ExternalLHEProducer",
-    args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc6_amd64_gcc630/13TeV/Powheg/V2/RelValidation/TTBar/hvq_slc6_amd64_gcc630_CMSSW_9_3_9_patch1_ttbar_new.tgz'),
-    nEvents = cms.untracked.uint32(5000),
-    numberOfParameters = cms.uint32(1),
-    outputFile = cms.string('cmsgrid_final.lhe'),
-    scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh')
-)
+from Configuration.Generator.TTbar_Pow_LHE_13TeV_cff import externalLHEProducer
 
 generator = cms.EDFilter("Herwig7GeneratorFilter",
 

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1270,8 +1270,8 @@ def identityFS(wf):
                           '--era'         : 'Run2_2016',
                         }
 
-# LHE-GEN-SIM with DQM
-step1LHEGenSimDQM = merge([{'-s':'LHE,GEN,SIM','--datatier'    : 'GEN-SIM,LHE,DQMIO','--eventcontent': 'LHE,RAWSIM,DQM'},step1LHEGenSimDefault])
+# LHE-GEN with DQM
+step1LHEGenDQM = merge([{'-s':'LHE,GEN,VALIDATION:genvalid','--datatier'    : 'LHE,GEN,DQMIO','--eventcontent': 'LHE,RAWSIM,DQM'},step1LHEDefaults])
 
 
 def lhegensim(fragment,howMuch):
@@ -1305,7 +1305,7 @@ def lhegensim2017(fragment,howMuch):
 steps['sherpa_ZtoEE_0j_OpenLoops_13TeV_MASTER']=genvalid('sherpa_ZtoEE_0j_OpenLoops_13TeV_MASTER_cff',step1GenDefaults)
 
 #Herwig7
-steps['TTbar_13TeV_Pow_herwig7']=genvalid('Configuration/Generator/python/TT_13TeV_Pow_Herwig7_cff',step1LHEGenSimDQM)
+steps['TTbar_13TeV_Pow_herwig7']=genvalid('Configuration/Generator/python/TT_13TeV_Pow_Herwig7_cff',step1LHEGenDQM)
 
 
 # Heavy Ion