Commit 4194750b authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.6.0

parent 5a54d899
WHIZARD Main Authors:
contact <whizard@desy.de>
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
Juergen Reuter <juergen.reuter@desy.de>
WHIZARD Contributors:
Timothy Barklow <timb@slac.stanford.edu>
Mikael Berggren <mikael.berggren@desy.de>
Simon Brass <brass@physik.uni-siegen.de>
Bijan Chokoufe Nejad <bijan.chokoufe@desy.de>
Christian Fleper <christian.fleper@uni-siegen.de>
Akiya Miyamoto <akiya.miyamoto@kek.jp>
Vincent Rothe <vincent.rothe@desy.de>
Marco Sekulla <marco.sekulla@kit.edu>
Christian Speckner <cnspeckn@googlemail.com>
So Young Shim <soyoung.shim@desy.de>
Florian Staub <florian.staub@cern.ch>
Pascal Stienemeier <pascal.stienemeier@desy.de>
Florian Staub <florian.staub@kit.edu>
Christian Schwinn <schwinn@physik.rwth-aachen.de>
Manuel Utsch <utsch@physik.uni-siegen.de>
Christian Weiss <christian.weiss@desy.de>
Zhijie Zhao <zhao@physik.uni-siegen.de>
Former WHIZARD team members:
Fabian Bach
Fabian Bach
Hans-Werner Boschmann
Felix Braam
Daniel Gordo Gomez
Sebastian Schmidt
......
General:
* WHIZARD 2.4 currently runs only with the NAGFOR 6.0 (or newer) and
* WHIZARD 2.4+ currently runs only with the NAGFOR 6.0 (or newer) and
gfortran 4.8.5 (or newer) Fortran compilers as well as Intel ifort
16.0.0 (or newer). Intel ifort 17.0.0/1/2 has a serious regression and
does not work, however.
17.0.4 (or newer).
[After compiler bugs are fixed, it should also run with PGF
and pathscale. See the file EXTENSIONS for the list of Fortran 2003
[See the file EXTENSIONS for the list of Fortran 2003/2008/2015
features that the compiler must support.]
* WHIZARD 2.4 incorporates all features from WHIZARD 1, making the
* WHIZARD 2.6+ incorporates all features from WHIZARD 1, making the
legacy branch obsolete now.
* Please report bugs and problems or performance issues
......@@ -45,7 +43,7 @@ Known bugs:
Manual:
* WHIZARD 2.4, the new features, is still mostly undocumented. The manual
* WHIZARD 2.6, 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
......
This diff is collapsed.
......@@ -10,6 +10,7 @@ Impure elemental functions
ALLOCATABLE structure component
ALLOCATABLE dummy argument
ALLOCATABLE function result
Automatic allocate on assignment
* C interoperability:
......
......@@ -94,6 +94,9 @@ WHIZARD:
-- An interface to FeynRules exists and is included in the
FeynRules program: http://feynrules.irmp.ucl.ac.be
-- Parallelisation with MPI requires a at least MPI-3 capable MPI library.
You can get OpenMPI from https://www.open-mpi.org/.
#-------------------------------------------------------------
# platform specific issues
#-------------------------------------------------------------
......@@ -231,6 +234,7 @@ Optional Features:
--enable-fc-openmp use OpenMP for the Fortran code [[no]]
--enable-fc-profiling use profiling for the Fortran code [[no]]
--enable-fc-impure compile Omega libraries impure [[no]]
--enable-fc-mpi use OpenMPI/MPICH for the Fortran code [[no]]
--disable-ocaml disable the OCaml parts, even if OCaml available
[[no]]
--enable-default-UFO-dir=directory
......@@ -270,7 +274,8 @@ Optional Packages:
request a floating point precision other than
double precision. Note that only single and
double are guaranteed to be provided by all
Fortran compilers.
Fortran compilers.
--with-mpi-lib=mpich|openmpi request an external MPI library.
--with-pythia8=dir assume the given directory for PYTHIA8
--with-fastjet=dir assume the given directory for FastJet
--with-gosam=dir assume the given directory for GoSam
......
......@@ -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.5.0
version 2.6.0
for details cf. the ChangeLog file
......@@ -5,9 +5,8 @@
# 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, Bijan Chokoufe Nejad,
# Sebastian Schmidt, Marco Sekulla, Christian Speckner, So Young Shim,
# Christian Weiss, Zhijie Zhao, Daniel Wiesler
# 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
......
## Makefile.am -- Makefile for WHIZARD
# $Id: Makefile.am 1564 2010-01-21 18:19:23Z ohl $
##
## Process this file with automake to produce Makefile.in
##
......@@ -9,7 +8,8 @@
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
# Makefile.am --
# $Id: Makefile.am 319 2010-04-18 15:00:54Z ohl $
##
## Process this file with automake to produce Makefile.in
##
......@@ -9,7 +8,8 @@
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
# Makefile.am --
# $Id: Makefile.am 314 2010-04-17 20:32:33Z ohl $
########################################################################
#
# Copyright (C) 1999-2017 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
# Makefile.am --
# $Id: Makefile.am 314 2010-04-17 20:32:33Z ohl $
########################################################################
## Data files needed for running CIRCE2
......
# Makefile.am --
# $Id: Makefile.am 317 2010-04-18 00:31:03Z ohl $
########################################################################
#
# Copyright (C) 1999-2017 by
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......@@ -71,7 +71,8 @@ VPATH = $(srcdir):$(top_builddir)/circe1/src:$(top_srcdir)/circe1/src
if NOWEB_AVAILABLE
circe1.tex: $(WEBS)
$(NOWEAVE) -filter ./tex-comments -delay -index \
@if $(AM_V_P); then :; else echo " NOWEAVE " $@; fi
$(AM_V_at)$(NOWEAVE) -filter ./tex-comments -delay -index \
`for i in $^; do case $$i in *.nw) echo $$i;; esac done` \
> $@
......@@ -80,7 +81,8 @@ circe1.tex: tex-comments
endif NOWEB_AVAILABLE
.mp4.mp: circemacs.mp4
$(M4) -I$(top_srcdir)/circe1/share/doc $< >$@
@if $(AM_V_P); then :; else echo " M4 " $@; fi
$(AM_V_at)$(M4) -I$(top_srcdir)/circe1/share/doc $< >$@
########################################################################
# Old targets for the fit plots
......@@ -91,16 +93,6 @@ fit.mp dist.mp: circemacs.mp4
fit.11: fit.mp
TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST) $<
# preview.pdf: vegas.data vamp.data
# vegas.data: vegas.d
# cp $< $@
#
# vamp.data: vamp.d
# cp $< $@
########################################################################
# The distribution plots for the write-up
########################################################################
......@@ -113,96 +105,126 @@ dist.1: dist.mp \
de-sband-ee.dat dg-sband-ee.dat de-tesla-ee.dat dg-tesla-ee.dat \
de-xband-ee.dat dg-xband-ee.dat de-sbandt-ee.dat dg-sbandt-ee.dat \
de-teslat-ee.dat dg-teslat-ee.dat de-xbandt-ee.dat dg-xbandt-ee.dat
TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) \
MPINPUTS=$(MP_FLAGS) $(MPOST) $<
@if $(AM_V_P); then TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) \
MPINPUTS=$(MP_FLAGS) $(MPOST) $<; else \
echo " METAPOST " $@; TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) \
MPINPUTS=$(MP_FLAGS) $(MPOST) $< >/dev/null; fi
########################################################################
# Generating CIRCE data
########################################################################
de-sband.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-sband.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-tesla.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-tesla.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-xband.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-xband.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-sbandt.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-sbandt.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 1 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-teslat.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-teslat.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-xbandt.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-xbandt.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 3 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-tesla3.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 350.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 350.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-tesla3.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 350.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 350.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-tesla8.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 800.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 800.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-tesla8.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 800.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 800.0 2 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-sband-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-sband-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-tesla-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-tesla-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-xband-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 500.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 500.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-xband-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 500.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 500.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-sbandt-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-sbandt-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 4 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-teslat-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-teslat-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 5 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
de-xbandt-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 11 11 1000.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 11 11 1000.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
dg-xbandt-ee.dat: $(top_builddir)/circe1/tools/circe1_plot
echo 1 0.001 1.0 50 -1.0 22 11 1000.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
@if $(AM_V_P); then :; else echo " PLOT " $@; fi
$(AM_V_at)echo 1 0.001 1.0 50 -1.0 22 11 1000.0 6 $(CIRCE1_VER) $(CIRCE1_REV) | $(CPLOT)
CPLOT = $(top_builddir)/circe1/tools/circe1_plot | $(GREP) -v circe1: | $(SED) 's/E/e/g' > $@
......@@ -214,30 +236,26 @@ SUFFIXES = .tex .pdf
if DISTRIBUTION
if PDFLATEX_AVAILABLE
if MPOST_AVAILABLE
if SUPP_PDF_AVAILABLE
if MAKEINDEX_AVAILABLE
.tex.pdf:
-TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
$(MAKEINDEX) -o $*.ind $*.idx
-test -r $*.mp && TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST) $*
-test -r $*pics.mp && MPINPUTS=$(MP_FLAGS) $(MPOST) $*pics
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
fi
else
.tex.pdf:
-TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
-test -r $*.mp && TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST) $*
-test -r $*pics.mp && MPINPUTS=$(MP_FLAGS) $(MPOST) $*pics
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
@if $(AM_V_P); then TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; else \
echo " PDFLATEX " $<; TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; fi
if MAKEINDEX_AVAILABLE
@if $(AM_V_P); then $(MAKEINDEX) -o $*.ind $*.idx; else \
echo " MAKEINDEX " $*.ind $*.idx; $(MAKEINDEX) -q -o $*.ind $*.idx; fi
endif MAKEINDEX_AVAILABLE
@if $(AM_V_P); then TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; else \
echo " PDFLATEX " $<; TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; fi
@if $(AM_V_P); then \
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
fi; else \
if grep -s 'Rerun to get cross-references right.' $*.log >/dev/null; then \
echo " PDFLATEX " $< "(for cross-references)"; \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; \
fi; \
fi
endif
endif SUPP_PDF_AVAILABLE
endif MPOST_AVAILABLE
endif PDFLATEX_AVAILABLE
endif DISTRIBUTION
......@@ -256,17 +274,20 @@ endif DISTRIBUTION
if EPSPDF_AVAILABLE
if EPSPDF_043
.eps.pdf:
$(EPSPDF) $< $@
@if $(AM_V_P); then :; else echo " EPSPDF " $@; fi
$(AM_V_at)$(EPSPDF) $< $@
else
if EPSTOPDF_AVAILABLE
.eps.pdf:
$(EPSTOPDF) --outfile=$@ $<
@if $(AM_V_P); then :; else echo " EPSTOPDF " $@; fi
$(AM_V_at)$(EPSTOPDF) --outfile=$@ $<
endif
endif
else
if EPSTOPDF_AVAILABLE
.eps.pdf:
$(EPSTOPDF) --outfile=$@ $<
@if $(AM_V_P); then :; else echo " EPSTOPDF " $@; fi
$(AM_V_at)$(EPSTOPDF) --outfile=$@ $<
endif
endif
......
# Makefile.am --
# $Id: Makefile.am 7783 2017-01-03 09:28:52Z jr_reuter $
##
## Process this file with automake to produce Makefile.in
##
......@@ -9,7 +8,8 @@
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
# Makefile.am --
# $Id: Makefile.am 319 2010-04-18 15:00:54Z ohl $
##
## Process this file with automake to produce Makefile.in
##
......@@ -9,7 +8,8 @@
# Wolfgang Kilian <kilian@physik.uni-siegen.de>
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
## Makefile.am -- Makefile for WHIZARD
# $Id: Makefile.am 1564 2010-01-21 18:19:23Z ohl $
##
## Process this file with automake to produce Makefile.in
##
......@@ -10,7 +9,7 @@
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
# Makefile.am --
# $Id: Makefile.am 314 2010-04-17 20:32:33Z ohl $
##
## Process this file with automake to produce Makefile.in
##
......@@ -10,7 +9,7 @@
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......
......@@ -9,7 +9,7 @@
# Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
# Juergen Reuter <juergen.reuter@desy.de>
# with contributions from
# Christian Speckner <cnspeckn@googlemail.com>
# 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
......@@ -75,7 +75,8 @@ endif
if NOWEB_AVAILABLE
circe2.tex: $(WEBS)
$(NOWEAVE) -filter ./tex-comments -delay -index \
@if $(AM_V_P); then :; else echo " NOWEAVE " $@; fi
$(AM_V_at)$(NOWEAVE) -filter ./tex-comments -delay -index \
`for i in $^; do case $$i in *.nw) echo $$i;; esac done` \
> $@
......@@ -88,7 +89,8 @@ tex-comments: tex-comments.sh
chmod +x $@
.data.histo:
cp $< $@
@if $(AM_V_P); then :; else echo " CP " $@; fi
$(AM_V_at)cp $< $@
# preview.pdf: vegas.data vamp.data
......@@ -117,19 +119,24 @@ if DISTRIBUTION
if OCAMLWEB_AVAILABLE
.mll.implementation:
$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
@if $(AM_V_P); then :; else echo " OCAMLWEB " $@; fi
$(AM_V_at)$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
.mly.implementation:
$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
@if $(AM_V_P); then :; else echo " OCAMLWEB " $@; fi
$(AM_V_at)$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
.ml.implementation:
$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
@if $(AM_V_P); then :; else echo " OCAMLWEB " $@; fi
$(AM_V_at)$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
.mli.interface:
$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
@if $(AM_V_P); then :; else echo " OCAMLWEB " $@; fi
$(AM_V_at)$(OCAMLWEB) --no-preamble --noweb --no-index $< >$@
index.tex: $(CIRCE2_CAML) $(CIRCE2_DERIVED)
$(OCAMLWEB) --no-preamble --noweb $^ | \
@if $(AM_V_P); then :; else echo " OCAMLWEB " $@; fi
$(AM_V_at)$(OCAMLWEB) --no-preamble --noweb $^ | \
sed -n '/\\ocwbeginindex{}/,/\\ocwendindex{}/p' >$@
endif OCAMLWEB_AVAILABLE
......@@ -137,32 +144,34 @@ endif DISTRIBUTION
endif NOWEB_AVAILABLE
MPOST_LATEX = TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST)
if DISTRIBUTION
if PDFLATEX_AVAILABLE
if MPOST_AVAILABLE
if SUPP_PDF_AVAILABLE
if MAKEINDEX_AVAILABLE
.tex.pdf:
-TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
-$(MAKEINDEX) -o $*.ind $*.idx
-test -r $*.mp && TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST) $*
-test -r $*pics.mp && MPINPUTS=$(MP_FLAGS) $(MPOST) $*pics
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
fi
else
.tex.pdf:
-TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
-test -r $*.mp && TEX=$(LATEX) TEXINPUTS=$(TEX_FLAGS) $(MPOST) $*
-test -r $*pics.mp && MPINPUTS=$(MP_FLAGS) $(MPOST) $*pics
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
@if $(AM_V_P); then TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; else \
echo " PDFLATEX " $<; TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; fi
if MAKEINDEX_AVAILABLE
@if $(AM_V_P); then $(MAKEINDEX) -o $*.ind $*.idx; else \
echo " MAKEINDEX " $*.ind $*.idx; $(MAKEINDEX) -q -o $*.ind $*.idx; fi
endif MAKEINDEX_AVAILABLE
if MPOST_AVAILABLE
@if $(AM_V_P); then test -r $*.mp && $(MPOST_LATEX) $*; else \
echo " METAPOST " $*.mp; test -r $*.mp && $(MPOST_LATEX) $* >/dev/null; fi
endif MPOST_AVAILABLE
@if $(AM_V_P); then TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; else \
echo " PDFLATEX " $<; TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; fi
@if $(AM_V_P); then \
if grep -s 'Rerun to get cross-references right.' $*.log; then \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $<; \
fi; else \
if grep -s 'Rerun to get cross-references right.' $*.log >/dev/null; then \
echo " PDFLATEX " $< "(for cross-references)"; \
TEXINPUTS=$(TEX_FLAGS) $(PDFLATEX) $< >/dev/null; \
fi; \