Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F7877790
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Subscribers
None
View Options
Index: trunk/test/Makefile.am
===================================================================
--- trunk/test/Makefile.am (revision 4433)
+++ trunk/test/Makefile.am (revision 4434)
@@ -1,371 +1,371 @@
## Makefile.am -- Makefile for executable WHIZARD test scripts
##
## Process this file with automake to produce Makefile.in
##
########################################################################
#
# Copyright (C) 1999-2013 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>
#
# 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.
#
########################################################################
WHIZARD_DRIVER = run_whizard.sh
UNIT_TESTS = \
sf_aux.run \
sf_mappings.run \
sf_base.run \
phs_base.run \
phs_single.run \
phs_wood.run \
rng_base.run \
rng_tao.run \
mci_base.run \
mci_midpoint.run \
mci_vamp.run \
prclib_interfaces.run \
particle_specifiers.run \
process_libraries.run \
prclib_stacks.run \
test_me.run \
subevt_expr.run \
processes.run \
process_stacks.run \
events.run \
eio_base.run \
iterations.run \
rt_data.run \
dispatch.run \
process_configurations.run \
commands.run
UNIT_TESTS_REQ_OCAML = \
omega_interface.run \
compilations.run \
integrations.run \
simulations.run
TESTS_DEFAULT = \
empty.run \
testproc_1.run \
testproc_2.run \
testproc_3.run
# vars.run \
# md5.run \
# errors.run \
# extpar.run \
# formats.run \
# os_interface.run \
# susyhit.run \
# sorting.run \
# color.run \
# model.run \
# particles.run \
# beams.run \
# polarizations.run \
# lexers.run \
# parser.run \
# state_matrices.run \
# interactions.run \
# evaluators.run \
# analysis.run \
# expressions.run \
# hepmc.run \
# strfun.run \
# phs_forests.run \
# cascades.run \
# commands.run \
# slha_interface.run \
# hard_interactions.run
#events.run
#test_me.run
#processes.run
XFAIL_TESTS_DEFAULT = \
errors.run
#hard_interactions.run: test_me.run.log
TESTS_USER_STRFUN = \
user_strfun.run
TESTS_REQ_OCAML = \
qedtest_1.run \
qedtest_2.run \
qedtest_3.run \
- qedtest_4.run #\
+ qedtest_4.run \
qedtest_5.run #\
libs.run \
qedtest.run \
user_cuts.run \
$(TESTS_USER_STRFUN) \
helicity.run \
smtest.run \
defaultcuts.run \
restrictions.run \
decays.run \
alphas.run \
colors.run \
model.run \
cuts.run \
ilc.run \
mssmtest.run \
models.run \
pdf_builtin.run
XFAIL_TESTS_REQ_OCAML =
TESTS_REQ_LHAPDF = #\
lhapdf.run
XFAIL_TESTS_REQ_LHAPDF =
TESTS_REQ_STDHEP = #\
stdhep.run \
stdhep_up.run
XFAIL_TESTS_REQ_STDHEP =
TESTS_STATIC = #\
static.run
XFAIL_TESTS_STATIC =
TESTS_REQ_SHOWER = #\
fsr_shower.run
# isr_shower.run
XFAIL_TESTS_REQ_SHOWER =
TESTS_EXTENDED = \
sm_ext.run \
mssm_ext.run \
nmssm_ext.run
XFAIL_TESTS_EXTENDED =
TESTS_REQ_GAMELAN = #\
plain.run \
commands.run \
$(TESTS_REQ_OCAML) \
$(TESTS_REQ_LHAPDF) \
$(TESTS_REQ_STDHEP) \
$(TESTS_REQ_SHOWER) \
$(TESTS_EXTENDED)
#test_me.run
TEST_DRIVERS_RUN = \
$(UNIT_TESTS) \
$(UNIT_TESTS_REQ_OCAML) \
$(TESTS_DEFAULT) \
$(TESTS_REQ_OCAML) \
$(TESTS_REQ_LHAPDF) \
$(TESTS_REQ_STDHEP) \
$(TESTS_REQ_SHOWER) \
$(TESTS_STATIC) \
$(TESTS_EXTENDED)
TEST_DRIVERS_SH = $(TEST_DRIVERS_RUN:.run=.sh)
EXTRA_DIST = $(TEST_DRIVERS_SH)
########################################################################
TESTS =
XFAIL_TESTS =
if OCAML_AVAILABLE
UNIT_TESTS += $(UNIT_TESTS_REQ_OCAML)
endif OCAML_AVAILABLE
# Temporarily, only the new unit tests are executed
if DEFAULT_CHECKS
TESTS += $(UNIT_TESTS)
endif DEFAULT_CHECKS
# Execute those as well
if DEFAULT_CHECKS
TESTS += $(TESTS_DEFAULT)
#XFAIL_TESTS += $(XFAIL_TESTS_DEFAULT)
endif DEFAULT_CHECKS
if OCAML_AVAILABLE
TESTS += $(TESTS_REQ_OCAML)
XFAIL_TESTS += $(XFAIL_TESTS_REQ_OCAML)
if LHAPDF_AVAILABLE
TESTS += $(TESTS_REQ_LHAPDF)
XFAIL_TESTS += $(XFAIL_TESTS_REQ_LHAPDF)
endif LHAPDF_AVAILABLE
if STDHEP_AVAILABLE
TESTS += $(TESTS_REQ_STDHEP)
XFAIL_TESTS += $(XFAIL_TESTS_REQ_STDHEP)
endif STDHEP_AVAILABLE
if SHOWER_AVAILABLE
TESTS += $(TESTS_REQ_SHOWER)
XFAIL_TESTS += $(XFAIL_TESTS_REQ_SHOWER)
endif SHOWER_AVAILABLE
if STATIC_AVAILABLE
TESTS += $(TESTS_STATIC)
XFAIL_TESTS += $(XFAIL_TESTS_STATIC)
endif STATIC_AVAILABLE
if EXT_NUM_CHECKS
TESTS += $(TESTS_EXTENDED)
XFAIL_TESTS += $(XFAIL_TESTS_EXTENDED)
endif EXT_NUM_CHECKS
endif OCAML_AVAILABLE
mssm_ext.run: $(EXTENDED_MSSM_TEST_DRIVERS)
echo '#! /bin/sh' >$@
for driver in $(EXTENDED_MSSM_TEST_DRIVERS); do \
echo ./$$driver; \
done >>$@
chmod +x $@
nmssm_ext.run: $(EXTENDED_NMSSM_TEST_DRIVERS)
echo '#! /bin/sh' >$@
for driver in $(EXTENDED_NMSSM_TEST_DRIVERS); do \
echo ./$$driver; \
done >>$@
chmod +x $@
EXTENDED_MSSM_TEST_DRIVERS = \
mssm_ext-ee.run mssm_ext-ee2.run \
mssm_ext-en.run mssm_ext-tn.run \
mssm_ext-uu.run mssm_ext-uu2.run mssm_ext-uuckm.run \
mssm_ext-dd.run mssm_ext-dd2.run mssm_ext-ddckm.run \
mssm_ext-bb.run mssm_ext-bt.run mssm_ext-tt.run \
mssm_ext-ug.run mssm_ext-dg.run \
mssm_ext-aa.run mssm_ext-wa.run mssm_ext-za.run \
mssm_ext-ww.run mssm_ext-wz.run mssm_ext-zz.run \
mssm_ext-gg.run mssm_ext-ga.run mssm_ext-gw.run mssm_ext-gz.run
EXTENDED_NMSSM_TEST_DRIVERS = \
nmssm_ext-aa.run nmssm_ext-bb1.run nmssm_ext-bb2.run \
nmssm_ext-bt.run nmssm_ext-dd1.run \
nmssm_ext-dd2.run nmssm_ext-ee1.run \
nmssm_ext-ee2.run nmssm_ext-en.run \
nmssm_ext-ga.run nmssm_ext-gg.run \
nmssm_ext-gw.run nmssm_ext-gz.run \
nmssm_ext-qg.run nmssm_ext-tn.run \
nmssm_ext-tt1.run nmssm_ext-tt2.run \
nmssm_ext-uu1.run nmssm_ext-uu2.run \
nmssm_ext-wa.run nmssm_ext-ww1.run nmssm_ext-ww2.run \
nmssm_ext-wz.run nmssm_ext-za.run
# VPATH = $(top_builddir)/share/test:$(top_srcdir)/share/test:$(srcdir)
VPATH = $(srcdir)
SUFFIXES = .sh .run
.sh.run:
@rm -f $@
@if test -f $(top_builddir)/share/test/$*.sin; then \
$(SED) 's|@script@|$(top_builddir)/share/test/$*|g' $< > $@; \
elif test -f $(top_srcdir)/share/test/$*.sin; then \
$(SED) 's|@script@|$(top_srcdir)/share/test/$*|g' $< > $@; \
else \
echo "$*.sin not found!" 1>&2; \
exit 2; \
fi
chmod +x $@
testproc_3.run: testproc_3.phs
testproc_3.phs: $(top_builddir)/share/test/testproc_3.phs
cp $< $@
plain.run: TEST.mdl
susyhit.run: susyhit.in
user_cuts.run: user_cuts.f90
user_strfun.run: user_strfun.f90
user_cuts.f90: $(top_builddir)/share/test/user_cuts.f90
cp $< $@
user_strfun.f90: $(top_builddir)/share/test/user_strfun.f90
cp $< $@
TEST.mdl: $(top_srcdir)/share/test/TEST.mdl
cp $< $@
if MPOST_AVAILABLE
$(TESTS_REQ_GAMELAN): gamelan.sty
gamelan.sty: $(top_builddir)/src/gamelan/gamelan.sty
cp $< $@
$(top_builddir)/src/gamelan/gamelan.sty:
$(MAKE) -C $(top_builddir)/src/gamelan gamelan.sty
endif
susyhit.in: $(top_builddir)/share/test/susyhit.in
cp $< $@
BUILT_SOURCES = \
TESTFLAG \
ref-output \
err-output
# If this file is found in the working directory, WHIZARD
# will use the paths for the uninstalled version (source/build tree),
# otherwise it uses the installed version
TESTFLAG:
touch $@
# The reference output files are in the source directory. Copy them here.
ref-output: $(top_srcdir)/share/test/ref-output
mkdir -p ref-output
for f in $</*.ref; do cp $$f $@; done
# The output files from self tests go here.
err-output:
mkdir -p err-output
## installcheck runs the test scripts with the TESTFLAG removed.
installcheck-local: notestflag check-am
notestflag:
rm -f TESTFLAG
.PHONY: notestflag
## Remove generated files
clean-local:
rm -f gamelan.sty TESTFLAG TEST.mdl
rm -f whizard.static
rm -f *.run *.log slha_test.out
rm -f *.f90 *.c *.mod *.o *.la
rm -f *.makefile
rm -rf err-output
rm -rf ref-output
rm -f *.phs *.vg *.vgb *.evt *.evx *.lhef *.hepmc *.hepevt
rm -f *.tmp *.dat *.debug *.lha *.short *.long *.athena
rm -f *.stdhep *.stdhep_up fort.81
rm -f *.tex *.mp *.mpx *.[1-9] *.[1-9][0-9] *.[1-9][0-9][0-9]
rm -f *.ltp *.aux *.dvi *.ps *.pdf so_test.*
rm -f slhaspectrum.in suspect2.out suspect2_lha.out
rm -f susyhit.in susyhit_slha.out suspect2_lha.in
## Remove backup files
maintainer-clean-local: maintainer-clean-fc
-rm -f *~
.PHONY: maintainer-clean-local
Index: trunk/share/test/ref-output/qedtest_5.ref
===================================================================
--- trunk/share/test/ref-output/qedtest_5.ref (revision 4433)
+++ trunk/share/test/ref-output/qedtest_5.ref (revision 4434)
@@ -1,30 +1,30 @@
$method = "omega"
$phs_method = "wood"
$integration_method = "vamp"
sqrts = 1.000000000000E+03
| Generating phase space configuration ...
| ... success.
| Phase space configuration: 1 channels, 2 dimensions
-| Starting integration for process 'qedtest_1_p1'
+| Starting integration for process 'qedtest_5_p1'
|=============================================================================|
| It Calls Integral[fb] Error[fb] Err[%] Acc Eff[%] Chi2 N[It] |
|=============================================================================|
1 800 8.6803424E+01 7.69E-02 0.09 0.03* 0.00
2 800 8.6983246E+01 6.03E-02 0.07 0.02* 0.00
3 800 8.6981187E+01 6.11E-02 0.07 0.02 0.00
|-----------------------------------------------------------------------------|
3 2400 8.6922619E+01 1.03E-01 0.12 0.06 0.00 0.00 3
|-----------------------------------------------------------------------------|
4 800 8.6888780E+01 6.21E-02 0.07 0.02 0.00
5 800 8.6803833E+01 6.21E-02 0.07 0.02 0.00
6 800 8.6821758E+01 6.15E-02 0.07 0.02* 0.00
|-----------------------------------------------------------------------------|
6 2400 8.6838124E+01 4.48E-02 0.05 0.03 0.00 0.00 3
|=============================================================================|
n_events = 10
?unweighted = false
-| Starting simulation for process 'qedtest_1_p1'
+| Starting simulation for process 'qedtest_5_p1'
| Generating 10 weighted events ...
| ... event generation finished.
| WHIZARD run finished.
|=============================================================================|
Index: trunk/share/test/qedtest_5.sin
===================================================================
--- trunk/share/test/qedtest_5.sin (revision 4433)
+++ trunk/share/test/qedtest_5.sin (revision 4434)
@@ -1,28 +1,28 @@
# Sindarin input for WHIZARD self-test
# Process e- e+ -> mu- mu+
-library = "qedtest_1_lib"
+library = "qedtest_5_lib"
model = "QED"
ee = 0.30286
me = 0
mmu = 0
?logging = true
$method = "omega"
-process qedtest_1_p1 = "e-", "e+" => "mu-", "mu+"
+process qedtest_5_p1 = "e-", "e+" => "mu-", "mu+"
compile ()
$phs_method = "wood"
$integration_method = "vamp"
iterations = 3:1000:"g", 3:1000
sqrts = 1000
-integrate (qedtest_1_p1)
+integrate (qedtest_5_p1)
n_events = 10
?unweighted = false
-simulate (qedtest_1_p1)
+simulate (qedtest_5_p1)
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Tue, Nov 19, 4:24 PM (1 d, 13 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3805147
Default Alt Text
(12 KB)
Attached To
rWHIZARDSVN whizardsvn
Event Timeline
Log In to Comment