diff --git a/[refs] b/[refs] index 966fc3a99eaa8..65ae20dd7d8b7 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 2e2e9320689366b08f5d694304da4f70c8ff4017 +"refs/heads/CMSSW_7_1_X": be9948be30cf61aa2fed107637121196eba2f853 diff --git a/trunk/GeneratorInterface/PomwigInterface/BuildFile b/trunk/GeneratorInterface/PomwigInterface/BuildFile index 7221fb76cd8b8..fd4e6d6e204c9 100644 --- a/trunk/GeneratorInterface/PomwigInterface/BuildFile +++ b/trunk/GeneratorInterface/PomwigInterface/BuildFile @@ -1,15 +1,15 @@ - + + + + - - - diff --git a/trunk/GeneratorInterface/PomwigInterface/python/POMWIG_SingleDiffractivePlusWmunu_10TeV_cff.py b/trunk/GeneratorInterface/PomwigInterface/python/POMWIG_SingleDiffractivePlusWmunu_10TeV_cff.py index 5697b1f59493f..54ac263157494 100644 --- a/trunk/GeneratorInterface/PomwigInterface/python/POMWIG_SingleDiffractivePlusWmunu_10TeV_cff.py +++ b/trunk/GeneratorInterface/PomwigInterface/python/POMWIG_SingleDiffractivePlusWmunu_10TeV_cff.py @@ -14,8 +14,6 @@ filterEfficiency = cms.untracked.double(1.0), ) -source = cms.Source("EmptySource") - generator = cms.EDFilter("PomwigGeneratorFilter", herwig6Parameters, HerwigParameters = cms.PSet( @@ -35,4 +33,4 @@ doPDGConvert = cms.bool(False) ) -ProductionFilterSequence = cms.Sequence(generator) +#ProductionFilterSequence = cms.Sequence(generator) diff --git a/trunk/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc b/trunk/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc index 81a3deca12716..f7bdc6d1c5f31 100644 --- a/trunk/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc +++ b/trunk/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc @@ -140,7 +140,7 @@ bool PomwigHadronizer::initializeForInternalPartons() // Call hwudat to set up HERWIG block data hwudat(); - + // Setting basic parameters ... hwproc.PBEAM1 = comEnergy/2.; hwproc.PBEAM2 = comEnergy/2.;