Index: trunk/tests/functional_tests/reweight_10.sh =================================================================== --- trunk/tests/functional_tests/reweight_10.sh (revision 8378) +++ trunk/tests/functional_tests/reweight_10.sh (revision 8379) @@ -1,17 +1,19 @@ #!/bin/sh ### Check WHIZARD for a simple test process name=`basename @script@` echo "Running script $0" if test -f OCAML_FLAG; then ./run_whizard.sh @script@ --no-logging --no-model + cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp + mv $name.log.tmp $name.log echo "Contents of ${name}_in.weights.dat" >> $name.log cat ${name}_in.weights.dat >> $name.log echo "Contents of ${name}_out.weights.dat" >> $name.log cat ${name}_out.weights.dat >> $name.log diff ref-output/`basename @script@`.ref `basename @script@`.log else echo "|=============================================================================|" echo "No O'Mega matrix elements available, test skipped" exit 77 fi Index: trunk/tests/functional_tests/reweight_9.sh =================================================================== --- trunk/tests/functional_tests/reweight_9.sh (revision 8378) +++ trunk/tests/functional_tests/reweight_9.sh (revision 8379) @@ -1,19 +1,21 @@ #!/bin/sh ### Check WHIZARD for a simple test process name=`basename @script@` echo "Running script $0" if test -f OCAML_FLAG; then ./run_whizard.sh @script@ --no-logging --no-model + cat $name.log | sed -e 's/WHIZARD 2.*$/WHIZARD [version]/' > $name.log.tmp + mv $name.log.tmp $name.log echo "Contents of ${name}_in.weights.dat" >> $name.log cat ${name}_in.weights.dat >> $name.log echo "Contents of ${name}_raw.weights.dat" >> $name.log cat ${name}_raw.weights.dat >> $name.log echo "Contents of ${name}_lhef.weights.dat" >> $name.log cat ${name}_lhef.weights.dat >> $name.log diff ref-output/`basename @script@`.ref `basename @script@`.log else echo "|=============================================================================|" echo "No O'Mega matrix elements available, test skipped" exit 77 fi Index: trunk/share/tests/functional_tests/ref-output/reweight_10.ref =================================================================== --- trunk/share/tests/functional_tests/ref-output/reweight_10.ref (revision 8378) +++ trunk/share/tests/functional_tests/ref-output/reweight_10.ref (revision 8379) @@ -1,124 +1,124 @@ ?openmp_logging = false ?vis_history = false ?integration_timer = false $method = "omega" $phs_method = "wood" $integration_method = "vamp" seed = 7 | Switching to model 'QED' ?pacify = true | Switching to model 'SM', scheme 'default' | Process library 'reweight_10_lib': recorded process 'reweight_10_p' | Process library 'reweight_10_lib': compiling ... | Process library 'reweight_10_lib': writing makefile | Process library 'reweight_10_lib': removing old files | Process library 'reweight_10_lib': writing driver | Process library 'reweight_10_lib': creating source code | Process library 'reweight_10_lib': compiling sources | Process library 'reweight_10_lib': linking | Process library 'reweight_10_lib': loading | Process library 'reweight_10_lib': ... success. sqrts = 9.00000E+01 | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 7 | Initializing integration for process reweight_10_p: | Beam structure: e-, e+ | Beam data (collision): | e- (mass = 5.1099700E-04 GeV) | e+ (mass = 5.1099700E-04 GeV) | sqrts = 9.000000000000E+01 GeV | Phase space: generating configuration ... | Phase space: ... success. | Phase space: writing configuration file 'reweight_10_p.i1.phs' | ------------------------------------------------------------------------ | Process [scattering]: 'reweight_10_p' | Library name = 'reweight_10_lib' | Process index = 1 | Process components: | 1: 'reweight_10_p_i1': e-, e+ => tau-, tau+ [omega] | ------------------------------------------------------------------------ | Phase space: 1 channels, 2 dimensions | Phase space: found 1 channel, collected in 1 grove. | Phase space: Using 1 equivalence between channels. | Phase space: wood Warning: No cuts have been defined. | Starting integration for process 'reweight_10_p' | Integrate: iterations = 2:1000 | Integrator: 1 chains, 1 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 800 1.058E+06 9.85E+02 0.09 0.03 61.0 2 800 1.057E+06 9.22E+02 0.09 0.02 60.9 |-----------------------------------------------------------------------------| 2 1600 1.057E+06 6.73E+02 0.06 0.03 60.9 2.02 2 |=============================================================================| n_events = 2 ?write_raw = true $sample = "reweight_10_in" | Starting simulation for process 'reweight_10_p' | Simulate: using integration grids from file 'reweight_10_p.m1.vg' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 8 | Simulation: requested number of events = 2 | corr. to luminosity [fb-1] = 1.8914E-06 | Events: writing to LHEF file 'reweight_10_in.lhe' | Events: writing to weight stream file 'reweight_10_in.weights.dat' | Events: writing to ASCII file 'reweight_10_in.debug' | Events: writing to raw file 'reweight_10_in.evx' | Events: generating 2 unweighted, unpolarized events ... | Events: event normalization mode '1' | ... event sample complete. | Events: actual unweighting efficiency = 20.00 % | Events: closing LHEF file 'reweight_10_in.lhe' | Events: closing weight stream file 'reweight_10_in.weights.dat' | Events: closing ASCII file 'reweight_10_in.debug' | Events: closing raw file 'reweight_10_in.evx' $rescan_input_format = "lhef" ?update_sqme = true $sample = "reweight_10_out" SM.alphas => 2.00000E-01 | Starting simulation for process 'reweight_10_p' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 9 Warning: Reading phs file: MD5 sum check disabled | Phase space: keeping configuration file 'reweight_10_p.i1.phs' | Simulate: initializing alternate process setup ... | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 10 Warning: Reading phs file: MD5 sum check disabled | Phase space: keeping configuration file 'reweight_10_p.i1.phs' | ... alternate process setup complete. | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 11 | Simulation: requested number of events = 2 | corr. to luminosity [fb-1] = 1.8914E-06 | Recalculating observables | Recalculating squared matrix elements | Events: reading from LHEF file 'reweight_10_in.lhe' -| LHEF: Event file has been generated by WHIZARD 2.8.3 +| LHEF: Event file has been generated by WHIZARD [version] | Events: writing to LHEF file 'reweight_10_out.lhe' | Events: writing to weight stream file 'reweight_10_out.weights.dat' | Events: writing to ASCII file 'reweight_10_out.debug' | Events: writing to raw file 'reweight_10_out.evx' | Rescanning unweighted events (process parameters updated) ... | ... event file terminates after 2 events. | Events: closing LHEF file 'reweight_10_out.lhe' | Events: closing weight stream file 'reweight_10_out.weights.dat' | Events: closing ASCII file 'reweight_10_out.debug' | Events: closing raw file 'reweight_10_out.evx' | Events: closing LHEF file 'reweight_10_in.lhe' | There were no errors and 3 warning(s). | WHIZARD run finished. |=============================================================================| Contents of reweight_10_in.weights.dat 0 1.0000000000E+00 1.1651688154E+00 1.1651688154E+00 1 0 1.0000000000E+00 8.3464760192E-01 8.3464760192E-01 1 Contents of reweight_10_out.weights.dat 0 1.0000000000E+00 1.1651688154E+00 1.1651688154E+00 1 1 1.0000000000E+00 1.1651688154E+00 0 1.0000000000E+00 8.3464760192E-01 8.3464760192E-01 1 1 1.0000000000E+00 8.3464760192E-01 Index: trunk/share/tests/functional_tests/ref-output/reweight_9.ref =================================================================== --- trunk/share/tests/functional_tests/ref-output/reweight_9.ref (revision 8378) +++ trunk/share/tests/functional_tests/ref-output/reweight_9.ref (revision 8379) @@ -1,139 +1,139 @@ ?openmp_logging = false ?vis_history = false ?integration_timer = false $method = "omega" $phs_method = "wood" $integration_method = "vamp" seed = 0 | Switching to model 'QED' ?pacify = true | Switching to model 'SM', scheme 'default' | Process library 'reweight_9_lib': recorded process 'reweight_9_p' | Process library 'reweight_9_lib': compiling ... | Process library 'reweight_9_lib': writing makefile | Process library 'reweight_9_lib': removing old files | Process library 'reweight_9_lib': writing driver | Process library 'reweight_9_lib': creating source code | Process library 'reweight_9_lib': compiling sources | Process library 'reweight_9_lib': linking | Process library 'reweight_9_lib': loading | Process library 'reweight_9_lib': ... success. sqrts = 9.00000E+01 | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 0 | Initializing integration for process reweight_9_p: | Beam structure: e-, e+ | Beam data (collision): | e- (mass = 5.1099700E-04 GeV) | e+ (mass = 5.1099700E-04 GeV) | sqrts = 9.000000000000E+01 GeV | Phase space: generating configuration ... | Phase space: ... success. | Phase space: writing configuration file 'reweight_9_p.i1.phs' | ------------------------------------------------------------------------ | Process [scattering]: 'reweight_9_p' | Library name = 'reweight_9_lib' | Process index = 1 | Process components: | 1: 'reweight_9_p_i1': e-, e+ => tau-, tau+ [omega] | ------------------------------------------------------------------------ | Phase space: 1 channels, 2 dimensions | Phase space: found 1 channel, collected in 1 grove. | Phase space: Using 1 equivalence between channels. | Phase space: wood Warning: No cuts have been defined. | Starting integration for process 'reweight_9_p' | Integrate: iterations = 2:1000 | Integrator: 1 chains, 1 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 800 1.056E+06 9.33E+02 0.09 0.02 60.9 2 800 1.059E+06 9.71E+02 0.09 0.03 61.0 |-----------------------------------------------------------------------------| 2 1600 1.057E+06 6.73E+02 0.06 0.03 61.0 2.90 2 |=============================================================================| n_events = 2 ?write_raw = true $sample = "reweight_9_in" | Starting simulation for process 'reweight_9_p' | Simulate: using integration grids from file 'reweight_9_p.m1.vg' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 1 | Simulation: requested number of events = 2 | corr. to luminosity [fb-1] = 1.8913E-06 | Events: writing to LHEF file 'reweight_9_in.lhe' | Events: writing to weight stream file 'reweight_9_in.weights.dat' | Events: writing to ASCII file 'reweight_9_in.debug' | Events: writing to raw file 'reweight_9_in.evx' | Events: generating 2 unweighted, unpolarized events ... | Events: event normalization mode '1' | ... event sample complete. | Events: actual unweighting efficiency = 50.00 % | Events: closing LHEF file 'reweight_9_in.lhe' | Events: closing weight stream file 'reweight_9_in.weights.dat' | Events: closing ASCII file 'reweight_9_in.debug' | Events: closing raw file 'reweight_9_in.evx' $rescan_input_format = "lhef" ?update_sqme = true $sample = "reweight_9_raw" | Starting simulation for process 'reweight_9_p' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 2 Warning: Reading phs file: MD5 sum check disabled | Phase space: keeping configuration file 'reweight_9_p.i1.phs' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 3 | Simulation: requested number of events = 2 | corr. to luminosity [fb-1] = 1.8913E-06 | Recalculating observables | Recalculating squared matrix elements | Events: reading from LHEF file 'reweight_9_in.lhe' -| LHEF: Event file has been generated by WHIZARD 2.8.3 +| LHEF: Event file has been generated by WHIZARD [version] | Events: writing to weight stream file 'reweight_9_raw.weights.dat' | Events: writing to ASCII file 'reweight_9_raw.debug' | Events: writing to raw file 'reweight_9_raw.evx' | Rescanning unweighted events (process parameters updated) ... | ... event file terminates after 2 events. | Events: closing weight stream file 'reweight_9_raw.weights.dat' | Events: closing ASCII file 'reweight_9_raw.debug' | Events: closing raw file 'reweight_9_raw.evx' | Events: closing LHEF file 'reweight_9_in.lhe' $rescan_input_format = "lhef" ?update_sqme = true $sample = "reweight_9_lhef" | Starting simulation for process 'reweight_9_p' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 4 Warning: Reading phs file: MD5 sum check disabled | Phase space: keeping configuration file 'reweight_9_p.i1.phs' | RNG: Initializing TAO random-number generator | RNG: Setting seed for random-number generator to 5 | Simulation: requested number of events = 2 | corr. to luminosity [fb-1] = 1.8913E-06 | Recalculating observables | Recalculating squared matrix elements | Events: reading from LHEF file 'reweight_9_in.lhe' -| LHEF: Event file has been generated by WHIZARD 2.8.3 +| LHEF: Event file has been generated by WHIZARD [version] | Events: writing to weight stream file 'reweight_9_lhef.weights.dat' | Events: writing to raw file 'reweight_9_lhef.evx' | Rescanning unweighted events (process parameters updated) ... | ... event file terminates after 2 events. | Events: closing weight stream file 'reweight_9_lhef.weights.dat' | Events: closing raw file 'reweight_9_lhef.evx' | Events: closing LHEF file 'reweight_9_in.lhe' | There were no errors and 3 warning(s). | WHIZARD run finished. |=============================================================================| Contents of reweight_9_in.weights.dat 0 1.0000000000E+00 1.3828479640E+00 1.3828479640E+00 1 0 1.0000000000E+00 1.0778464949E+00 1.0778464949E+00 1 Contents of reweight_9_raw.weights.dat 0 1.0000000000E+00 1.3828479640E+00 1.3828479640E+00 1 0 1.0000000000E+00 1.0778464949E+00 1.0778464949E+00 1 Contents of reweight_9_lhef.weights.dat 0 1.0000000000E+00 1.3828479640E+00 1.3828479640E+00 1 0 1.0000000000E+00 1.0778464949E+00 1.0778464949E+00 1