Commit 9e23da43 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.2.6

parent fd0b4898
......@@ -5,6 +5,7 @@ Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
......
General:
* WHIZARD 2.2 currently runs only with the NAGFOR 5.3 (or newer) and
* WHIZARD 2.2 currently runs only with the NAGFOR 6.0 (or newer) and
gfortran 4.7.4 (or newer) Fortran compilers
[After compiler bugs are fixed, it should also run with g95, PGF
[After compiler bugs are fixed, it should also run with PGF
and ifort. See the file EXTENSIONS for the list of Fortran 2003
features that the compiler must support.]
......
......@@ -2,8 +2,25 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.2.5
Version 2.2.6
2015-05-02
RELEASE: version 2.2.6
2015-05-01
Models for (unitarized) tensor resonances in VBS
2015-04-28
Bug fix in channel weights for event generation.
2015-04-18
Improved event record transfer WHIZARD/PYTHIA6
2015-03-19
POWHEG matching: alpha version
##################################################################
2015-02-27
RELEASE: version 2.2.5
......
......@@ -66,6 +66,12 @@ WHIZARD:
You can get Qgraf from: http://cfif.ist.utl.pt/~paulo/qgraf.html
You can get FORM from: http://www.nikhef.nl/~form/
-- OpenLoops for NLO matrix elements.
Available from: http://openloops.hepforge.org/
-- LoopTools for one-loop functions (for the top threshold)
You can get it from: http://www.feynarts.de/looptools/
-- HepMC for the corresponding event file standard.
Available from: http://lcgapp.cern.ch/project/simu/HepMC
......@@ -222,6 +228,10 @@ Optional Features:
--enable-lcio enable LCIO for binary event files [[yes]]
--enable-pythia6 enable internal PYTHIA6 for hadronization [[yes]]
--enable-gosam enable GoSAM for external NLO matrix elements [[no]]
--enable-openloops enable OpenLoops for external NLO matrix elements
[[no]]
--enable-looptools enable LoopTools for top threshold one-loop
functions [[no]]
--enable-hoppet enable HOPPET for b quark pdf matching [[no]]
--enable-fastjet enable FastJet for handling event data [[no]]
--enable-pythia8 enable PYTHIA8 for shower and hadronization [[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.2.5
version 2.2.6
for details cf. the ChangeLog file
......@@ -5,8 +5,9 @@
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from Fabian Bach, Felix Braam, Sebastian Schmidt,
# Christian Speckner, Daniel Wiesler
# with contributions from Fabian Bach, Felix Braam, Bijan Chokoufe Nejad,
# Sebastian Schmidt, Marco Sekulla, Christian Speckner, Christian Weiss,
# 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
......@@ -47,7 +48,7 @@ the Higgs boson, and the top quark), the MSSM, the NMSSM, several types
of Little Higgs models, Universal Extra Dimensions, the 3-site Higgsless
moose model, and a generic Z' model. Model extensions or completely
different models can be added. Almost arbitrary models might be added via
the interface to the package FeynRules.
interfaces to the packages FeynRules and SARAH.
The WHIZARD manual as well as the documented source code can be found
in the subdirectory 'share/doc'. The manual describes the installation
......
......@@ -5,6 +5,7 @@ Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
......
......@@ -5,6 +5,7 @@ Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
......
......@@ -372,7 +372,7 @@ contains
return
end if
if (ierror .gt. 0) then
write (*, '(2A)') 'circe2_load: ', 'Version 2.2.5'
write (*, '(2A)') 'circe2_load: ', 'Version 2.2.6'
end if
prefix = index (design, '*') - 1
do
......
......@@ -2,7 +2,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.2.5'
'Version 2.2.6'
@
<<[[implicit none]]>>=
implicit none
......
......@@ -5,6 +5,7 @@ Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
......
......@@ -101,7 +101,7 @@ else
fi
AC_SUBST([GOSAM_DIR])
AM_CONDITIONAL([GOSAM_AVAILABLE], [test -n $GOSAM_DIR])
AM_CONDITIONAL([GOSAM_AVAILABLE], [test "$enable_gosam" = "yes"])
]) dnl WO_PROG_GOSAM
......
......@@ -46,13 +46,13 @@ if test "$enable_lhapdf" = "yes"; then
AC_MSG_RESULT([$LHAPDF_PDFSETS_PATH])
AC_MSG_CHECKING([the standard PDF sets])
if test -f "$LHAPDF_PDFSETS_PATH/CT10/CT10.info" -a -f "$LHAPDF_PDFSETS_PATH/CT10/CT10_0000.dat"; then
if test -f "$LHAPDF_PDFSETS_PATH/CT10/CT10.info" -a -f "$LHAPDF_PDFSETS_PATH/CT10/CT10_0000.dat" -a -f "$LHAPDF_PDFSETS_PATH/cteq6l1/cteq6l1.info" -a -f "$LHAPDF_PDFSETS_PATH/cteq6l1/cteq6l1_0000.dat"; 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: CT10. ])
AC_MSG_NOTICE([error: PDF sets: cteq6l1, CT10. ])
AC_MSG_NOTICE([error: *************************************************************])
enable_lhapdf="no"
AC_MSG_CHECKING([for LHAPDF])
......
dnl looptools.m4 -- checks for LoopTools library
dnl
include([aux.m4])
### Determine paths to LoopTools components
### If successful, set the conditional LOOPTOOLS_AVAILABLE
### Also: LOOPTOOLS_VERSION LOOPTOOLS_INCLUDES LDFLAGS_LOOPTOOLS
AC_DEFUN([WO_PROG_LOOPTOOLS],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_ARG_ENABLE([looptools],
[AS_HELP_STRING([--enable-looptools],
[enable LoopTools loop integral library [[no]]])],
[], [enable_looptools="no"])
if test "$enable_looptools" = "yes"; then
# Guessing the most likely paths
wo_looptools_path="/usr/local/lib64:/usr/lib64:/opt/local/lib64"
WO_PATH_LIB(LOOPTOOLS, ooptools, libooptools.a, $wo_looptools_path:$LOOPTOOLS_DIR)
if test "$LOOPTOOLS_DIR" = ""; then
enable_looptools="no"
else
wo_looptools_includes="-I$LOOPTOOLS_DIR/../include"
fi
if test "$enable_looptools" = "yes"; then
wo_looptools_libdir="-L$LOOPTOOLS_DIR"
AC_LANG_PUSH([Fortran])
AC_CHECK_LIB([ooptools],[ltini],
[LDFLAGS_LOOPTOOLS="$wo_looptools_libdir -looptools"],
[dnl
AC_MSG_NOTICE([warning: ********************************************************])
AC_MSG_NOTICE([warning: It seems your LoopTools is too old (v2.5 or older) or ])
AC_MSG_NOTICE([warning: was not compiled properly or compiled with a different ])
AC_MSG_NOTICE([warning: FORTRAN compiler and you forgot to add the proper ])
AC_MSG_NOTICE([warning: runtime to LIBS / LD_LIBRARY_PATH: ])
AC_MSG_NOTICE([warning: Disabling LoopTools support... ])
AC_MSG_NOTICE([warning: ********************************************************])
enable_looptools=no],[$wo_looptools_libdir])
if test "$enable_looptools" = "yes"; then
LOOPTOOLS_INCLUDES=$wo_looptools_includes
fi
AC_LANG_POP()
else
AC_MSG_CHECKING([for LoopTools])
AC_MSG_RESULT([(disabled)])
fi
else
AC_MSG_CHECKING([for LoopTools])
AC_MSG_RESULT([(disabled)])
fi
AC_SUBST([LOOPTOOLS_INCLUDES])
AC_SUBST(LDFLAGS_LOOPTOOLS)
if test "$enable_looptools" = "yes"; then
LOOPTOOLS_AVAILABLE_FLAG=".true."
else
LOOPTOOLS_AVAILABLE_FLAG=".false."
fi
AC_SUBST(LOOPTOOLS_AVAILABLE_FLAG)
AM_CONDITIONAL([LOOPTOOLS_AVAILABLE], [test "$enable_looptools" = "yes"])
])
dnl openloops.m4 -- checks for OpenLoops package
dnl
AC_DEFUN([WO_PROG_OPENLOOPS],
[dnl
AC_ARG_ENABLE([openloops],
[AS_HELP_STRING([--enable-openloops],
[(experimental) enable OpenLoops for NLO matrix elements [[no]]])],
[], [enable_openloops="no"])
AC_ARG_WITH([openloops],
[AS_HELP_STRING([--with-openloops=dir],
[assume the given directory for OpenLoops])])
unset OPENLOOPS_DIR
if test "$enable_openloops" = "yes"; then
save_path=$PATH
save_ld_library_path=$LD_LIBRARY_PATH
unset OPENLOOPS_DIR
if test -n "$with_openloops"; then
WO_PATH_LIB(openloops_lib, [openloops], [libopenloops.${SHRLIB_EXT}], ${with_openloops}/lib)
else
WO_PATH_LIB(openloops_lib, [openloops], [libopenloops.${SHRLIB_EXT}], $LD_LIBRARY_PATH)
fi
if test "$openloops_lib" != "no"; then
openloops_libdir=`dirname $openloops_lib`
OPENLOOPS_DIR=`dirname $openloops_libdir`
fi
else
AC_MSG_CHECKING([for OpenLoops])
AC_MSG_RESULT([(disabled)])
fi
AC_SUBST([OPENLOOPS_DIR])
AM_CONDITIONAL([OPENLOOPS_AVAILABLE], [test "$enable_openloops" = "yes"])
]) dnl WO_PROG_OPENLOOPS
......@@ -5,6 +5,7 @@ Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
......
NEWS -- User-visible changes for O'Mega
version 2.2.5
version 2.2.6
for details cf. the WHIZARD ChangeLog file
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