Commit f04643a6 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska Committed by Graeme Stewart
Browse files

version update (Herwigpp_i-00-06-27)

        * update to version 7.03 (and ThePEG 2.0.3)
        * tagging Herwigpp_i-00-06-27


Former-commit-id: 9a90cd43
parent a7ee10ac
......@@ -15,6 +15,16 @@ atlas_depends_on_subdirs(
GaudiKernel
Tools/PathResolver )
# Set the version of ThePEG to use:
set( THEPEG_VERSION 2.0.3 )
set( THEPEG_ROOT
${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_VERSION}/${ATLAS_PLATFORM} )
# Set the version of Herwigpp to use:
set( HERWIG3_VERSION 7.0.3 )
set( HERWIG3_ROOT
${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_VERSION}/${ATLAS_PLATFORM} )
# External dependencies:
find_package( Boost )
find_package( Herwig3 )
......
......@@ -270,9 +270,6 @@ set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBo
create ThePEG::FixedCMSLuminosity /Herwig/Generators/FCMSLuminosity
set /Herwig/EventHandlers/LHEHandler:LuminosityFunction /Herwig/Generators/FCMSLuminosity
# Turn on QED radiation
insert /Herwig/EventHandlers/LHEHandler:PostSubProcessHandlers[0] /Herwig/QEDRadiation/QEDRadiationHandler
## Set the PDF for the LHE reader.
set /Herwig/EventHandlers/LHEReader:PDFA /Herwig/Partons/AtlasPDFset{pdfsubname}
set /Herwig/EventHandlers/LHEReader:PDFB /Herwig/Partons/AtlasPDFset{pdfsubname}
......@@ -515,8 +512,6 @@ cd /Herwig/EventHandlers
###########################################################
#Include spin effects
set /Herwig/EventHandlers/theLHReader:IncludeSpin Yes
#Turn on QED radiation
insert /Herwig/EventHandlers/theLesHouchesHandler:PostSubProcessHandlers[0] /Herwig/QEDRadiation/QEDRadiationHandler
#Avoid error message about event handler not having a luminosity function - these lines should not influence results!
#create ThePEG::LuminosityFunction /Herwig/Generators/LuminosityFunction
#set /Herwig/EventHandlers/theLesHouchesHandler:LuminosityFunction /Herwig/Generators/LuminosityFunction
......@@ -585,11 +580,6 @@ set /Herwig/Decays/DecayHandler:MaxLifeTime 10*mm
set /Herwig/Cuts/JetKtCut:MinKT 20.0*GeV
set /Herwig/Cuts/LeptonKtCut:MinKT 0.0*GeV
## Set QED pT cutoffs to match PHOTOS
# Enabled by default from H++ 2.4.0
set /Herwig/QEDRadiation/QEDRadiationHandler:RadiationGenerator:FFDipole:MinimumEnergyRest 10.0*MeV
set /Herwig/QEDRadiation/QEDRadiationHandler:RadiationGenerator:IFDipole:MinimumEnergyRest 10.0*MeV
# Turn off intermediate photons inserted explicitly into the event record with an incorrect life length in the pi0 -> e+e-e+e- decay mode
# This is the default from H++ 2.6.1
set /Herwig/Decays/PScalar4f:GenerateIntermediates 0
......@@ -610,9 +600,6 @@ set /Herwig/Decays/PScalar4f:GenerateIntermediates 0
#set /Herwig/EventHandlers/LHCHandler:HadronizationHandler NULL
#set /Herwig/Analysis/Basics:CheckQuark No
## To turn off QED radiation, put this into your JO:
#erase /Herwig/EventHandlers/LHCHandler:PostSubProcessHandlers[0]
## To turn off decays, put this into your JO:
#set /Herwig/EventHandlers/LHCHandler:DecayHandler NULL
......
......@@ -65,7 +65,7 @@ Herwigpp::Herwigpp(const string& name, ISvcLocator* pSvcLocator) :
{
declareProperty("Commands", m_herwigCommandVector);
declareProperty("RunName", m_runname="Atlas");
declareProperty("InFileDump", m_infiledump="");
declareProperty("InFileDump", m_infiledump="herwigInfileDump.in");
declareProperty("CrossSectionScaleFactor", m_xsscale=1.0);
declareProperty("doAlpgen",m_doAlpgen=false);
declareProperty("useTwoLoopAlphas",m_useTwoLoopAlphas=true);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment