Page MenuHomeHEPForge
Files F7877588

No OneTemporary
Actions

View Options

diff --git a/Contrib/FxFx/Makefile.in b/Contrib/FxFx/Makefile.in
deleted file mode 100644
--- a/Contrib/FxFx/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- Makefile -*- (for emacs)
-#
-# This Makefile is intended for compiling Herwig++ plugins
-#
-# This Makefile received very little testing,
-# any bug reports are very welcome!
-#
-# Location of include files
-THEPEGINCLUDE =
-HERWIGINCLUDE =
-GSLINCLUDE =
-FASTJETINCLUDE =
-RIVETINCLUDE = -I$(shell rivet-config --includedir --cppflags)
-HEPMCINCLUDE =
-# Messy hack, not guaranteed to work:
-FASTJETLIB = `echo $(FASTJETINCLUDE) | sed "s/-I//" | sed "s/ //"`/../lib/
-LDFLAGS = -L$(FASTJETLIB) -lfastjet $(shell rivet-config --ldflags --libs)
-SHARED_FLAG =
-INCLUDE = $(THEPEGINCLUDE) $(HERWIGINCLUDE) $(GSLINCLUDE) $(FASTJETINCLUDE) $(RIVETINCLUDE) $(HEPMCINCLUDE)
-# C++ flags
-CXX =
-CXXFLAGS =
-
-ALLCCFILES=$(shell echo *.cc)
-
-default : FxFx.so FxFxHandler.so FxFxAnalysis.so
-
-%.o : %.cc %.h
- $(CXX) -fPIC $(CPPFLAGS) $(INCLUDE) $(CXXFLAGS) -c -shared $< -o $@
-
-FxFx.so : FxFxFileReader.o FxFxEventHandler.o FxFxReader.o
- $(CXX) -fPIC $(CPPFLAGS) $(INCLUDE) $(CXXFLAGS) $(SHARED_FLAG) $(LDFLAGS) \
- -Wl,-undefined -Wl,dynamic_lookup \
- FxFxFileReader.o FxFxEventHandler.o FxFxReader.o -o FxFx.so
-
-FxFxHandler.so : FxFxHandler.o
- $(CXX) -fPIC $(CPPFLAGS) $(INCLUDE) $(CXXFLAGS) $(SHARED_FLAG) $(LDFLAGS) \
- -Wl,-undefined -Wl,dynamic_lookup \
- FxFxHandler.o -o FxFxHandler.so
-
-FxFxAnalysis.so : FxFxAnalysis.o
- $(CXX) -fPIC $(CPPFLAGS) $(INCLUDE) $(CXXFLAGS) $(SHARED_FLAG) $(LDFLAGS) \
- -Wl,-undefined -Wl,dynamic_lookup \
- FxFxAnalysis.o -o FxFxAnalysis.so
-
-clean:
- rm -f $(ALLCCFILES:.cc=.o) \
- FxFx.so FxFxHandler.so FxFxAnalysis.so
-
-install:
- cp *.so $(HERWIGINSTALL)/lib/Herwig
diff --git a/Contrib/FxFx/FxFx.h b/MatrixElement/FxFx/FxFx.h
rename from Contrib/FxFx/FxFx.h
rename to MatrixElement/FxFx/FxFx.h
diff --git a/Contrib/FxFx/FxFxAnalysis.cc b/MatrixElement/FxFx/FxFxAnalysis.cc
rename from Contrib/FxFx/FxFxAnalysis.cc
rename to MatrixElement/FxFx/FxFxAnalysis.cc
diff --git a/Contrib/FxFx/FxFxAnalysis.h b/MatrixElement/FxFx/FxFxAnalysis.h
rename from Contrib/FxFx/FxFxAnalysis.h
rename to MatrixElement/FxFx/FxFxAnalysis.h
diff --git a/Contrib/FxFx/FxFxEventHandler.cc b/MatrixElement/FxFx/FxFxEventHandler.cc
rename from Contrib/FxFx/FxFxEventHandler.cc
rename to MatrixElement/FxFx/FxFxEventHandler.cc
diff --git a/Contrib/FxFx/FxFxEventHandler.fh b/MatrixElement/FxFx/FxFxEventHandler.fh
rename from Contrib/FxFx/FxFxEventHandler.fh
rename to MatrixElement/FxFx/FxFxEventHandler.fh
diff --git a/Contrib/FxFx/FxFxEventHandler.h b/MatrixElement/FxFx/FxFxEventHandler.h
rename from Contrib/FxFx/FxFxEventHandler.h
rename to MatrixElement/FxFx/FxFxEventHandler.h
diff --git a/Contrib/FxFx/FxFxFileReader.cc b/MatrixElement/FxFx/FxFxFileReader.cc
rename from Contrib/FxFx/FxFxFileReader.cc
rename to MatrixElement/FxFx/FxFxFileReader.cc
diff --git a/Contrib/FxFx/FxFxFileReader.fh b/MatrixElement/FxFx/FxFxFileReader.fh
rename from Contrib/FxFx/FxFxFileReader.fh
rename to MatrixElement/FxFx/FxFxFileReader.fh
diff --git a/Contrib/FxFx/FxFxFileReader.h b/MatrixElement/FxFx/FxFxFileReader.h
rename from Contrib/FxFx/FxFxFileReader.h
rename to MatrixElement/FxFx/FxFxFileReader.h
diff --git a/Contrib/FxFx/FxFxHandler.cc b/MatrixElement/FxFx/FxFxHandler.cc
rename from Contrib/FxFx/FxFxHandler.cc
rename to MatrixElement/FxFx/FxFxHandler.cc
diff --git a/Contrib/FxFx/FxFxHandler.h b/MatrixElement/FxFx/FxFxHandler.h
rename from Contrib/FxFx/FxFxHandler.h
rename to MatrixElement/FxFx/FxFxHandler.h
diff --git a/Contrib/FxFx/FxFxLHReader.cc b/MatrixElement/FxFx/FxFxLHReader.cc
rename from Contrib/FxFx/FxFxLHReader.cc
rename to MatrixElement/FxFx/FxFxLHReader.cc
diff --git a/Contrib/FxFx/FxFxLHReader.fh b/MatrixElement/FxFx/FxFxLHReader.fh
rename from Contrib/FxFx/FxFxLHReader.fh
rename to MatrixElement/FxFx/FxFxLHReader.fh
diff --git a/Contrib/FxFx/FxFxLHReader.h b/MatrixElement/FxFx/FxFxLHReader.h
rename from Contrib/FxFx/FxFxLHReader.h
rename to MatrixElement/FxFx/FxFxLHReader.h
diff --git a/Contrib/FxFx/FxFxReader.cc b/MatrixElement/FxFx/FxFxReader.cc
rename from Contrib/FxFx/FxFxReader.cc
rename to MatrixElement/FxFx/FxFxReader.cc
diff --git a/Contrib/FxFx/FxFxReader.fh b/MatrixElement/FxFx/FxFxReader.fh
rename from Contrib/FxFx/FxFxReader.fh
rename to MatrixElement/FxFx/FxFxReader.fh
diff --git a/Contrib/FxFx/FxFxReader.h b/MatrixElement/FxFx/FxFxReader.h
rename from Contrib/FxFx/FxFxReader.h
rename to MatrixElement/FxFx/FxFxReader.h
diff --git a/Contrib/FxFx/HW7-Zjets-FxFx-FxFx.in b/MatrixElement/FxFx/HW7-Zjets-FxFx-FxFx.in
rename from Contrib/FxFx/HW7-Zjets-FxFx-FxFx.in
rename to MatrixElement/FxFx/HW7-Zjets-FxFx-FxFx.in
diff --git a/Contrib/FxFx/HW7-Zjets-FxFx-Tree.in b/MatrixElement/FxFx/HW7-Zjets-FxFx-Tree.in
rename from Contrib/FxFx/HW7-Zjets-FxFx-Tree.in
rename to MatrixElement/FxFx/HW7-Zjets-FxFx-Tree.in
diff --git a/MatrixElement/Reweighters/Makefile.am b/MatrixElement/FxFx/Makefile.am
copy from MatrixElement/Reweighters/Makefile.am
copy to MatrixElement/FxFx/Makefile.am
--- a/MatrixElement/Reweighters/Makefile.am
+++ b/MatrixElement/FxFx/Makefile.am
@@ -1,3 +1,26 @@
-noinst_LTLIBRARIES = libHwReweighters.la
-libHwReweighters_la_SOURCES = \
-ReweightEW.cc ReweightEW.h
+pkglib_LTLIBRARIES = HwFxFx.la HwFxFxHandler.la HwFxFxAnalysis.la
+HwFxFx_la_SOURCES = \
+FxFxFileReader.cc FxFxFileReader.fh FxFxFileReader.h\
+FxFxEventHandler.cc FxFxEventHandler.h\
+FxFxReader.cc FxFxReader.fh \
+FxFx.h
+HwFxFx_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+
+HwFxFxHandler_la_SOURCES = \
+FxFxHandler.cc FxFxHandler.h
+HwFxFxHandler_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+
+HwFxFxAnalysis_la_SOURCES = \
+FxFxAnalysis.cc FxFxAnalysis.h
+HwFxFxAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+
+#
+# FxFxLHReader.cc FxFxReader.h
+# FxFxLHReader.fh HW7-Zjets-FxFx-FxFx.in
+# FxFxLHReader.h HW7-Zjets-FxFx-Tree.in
+#
+
+
+
+
+
diff --git a/MatrixElement/Makefile.am b/MatrixElement/Makefile.am
--- a/MatrixElement/Makefile.am
+++ b/MatrixElement/Makefile.am
@@ -1,12 +1,12 @@
-SUBDIRS = General Lepton Hadron DIS Powheg Gamma Matchbox Reweighters
+SUBDIRS = General Lepton Hadron DIS Powheg Gamma Matchbox Reweighters FxFx
noinst_LTLIBRARIES = libHwME.la
libHwME_la_SOURCES = \
HwMEBase.h HwMEBase.fh HwMEBase.cc \
MEfftoVH.h MEfftoVH.cc \
MEfftoffH.h MEfftoffH.cc \
HardVertex.fh HardVertex.h HardVertex.cc \
ProductionMatrixElement.h ProductionMatrixElement.cc \
DrellYanBase.h DrellYanBase.cc \
BlobME.h BlobME.cc
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,244 +1,245 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
AC_INIT([Herwig],[7.2.0],[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.])])
AC_CHECK_HEADER([sys/stat.h],[],
[AC_MSG_ERROR([Herwig needs "sys/stat.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_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
+ MatrixElement/FxFx/Makefile
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
Shower/Dipole/Colorea/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

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 3:50 PM (1 d, 19 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3805032
Default Alt Text
(13 KB)

Event Timeline