Commit 20d6fb68 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.2.7

parent 9e23da43
......@@ -6,12 +6,12 @@ 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>
Christian Weiss <christian.weiss@desy.de>
Former WHIZARD team members:
Fabian Bach
Felix Braam
Daniel Gordo Gomez
Sebastian Schmidt
......
......@@ -2,7 +2,46 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 2.2.6
Version 2.2.7
2015-08-11
RELEASE: version 2.2.7
2015-08-10
Infrastructure for damped POWHEG
Massive emitters in POWHEG
Born matrix elements via BLHA
GoSam filters via SINDARIN
Minor running coupling bug fixes
Fixed-order NLO events
2015-08-06
CT14 PDFs included (LO, NLO, NNLL)
2015-07-07
Revalidation of ILC WHIZARD-PYTHIA event chain
Extended test suite for showered events
Alpha version of massive FSR for POWHEG
2015-06-09
Fix memory leak in interaction for long cascades
Catch mismatch between beam definition and CIRCE2 spectrum
2015-06-08
Automated POWHEG matching: beta version
Infrastructure for GKS matching
Alpha version of fixed-order NLO events
CIRCE2 polarization averaged spectra with
explicitly polarized beams
2015-05-12
Abstract matching type: OO structure for matching/merging
2015-05-07
Bug fix in event record WHIZARD-PYTHIA6 transferral
Gaussian beam spectra for lepton colliders
##################################################################
2015-05-02
RELEASE: version 2.2.6
......@@ -19,7 +58,7 @@ Use svn log to see detailed changes.
2015-03-19
POWHEG matching: alpha version
##################################################################
##################################################################
2015-02-27
RELEASE: version 2.2.5
......
......@@ -238,10 +238,6 @@ Optional Features:
--enable-optimization-for-parameter-files
enable (useless) optimization for parameter file
[[no]]
--disable-default-checks
disable the default self-checks [[no]]
--enable-extnum-checks enable time-consuming extensive SM, SUSY and models
checks [[no]]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......
......@@ -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.6
version 2.2.7
for details cf. the ChangeLog file
......@@ -32,7 +32,8 @@ 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.
corrections) may be interfaced as well via the BLHA interface, from
external packages like e.g. GoSam and OpenLoops.
The program is able to calculate numerically stable signal and
background cross sections and generate unweighted event samples with
......
......@@ -553,6 +553,54 @@ AC_DEFUN([WO_FC_CHECK_ISO_FORTRAN_ENV],
]
)
### Check for the TR19767 extensions (submodules)
AC_DEFUN([WO_FC_CHECK_TR19767],
[AC_CACHE_CHECK([whether $FC supports submodules (F2008)],
[wo_cv_fc_submodules],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_LANG([Fortran])
AC_COMPILE_IFELSE([dnl
module conftest_mod
type :: point
real :: x, y
end type point
interface
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
end function point_dist
end interface
end module conftest_mod
submodule (conftest_mod) conftest_mod_a
contains
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
distance = sqrt((a%x - b%x)**2 + (a%y - b%y)**2)
end function point_dist
end submodule conftest_mod_a
program conftest
use conftest_mod
end program conftest
],
[wo_cv_fc_submodules="yes"],
[wo_cv_fc_submodules="no"])
])
rm -f conftest_mod.*
FC_SUPPORTS_SUBMODULES="$wo_cv_fc_submodules"
AC_SUBST([FC_SUPPORTS_SUBMODULES])
AM_CONDITIONAL([FC_SUBMODULES],
[test "$wo_cv_fc_submodules" = "yes"])
if test "$FC_SUPPORTS_SUBMODULES" = "no"; then
AC_MSG_NOTICE([NOTE: Fortran compiler does not support submodules (F2008).])
fi])
### end WO_FC_CHECK_TR19767
### Check for wrapping of linker flags
### (nagfor 'feature': must be wrapped twice)
AC_DEFUN([WO_FC_CHECK_LDFLAGS_WRAPPING],
......
# Makefile.am --
# $Id: Makefile.am 6465 2015-01-10 15:22:31Z jr_reuter $
# $Id: Makefile.am 7137 2015-08-07 19:02:32Z jr_reuter $
##
## Process this file with automake to produce Makefile.in
##
......@@ -123,6 +123,9 @@ endif
## Remove F90 module files
clean-local: clean-noweb
-rm -f *.$(FC_MODULE_EXT) *.g90
if FC_SUBMODULES
-rm -f *.smod
endif
## Remove backup files
maintainer-clean-backup:
......
......@@ -176,6 +176,9 @@ endif
clean-local: clean-noweb
-rm -f *.run
-rm -f *.$(FC_MODULE_EXT) *.g90 circemacs.mp4
if FC_SUBMODULES
-rm -f *.smod
endif
## Remove backup files
maintainer-clean-backup:
......
......@@ -553,6 +553,54 @@ AC_DEFUN([WO_FC_CHECK_ISO_FORTRAN_ENV],
]
)
### Check for the TR19767 extensions (submodules)
AC_DEFUN([WO_FC_CHECK_TR19767],
[AC_CACHE_CHECK([whether $FC supports submodules (F2008)],
[wo_cv_fc_submodules],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_LANG([Fortran])
AC_COMPILE_IFELSE([dnl
module conftest_mod
type :: point
real :: x, y
end type point
interface
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
end function point_dist
end interface
end module conftest_mod
submodule (conftest_mod) conftest_mod_a
contains
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
distance = sqrt((a%x - b%x)**2 + (a%y - b%y)**2)
end function point_dist
end submodule conftest_mod_a
program conftest
use conftest_mod
end program conftest
],
[wo_cv_fc_submodules="yes"],
[wo_cv_fc_submodules="no"])
])
rm -f conftest_mod.*
FC_SUPPORTS_SUBMODULES="$wo_cv_fc_submodules"
AC_SUBST([FC_SUPPORTS_SUBMODULES])
AM_CONDITIONAL([FC_SUBMODULES],
[test "$wo_cv_fc_submodules" = "yes"])
if test "$FC_SUPPORTS_SUBMODULES" = "no"; then
AC_MSG_NOTICE([NOTE: Fortran compiler does not support submodules (F2008).])
fi])
### end WO_FC_CHECK_TR19767
### Check for wrapping of linker flags
### (nagfor 'feature': must be wrapped twice)
AC_DEFUN([WO_FC_CHECK_LDFLAGS_WRAPPING],
......
......@@ -4,6 +4,7 @@
DATAFILES = \
ilc200.circe ilc230.circe ilc250.circe ilc350.circe ilc500.circe \
cepc240.circe cepc250.circe \
teslagg_500_polavg.circe teslagg_500.circe
EXTRA_DIST = $(DATAFILES)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -20,7 +20,7 @@ shift
template=$1
shift
if test "X$template" = "X"; then
echo "usage: fill_circe2_template GP++-output template" 1>&2
echo "usage: $0 GP++-output template [parameter=value ...]" 1>&2
exit 1
fi
......
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