Page MenuHomeHEPForge
Files F7878814

No OneTemporary
Actions

View Options

diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,23 +1,24 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
+# Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# @configure_input@
-# serial 4179 ltversion.m4
+# serial 4245 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
+m4_define([LT_PACKAGE_VERSION], [2.4.7])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
+[macro_version='2.4.7'
+macro_revision='2.4.7'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/src/defaults/Partons.in b/src/defaults/Partons.in
--- a/src/defaults/Partons.in
+++ b/src/defaults/Partons.in
@@ -1,37 +1,40 @@
# -*- ThePEG-repository -*-
mkdir /Herwig/Partons
cd /Herwig/Partons
create ThePEG::NoRemnants NoRemnants
create ThePEG::NoPDF NoPDF
newdef NoPDF:RemnantHandler NoRemnants
create ThePEG::UnResolvedRemnant LeptonRemnants UnResolvedRemnant.so
create Herwig::HwRemDecayer RemnantDecayer HwShower.so
newdef RemnantDecayer:PomeronStructure Gluon
newdef RemnantDecayer:colourDisrupt 0.0
newdef RemnantDecayer:ladderPower -0.088983
newdef RemnantDecayer:ladderNorm 1.086029
newdef RemnantDecayer:PtDistribution 4
create ThePEG::SoftRemnantHandler HadronRemnants
newdef HadronRemnants:RemnantDecayer RemnantDecayer
read PDF.in
# Make particle extractors
create ThePEG::PartonExtractor EEExtractor
newdef EEExtractor:NoPDF NoPDF
cp EEExtractor PPExtractor
newdef PPExtractor:FlatSHatY 1
newdef PPExtractor:FirstPDF HardLOPDF
newdef PPExtractor:SecondPDF HardLOPDF
cp EEExtractor EPExtractor
newdef EPExtractor:FlatSHatY 1
+cp EEExtractor PEExtractor
+newdef PEExtractor:FlatSHatY 1
newdef PPExtractor:FirstPDF HardLOPDF
newdef PPExtractor:SecondPDF HardLOPDF
newdef EPExtractor:SecondPDF HardLOPDF
+newdef PEExtractor:FirstPDF HardLOPDF
diff --git a/src/snippets/Makefile.am b/src/snippets/Makefile.am
--- a/src/snippets/Makefile.am
+++ b/src/snippets/Makefile.am
@@ -1,49 +1,50 @@
BUILT_SOURCES = done-all-links
snippetsdir = ${pkgdatadir}/snippets
INPUTFILES = \
CellGridSampler.in \
Diffraction.in \
DipoleMerging.in \
DipoleShowerFiveFlavours.in \
DipoleShowerFourFlavours.in \
EECollider.in \
EPCollider.in \
+PECollider.in \
HepMCFixedOrder.in \
HepMC.in \
Matchbox.in \
MB-DipoleShower.in \
MB.in \
MonacoSampler.in \
Particles-SetLonglivedParticlesStable.in \
PDF-CT10.in \
PDF-NNPDF30NLO.in \
PPCollider.in \
RivetFixedOrder.in \
Rivet.in \
YFS.in \
CMWinQtiledShower.in \
Dipole_AutoTunes_gss.in \
Tune-DotProduct.in \
Tune-DotProduct-Veto.in \
Tune-pT.in \
Tune-Q2.in \
EvolutionScheme-DotProduct.in \
EvolutionScheme-DotProduct-Veto.in \
EvolutionScheme-pT.in \
EvolutionScheme-Q2.in \
FixedTarget.in \
FixedTarget-PP.in \
H7Hadrons.in
dist_snippets_DATA = $(INPUTFILES)
CLEANFILES = done-all-links
done-all-links: $(INPUTFILES)
@echo "Linking input files"
@for i in $(INPUTFILES); do \
if test -f $(srcdir)/$$i -a ! -e $$i; then \
$(LN_S) -f $(srcdir)/$$i; fi; done
@touch done-all-links
diff --git a/src/snippets/EPCollider.in b/src/snippets/PECollider.in
copy from src/snippets/EPCollider.in
copy to src/snippets/PECollider.in
--- a/src/snippets/EPCollider.in
+++ b/src/snippets/PECollider.in
@@ -1,52 +1,52 @@
# -*- ThePEG-repository -*-
cd /Herwig/EventHandlers
create ThePEG::LuminosityFunction Luminosity
-set EventHandler:BeamA /Herwig/Particles/e-
-set Luminosity:BeamEMaxA 30.*GeV
-set EventHandler:BeamB /Herwig/Particles/p+
-set Luminosity:BeamEMaxB 920.*GeV
+set EventHandler:BeamB /Herwig/Particles/e-
+set Luminosity:BeamEMaxB 30.*GeV
+set EventHandler:BeamA /Herwig/Particles/p+
+set Luminosity:BeamEMaxA 920.*GeV
set EventHandler:LuminosityFunction Luminosity
set /Herwig/Shower/ShowerHandler:MPIHandler NULL
set /Herwig/Shower/PowhegShowerHandler:MPIHandler NULL
set /Herwig/DipoleShower/DipoleShowerHandler:MPIHandler NULL
# cuts for DIS
set EventHandler:Cuts:ScaleMin 1.0*GeV2
set EventHandler:Cuts:X1Min 1.0e-5
set EventHandler:Cuts:X2Min 1.0e-5
set EventHandler:Cuts:MHatMin 0.0*GeV
set /Herwig/Cuts/NeutralCurrentCut:MinW2 0
set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
set /Herwig/Cuts/ChargedCurrentCut:MinW2 0
set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
clear EventHandler:Cuts:OneCuts
clear EventHandler:Cuts:TwoCuts
clear EventHandler:Cuts:MultiCuts
insert EventHandler:Cuts:TwoCuts[0] /Herwig/Cuts/NeutralCurrentCut
insert EventHandler:Cuts:TwoCuts[1] /Herwig/Cuts/ChargedCurrentCut
# switch off final-state electron/muon FSR
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting e-->e-,gamma; /Herwig/Shower/LtoLGammaSudakov
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting mu-->mu-,gamma; /Herwig/Shower/LtoLGammaSudakov
do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting tau-->tau-,gamma; /Herwig/Shower/LtoLGammaSudakov
do /Herwig/Shower/SplittingGenerator:DeleteInitialSplitting gamma->e-,e+; /Herwig/Shower/GammatoQQbarSudakov
do /Herwig/Shower/SplittingGenerator:DeleteInitialSplitting gamma->mu-,mu+; /Herwig/Shower/GammatoQQbarSudakov
do /Herwig/Shower/SplittingGenerator:DeleteInitialSplitting gamma->tau-,tau+; /Herwig/Shower/GammatoQQbarSudakov
set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption Colour
# Matchbox settings
cd /Herwig/MatrixElements/Matchbox
-set Factory:FirstPerturbativePDF No
-set Factory:SecondPerturbativePDF Yes
+set Factory:SecondPerturbativePDF No
+set Factory:FirstPerturbativePDF Yes
set Factory:PartonExtractor /Herwig/Partons/EPExtractor
-set /Herwig/Merging/MergingFactory:FirstPerturbativePDF No
-set /Herwig/Merging/MergingFactory:SecondPerturbativePDF Yes
+set /Herwig/Merging/MergingFactory:SecondPerturbativePDF No
+set /Herwig/Merging/MergingFactory:FirstPerturbativePDF Yes
set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/EPExtractor
# Erase the PDF for the lepton side (the one from Particle Data object is used)
-set /Herwig/Shower/ShowerHandler:PDFA NULL
-set /Herwig/DipoleShower/DipoleShowerHandler:PDFA NULL
+set /Herwig/Shower/ShowerHandler:PDFB NULL
+set /Herwig/DipoleShower/DipoleShowerHandler:PDFB NULL
cd /Herwig/Generators/
-set /Herwig/MatrixElements/SubProcess:PartonExtractor /Herwig/Partons/EPExtractor
+set /Herwig/MatrixElements/SubProcess:PartonExtractor /Herwig/Partons/PEExtractor

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 6:58 PM (1 d, 14 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3805711
Default Alt Text
(6 KB)

Event Timeline