Skip to content
GitLab
Commit efce6843 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

ad37f93 Entry in BUGS files.

parent 8701f8e3
Hide whitespace changes
Inline Side-by-side
BUGS
View file @ efce6843
......@@ -19,6 +19,11 @@ General:
Known (recent) bugs:
* WHIZARD 2.8.3 exhibits a bug for UFO models containing Majorana fermions:
no matrix element is generated. WHIZARD 2.8.4 solves this problem. There
are still some wrong sign in interference terms for very complicated
processes.
* WHIZARD 2.8.1 and earlier does not compile with OCaml versions 4.08.0
and newer due to a deletion of a deprecated feature in the OCaml language.
This is fixed in 2.8.2+ of WHIZARD. For older WHIZARD versions, please
......
ChangeLog
View file @ efce6843
......@@ -2,7 +2,15 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.8.3
Version 2.8.4
2020-07-08
RELEASE: version 2.8.4
2020-07-07
Bug fix: steering of UFO Majorana models from WHIZARD
##################################################################
2020-07-03
RELEASE: version 2.8.3
......
NEWS
View file @ efce6843
......@@ -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 2.8.4
for details cf. the ChangeLog file
circe2/src/circe2.nw
View file @ efce6843
......@@ -3,7 +3,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.8.3'
'Version 2.8.4'
@
<<[[implicit none]]>>=
implicit none
......
configure.ac.in
View file @ efce6843
......@@ -33,7 +33,7 @@ dnl FCFLAGS Fortran compiler flags
dnl ***********************************************************************
dnl
dnl Start configuration
AC_INIT([XXXWHIZARDXXX],[2.8.3])
AC_INIT([XXXWHIZARDXXX],[2.8.4])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.12.2 color-tests parallel-tests])
AC_PREREQ([2.65])
......@@ -49,7 +49,7 @@ AC_MSG_NOTICE([**************************************************************])
WO_CONFIGURE_SECTION([Start of package configuration])
### Further version information
PACKAGE_DATE="Jul 03 2020"
PACKAGE_DATE="Jul 08 2020"
PACKAGE_STATUS="release"
AC_SUBST(PACKAGE_DATE)
......@@ -1058,6 +1058,7 @@ AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([tests/models/Makefile])
AC_CONFIG_FILES([tests/models/UFO/Makefile])
AC_CONFIG_FILES([tests/models/UFO/SM/Makefile])
AC_CONFIG_FILES([tests/models/UFO/MSSM/Makefile])
AC_CONFIG_FILES([tests/unit_tests/Makefile])
AC_CONFIG_FILES([tests/functional_tests/Makefile])
......
omega/src/Makefile.sources
View file @ efce6843
......@@ -201,6 +201,7 @@ OMEGA_APPLICATIONS_ML = \
omega_Template.ml \
omega_SYM.ml \
omega_UFO.ml \
omega_UFO_Dirac.ml \
omega_UFO_Majorana.ml \
omega_SM_Majorana.ml \
omega_SM_Majorana_legacy.ml
......
omega/src/compare_majorana_UFO.sh
View file @ efce6843
......@@ -27,9 +27,12 @@ make OCAMLFLAGS="$OCAMLFLAGS" -j $jobs -C $build/omega/src || exit 1
make -j $jobs -C $build/omega/bin \
omega_UFO.opt omega_UFO_Majorana.opt || exit 1
omega_dirac="$build/omega/bin/omega_UFO.opt -model:exec -target:width $width"
omega_dirac="$build/omega/bin/omega_UFO_Dirac.opt -model:exec -target:width $width"
omega_majorana="$build/omega/bin/omega_UFO_Majorana.opt -model:Majorana -model:exec -target:width $width"
omega_dirac="$build/omega/bin/omega_UFO.opt -model:exec -target:width $width"
omega_majorana="$build/omega/bin/omega_UFO.opt -model:Majorana -model:exec -target:width $width"
$omega_dirac "$mode" "$process" > omega_amplitude_dirac.f90 2>/dev/null
$omega_majorana "$mode" "$process" > omega_amplitude_majorana.f90 2>/dev/null
......
omega/src/omega.ml
View file @ efce6843
......@@ -446,10 +446,13 @@ i*)
let cmdline =
String.concat " " (List.map ThoString.quote (Array.to_list Sys.argv)) in
let output_channel =
let output_channel, close_output_channel =
match !output_file with
| None -> stdout
| Some name -> open_out name in
| None ->
(stdout, fun () -> ())
| Some name ->
let oc = open_out name in
(oc, fun () -> close_out oc) in
let processes =
try
......@@ -514,9 +517,11 @@ i*)
| Fusion.Majorana ->
begin
Printf.eprintf
"O'Mega: found Majorana fermions: use a supporting binary!\n";
"O'Mega: found Majorana fermions, switching representation!\n";
flush stderr;
CF.empty;
close_output_channel ();
Arg.current := 0;
raise Fusion.Majorana
end
| exc ->
begin
......@@ -658,10 +663,7 @@ i*)
| None -> ()
end;
begin match !output_file with
| None -> ()
| Some name -> close_out output_channel
end;
close_output_channel ();
exit 0
......
omega/src/omega_UFO.ml
View file @ efce6843
......@@ -31,12 +31,12 @@ module Bound (M : Model.T) : Tuple.Bound =
pred (M.max_degree ())
end
module O = Omega.Make(Fusion.Nary(Bound(UFO.Model)))(Targets.Fortran)(UFO.Model)
let _ = O.main ()
(*i
* Local Variables:
* indent-tabs-mode:nil
* page-delimiter:"^(\\* .*\n"
* End:
i*)
module Omega_Dirac =
Omega.Make(Fusion.Nary(Bound(UFO.Model)))(Targets.Fortran)(UFO.Model)
module Omega_Majorana =
Omega.Make(Fusion.Nary_Majorana(Bound(UFO.Model)))(Targets.Fortran_Majorana)(UFO.Model)
let _ =
try Omega_Dirac.main () with
| Fusion.Majorana -> Omega_Majorana.main ()
omega/src/omega_UFO_Dirac.ml 0 → 100644
View file @ efce6843
(* omega_UFO.ml --
Copyright (C) 1999-2020 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
with contributions from
Christian Speckner <cnspeckn@googlemail.com>
WHIZARD 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.
WHIZARD 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, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *)
module Bound (M : Model.T) : Tuple.Bound =
struct
(* \begin{dubious}
Above [max_degree = 6], the performance drops \emph{dramatically}!
\end{dubious} *)
let max_arity () =
pred (M.max_degree ())
end
module O = Omega.Make(Fusion.Nary(Bound(UFO.Model)))(Targets.Fortran)(UFO.Model)
let _ = O.main ()
share/doc/custom.hva
View file @ efce6843
% custom.hva -- tuning HEVEA for WHIZARD documentation
% Wolfgang's version, continued by JRR
% Specials
\newcommand{\thisversion}{2.8.3}
\newcommand{\thisversion}{2.8.4}
\newenvironment{interaction}{\small\verbatim}{\endverbatim\endsmall}
\newenvironment{syntax}{\begin{quote}\begin{flushleft}\tt}{\end{flushleft}\end{quote}}
\newcommand{\var}[1]{$\langle$\textit{#1}$\rangle$}
......
share/doc/manual.tex
View file @ efce6843
......@@ -283,7 +283,7 @@ Parameter & Value & Default & Description \\
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%END LATEX
\newcommand{\thisversion}{2.8.3}
\newcommand{\thisversion}{2.8.4}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -706,7 +706,8 @@ of \whizard (we break the table into logical and temporal blocks of
2.8.2 & 10/2019 & Support for OCaml $\geq$ 4.06.0, UFO Spin-2 support,
LCIO alternative weights \\
2.8.3 & 07/2020 & UFO Majorana feature complete, many $e^+e^-$ related
improvements
improvements \\
2.8.4 & 07/2020 & Bug fix for UFO Majorana models
\\\hline\hline
\end{tabular}
\end{center}
......@@ -1801,7 +1802,7 @@ named \verb|hello.sin|.
| M. Moretti, T. Ohl, J. Reuter, arXiv: hep-ph/0102195 |
| |
|=============================================================================|
| WHIZARD 2.8.3
| WHIZARD 2.8.4
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......@@ -1832,7 +1833,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 2.8.4
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......@@ -1891,7 +1892,7 @@ This produces a lot of output which looks similar to this:
| Writing log to 'whizard.log'
[... banner ...]
|=============================================================================|
| WHIZARD 2.8.3
| WHIZARD 2.8.4
|=============================================================================|
| Reading model file '/usr/local/share/whizard/models/SM.mdl'
| Preloaded model: SM
......@@ -11807,7 +11808,7 @@ This is the modern version of the Les Houches accord event format
<LesHouchesEvents version="1.0">
<header>
<generator_name>WHIZARD</generator_name>
<generator_version>2.8.3</generator_version>
<generator_version>2.8.4</generator_version>
</header>
<init>
25 25 5.0000000000E+02 5.0000000000E+02 -1 -1 -1 -1 3 1
......
share/tests/Makefile.am
View file @ efce6843
......@@ -749,6 +749,7 @@ REF_OUTPUT_FILES_BASE = \
functional_tests/ref-output/ufo_3.ref \
functional_tests/ref-output/ufo_4.ref \
functional_tests/ref-output/ufo_5.ref \
functional_tests/ref-output/ufo_6.ref \
functional_tests/ref-output/nlo_1.ref \
functional_tests/ref-output/nlo_2.ref \
functional_tests/ref-output/nlo_6.ref \
......@@ -1231,6 +1232,7 @@ MISC_TESTS_SIN = \
functional_tests/ufo_3.sin \
functional_tests/ufo_4.sin \
functional_tests/ufo_5.sin \
functional_tests/ufo_6.sin \
functional_tests/nlo_1.sin \
functional_tests/nlo_2.sin \
functional_tests/nlo_3.sin \
......
share/tests/functional_tests/ref-output/ufo_6.ref 0 → 100644
View file @ efce6843
?openmp_logging = false
?vis_history = false
?integration_timer = false
| Switching to model 'ufo_6_MSSM' (generated from UFO source)
seed = 0
?resonance_history = true
resonance_on_shell_limit = 4.000000000000E+00
phs_off_shell = 1
phs_t_channel = 2
| Process library 'ufo_6_lib': recorded process 'ufo_6_nn'
sqrts = 5.000000000000E+02
openmp_num_threads = 1
| Integrate: current process library needs compilation
| Process library 'ufo_6_lib': compiling ...
| Process library 'ufo_6_lib': writing makefile
| Process library 'ufo_6_lib': removing old files
| Process library 'ufo_6_lib': writing driver
| Process library 'ufo_6_lib': creating source code
| Process library 'ufo_6_lib': compiling sources
| Process library 'ufo_6_lib': linking
| Process library 'ufo_6_lib': loading
| Process library 'ufo_6_lib': ... success.
| Integrate: compilation done
| RNG: Initializing TAO random-number generator
| RNG: Setting seed for random-number generator to 0
| Initializing integration for process ufo_6_nn:
| Beam structure: [any particles]
| Beam data (collision):
| e- (mass = 0.0000000E+00 GeV)
| e+ (mass = 0.0000000E+00 GeV)
| sqrts = 5.000000000000E+02 GeV
| Phase space: generating configuration ...
| Phase space: ... success.
| Phase space: writing configuration file 'ufo_6_nn.i1.phs'
| ------------------------------------------------------------------------
| Process [scattering]: 'ufo_6_nn'
| Library name = 'ufo_6_lib'
| Process index = 1
| Process components:
| 1: 'ufo_6_nn_i1': e-, e+ => n1, n1 [omega]
| ------------------------------------------------------------------------
| Phase space: 5 channels, 2 dimensions
| Phase space: found 5 channels, collected in 2 groves.
| Phase space: Using 18 equivalences between channels.
| Phase space: wood
Warning: No cuts have been defined.
| Starting integration for process 'ufo_6_nn'
| Integrate: iterations = 1:1000
| Integrator: 2 chains, 5 channels, 2 dimensions
| Integrator: Using VAMP channel equivalences
| Integrator: 1000 initial calls, 20 bins, stratified = T
| Integrator: VAMP
|=============================================================================|
| It Calls Integral[fb] Error[fb] Err[%] Acc Eff[%] Chi2 N[It] |
|=============================================================================|
1 1000 2.6886277E+02 6.74E-01 0.25 0.08* 83.22
|-----------------------------------------------------------------------------|
1 1000 2.6886277E+02 6.74E-01 0.25 0.08 83.22
|=============================================================================|
| Restoring model 'ufo_6_MSSM'
n_events = 1
| Starting simulation for process 'ufo_6_nn'
| Simulate: using integration grids from file 'ufo_6_nn.m1.vg'
| Creating library for resonant subprocesses 'ufo_6_nn_R'
| Process library 'ufo_6_nn_R': initialized
| Process library 'ufo_6_nn_R': compiling ...
| Process library 'ufo_6_nn_R': ... success.
| Simulate: activating resonance insertion
| RNG: Initializing TAO random-number generator
| RNG: Setting seed for random-number generator to 1
| Simulation: requested number of events = 1
| corr. to luminosity [fb-1] = 3.7194E-03
| Events: writing to LHEF file 'ufo_6_nn.lhe'
| Events: writing to raw file 'ufo_6_nn.evx'
| Events: generating 1 unweighted, unpolarized events ...
| Events: event normalization mode '1'
| ... event sample complete.
| Events: actual unweighting efficiency = 100.00 %
| Events: closing LHEF file 'ufo_6_nn.lhe'
| Events: closing raw file 'ufo_6_nn.evx'
| There were no errors and 1 warning(s).
| WHIZARD run finished.
|=============================================================================|
share/tests/functional_tests/ufo_6.sin 0 → 100644
View file @ efce6843
# SINDARIN input for WHIZARD self-test
# Test UFO models with Majorana fermions
?logging = true
?openmp_logging = false
?vis_history = false
?integration_timer = false
model = ufo_6_MSSM (ufo)
seed = 0
?resonance_history = true
resonance_on_shell_limit = 4
phs_off_shell = 1
phs_t_channel = 2
process ufo_6_nn = "e-", "e+" => "n1", "n1"
sqrts = 500 GeV
!!! Tests should be run single-threaded
openmp_num_threads = 1
integrate (ufo_6_nn) { iterations = 1:1000 }
n_events = 1
sample_format = lhef
simulate (ufo_6_nn)
\ No newline at end of file
src/noweb-frame/whizard-prelude.nw
View file @ efce6843
......@@ -48,12 +48,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\WhizardVersion{2.8.3}
\def\WhizardDate{Jul 03 2020}
\def\WhizardVersion{2.8.4}
\def\WhizardDate{Jul 08 2020}
<<Version>>=
2.8.3
2.8.4
<<Date>>=
Jul 03 2020
Jul 08 2020
@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{%
......
tests/functional_tests/Makefile.am
View file @ efce6843
......@@ -201,6 +201,7 @@ TESTS_REQ_OCAML = \
ufo_3.run \
ufo_4.run \
ufo_5.run \
ufo_6.run \
nlo_1.run \
nlo_2.run \
nlo_3.run \
......@@ -506,6 +507,7 @@ ufo_2.run: ufo_2_SM/$(UFO_TAG_FILE)
ufo_3.run: ufo_3_models/ufo_3_SM/$(UFO_TAG_FILE)
ufo_4.run: ufo_4_models/ufo_4_SM/$(UFO_TAG_FILE)
ufo_5.run: ufo_5_SM/$(UFO_TAG_FILE)
ufo_6.run: ufo_6_MSSM/$(UFO_TAG_FILE)
ufo_1_SM/$(UFO_TAG_FILE): $(UFO_MODELPATH)/SM/$(UFO_TAG_FILE)
mkdir -p ufo_1_SM
......@@ -522,6 +524,9 @@ ufo_4_models/ufo_4_SM/$(UFO_TAG_FILE): $(UFO_MODELPATH)/SM/$(UFO_TAG_FILE)
ufo_5_SM/$(UFO_TAG_FILE): $(UFO_MODELPATH)/SM/$(UFO_TAG_FILE)
mkdir -p ufo_5_SM
cp $(UFO_MODELPATH)/SM/*.py ufo_5_SM
ufo_6_MSSM/$(UFO_TAG_FILE): $(UFO_MODELPATH)/MSSM/$(UFO_TAG_FILE)
mkdir -p ufo_6_MSSM
cp $(UFO_MODELPATH)/MSSM/*.py ufo_6_MSSM
ufo_5.run: ufo_5_test.slha
ufo_5_test.slha: $(top_builddir)/share/tests/functional_tests/ufo_5_test.slha
......@@ -529,6 +534,8 @@ ufo_5_test.slha: $(top_builddir)/share/tests/functional_tests/ufo_5_test.slha
$(UFO_MODELPATH)/SM/$(UFO_TAG_FILE): $(top_srcdir)/omega/tests/UFO/SM/$(UFO_TAG_FILE)
$(MAKE) -C $(UFO_MODELPATH)/SM all
$(UFO_MODELPATH)/MSSM/$(UFO_TAG_FILE): $(top_srcdir)/omega/tests/UFO/MSSM/$(UFO_TAG_FILE)
$(MAKE) -C $(UFO_MODELPATH)/MSSM all
endif OCAML_AVAILABLE
......@@ -804,10 +811,10 @@ clean-local: clean-macosx
rm -f slhaspectrum.in suspect2.out suspect2_lha.out
rm -f susyhit.in susyhit_slha.out suspect2_lha.in
rm -rf job_id_3_x.8001 job_id_4_x.8001
rm -rf ufo_1_SM ufo_2_SM ufo_3_models ufo_4_models ufo_5_SM
rm -rf ufo_1_SM ufo_2_SM ufo_3_models ufo_4_models ufo_5_SM ufo_6_MSSM
rm -f ufo_1_SM.ufo.mdl ufo_2_SM.ufo.mdl
rm -f ufo_3_SM.ufo.mdl ufo_4_SM.ufo.mdl
rm -f ufo_5_SM.ufo.mdl
rm -f ufo_5_SM.ufo.mdl ufo_6_MSSM.ufo.mdl
rm -f *.$(WT_OMEGA_CACHE_SUFFIX)
rm -rf output_cll
rm -rf *.dSYM
......
tests/functional_tests/ufo_6.sh 0 → 100644
View file @ efce6843
#!/bin/sh
### Check WHIZARD for a simple test process
echo "Running script $0"
if test -f OCAML_FLAG; then
./run_whizard.sh @script@ --no-logging
diff ref-output/`basename @script@`.ref `basename @script@`.log
else
echo "|=============================================================================|"
echo "No O'Mega matrix elements available, test skipped"
exit 77
fi
tests/models/UFO/MSSM/Makefile.am 0 → 100644
View file @ efce6843
## Makefile.am -- Makefile for models used in WHIZARD test scripts
##
## Process this file with automake to produce Makefile.in
##
########################################################################
#
# Copyright (C) 1999-2020 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from
# cf. main AUTHORS file
#
# WHIZARD 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.
#
# WHIZARD 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, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
########################################################################
## Definitions
# The UFO model is contained in the OMega test suite. Copy all files here.
OMEGA_TEST_UFO_DIR = $(top_srcdir)/omega/tests/UFO
MODEL = MSSM
UFO_FILES = \
__init__.py \
coupling_orders.py \
couplings.py \
CT_couplings.py \
function_library.py \
lorentz.py \
object_library.py \
parameters.py \
particles.py \
propagators.py \
vertices.py \
write_param_card.py
$(UFO_FILES): $(OMEGA_TEST_UFO_DIR)/$(MODEL)/__init__.py
cp $(OMEGA_TEST_UFO_DIR)/$(MODEL)/$@ .
########################################################################
## Targets
all: $(UFO_FILES)
distclean-local:
rm -f $(UFO_FILES)
########################################################################
## The End.
########################################################################
tests/models/UFO/Makefile.am
View file @ efce6843
......@@ -27,7 +27,7 @@
#
########################################################################
SUBDIRS = SM
SUBDIRS = SM MSSM
########################################################################
## The End.
......
Supports Markdown
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