Index: trunk/tests/ext_tests_nlo/nlo_pptttt.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_pptttt.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_pptttt.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppzw.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppzw.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppzw.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppwj.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppwj.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppwj.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppzj.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppzj.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppzj.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_pptt.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_pptt.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_pptt.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppzz.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppzz.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppzz.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppzwj.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppzwj.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppzwj.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppzzj.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppzzj.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppzzj.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/ext_tests_nlo/nlo_ppttz.sh =================================================================== --- trunk/tests/ext_tests_nlo/nlo_ppttz.sh (revision 8330) +++ trunk/tests/ext_tests_nlo/nlo_ppttz.sh (revision 8331) @@ -1,29 +1,36 @@ #!/bin/sh echo "Running script $0" name=`basename @script@` if test -f ref-output/$name.ref; then - if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then + if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG -a -f LHAPDF6_FLAG; then ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log rm $name.log.tmp diff ref-output/$name.ref $name.log diffrc=$? grep --quiet "\[OpenLoops\] Requested library not installed." $name.run.log greprc=$? if test $diffrc -gt 0 -a $greprc -eq 0; then echo "|=============================================================================|" echo "OpenLoops process library missing" exit 99 fi + grep --quiet "'MSTW2008nlo68cl' not found" $name.run.log + greprc=$? + if test $diffrc -gt 0 -a $greprc -eq 0; then + echo "|=============================================================================|" + echo "LHAPDF: Data file 'MSTW2008nlo68cl' missing" + exit 99 + fi exit $diffrc else echo "|=============================================================================|" - echo "No O'Mega/OpenLoops matrix elements / FastJet available" + echo "No O'Mega/OpenLoops matrix elements / FastJet / LHAPDF6 available" exit 77 fi else echo "|=============================================================================|" echo "$name.ref not found" exit 77 fi Index: trunk/tests/functional_tests/openloops_12.sh =================================================================== --- trunk/tests/functional_tests/openloops_12.sh (revision 8330) +++ trunk/tests/functional_tests/openloops_12.sh (revision 8331) @@ -1,14 +1,14 @@ #!/bin/sh ### Testing integration of the real component of ee -> jjj. echo "Running script $0" if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then name=`basename @script@` ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log diff ref-output/$name.ref $name.log else echo "|=============================================================================|" - echo "No O'Mega or OpenLoops matrix elements available, test skipped" + echo "No O'Mega/OpenLoops matrix elements / FastJet available. Test skipped." exit 77 fi Index: trunk/tests/functional_tests/openloops_13.sh =================================================================== --- trunk/tests/functional_tests/openloops_13.sh (revision 8330) +++ trunk/tests/functional_tests/openloops_13.sh (revision 8331) @@ -1,14 +1,14 @@ #!/bin/sh ### Testing integration of the virtual component of ee -> jjj. echo "Running script $0" if test -f OCAML_FLAG -a -f OPENLOOPS_FLAG -a -f FASTJET_FLAG; then name=`basename @script@` ./run_whizard.sh @script@ --no-logging mv $name.log $name.log.tmp cat $name.log.tmp | sed -e 's/Loading library:.*/Loading library: [...]/' > $name.log diff ref-output/$name.ref $name.log else echo "|=============================================================================|" - echo "No O'Mega or OpenLoops matrix elements available, test skipped" + echo "No O'Mega/OpenLoops matrix elements / FastJet available. Test skipped." exit 77 fi