Commit 8d0e1e77 authored by Juergen Reuter's avatar Juergen Reuter
Browse files

1fa11ba Merge branch '3.0.0_alpha' into 'master'

parent 8701f8e3
General:
* WHIZARD 2.8+ currently runs only with the NAGFOR 6.2 (or newer) and
* WHIZARD 3.0+ currently runs only with the NAGFOR 6.2 (or newer) and
gfortran 5.1.0 (or newer) Fortran compilers as well as Intel ifort
19.0.2 (or newer). gfortran 6.5 has a severe regression, and cannot
be used.
......@@ -41,7 +41,7 @@ Compilers and OS specialties:
anything for the installed WHIZARD, but the testsuite (make check)
will not work before make install has been executed. make distcheck
will not work on El Capitan. There is also the option to disable
the System Integrity Protocol (SIP) of El Capitan by booting in
the System Integrity Protocol (SIP) of modern OSX by booting in
Recovery Mode, open a terminal and type 'csrutil disable'. However, we
do not recommend to do so.
......@@ -52,6 +52,9 @@ Manual:
on the Hepforge webpage:
https://whizard.hepforge.org/manual.pdf
Old bugs in old versions:
* In version 2.3.0 there is a regression which produces invalid O'Mega
......
......@@ -2,7 +2,9 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.8.3
Version 3.0.0_alpha+
##################################################################
2020-07-03
RELEASE: version 2.8.3
......@@ -52,7 +54,7 @@ Use svn log to see detailed changes.
##################################################################
2020-03-03
RELEASE: version 3.0.0_alpha
RELEASE: version 3.0.0_alpha
2020-02-25
Bug fix: Scale and alphas can be retrieved from internal event format to
......
......@@ -16,9 +16,9 @@ the HepForge repository:
The command
gzip -cd whizard-2.X.X.tgz | tar xf -
gzip -cd whizard-3.X.X.tgz | tar xf -
will unpack the sources in a subdirectory whizard-2.X.X,
will unpack the sources in a subdirectory whizard-3.X.X,
where X.X is the current version (and sub-version) number.
Prerequisites are:
......@@ -103,12 +103,8 @@ WHIZARD:
MAC OS X:
WHIZARD has been tested and partially developed under MAC OS X
Darwin 9.6.X-9.8.X (Leopard) and Darwin 10.0.X-10.6.X (Snow
Leopard), Darwin 10.7.X (Lion), Darwin 10.8.X (Mountain Lion),
Darwin 10.9.X (Maverick), Darwin 10.10.X (Yosemite), Darwin
10.11.X (El Capitan) as well as Darwin 10.12.X (Sierra) and
10.13.X (High Sierra). The single pass linker here forces to
WHIZARD has been tested and partially developed under MAC OSX
The single pass linker of OSX forces to
explicitly include static C++ libraries when externally linking
PYTHIA8, HepMC, FastJet, LHAPDF or LCIO. The necessary flags
are automatically taken care of by the configure script.
......@@ -119,7 +115,7 @@ to subprocesses. This does not change anything for the installed
WHIZARD, but the testsuite (make check) will not work probably even
after make install has been executed. make distcheck will not work on
Darwin >= 10.11. There is also the option to disable the System Integrity
Protection (SIP) of El Capitan by booting in Recovery Mode (use Command R
Protection (SIP) of modern OSX by booting in Recovery Mode (use Command R
while booting), open a terminal and type 'csrutil disable'. However, we
do not recommend to do so unless you know exactly what you are doing.
......
......@@ -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.8.3
version 3.0.0_alpha+
for details cf. the ChangeLog file
......@@ -31,7 +31,7 @@ The events can be written to file in HepMC, LHEF, LCIO or ASCII format.
Tree-level matrix elements are generated automatically for arbitrary
partonic processes by calling the O'Mega matrix element generator.
Matrix elements obtained by alternative methods (e.g., including loop
corrections) may be interfaced as well via the BLHA interface, from
corrections) are interfaced as well via the BLHA interface, from
external packages like e.g. GoSam, OpenLoops and RECOLA.
The program is able to calculate numerically stable signal and
......
......@@ -3,7 +3,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.8.3'
'Version 3.0.0_alpha+'
@
<<[[implicit none]]>>=
implicit none
......
......@@ -33,7 +33,7 @@ dnl FCFLAGS Fortran compiler flags
dnl ***********************************************************************
dnl
dnl Start configuration
AC_INIT([XXXWHIZARDXXX],[2.8.3])
AC_INIT([XXXWHIZARDXXX],[3.0.0_alpha+])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.12.2 color-tests parallel-tests])
AC_PREREQ([2.65])
......@@ -50,7 +50,7 @@ WO_CONFIGURE_SECTION([Start of package configuration])
### Further version information
PACKAGE_DATE="Jul 03 2020"
PACKAGE_STATUS="release"
PACKAGE_STATUS="alpha"
AC_SUBST(PACKAGE_DATE)
AC_SUBST(PACKAGE_STATUS)
......
% custom.hva -- tuning HEVEA for WHIZARD documentation
% Wolfgang's version, continued by JRR
% Specials
\newcommand{\thisversion}{2.8.3}
\newcommand{\thisversion}{3.0.0\_alpha}
\newenvironment{interaction}{\small\verbatim}{\endverbatim\endsmall}
\newenvironment{syntax}{\begin{quote}\begin{flushleft}\tt}{\end{flushleft}\end{quote}}
\newcommand{\var}[1]{$\langle$\textit{#1}$\rangle$}
......
......@@ -283,7 +283,7 @@ Parameter & Value & Default & Description \\
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%END LATEX
\newcommand{\thisversion}{2.8.3}
\newcommand{\thisversion}{3.0.0 $\alpha$}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -292,9 +292,9 @@ Parameter & Value & Default & Description \\
%%%\preprintno{arXiv:0708.4233 (also based on LC-TOOL-2001-039 (revised))}
%END LATEX
\title{%
%HEVEA WHIZARD 2.8 \\
%HEVEA WHIZARD 3.0 \\
%BEGIN LATEX
\ttt{\huge WHIZARD 2.8} \\[\baselineskip]
\ttt{\huge WHIZARD 3.0} \\[\baselineskip]
%END LATEX
A generic \\ Monte-Carlo integration and event generation package \\
for multi-particle processes\\[\baselineskip]
......@@ -1801,7 +1801,7 @@ named \verb|hello.sin|.
| M. Moretti, T. Ohl, J. Reuter, arXiv: hep-ph/0102195 |
| |
|=============================================================================|
| WHIZARD 2.8.3
| WHIZARD 3.0.0_alpha
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......@@ -1832,7 +1832,7 @@ including the \whizard\ banner is shown in Fig.~\ref{fig:helloworld})
\centerline{[... here a banner is displayed]}
\begin{Verbatim}
|=============================================================================|
| WHIZARD 2.8.3
| WHIZARD 3.0.0_alpha
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......@@ -1891,7 +1891,7 @@ This produces a lot of output which looks similar to this:
| Writing log to 'whizard.log'
[... banner ...]
|=============================================================================|
| WHIZARD 2.8.3
| WHIZARD 3.0.0_alpha
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......
......@@ -48,10 +48,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\WhizardVersion{2.8.3}
\def\WhizardVersion{3.0.0 $alpha$}
\def\WhizardDate{Jul 03 2020}
<<Version>>=
2.8.3
3.0.0_alpha+
<<Date>>=
Jul 03 2020
@
......
......@@ -5,7 +5,7 @@ if test -f OCAML_FLAG; then
rm -f @script@_lib.* @script@_p?.*
name=`basename @script@`
./run_whizard.sh @script@ --no-logging --model QCD
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}a.weights.dat" >> $name.log
cat ${name}a.weights.dat | sed -e 's/..E/XXE/g' >> $name.log
......
......@@ -5,7 +5,7 @@ if test -f OCAML_FLAG; then
rm -f @script@_lib.* @script@_p?.*
name=`basename @script@`
./run_whizard.sh @script@ --no-logging --model QCD
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}b.weights.dat" >> $name.log
cat ${name}b.weights.dat >> $name.log
......
......@@ -5,7 +5,7 @@ if test -f OCAML_FLAG; then
rm -f @script@_lib.* @script@_p?.*
name=`basename @script@`
./run_whizard.sh @script@ --no-logging --model QCD
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}b.weights.dat" >> $name.log
cat ${name}b.weights.dat >> $name.log
......
......@@ -8,7 +8,7 @@ if test -f OCAML_FLAG; then
cat ${name}a.mokka.evt >> $name.log
echo "Contents of ${name}b.mokka.evt" >> $name.log
cat ${name}b.mokka.evt >> $name.log
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
diff ref-output/`basename @script@`.ref `basename @script@`.log
else
......
......@@ -5,7 +5,7 @@ if test -f OCAML_FLAG; then
rm -f @script@_lib.* @script@_p?.*
name=`basename @script@`
./run_whizard.sh @script@ --no-logging --model QCD
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}a.weights.dat" >> $name.log
cat ${name}a.weights.dat | sed -e 's/..E/XXE/g' >> $name.log
......
......@@ -9,7 +9,7 @@ if test -f OCAML_FLAG; then
echo "STDHEP EV4 version:" >> $script.log
./stdhep_rd ${script}_p1.ev4.hep 1 >> ${script}.log
mv ${script}.log ${script}.log.tmp
cat ${script}.log.tmp | sed -e 's/total blocks.*/total blocks: [...]/' -e 's/WHIZARD 2.*/WHIZARD [version]/' -e 's/date: .*/date: [...]/' > ${script}.log
cat ${script}.log.tmp | sed -e 's/total blocks.*/total blocks: [...]/' -e 's/WHIZARD 3.*/WHIZARD [version]/' -e 's/date: .*/date: [...]/' > ${script}.log
diff ref-output/${script}.ref ${script}.log
else
echo "|=============================================================================|"
......
......@@ -4,7 +4,7 @@ name=`basename @script@`
echo "Running script $0"
if test -f OCAML_FLAG; then
./run_whizard.sh @script@ --no-logging --no-model
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}_in.weights.dat" >> $name.log
cat ${name}_in.weights.dat >> $name.log
......
......@@ -4,7 +4,7 @@ name=`basename @script@`
echo "Running script $0"
if test -f OCAML_FLAG; then
./run_whizard.sh @script@ --no-logging --no-model
cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp
cat $name.log | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $name.log.tmp
mv $name.log.tmp $name.log
echo "Contents of ${name}_in.weights.dat" >> $name.log
cat ${name}_in.weights.dat >> $name.log
......
......@@ -5,7 +5,7 @@ if test -f OCAML_FLAG; then
./run_whizard.sh @script@ --no-logging
script=`basename @script@`
mv $script.log $script.log.tmp
cat $script.log.tmp | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $script.log
cat $script.log.tmp | sed -e 's/WHIZARD 3.*$/WHIZARD [version]/' > $script.log
rm -f $script.log.tmp
echo "Contents of ${script}a.dat:" >> $script.log
cat ${script}a.dat >> $script.log
......
......@@ -8,7 +8,7 @@ if test -f OCAML_FLAG; then
echo "STHDHEP file contents:" > ${s}_hep.log
./stdhep_rd ${s}_p.hep 3 >> ${s}_hep.log
mv ${s}_hep.log ${s}_hep.log.tmp
cat ${s}_hep.log.tmp | sed -e 's/total blocks.*/total blocks: [...]/' -e 's/WHIZARD 2.*/WHIZARD [version]/' -e 's/date: .*/date: [...]/' > ${s}_hep.log
cat ${s}_hep.log.tmp | sed -e 's/total blocks.*/total blocks: [...]/' -e 's/WHIZARD 3.*/WHIZARD [version]/' -e 's/date: .*/date: [...]/' > ${s}_hep.log
diff ref-output/$s.ref ${s}_hep.log
else
echo "|=============================================================================|"
......
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