Commit 1677c325 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.0.4

parent 5995b548
......@@ -3,3 +3,4 @@ WHIZARD Authors:
Wolfgang Kilian <kilian@hep.physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <reuter@physik.uni-freiburg.de>
Christian Speckner <christian.speckner@physik.uni-freiburg.de>
\ No newline at end of file
......@@ -3,20 +3,23 @@ Known bugs:
General:
* WHIZARD 2.0 currently runs only with the NAGFOR 5.2 and gfortran 4.5.0
Fortran compilers, as well as with ifort 11.1.069 on 32bit Linux
(or newer) Fortran compilers, as well as with ifort 11.1.069 on 32bit
Linux
[After compiler bugs are fixed, it should also run with g95, PGF
and ifort. See the file EXTENSIONS for the list of Fortran 2003
features that the compiler must support.]
* WHIZARD 2.0 is still in an early release stage. Not that not all features
from WHIZARD 1 have as yet been reimplemented in WHIZARD 2.0.
* WHIZARD 2.0 is still in a relatively early release stage. However,
except for a few technical points, all features from WHIZARD 1 have
been reimplemented in WHIZARD 2.0.
* Please report bugs and problems or performance issues
to one of the authors:
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <reuter@physik.uni-freiburg.de>
Christian Speckner <christian.speckner@physik.uni-freiburg.de>
Manual:
......
ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.0.4
2010-10-26
RELEASE: version 2.0.4
2010-10-06
Bug fix in MSSM implementation
2010-10-01
Update to libtool 2.4
2010-09-29
Support for anomalous top couplings (form factors etc.)
Bug fix for running gauge Yukawa SUSY couplings
2010-09-28
RELEASE: version 1.96
2010-09-21
Beam remnants and pT spectra for lepton collider re-enabled
Restructuring subevt class
2010-09-16
Shower and matching are disabled by default
PYTHIA as a conditional on these two options
2010-09-14
Possibility to read in beam spectra re-enabled (e.g. Guinea
Pig)
2010-09-13
Energy scan as (pseudo-) structure functions re-implemented
2010-09-10
CIRCE2 included again in WHIZARD 2 and validated
2010-09-02
Re-implementation of asymmetric beam energies and collision
angles, e-p collisions work, inclusion of a HERA DIS test
case
##################################################################
Version 2.0.3
2010-10-18
......
......@@ -186,6 +186,8 @@ Optional Features:
--enable-lhapdf enable LHAPDF for structure functions [[yes]]
--enable-hepmc enable HepMC for handling event data [[yes]]
--enable-stdhep enable STDHEP for binary event files [[yes]]
--enable-matching enable MLM matching w/ PYTHIA parton showers [[no]]
--enable-shower enable parton showers [[no]]
--enable-optimization-for-parameter-files
enable (useless) optimization for parameter file
[[no]]
......
......@@ -3,5 +3,5 @@ NEWS -- User-visible changes for the WHIZARD package
(for NEWS on the O'Mega matrix element generator cf. its
corresponding NEWS file)
version 2.0.3
version 2.0.4
for details cf. the ChangeLog file
......@@ -5,8 +5,9 @@
# Wolfgang Kilian <kilian@hep.physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@physik.uni-freiburg.de>
# with contributions by Felix Braam, Sebastian Schmidt,
# Christian Speckner, Daniel Wiesler
# Christian Speckner <christian.speckner@physik.uni-freiburg.de>
# with contributions by Fabian Bach, Felix Braam, Sebastian Schmidt,
# Daniel Wiesler
#
# WHIZARD is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......
WHIZARD Core
* Release 2.0.3
* Release 2.0.5
- 2->1 processes ?
- reactivate CIRCE2/pT distribution
- profiling/optimization
- Library API (bind(C))
- Behavior in batch environment, large event numbers
* 2.1
- EWA implementation
- pT for EWA, EPA etc.
- reconsider structure function mappings for optimization
- integration of multiple observables
- jet finder
......@@ -38,17 +36,17 @@ O'Mega
- helicity optimization (numerically done/analytically pending)
Models
* Release 2.0.4
* Release 2.0.5
- more self-checks (trivial processes + all kinds of commands)
- Tests for 7, 8 fermions ...
* 2.1
- Top-quark anomalous couplings (partially done)
- Top-quark anomalous couplings (now partially included)
- W-gamma couplings to resonances
- W'
VAMP
* 2.0.4
* 2.0.5
- unify naming conventions for types with WHIZARD (JR will do,
e.g. type :: division -> division_t (partially done)
* 2.1
......@@ -59,7 +57,7 @@ configure
- Windows support?
Misc
* Release 2.0.4
* Release 2.0.5
- ATLAS/CMS software environment
- Manual + Paper (partially done)
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
timestamp='2009-11-20'
timestamp='2010-08-21'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -56,8 +56,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -91,7 +92,7 @@ if test $# != 0; then
exit 1
fi
trap 'exit 1' 1 2 15
trap 'exit 1' HUP INT TERM
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
......@@ -105,7 +106,7 @@ trap 'exit 1' 1 2 15
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
......@@ -551,7 +552,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
*:AIX:*:[456])
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
......@@ -967,6 +968,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-tilera-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
timestamp='2009-11-20'
timestamp='2010-09-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -123,8 +124,9 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
......@@ -281,6 +283,7 @@ case $basic_machine in
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
| or32 \
......@@ -294,7 +297,7 @@ case $basic_machine in
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
......@@ -302,6 +305,15 @@ case $basic_machine in
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
c54x)
basic_machine=tic54x-unknown
;;
c55x)
basic_machine=tic55x-unknown
;;
c6x)
basic_machine=tic6x-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
......@@ -333,7 +345,7 @@ case $basic_machine in
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
......@@ -367,6 +379,7 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
......@@ -380,7 +393,8 @@ case $basic_machine in
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
......@@ -480,6 +494,15 @@ case $basic_machine in
basic_machine=powerpc-ibm
os=-cnk
;;
c54x-*)
basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c55x-*)
basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c6x-*)
basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
os=-unicos
......@@ -839,6 +862,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
neo-tandem)
basic_machine=neo-tandem
;;
nse-tandem)
basic_machine=nse-tandem
;;
nsr-tandem)
basic_machine=nsr-tandem
;;
......@@ -1073,17 +1102,10 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
tic55x | c55x*)
basic_machine=tic55x-unknown
os=-coff
;;
tic6x | c6x*)
basic_machine=tic6x-unknown
os=-coff
# This must be matched before tile*.
tilegx*)
basic_machine=tilegx-unknown
os=-linux-gnu
;;
tile*)
basic_machine=tile-unknown
......@@ -1294,7 +1316,8 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
......@@ -1435,6 +1458,8 @@ case $os in
-dicos*)
os=-dicos
;;
-nacl*)
;;
-none)
;;
*)
......@@ -1475,6 +1500,15 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
tic54x-*)
os=-coff
;;
tic55x-*)
os=-coff
;;
tic6x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
......
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2009-04-28.21; # UTC
scriptversion=2010-02-06.18; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -200,7 +200,11 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
trap "ret=141; $do_exit" 13
trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
......
This diff is collapsed.
......@@ -40,9 +40,24 @@ if test "$enable_lhapdf" = "yes"; then
fi
AC_MSG_RESULT([$LHAPDF_PDFSETS_PATH])
AC_MSG_CHECKING([the standard PDF sets])
if test -f "$LHAPDF_PDFSETS_PATH/cteq61.LHpdf" -a -f "$LHAPDF_PDFSETS_PATH/cteq5l.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/GSG961.LHgrid" -a -f "$LHAPDF_PDFSETS_PATH/cteq6ll.LHpdf"; then
AC_MSG_RESULT([ all standard PDF sets installed])
else
AC_MSG_RESULT([ not all standard PDF sets installed])
AC_MSG_NOTICE([error: *************************************************************])
AC_MSG_NOTICE([error: LHAPDF standard PDF sets not installed, please install these ])
AC_MSG_NOTICE([error: PDF sets: cteq61.LHpdf, cteq6ll.LHpdf, cteq5l.LHgrid, ])
AC_MSG_NOTICE([error: GSG961.LHgrid. ])
AC_MSG_NOTICE([error: *************************************************************])
enable_lhapdf="no"
AC_MSG_CHECKING([for LHAPDF])
AC_MSG_RESULT([(disabled)])
fi
else
enable_lhapdf="no"
fi
else
AC_MSG_CHECKING([for LHAPDF])
AC_MSG_RESULT([(disabled)])
......
This diff is collapsed.
# Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# Written by Gary V. Vaughan, 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.
# serial 6 ltoptions.m4
# serial 7 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
......@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
......@@ -133,13 +134,13 @@ case $host in
esac
test -z "$AS" && AS=as
_LT_DECL([], [AS], [0], [Assembler program])dnl
_LT_DECL([], [AS], [1], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
......
......@@ -7,17 +7,17 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# Generated from ltversion.in.
# @configure_input@
# serial 3017 ltversion.m4
# serial 3293 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])
m4_define([LT_PACKAGE_VERSION], [2.4])
m4_define([LT_PACKAGE_REVISION], [1.3293])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.6b'
macro_revision='1.3017'
[macro_version='2.4'
macro_revision='1.3293'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007, 2009 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.
# serial 3
# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
......@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
......@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
......@@ -9,12 +9,35 @@ AC_DEFUN([WO_PROG_PYTHIA],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_ARG_ENABLE([pythia],
[AS_HELP_STRING([--enable-pythia],
[enable PYTHIA for matching w/ parton showers (if not found set PYTHIA_DIR)[[no]]])],
[], [enable_pythia="no"])
AC_ARG_ENABLE([matching],
[AS_HELP_STRING([--enable-matching],
[enable MLM matching w/ PYTHIA parton showers [[no]]])],
[], [enable_matching="no"])
if test "$enable_pythia" = "yes"; then
AC_ARG_ENABLE([shower],
[AS_HELP_STRING([--enable-shower],
[enable parton showers [[no]]])],
[], [enable_shower="no"])
AC_CACHE_CHECK([whether we want to enable MLM matching],
[wo_cv_mlm_matching],
[dnl
if test "$enable_matching" = "yes"; then
wo_cv_mlm_matching=yes
else
wo_cv_mlm_matching=no
fi])
AC_CACHE_CHECK([whether we want to enable showering],
[wo_cv_showering],
[dnl
if test "$enable_shower" = "yes"; then
wo_cv_showering=yes
else
wo_cv_showering=no
fi])
if test "$enable_shower" = "yes" -o "$enable_matching" = "yes"; then
PYTHIA_AVAILABLE_FLAG=".true."
AC_MSG_CHECKING([for PYTHIA])
AC_MSG_RESULT([(enabled)])
......@@ -25,5 +48,10 @@ else
fi
AC_SUBST(PYTHIA_AVAILABLE_FLAG)
AM_CONDITIONAL([PYTHIA_AVAILABLE], [test "$enable_pythia" = "yes"])
])
AM_CONDITIONAL([MATCHING_AVAILABLE],
[test "$wo_cv_mlm_matching" = "yes"])
AM_CONDITIONAL([SHOWER_AVAILABLE],
[test "$wo_cv_showering" = "yes"])
AM_CONDITIONAL([PYTHIA_AVAILABLE],
[test "$PYTHIA_AVAILABLE_FLAG" = ".true."])
])
\ No newline at end of file
......@@ -3,7 +3,7 @@
## Process this file with automake to produce Makefile.in
## Subdirectories to configure
SUBDIRS = doc susy models cuts test examples
SUBDIRS = doc susy models cuts beam-sim test examples
## Data files needed for running WHIZARD
## to be installed with the 'models' prefix kept
......@@ -28,8 +28,10 @@ dist_models_DATA = \
models/SM_CKM.mdl \
models/SM_km.mdl \
models/SM_top.mdl \
models/SM_top_anom.mdl \
models/SM.mdl \
models/SM_triangle_higgs.mdl \
models/SM_hadrons.mdl \
models/Template.mdl \
models/UED.mdl \
models/Xdim.mdl \
......@@ -52,6 +54,12 @@ cutsdir = $(pkgdatadir)/cuts
dist_cuts_DATA = \
cuts/default_cuts.sin
## Files containing predefined beam simulation files
## to be installed with the 'beam-sim' prefix kept
beamsimdir = $(pkgdatadir)/beam-sim
dist_beamsim_DATA = \
beam-sim/uniform_spread_2.5%.dat
## Files containing complete examples
examplesdir = $(pkgdatadir)/examples
dist_examples_DATA = \
......@@ -62,4 +70,5 @@ dist_examples_DATA = \
examples/LEP_higgs.sin \
examples/LEP_cc10.sin \
examples/eeww_polarized.sin \
examples/LEP_jets.sin
examples/LEP_jets.sin \
examples/HERA_DIS.sin
## Makefile.am -- Makefile for WHIZARD data files
##
## Process this file with automake to produce Makefile.in
## Empty dummy Makefile.am, because it is needed by make dist
This diff is collapsed.
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