Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7130 from bendavid/genbackportsJan12_71x
Generator backports to 71x (Multi-hadronization, cross section printouts, herwig++ fixes + LHE interface, pythia8+tauola fixes, extra pythia8 options/inline SLHA tables), Updated EM enrichment filter.
- Loading branch information
Showing
69 changed files
with
5,853 additions
and
1,608 deletions.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
Configuration/Generator/python/Hadronizer_TuneEE5C_generic_LHE_herwigpp_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.Generator.HerwigppDefaults_cfi import * | ||
| from Configuration.Generator.HerwigppUE_EE_5C_cfi import * | ||
|
|
||
|
|
||
| generator = cms.EDFilter("ThePEGHadronizerFilter", | ||
| herwigDefaultsBlock, | ||
| herwigppUESettingsBlock, | ||
| crossSection = cms.untracked.double(-1.), | ||
| filterEfficiency = cms.untracked.double(1), | ||
| configFiles = cms.vstring(), | ||
| parameterSets = cms.vstring( | ||
| 'cmsDefaults', | ||
| 'EE5C', | ||
| 'lheDefaults', | ||
| ), | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| herwigppUESettingsBlock = cms.PSet( | ||
|
|
||
| EE5CEnergyExtrapol = cms.vstring( | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:EnergyExtrapolation Power', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:ReferenceScale 7000.*GeV', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:Power 0.33', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:pTmin0 3.91*GeV', | ||
| ), | ||
|
|
||
| EE5C = cms.vstring( | ||
| '+pdfCTEQ6L1', | ||
| '+EE5CEnergyExtrapol', | ||
| # Colour reconnection settings | ||
| 'set /Herwig/Hadronization/ColourReconnector:ColourReconnection Yes', | ||
| 'set /Herwig/Hadronization/ColourReconnector:ReconnectionProbability 0.49', | ||
| # Colour Disrupt settings | ||
| 'set /Herwig/Partons/RemnantDecayer:colourDisrupt 0.80', | ||
| # inverse hadron radius | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:InvRadius 2.30', | ||
| # MPI model settings | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:softInt Yes', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:twoComp Yes', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:DLmode 2', | ||
| ), | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
Configuration/Generator/python/QCD_Pt_30_13TeV_herwigpp_cff.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.Generator.HerwigppDefaults_cfi import * | ||
| from Configuration.Generator.HerwigppUE_EE_5C_cfi import * | ||
|
|
||
| source = cms.Source("EmptySource") | ||
| generator = cms.EDFilter("ThePEGGeneratorFilter", | ||
| herwigDefaultsBlock, | ||
| herwigppUESettingsBlock, | ||
| configFiles = cms.vstring(), | ||
| processParameters = cms.vstring( | ||
| 'cd /Herwig/MatrixElements/', | ||
| 'insert SimpleQCD:MatrixElements[0] MEQCD2to2', | ||
|
|
||
| 'cd /', | ||
| 'set /Herwig/Cuts/JetKtCut:MinKT 30*GeV', | ||
| 'set /Herwig/Cuts/QCDCuts:MHatMin 0.0*GeV', | ||
| 'set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0', | ||
| ), | ||
| parameterSets = cms.vstring( | ||
| 'cmsDefaults', | ||
| 'cm13TeV', | ||
| 'EE5C', | ||
| 'processParameters', | ||
| ), | ||
| crossSection = cms.untracked.double(-1.), | ||
| filterEfficiency = cms.untracked.double(1.0), | ||
| ) | ||
|
|
||
| ProductionFilterSequence = cms.Sequence(generator) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #ifndef BaseHepMCFilter_H | ||
| #define BaseHepMCFilter_H | ||
|
|
||
| // J.Bendavid | ||
|
|
||
| // base class for simple filter to run inside of HadronizerFilter for | ||
| // multiple hadronization attempts on lhe events | ||
|
|
||
| #include "FWCore/ParameterSet/interface/ParameterSet.h" | ||
| #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" | ||
|
|
||
| // | ||
| // class declaration | ||
| // | ||
|
|
||
| class BaseHepMCFilter { | ||
| public: | ||
| BaseHepMCFilter(); | ||
| virtual ~BaseHepMCFilter(); | ||
|
|
||
|
|
||
| virtual bool filter(const HepMC::GenEvent* evt) = 0; | ||
|
|
||
| }; | ||
|
|
||
| #endif |
Oops, something went wrong.