Commit 449596f0 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.2.0

parent 91f60f3a
WHIZARD Authors:
WHIZARD Main Authors:
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
Sebastian Schmidt <sebastian.t.schmidt@desy.de>
Christian Speckner <christian.speckner@physik.uni-freiburg.de>
Daniel Wiesler <daniel.wiesler@desy.de>
\ No newline at end of file
WHIZARD Contributors:
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
Former WHIZARD team members:
Daniel Gordo Gomez
Sebastian Schmidt
Daniel Wiesler
\ No newline at end of file
......@@ -2,34 +2,23 @@ Known bugs:
General:
* WHIZARD 2.1 currently runs only with the NAGFOR 5.2 (or newer) and
gfortran 4.5.0 (or newer) Fortran compilers
* WHIZARD 2.2 currently runs only with the NAGFOR 5.2 (or newer) and
gfortran 4.7.1 (or newer) Fortran compilers
[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.1 is still in a relatively early release stage. However,
except for a few minor technical points, all features from WHIZARD 1 have
been reimplemented in WHIZARD 2.1.
* WHIZARD 2.2 incorporates all features from WHIZARD 1, making the
legacy branch obsolete now.
* 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 <juergen.reuter@desy.de>
Christian Speckner <christian.speckner@physik.uni-freiburg.de>
Graphics/debug output:
* MetaPost 1.504 (included in TeXLive 2011) has a bug which
prevents the graphical integration history to be correctly produced,
and also the graphics analysis when using run IDs or analysis
file names containing dots in the name.
to our support email address:
<whizard@desy.de>
Manual:
* WHIZARD 2.1, the new features, is still mostly undocumented. The manual
* WHIZARD 2.2, the new features, is still mostly undocumented. The manual
is still quite sparse. We are working on that. Regular updates independent
from the subreleases can be found on the Hepforge webpage:
http://projects.hepforge.org/whizard/manual.pdf
......
......@@ -2,8 +2,108 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.1.1
Version 2.2.0
2014-05-18
RELEASE: version 2.2.0
2014-04-11
Multiple components: inclusive process definitions,
syntax: process A + B + ...
2014-03-13
Improved PS mappings for e+e- ISR
ILC TDR and CLIC spectra included in CIRCE1
2014-02-23
New models: AltH w\ Higgs for exclusion purposes,
SM_rx for Dim 6-/Dim-8 operators, SSC for
general strong interactions (w/ Higgs), and
NoH_rx (w\ Higgs)
2014-02-14
Improved s-channel mapping, new on-shell
production mapping (e.g. Drell-Yan)
2014-02-03
PRE-RELEASE: version 2.2.0_beta
2013-12-16
HOPPET interface for b parton matching
2013-11-15
PRE-RELEASE: version 2.2.0_alpha-4
2013-10-27
LHEF standards 1.0/2.0/3.0 implemented
2013-10-15
PRE-RELEASE: version 2.2.0_alpha-3
2013-10-02
PRE-RELEASE: version 2.2.0_alpha-2
2013-09-25
PRE-RELEASE: version 2.2.0_alpha-1
2013-09-12
PRE-RELEASE: version 2.2.0_alpha
2013-09-03
General 2HDM implemented
2013-08-18
Rescanning/recalculating events
2013-06-07
Reconstruction of complete event
from 4-momenta possible
2013-05-06
Process library stacks
2013-05-02
Process stacks
2013-04-29
Single-particle phase space module
2013-04-26
Abstract interface for random
number generator
2013-04-24
More object-orientation on modules
Midpoint-rule integrator
2013-04-05
Object-oriented integration and
event generation
2013-03-12
Processes recasted object-oriented:
MEs, scales, structure functions
First infrastructure for general Lorentz
structures
2013-01-17
Object-orientated reworking of library and
process core, more variable internal structure,
unit tests
2012-12-14
Update Pythia version to 6.4.27
2012-12-04
Fix the phase in HAZ vertices
2012-11-21
First O'Mega unit tests, some infrastructure
2012-11-13
Bugfix in anom. HVV Lorentz structures
##################################################################
2012-09-18
RELEASE: version 2.1.1
......
......@@ -43,3 +43,7 @@ GET_ENVIRONMENT_VARIABLE
* Statements
FLUSH
* Special functions
ATANH
\ No newline at end of file
......@@ -28,7 +28,7 @@ Prerequisites are:
- Make
- Objective Caml compiler (version 3.10 or higher)
- Fortran 95/03 compiler
- Fortran 2003 compiler
- C/C++ (for HepMC interfaces)
The Objective Caml (O'Caml) compiler is available from
......@@ -74,10 +74,11 @@ WHIZARD:
MAC OS X:
WHIZARD has been tested and partially developed under MAC OS X
Darwin 9.6.0-9.8.0 (Leopard) and Darwin 10.0.0-10.2.0 (Snow
Leopard). The single pass linker here forces to explicitly include
static C++ libraries when externally linking HepMC. The necessary
flags are automatically taken care of by the configure script.
Darwin 9.6.0-9.8.0 (Leopard) and Darwin 10.0.0-10.6.0 (Snow
Leopard) as well as Darwin 10.7.0 (Lion). The single pass linker
here forces to explicitly include static C++ libraries when
externally linking HepMC. The necessary flags are automatically
taken care of by the configure script.
#-------------------------------------------------------------
# installing from a source code tar ball
......@@ -197,6 +198,7 @@ Optional Features:
--enable-stdhep enable STDHEP for binary event files [[yes]]
--enable-shower enable parton showers [[yes]]
--enable-mpi enable multi-parton interactions [[no]]
--enable-hoppet enable HOPPET for b quark pdf matching [[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.1.1
version 2.2.0
for details cf. the ChangeLog file
#######################################################################
# WHIZARD
#
# Copyright (C) 1999-2012 by
# Copyright (C) 1999-2014 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <christian.speckner@physik.uni-freiburg.de>
# with contributions by Fabian Bach, Felix Braam, Sebastian Schmidt,
# Daniel Wiesler
# with contributions from Fabian Bach, Felix Braam, Sebastian Schmidt,
# Christian Speckner, 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.1.2
- 2->1 processes ?
* Release 2.2
- large event numbers (still a problem??)
* 2.2
* 2.3
- EWA implementation (some progress in 2.1.1)
- reconsider structure function mappings for optimization
- reconsider structure function mappings for optimization (done?)
- integration of multiple observables
- jet finder
- reenabling underlying event
- process collections
- process collections (preparations in 2.2)
* 2.3
* 2.4
- Mathematica interface
- Parton shower matching (MLM done, CKKW pending)
- GUI (Tim)
- parallelization (OpenMP done, MPI pending)
- NLO/GoSAM (first things happened)
- NLO/GoSAM/FKS (first things happened)
- Dark Matter
- Use omega restrictions on diagrams for phase space
......@@ -27,37 +26,36 @@ Technical stuff
- include STAT and ERRMSG in allocate and deallocate statements
O'Mega
* 2.2
* 2.3
- arbitrary Lorentz structure
- flavor sums
- model files unification
- helicity optimization (numerically done/analytically pending)
Models
* Release 2.1.2
- more self-checks (trivial processes + all kinds of commands)
* Release 2.3
- Tests for 7, 8 fermions ...
* 2.2
* 2.3
- W-gamma couplings to resonances
- W'
VAMP
* 2.1.2
* 2.2
- unify naming conventions for types with WHIZARD (JR will do,
e.g. type :: division -> division_t (partially done)
* 2.2
* 2.3
- integration of multiple observables
configure
* 2.2
* 2.3
- Windows support?
Misc
* Release 2.1.2
* Release 2.3
- ATLAS/CMS software environment
- Manual + O'Mega Paper (partially done)
* 2.2
* 2.3
- review gamelan (partially done, esp. docu)
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2010-11-15.09; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
# Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Win32 hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l*)
lib=${1#-l}
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
set x "$@" "$dir/$lib.dll.lib"
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
set x "$@" "$dir/$lib.lib"
break
fi
done
IFS=$save_IFS
test "$found" != yes && set x "$@" "$lib.lib"
shift
;;
-L*)
func_file_conv "${1#-L}"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
WHIZARD Authors:
WHIZARD Main Authors:
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
Sebastian Schmidt <sebastian.t.schmidt@desy.de>
Christian Speckner <christian.speckner@physik.uni-freiburg.de>
Daniel Wiesler <daniel.wiesler@desy.de>
\ No newline at end of file
WHIZARD Contributors:
Fabian Bach <fbach@physik.uni-wuerzburg.de>
Marco Sekulla <sekulla@physik.uni-siegen.de>
Christian Speckner <cnspeckn@googlemail.com>
Former WHIZARD team members:
Daniel Gordo Gomez
Sebastian Schmidt
Daniel Wiesler
\ No newline at end of file
......@@ -5,11 +5,11 @@
##
########################################################################
#
# Copyright (C) 1999-2012 by
# Copyright (C) 1999-2014 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <christian.speckner@physik.uni-freiburg.de>
# Christian Speckner <cnspeckn@googlemail.com>