No OneTemporary
Actions

Size

31 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.hgignore b/.hgignore
	--- a/.hgignore
	+++ b/.hgignore
	@@ -1,112 +1,113 @@
	Makefile$
	Makefile\.in$
	\.deps$
	\.libs$
	\.l[ao]$
	\.so$
	\.so\.
	\.o$
	~$
	\.pyc$
	\.codereplace$
	\.orig$
	\.tar\.(gz\|bz2)$
	^autom4te.cache$
	^config.herwig$
	^config.log$
	^config.status$
	^configure$
	^include/Herwig$
	^Config/config.guess$
	^Config/config.h$
	^Config/config.h.in$
	^Config/config.sub$
	^Config/depcomp$
	^Config/compile$
	^Config/install-sh$
	^Config/missing$
	^Config/stamp-h1$
	^Config/ar-lib$
	^Contrib/make_makefiles.sh$
	^Contrib/./.\.(log\|out\|tex\|run)$
	^Utilities/hgstamp.inc$
	^Doc/HerwigDefaults.in$
	^Doc/refman-html$
	^Doc/fixinterfaces.pl$
	^Doc/refman.conf$
	^Doc/refman.h$
	^Doc/AllInterfaces.h$
	^Doc/HerwigDefaults.rpo$
	^Doc/Herwig-refman.tag$
	^Doc/tagfileThePEG.tag$
	^Doc/.*\.log$
	^INSTALL$
	^aclocal.m4$
	^confdefs.h$
	^conftest.c$
	^conftest.err$
	^include/done-all-links$
	^libtool$
	\.dirstamp$
	^src/hgstamp.inc$
	^src/herwigopts.h$
	^src/herwigopts.c$
	^src/defaults/Analysis.in$
	^src/defaults/Decays.in$
	^src/defaults/decayers.in$
	^src/herwig-config$
	^src/.*\.(run\|tex\|out\|log\|rpo\|spc\|top\|dump\|dot\|aux\|pdf\|ps\|png\|svg\|hepmc\|dvi)$
	^src/Makefile-UserModules$
	^lib/done-all-links$
	^lib/apple-fixes$
	^src/defaults/PDF.in$
	^src/defaults/done-all-links$
	^src/tune$
	^src/Herwig$
	^src/Herwig-scratch$
	^src/tests/.*\.(time\|mult\|Bmult\|chisq)$
	^src/Merging/test/*yoda
	^src/Merging/test/Herwig*
	^src/Merging/test/L*
	^src/Merging/test/done-all-links
	^src/Merging/done-all-links
	^Tests/./.\.(top\|ps\|pyc\|info\|dat\|pdf\|png)$
	^Tests/.*\.(top\|ps\|pyc\|info\|dat\|pdf\|png\|log\|out)$
	^Tests/.*\.(top\|run\|tex\|mult\|Bmult\|aida\|yoda)$
	^Tests/Rivet-.*$
	^Tests/Herwig-scratch$
	^Tests/Rivet/(LEP\|DIS\|LHC\|TVT\|Star\|BFactory\|ISR\|SppS)-.*\.in$
	^Tests/plots$
	^Tests/Herwig$
	^Tests/.*index.html$
	+PDF/SaSPhotonPDF.cc
	^Herwig\-
	^Models/Feynrules/python/Makefile-FR$
	^MatrixElement/Matchbox/External/MadGraph/mg2herwig.py$
	^MatrixElement/Matchbox/Scales/MatchboxScale.cc$
	^Utilities/Statistics/herwig-combinedistributions$
	^Utilities/Statistics/herwig-combineruns$
	^Utilities/Statistics/herwig-makedistributions$
	^src/defaults/MatchboxDefaults.in$
	^src/defaults/setup.gosam.in$
	^src/Matchbox/LO-DefaultShower.in$
	^src/Matchbox/LO-DipoleShower.in$
	^src/Matchbox/LO-NoShower.in$
	^src/Matchbox/MCatLO-DefaultShower.in$
	^src/Matchbox/MCatLO-DipoleShower.in$
	^src/Matchbox/MCatNLO-DefaultShower.in$
	^src/Matchbox/MCatNLO-DipoleShower.in$
	^src/Matchbox/NLO-NoShower.in$
	^src/Matchbox/Powheg-DefaultShower.in$
	^src/Matchbox/Powheg-DipoleShower.in$
	^src/defaults/MatchboxMergingDefaults.in
	^src/Matchbox/done-all-links$
	^src/snippets/done-all-links$
	^Utilities/XML/xml_test$
	^Utilities/utilities_test$
	^Utilities/versionstring.h$
	test\.(log\|trs)$
	test-suite\.log$
	^Config/test-driver$
	param_card\.dat$
	__all.cc$
	.ccR$
	\ No newline at end of file
	diff --git a/Contrib/SaSGamma/Makefile.in b/Contrib/SaSGamma/Makefile.in
	deleted file mode 100644
	--- a/Contrib/SaSGamma/Makefile.in
	+++ /dev/null
	@@ -1,36 +0,0 @@
	-# -- Makefile -- (for emacs)
	-
	-#
	-# This Makefile is intended for compiling Herwig++ plugins
	-# You can find plugins here: INSERT URL
	-#
	-# This Makefile received very little testing,
	-# any bug reports are very welcome!
	-#
	-
	-# location of include files
	-THEPEGINCLUDE=
	-GSLINCLUDE=
	-HERWIGINCLUDE=
	-FC=
	-FCLIBS=
	-LDFLAGS=
	-SHARED_FLAG=
	-INCLUDE = $(THEPEGINCLUDE) $(GSLINCLUDE) $(HERWIGINCLUDE)
	-#
	-# C++ flags
	-#
	-CXX=
	-CXXFLAGS=
	-
	-default : SaSPhotonPDF.so
	-
	-SaSPhotonPDF.so : SaSPhotonPDF.h SaSPhotonPDF.cc SaSGamma.o
	- $(CXX) -fPIC $(INCLUDE) $(CXXFLAGS) $(SHARED_FLAG) $(LDFLAGS) \
	- SaSGamma.o SaSPhotonPDF.cc -o SaSPhotonPDF.so $(FCLIBS)
	-
	-SaSGamma.o: SaSGamma.f
	- $(FC) -fPIC $(ACERDETINCLUDE) -c -fno-second-underscore SaSGamma.f
	-
	-clean:
	- rm -f .o .so
	diff --git a/Contrib/SaSGamma/test.f b/Contrib/SaSGamma/test.f
	deleted file mode 100644
	--- a/Contrib/SaSGamma/test.f
	+++ /dev/null
	@@ -1,12 +0,0 @@
	- PROGRAM TEST
	- DIMENSION XPDFGM(-6:6)
	- ISET=2
	- IP2=0
	- X=0.0860466
	- Q2=262.249
	- P2=6.67495e-08
	- CALL SASGAM(ISET,X,Q2,P2,IP2,F2GM,XPDFGM)
	- DO I=-5,5
	- PRINT *, XPDFGM(I)
	- ENDDO
	- END
	diff --git a/PDF/Makefile.am b/PDF/Makefile.am
	--- a/PDF/Makefile.am
	+++ b/PDF/Makefile.am
	@@ -1,52 +1,58 @@
	EXTRA_DIST = diffraction

	pkglib_LTLIBRARIES = HwPomeronPDF.la
	HwPomeronPDF_la_SOURCES = \
	PomeronPDF.cc PomeronPDF.h
	## add this to produce tests of the PDFs
	## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
	HwPomeronPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0

	pkglib_LTLIBRARIES += HwReggeonPDF.la
	HwReggeonPDF_la_SOURCES = \
	ReggeonPDF.cc ReggeonPDF.h
	## add this to produce tests of the PDFs
	## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
	HwReggeonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0

	pkglib_LTLIBRARIES += HwPomeronFlux.la
	HwPomeronFlux_la_SOURCES = \
	PomeronFlux.h PomeronFlux.cc
	HwPomeronFlux_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0

	## bound into HwShower.la
	noinst_LTLIBRARIES = libHwRemDecayer.la
	libHwRemDecayer_la_SOURCES = \
	HwRemDecayer.h HwRemDecayer.cc HwRemDecayer.fh

	## bound into HwShower.la
	noinst_LTLIBRARIES += libHwMPIPDF.la
	libHwMPIPDF_la_SOURCES = \
	MPIPDF.h MPIPDF.cc MPIPDF.fh \
	MinBiasPDF.h MinBiasPDF.cc MinBiasPDF.fh

	pkglib_LTLIBRARIES += HwSatPDF.la
	HwSatPDF_la_SOURCES = \
	SatPDF.h SatPDF.cc

	HwSatPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0

	pkglib_LTLIBRARIES += HwIncomingPhotonEvolver.la
	HwIncomingPhotonEvolver_la_SOURCES = \
	IncomingPhotonEvolver.h IncomingPhotonEvolver.cc

	HwIncomingPhotonEvolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0

	+pkglib_LTLIBRARIES += HwSaSPhotonPDF.la
	+HwSaSPhotonPDF_la_SOURCES = \
	+SaSGamma.f SaSPhotonPDF.cc SaSPhotonPDF.h
	+
	+HwSaSPhotonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
	+
	install-data-local:
	for i in `find $(srcdir)/diffraction -name '*.data'`; \
	do \
	$(install_sh_DATA) $$i $(DESTDIR)$(pkgdatadir)/PDF/$${i#$(srcdir)/}; \
	done

	uninstall-local:
	rm -rf $(DESTDIR)$(pkgdatadir)/PDF
	diff --git a/Contrib/SaSGamma/SaSGamma.f b/PDF/SaSGamma.f
	rename from Contrib/SaSGamma/SaSGamma.f
	rename to PDF/SaSGamma.f
	diff --git a/Contrib/SaSGamma/SaSPhotonPDF.cc b/PDF/SaSPhotonPDF.cc.in
	rename from Contrib/SaSGamma/SaSPhotonPDF.cc
	rename to PDF/SaSPhotonPDF.cc.in
	--- a/Contrib/SaSGamma/SaSPhotonPDF.cc
	+++ b/PDF/SaSPhotonPDF.cc.in
	@@ -1,173 +1,179 @@
	// -- C++ --
	//
	// This is the implementation of the non-inlined, non-templated member
	// functions of the SaSPhotonPDF class.
	//

	#include "SaSPhotonPDF.h"
	#include "ThePEG/Interface/ClassDocumentation.h"
	#include "ThePEG/EventRecord/Particle.h"
	#include "ThePEG/Repository/UseRandom.h"
	#include "ThePEG/Repository/EventGenerator.h"
	#include "ThePEG/Utilities/DescribeClass.h"
	#include "ThePEG/Interface/Switch.h"
	#include "ThePEG/Persistency/PersistentOStream.h"
	#include "ThePEG/Persistency/PersistentIStream.h"
	#include "ThePEG/PDT/ParticleData.h"
	#include "ThePEG/PDT/EnumParticles.h"

	using namespace Herwig;

	+/* Define to a macro mangling the given C identifier (in lower and upper
	+ case), which must not contain underscores, for linking with Fortran. */
	+#undef FC_FUNC
	+
	extern "C" {

	- void sasgam_(int ,float ,float ,float ,int ,float ,float *);
	-
	+ #define SASGAM_F77 FC_FUNC(sasgam,SASGAM)
	+ void SASGAM_F77(int ,float ,float ,float ,int ,float ,float *);
	+
	}

	bool SaSPhotonPDF::canHandleParticle(tcPDPtr particle) const {
	// only the photon can be handled
	return ( particle->id() == ParticleID::gamma );
	}

	cPDVector SaSPhotonPDF::partons(tcPDPtr particle) const {
	// All standard partons can be extracted.
	cPDVector ret;
	if ( canHandleParticle(particle) ) {
	ret.push_back(getParticleData(ParticleID::g));
	for ( int i = 1; i <= 5; ++i ) {
	ret.push_back(getParticleData(i));
	ret.push_back(getParticleData(-i));
	}
	}
	return ret;
	}

	-double SaSPhotonPDF::xfl(tcPDPtr particle, tcPDPtr parton, Energy2 partonScale,
	+double SaSPhotonPDF::xfl(tcPDPtr, tcPDPtr parton, Energy2 partonScale,
	double l, Energy2 particleScale) const {
	float x = exp(-l);
	float q2 = partonScale/GeV2;
	float p2 = particleScale/GeV2;
	float f2gm=0.;
	float xpdf[13];
	int iloc = parton->id()!=ParticleID::g ? 6+parton->id() : 6;
	- sasgam_(&iset_,&x,&q2,&p2,&ip_,&f2gm,xpdf);
	+ SASGAM_F77(&iset_,&x,&q2,&p2,&ip_,&f2gm,xpdf);
	// cerr << "testing " << partonScale/GeV2 << " " << particleScale/GeV2 << " " << x << "\n";
	// for(unsigned int ix=0;ix<13;++ix)
	// cerr << ix << " " << xpdf[ix] << "\n";
	// cerr << "testing " << parton->PDGName() << " " << iloc << "\n";
	return xpdf[iloc];
	}
	+
	double SaSPhotonPDF::xfvl(tcPDPtr particle, tcPDPtr parton, Energy2 partonScale,
	double l, Energy2 particleScale) const {
	if(parton->id()==ParticleID::g)
	return 0.;
	else
	return xfl(particle,parton,partonScale,l,particleScale);
	}

	IBPtr SaSPhotonPDF::clone() const {
	return new_ptr(*this);
	}

	IBPtr SaSPhotonPDF::fullclone() const {
	return new_ptr(*this);
	}

	void SaSPhotonPDF::persistentOutput(PersistentOStream & os) const {
	os << iset_ << ip_;
	}

	void SaSPhotonPDF::persistentInput(PersistentIStream & is, int) {
	is >> iset_ >> ip_;
	}


	// The following static variable is needed for the type
	// description system in ThePEG.
	DescribeClass<SaSPhotonPDF,PDFBase>
	-describeHerwigSaSPhotonPDF("Herwig::SaSPhotonPDF", "SaSPhotonPDF.so");
	+describeHerwigSaSPhotonPDF("Herwig::SaSPhotonPDF", "HwSaSPhotonPDF.so");

	void SaSPhotonPDF::Init() {

	static ClassDocumentation<SaSPhotonPDF> documentation
	("The SaSPhotonPDF class interfaces to the photon PDFs of Schuler and Sjostrand",
	"The photon PDF of \\cite{Schuler:1995fk} was used.",
	"\bibitem{Schuler:1995fk}\n"
	"G.~A.~Schuler and T.~Sjostrand,\n"
	"%``Low and high mass components of the photon distribution functions,''\n"
	"Z.\\ Phys.\\ C {\bf 68} (1995) 607\n"
	"doi:10.1007/BF01565260\n"
	"[hep-ph/9503384].\n"
	"%%CITATION = doi:10.1007/BF01565260;\n");

	static Switch<SaSPhotonPDF,int> interfaceIset
	("Iset",
	"The choice of PDF set",
	&SaSPhotonPDF::iset_, 2, false, false);
	static SwitchOption interfaceIset1D
	(interfaceIset,
	"1D",
	"SaS set 1D ('DIS', Q0 = 0.6 GeV)",
	1);
	static SwitchOption interfaceIset1M
	(interfaceIset,
	"1M",
	"SaS set 1M ('MSbar', Q0 = 0.6 GeV)",
	2);
	static SwitchOption interfaceIset2D
	(interfaceIset,
	"2D",
	"SaS set 2D ('DIS', Q0 = 2 GeV)",
	3);
	static SwitchOption interfaceIset2M
	(interfaceIset,
	"2M",
	"SaS set 2M ('MSbar', Q0 = 2 GeV)",
	4);

	static Switch<SaSPhotonPDF,int> interfaceIP2
	("IP2",
	"scheme used to evaluate off-shell anomalous component.",
	&SaSPhotonPDF::ip_, 0, false, false);
	static SwitchOption interfaceIP20
	(interfaceIP2,
	"0",
	"recommended default, see = 7.",
	0);
	static SwitchOption interfaceIP21
	(interfaceIP2,
	"1",
	"dipole dampening by integration; very time-consuming.",
	1);
	static SwitchOption interfaceIP22
	(interfaceIP2,
	"2",
	"P_0^2 = max( Q_0^2, P^2 )",
	2);
	static SwitchOption interfaceIP23
	(interfaceIP2,
	"3",
	"P'_0^2 = Q_0^2 + P^2.",
	3);
	static SwitchOption interfaceIP24
	(interfaceIP2,
	"4",
	"P_{eff} that preserves momentum sum.",
	4);
	static SwitchOption interfaceIP25
	(interfaceIP2,
	"5",
	"P_{int} that preserves momentum and average evolution range.",
	5);
	static SwitchOption interfaceIP26
	(interfaceIP2,
	"6",
	"P_{eff}, matched to P_0 in P2 -> Q2 limit.",
	6);
	static SwitchOption interfaceIP27
	(interfaceIP2,
	"7",
	"P_{eff}, matched to P_0 in P2 -> Q2 limit.",
	7);

	}
	diff --git a/Contrib/SaSGamma/SaSPhotonPDF.h b/PDF/SaSPhotonPDF.h
	rename from Contrib/SaSGamma/SaSPhotonPDF.h
	rename to PDF/SaSPhotonPDF.h
	diff --git a/configure.ac b/configure.ac
	--- a/configure.ac
	+++ b/configure.ac
	@@ -1,242 +1,243 @@
	dnl Process this file with autoconf to produce a configure script.

	AC_PREREQ([2.63])
	AC_INIT([Herwig],[7.1.2],[herwig@projects.hepforge.org],[Herwig])
	AC_CONFIG_SRCDIR([Utilities/HerwigStrategy.cc])
	AC_CONFIG_AUX_DIR([Config])
	AC_CONFIG_MACRO_DIR([m4])
	AC_CONFIG_HEADERS([Config/config.h])
	dnl AC_PRESERVE_HELP_ORDER
	AC_CANONICAL_HOST

	dnl === disable debug symbols by default =====
	if test "x$CXXFLAGS" = "x"; then
	CXXFLAGS=-O2
	fi
	if test "x$CFLAGS" = "x"; then
	CFLAGS=-O2
	fi

	AC_LANG([C++])

	AM_INIT_AUTOMAKE([1.11 subdir-objects gnu dist-bzip2 no-dist-gzip -Wall -Wno-portability])
	m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
	m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

	dnl Checks for C++ compiler. Handle C++11 flags.
	AC_PROG_CXX
	AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])

	dnl check for POSIX
	AC_CHECK_HEADER([unistd.h],[],
	[AC_MSG_ERROR([Herwig needs "unistd.h". Non-POSIX systems are not supported.])])

	dnl Checks for programs.
	AC_PROG_INSTALL
	AC_PROG_MAKE_SET
	AC_PROG_LN_S

	dnl modified search order
	AC_PROG_FC([gfortran g95 g77])
	dnl xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 xlf f77 frt pgf77 cf77 fort77 fl32 af77])
	AC_LANG_PUSH([Fortran])
	AC_MSG_CHECKING([if the Fortran compiler ($FC) works])
	AC_COMPILE_IFELSE(
	AC_LANG_PROGRAM([],[ print *[,]"Hello"]),
	[AC_MSG_RESULT([yes])],
	[AC_MSG_RESULT([no])
	AC_MSG_ERROR([A Fortran compiler is required to build Herwig.])
	]
	)
	AC_LANG_POP([Fortran])
	+AC_FC_WRAPPERS


	LT_PREREQ([2.2.6])
	LT_INIT([disable-static dlopen pic-only])

	dnl ####################################
	dnl ####################################

	dnl for Doc/fixinterfaces.pl
	AC_PATH_PROG(PERL, perl)

	dnl for Models/Feynrules
	AM_PATH_PYTHON([2.6],, [:])
	AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON" != "x:"])

	HERWIG_CHECK_GSL

	HERWIG_CHECK_THEPEG

	BOOST_REQUIRE([1.41])
	BOOST_FIND_HEADER([boost/numeric/ublas/io.hpp])
	dnl Boost 1.64 is missing a required header to make these work
	dnl we just assume they're there if io.hpp has been found OK above
	dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix.hpp])
	dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix_proxy.hpp])
	dnl BOOST_FIND_HEADER([boost/numeric/ublas/matrix_sparse.hpp])
	dnl BOOST_FIND_HEADER([boost/numeric/ublas/symmetric.hpp])
	dnl BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
	BOOST_FIND_HEADER([boost/operators.hpp])
	BOOST_FIND_HEADER([boost/progress.hpp])
	BOOST_FILESYSTEM([mt])
	BOOST_TEST()

	HERWIG_CHECK_VBFNLO

	HERWIG_CHECK_NJET

	HERWIG_CHECK_GOSAM

	HERWIG_CHECK_GOSAM_CONTRIB

	HERWIG_CHECK_OPENLOOPS

	HERWIG_CHECK_MADGRAPH

	HERWIG_CHECK_EVTGEN
	HERWIG_CHECK_PYTHIA

	HERWIG_COMPILERFLAGS

	HERWIG_LOOPTOOLS

	FASTJET_CHECK_FASTJET

	HERWIG_ENABLE_MODELS

	SHARED_FLAG=-shared
	AM_CONDITIONAL(NEED_APPLE_FIXES,
	[test "xx${host/darwin/foundit}xx" != "xx${host}xx"])
	if test "xx${host/darwin/foundit}xx" != "xx${host}xx"; then
	APPLE_DSO_FLAGS=-Wl,-undefined,dynamic_lookup
	SHARED_FLAG=-bundle
	fi
	AC_SUBST([APPLE_DSO_FLAGS])
	AC_SUBST([SHARED_FLAG])

	AC_CONFIG_FILES([UnderlyingEvent/Makefile
	Models/Makefile
	Models/StandardModel/Makefile
	Models/RSModel/Makefile
	Models/General/Makefile
	Models/Susy/Makefile
	Models/Susy/NMSSM/Makefile
	Models/Susy/RPV/Makefile
	Models/UED/Makefile
	Models/LH/Makefile
	Models/LHTP/Makefile
	Models/Transplanckian/Makefile
	Models/Leptoquarks/Makefile
	Models/Zprime/Makefile
	Models/TTbAsymm/Makefile
	Models/Feynrules/Makefile
	Models/Feynrules/python/Makefile-FR
	Models/ADD/Makefile
	Models/Sextet/Makefile
	Decay/Makefile
	Decay/FormFactors/Makefile
	Decay/Tau/Makefile
	Decay/Baryon/Makefile
	Decay/VectorMeson/Makefile
	Decay/Perturbative/Makefile
	Decay/ScalarMeson/Makefile
	Decay/TensorMeson/Makefile
	Decay/WeakCurrents/Makefile
	Decay/Partonic/Makefile
	Decay/General/Makefile
	Decay/Radiation/Makefile
	Decay/EvtGen/Makefile
	Doc/refman.conf
	Doc/refman.h
	PDT/Makefile
	PDF/Makefile
	MatrixElement/Makefile
	MatrixElement/General/Makefile
	MatrixElement/Lepton/Makefile
	MatrixElement/Hadron/Makefile
	MatrixElement/DIS/Makefile
	MatrixElement/Powheg/Makefile
	MatrixElement/Gamma/Makefile
	MatrixElement/Reweighters/Makefile
	MatrixElement/Matchbox/Makefile
	MatrixElement/Matchbox/Base/Makefile
	MatrixElement/Matchbox/Utility/Makefile
	MatrixElement/Matchbox/Phasespace/Makefile
	MatrixElement/Matchbox/Dipoles/Makefile
	MatrixElement/Matchbox/InsertionOperators/Makefile
	MatrixElement/Matchbox/Matching/Makefile
	MatrixElement/Matchbox/Cuts/Makefile
	MatrixElement/Matchbox/Scales/Makefile
	MatrixElement/Matchbox/ColorFull/Makefile
	MatrixElement/Matchbox/CVolver/Makefile
	MatrixElement/Matchbox/Builtin/Makefile
	MatrixElement/Matchbox/Builtin/Amplitudes/Makefile
	MatrixElement/Matchbox/Tests/Makefile
	MatrixElement/Matchbox/External/Makefile
	MatrixElement/Matchbox/External/BLHAGeneric/Makefile
	MatrixElement/Matchbox/External/VBFNLO/Makefile
	MatrixElement/Matchbox/External/NJet/Makefile
	MatrixElement/Matchbox/External/GoSam/Makefile
	MatrixElement/Matchbox/External/OpenLoops/Makefile
	MatrixElement/Matchbox/External/MadGraph/Makefile
	MatrixElement/Matchbox/External/MadGraph/mg2herwig.py
	Sampling/Makefile
	Sampling/CellGrids/Makefile
	Shower/Makefile
	Shower/QTilde/Makefile
	Shower/QTilde/Matching/Makefile
	Shower/Dipole/Makefile
	Shower/Dipole/Base/Makefile
	Shower/Dipole/Kernels/Makefile
	Shower/Dipole/Kinematics/Makefile
	Shower/Dipole/Utility/Makefile
	Shower/Dipole/AlphaS/Makefile
	Utilities/Makefile
	Utilities/XML/Makefile
	Utilities/Statistics/Makefile
	Hadronization/Makefile
	lib/Makefile
	include/Makefile
	src/Makefile
	src/defaults/Makefile
	src/snippets/Makefile
	src/Matchbox/Makefile
	src/herwig-config
	Doc/Makefile
	Doc/HerwigDefaults.in
	Looptools/Makefile
	Analysis/Makefile
	API/Makefile
	src/Makefile-UserModules
	src/defaults/Analysis.in
	src/defaults/MatchboxDefaults.in
	src/defaults/Decays.in
	src/defaults/decayers.in
	src/defaults/setup.gosam.in
	src/Matchbox/LO-DefaultShower.in
	src/Matchbox/LO-DipoleShower.in
	src/Matchbox/MCatLO-DefaultShower.in
	src/Matchbox/MCatLO-DipoleShower.in
	src/Matchbox/LO-NoShower.in
	src/Matchbox/MCatNLO-DefaultShower.in
	src/Matchbox/MCatNLO-DipoleShower.in
	src/Matchbox/NLO-NoShower.in
	src/Matchbox/Powheg-DefaultShower.in
	src/Matchbox/Powheg-DipoleShower.in
	src/Merging/Makefile
	Shower/Dipole/Merging/Makefile
	src/defaults/MatchboxMergingDefaults.in
	Contrib/Makefile
	Contrib/make_makefiles.sh
	Tests/Makefile
	Makefile])

	AC_CONFIG_LINKS([Doc/BSMlibs.in:Doc/BSMlibs.in])
	AC_CONFIG_FILES([Doc/fixinterfaces.pl],[chmod +x Doc/fixinterfaces.pl])
	-
	+AC_CONFIG_HEADERS([PDF/SaSPhotonPDF.cc])
	HERWIG_OVERVIEW

	AC_CONFIG_COMMANDS([summary],[cat config.herwig])

	AC_OUTPUT
	diff --git a/Contrib/SaSGamma/LHC-GammaGamma.in b/src/LHC-ResolvedGammaGamma.in
	rename from Contrib/SaSGamma/LHC-GammaGamma.in
	rename to src/LHC-ResolvedGammaGamma.in
	--- a/Contrib/SaSGamma/LHC-GammaGamma.in
	+++ b/src/LHC-ResolvedGammaGamma.in
	@@ -1,76 +1,73 @@
	# -- ThePEG-repository --

	##################################################
	# Example generator based on LEP parameters
	# usage: Herwig read LEP.in
	##################################################

	read snippets/PPCollider.in

	##################################################
	# Technical parameters for this run
	##################################################
	cd /Herwig/Generators
	set EventGenerator:EventHandler:Sampler:Ntry 10000

	##################################################
	# Choice of phase-space generation for PDFs
	##################################################
	set /Herwig/Partons/PPExtractor:FlatSHatY 0

	##################################################
	# Change the proton PDFs to those for photon radiation
	##################################################
	set /Herwig/Particles/p+:PDF /Herwig/Partons/BudnevPDF
	set /Herwig/Particles/pbar-:PDF /Herwig/Partons/BudnevPDF
	set /Herwig/Partons/PPExtractor:FirstPDF /Herwig/Partons/BudnevPDF
	set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/BudnevPDF

	-create Herwig::SaSPhotonPDF /Herwig/Partons/SaSPDF SaSPhotonPDF.so
	-set /Herwig/Partons/SaSPDF:RemnantHandler /Herwig/Partons/HadronRemnants
	-set /Herwig/Particles/gamma:PDF /Herwig/Partons/SaSPDF
	-
	set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/SaSPDF
	set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/SaSPDF
	+set /Herwig/Particles/gamma:PDF /Herwig/Partons/SaSPDF


	##################################################
	# Cuts
	##################################################
	cd /Herwig/Cuts
	set Cuts:ScaleMin 0.0
	set Cuts:X1Min 0
	set Cuts:X2Min 0
	set Cuts:X1Max 1.
	set Cuts:X2Max 1.
	set Cuts:MHatMin 1.*GeV
	erase Cuts:MultiCuts 0
	set LeptonKtCut:MinKT 3*GeV

	##################################################
	# Selected the hard process
	##################################################
	cd /Herwig/MatrixElements

	# fermion-antifermion
	insert SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEqq2gZ2ff

	##################################################
	# LHC physics parameters (override defaults)
	##################################################
	cd /Herwig/Generators
	set EventGenerator:EventHandler:CascadeHandler:MPIHandler NULL

	##################################################
	## prepare for Rivet analysis or HepMC output
	## when running with parton shower
	##################################################
	#read snippets/Rivet.in
	#insert /Herwig/Analysis/Rivet:Analyses 0 XXX_2015_ABC123
	#read snippets/HepMC.in
	#set /Herwig/Analysis/HepMC:PrintEvent NNN

	###################################################
	# Save run for later usage with 'Herwig run'
	##################################################
	-saverun LHC-GammaGamma EventGenerator
	+saverun LHC-ResolvedGammaGamma EventGenerator
	diff --git a/src/Makefile.am b/src/Makefile.am
	--- a/src/Makefile.am
	+++ b/src/Makefile.am
	@@ -1,227 +1,228 @@
	SUBDIRS = defaults snippets Matchbox Merging

	defaultsdir = ${pkgdatadir}/defaults

	bin_PROGRAMS = Herwig

	Herwig_SOURCES = \
	HerwigMain.cc HerwigCLI.cc HerwigCLI.h \
	herwigopts.c herwigopts.h

	BUILT_SOURCES = herwigopts.c herwigopts.h

	Herwig_LDFLAGS = $(AM_LDFLAGS) -export-dynamic $(THEPEGLDFLAGS) \
	$(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS)
	Herwig_LDADD = $(THEPEGLIB) -ldl \
	$(top_builddir)/API/libHerwigAPI.la \
	$(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS)

	bin_SCRIPTS = herwig-config

	HELPERFILES = \
	CMSSM40.1.1.slha \
	NMSSM.spc \
	ADD.model \
	Leptoquark.model \
	LH.model \
	LHTP.model \
	MSSM.model \
	MUED.model \
	NMSSM.model \
	RPV-Bi.model \
	RPV-Tri.model \
	RS.model \
	Sextet.model \
	TTBA.model \
	Zprime.model \
	RPV-BI.slha \
	RPV-TRI.slha \
	RPV-UDD.slha

	INPUTFILES = \
	DIS.in \
	DIS-Matchbox.in \
	GammaGamma.in \
	ILC.in \
	ILC-MSSM.in \
	ILC-MUED.in \
	ILC-RS.in \
	LEP.in \
	LEP-Matchbox.in \
	LHC-ADD.in \
	LHC-CEX.in \
	LHC-GammaGamma.in \
	+LHC-ResolvedGammaGamma.in \
	LHC.in \
	LHC-Matchbox.in \
	LHC-LQ.in \
	LHC-MSSM.in \
	LHC-MUED.in \
	LHC-NMSSM.in \
	LHC-Powheg.in \
	LHC-RPV.in \
	LHC-RS.in \
	LHC-Sextet.in \
	LHC-TRP.in \
	LHC-TTBA.in \
	LHC-MB.in \
	LHC-ZP.in \
	TVT.in \
	TVT-Powheg.in \
	TVT-TTBA.in \
	LHC-LH.in \
	LHC-LHTP.in \
	LHE.in

	dist_pkgdata_DATA = $(INPUTFILES) $(HELPERFILES)
	pkgdata_DATA = Makefile-UserModules

	CLEANFILES = HerwigDefaults.rpo \
	.run .log .out .tex \
	multi.test *.output probs.test chisq.value \
	LHC-RS-BR.spc LHC-MSSM-BR.spc LHC-RPV-BR.spc

	clean-local:
	-rm -rf Herwig

	## checking targets ##

	HerwigDefaults.rpo: Herwig $(srcdir)/defaults/.in defaults/PDF.in defaults/Analysis.in $(top_builddir)/lib/.so
	./Herwig init -L$(top_builddir)/lib defaults/HerwigDefaults.in -D

	check_BSM_Full=
	check_BSM=

	if WANT_BSM

	check_BSM += check-LHC-RPV check-LHC-RS

	check_BSM_Full += \
	check-LHC-RPV check-LHC-MSSM check-ILC-MSSM \
	check-LHC-NMSSM \
	check-LHC-MUED check-ILC-MUED \
	check-LHC-RS check-ILC-RS check-LHC-ADD \
	check-LHC-LH check-LHC-LHTP \
	check-LHC-TRP \
	check-LHC-TTBA check-TVT-TTBA \
	check-LHC-ZP \
	check-LHC-LQ \
	check-LHC-Sextet

	endif
	check_BSM_Full_valgrind = $(subst check,check-valgrind,$(check_BSM_Full))
	check_BSM_valgrind = $(subst check,check-valgrind,$(check_BSM))

	check-local: check-LEP check-LHC $(check_BSM) check-DIS check-ILC check-GammaGamma check-LHC-Powheg

	check-valgrind-local: check-valgrind-LEP check-valgrind-LHC $(check_BSM_valgrind) check-valgrind-DIS check-valgrind-ILC check-valgrind-GammaGamma check-valgrind-LHC-Powheg

	check-Powheg: check-LHC-Powheg check-TVT-Powheg

	check-valgrind-Powheg: check-valgrind-LHC-Powheg check-valgrind-TVT-Powheg

	check-BSM: $(check_BSM_Full)

	check-valgrind-BSM: $(check_BSM_Full_valgrind)

	check_Matchbox= \
	check-LEP-Matchbox check-DIS-Matchbox check-LHC-Matchbox
	check_Matchbox_valgrind = $(subst check,check-valgrind,$(check_Matchbox))

	check-Matchbox: $(check_Matchbox)

	check-valgrind-Matchbox: $(check_Matchbox_valgrind)

	-check-extra: check-LHC-CEX check-LHC-GammaGamma check-LHC-MB check-TVT
	+check-extra: check-LHC-CEX check-LHC-GammaGammacheck-LHC-ResolvedGammaGamma check-LHC-MB check-TVT

	check-valgrind-extra: check-valgrind-LHC-CEX check-valgrind-LHC-GammaGamma check-valgrind-LHC-MB check-valgrind-TVT

	check-all: check-local check-Powheg check-BSM check-Matchbox check-extra

	check-valgrind-all: check-valgrind-local check-valgrind-Powheg check-valgrind-BSM check-valgrind-Matchbox check-valgrind-extra

	link-helper-files:
	@for i in $(HELPERFILES); do \
	if test -f $(srcdir)/$$i -a ! -e $$i; then \
	$(LN_S) -f $(srcdir)/$$i; fi; done

	## valgrind targets ##

	VALGRIND=valgrind --leak-check=full --num-callers=25 --freelist-vol=100000000 --leak-resolution=med --trace-children=yes

	check-valgrind-%: $(srcdir)/%.in HerwigDefaults.rpo link-helper-files
	$(VALGRIND) ./Herwig read -d1 -D $< &> valgrind-$(notdir $(subst .in,,$<))-read.log
	$(VALGRIND) ./Herwig run $(notdir $(subst .in,.run,$<)) -N 500 -d1 -D &> valgrind-$(notdir $(subst .in,,$<))-run.log

	valgrind: valgrind-init valgrind-read valgrind-run

	valgrind-init:
	$(VALGRIND) ./Herwig init -d1 -D -L$(top_builddir)/lib defaults/HerwigDefaults.in \
	&> /tmp/valgrind-init.log
	valgrind-read:
	$(VALGRIND) ./Herwig read -d1 -D LHC.in &> /tmp/valgrind-read.log
	valgrind-run:
	$(VALGRIND) ./Herwig run -d1 -D -N5 LHC.run &> /tmp/valgrind-run.log

	CHECKCOMMAND = ./Herwig run $(notdir $(subst .in,.run,$<)) -N500 -d1 -D

	check-%: $(srcdir)/%.in HerwigDefaults.rpo link-helper-files
	./Herwig read -i . $< -D
	@echo $(CHECKCOMMAND)
	@$(CHECKCOMMAND) && echo "# $@ OK #" \
	\|\| (echo "###### $@ BAD ######"; false)
	SETUPTHEPEG=$(THEPEGPATH)/bin/setupThePEG
	THEPEGREPO=$(THEPEGLIBPATH)/ThePEGDefaults.rpo

	install-data-hook:
	@echo Creating repository
	@./Herwig init -L$(DESTDIR)$(pkglibdir) -i$(DESTDIR)$(pkgdatadir) -i$(DESTDIR)$(pkgdatadir)/snippets $(DESTDIR)$(defaultsdir)/HerwigDefaults.in --repo=$(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo
	@if test -n "$(DESTDIR)"; \
	then sed -i.bak -e "s@$(DESTDIR)@@g" $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo; \
	rm -f $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo.bak; \
	fi

	uninstall-hook:
	rm -f $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo


	register: register-with-thepeg-repo
	register-with-thepeg-repo:
	@if test -x "$(SETUPTHEPEG)" -a -w "$(THEPEGREPO)"; \
	then echo Registering with ThePEG; \
	"$(SETUPTHEPEG)" --init \
	$(DESTDIR)$(defaultsdir)/HerwigDefaults.in \
	-r "$(THEPEGREPO)" -o "$(THEPEGREPO)" \
	-i $(DESTDIR)$(pkgdatadir) \
	-l$(DESTDIR)$(pkglibdir) ; \
	if test -n "$(DESTDIR)"; \
	then sed -i -e "s@$(DESTDIR)@@g" "$(THEPEGREPO)" ; fi ; \
	fi


	unregister : unregister-from-thepeg-repo
	unregister-from-thepeg-repo:
	@if test -x "$(SETUPTHEPEG)" -a -w "$(THEPEGREPO)"; \
	then echo Unregistering with ThePEG; \
	"$(SETUPTHEPEG)" --init defaults/HerwigCleanup.in \
	-r "$(THEPEGREPO)" -o "$(THEPEGREPO)" \
	-l$(DESTDIR)$(pkglibdir) ; \
	fi

	EXTRA_DIST = herwigopts.ggo

	nodist_Herwig_SOURCES = hgstamp.inc
	BUILT_SOURCES += hgstamp.inc
	CLEANFILES += hgstamp.inc

	HGVERSION := $(shell hg -R $(top_srcdir) parents --template '"Herwig {node\|short} ({branch})"' 2> /dev/null \|\| echo \"$(PACKAGE_STRING)\" \|\| true )

	.PHONY: update_hgstamp
	hgstamp.inc: update_hgstamp
	@[ -f $@ ] \|\| touch $@
	@echo '$(HGVERSION)' \| cmp -s $@ - \|\| echo '$(HGVERSION)' > $@

	GENGETOPT = gengetopt

	%opts.h %opts.c : %opts.ggo
	$(GENGETOPT) < $<

	diff --git a/src/defaults/PDF.in.in b/src/defaults/PDF.in.in
	--- a/src/defaults/PDF.in.in
	+++ b/src/defaults/PDF.in.in
	@@ -1,73 +1,77 @@
	# -- ThePEG-repository --

	# PDF.in. Generated from PDF.in.in by Makefile.am

	#####################################
	# Default PDF set
	#####################################

	# Handle leptons
	create ThePEG::LeptonLeptonPDF LeptonPDF LeptonLeptonPDF.so
	newdef LeptonPDF:RemnantHandler LeptonRemnants
	newdef /Herwig/Particles/e-:PDF LeptonPDF
	newdef /Herwig/Particles/e+:PDF LeptonPDF

	# Handle hadrons
	# NEW DEFAULT for Hw 7
	library ThePEGLHAPDF.so

	create ThePEG::LHAPDF HardLOPDF
	newdef HardLOPDF:RemnantHandler HadronRemnants

	create ThePEG::LHAPDF HardNLOPDF
	newdef HardNLOPDF:RemnantHandler HadronRemnants

	create ThePEG::LHAPDF ShowerLOPDF
	newdef ShowerLOPDF:RemnantHandler HadronRemnants

	create ThePEG::LHAPDF ShowerNLOPDF
	newdef ShowerNLOPDF:RemnantHandler HadronRemnants

	create ThePEG::LHAPDF MPIPDF
	newdef MPIPDF:RemnantHandler HadronRemnants

	create ThePEG::LHAPDF RemnantPDF
	newdef RemnantPDF:RemnantHandler HadronRemnants

	newdef HardLOPDF:PDFName MMHT2014lo68cl
	newdef HardNLOPDF:PDFName MMHT2014nlo68cl

	newdef ShowerLOPDF:PDFName MMHT2014lo68cl
	newdef ShowerNLOPDF:PDFName MMHT2014nlo68cl

	newdef MPIPDF:PDFName MMHT2014lo68cl
	newdef RemnantPDF:PDFName MMHT2014lo68cl

	# set LO PDFS for hard process and can be changed later

	newdef /Herwig/Particles/p+:PDF HardLOPDF
	newdef /Herwig/Particles/pbar-:PDF HardLOPDF

	# photons from leptons in WW approx
	create ThePEG::WeizsackerWilliamsPDF WWPDF WeizsackerWilliamsPDF.so
	create ThePEG::UnResolvedRemnant /Herwig/Partons/LeptonGammaRemnants
	newdef /Herwig/Partons/WWPDF:RemnantHandler /Herwig/Partons/LeptonGammaRemnants

	# photons from protons in Budnev approx
	create ThePEG::BudnevPDF BudnevPDF BudnevPDF.so
	create ThePEG::UnResolvedRemnant /Herwig/Partons/HadronGammaRemnants
	newdef /Herwig/Partons/BudnevPDF:RemnantHandler /Herwig/Partons/HadronGammaRemnants

	+# partons inside photons
	+create Herwig::SaSPhotonPDF /Herwig/Partons/SaSPDF HwSaSPhotonPDF.so
	+set /Herwig/Partons/SaSPDF:RemnantHandler /Herwig/Partons/HadronRemnants
	+
	# pomerons
	create Herwig::PomeronFlux PomeronFlux HwPomeronFlux.so
	newdef PomeronFlux:PDFFit Pomeron2006A
	newdef PomeronFlux:Q2Max 1.
	newdef PomeronFlux:Q2Min 1.0e-6
	create ThePEG::UnResolvedRemnant /Herwig/Partons/ProtonRemnant UnResolvedRemnant.so
	newdef /Herwig/Partons/PomeronFlux:RemnantHandler /Herwig/Partons/ProtonRemnant

	create Herwig::PomeronPDF PomeronPDF HwPomeronPDF.so
	newdef PomeronPDF:RemnantHandler HadronRemnants
	newdef PomeronPDF:RootName @HERWIG_PDF_POMERON@
	newdef /Herwig/Particles/pomeron:PDF PomeronPDF
	newdef PomeronPDF:PDFFit 2006A

File Metadata

Mime Type: text/x-diff
Expires: Tue, Sep 30, 4:42 AM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 6564788
Default Alt Text: (31 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions