Index: trunk/share/tests/ext_tests_nlo/nlo_eetthz.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetthz.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetthz.sin	(revision 8289)
@@ -1,25 +1,23 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
-       + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eetthz_p1 = e1, E1 => t, T, H, Z { nlo_calculation = full }
-
-#integrate (nlo_eetthz_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eetthz_p1) { iterations = 4:4000:"gw",2:4000 }
+integrate (nlo_eetthz_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettaa.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettaa.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettaa.sin	(revision 8289)
@@ -1,28 +1,15 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
 !!! No jets -> No photon isolation. Just use the Pt and Eta cuts on the photon
 cuts = all abs(Pt) > 20 GeV [A] and all abs(Eta) < 2 [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
       +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
       + eval Pt [extract index 1 [A]] + eval Pt [extract index 2 [A]]) / 2
 
+#?combined_nlo_integration = true
 process nlo_eettaa_p1 = e1, E1 => t, T, A, A { nlo_calculation = full }
-
-# integrate (nlo_eettaa_p1) { iterations = 10:20000:"gw",2:10000 } # validation
-mult_call_real = 2
-integrate (nlo_eettaa_p1) { iterations = 4:5000:"gw",2:5000 }
+integrate (nlo_eettaa_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettzj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettzj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettzj.sin	(revision 8289)
@@ -1,41 +1,28 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 1
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
 
-$exclude_gauge_splittings = "t:T"
-
-scale = let int njet = count [jet] in
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
         if njet == 1 then
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           +  sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
-           + eval Pt [extract index 1 [jet]]) / 2
-        else
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           +  sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
-           + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        elsif njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
         endif
 
-process nlo_eettzj_p1 = e1, E1 => t, T, Z, jet { nlo_calculation = full }
-
-mult_call_real = 5
-#integrate (nlo_eettzj_p1) { iterations = 12:50000:"gw",2:50000 } # validation
-integrate (nlo_eettzj_p1) { iterations = 3:3000:"gw",2:3000 }
+#?combined_nlo_integration = true
+process nlo_eettzj_p1 = e1, E1 => t, T, Z, jet {nlo_calculation = full }
+integrate (nlo_eettzj_p1) { iterations = 1:140:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eebbj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eebbj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eebbj.sin	(revision 8289)
@@ -1,41 +1,31 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 1
 
 alias jet = u:U:d:D:s:S:c:C:gl
 alias bjet = b:B:gl
 
 # cuts = all abs(Pt) > 30 GeV [jet] and all abs(Eta) < 4 [jet]
 #        and count [cluster if E > 0 GeV [jet]] >= 1
 #        and all abs(Pt) > 30 GeV [bjet] and all abs(Eta) < 4 [bjet]
 #        and count [cluster if E > 0 GeV [bjet]] >= 2
 
 mb = 4.75
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
        and
        let subevt @clustered_bjets = cluster [bjet] in
        let subevt @pt_selected_b = select if Pt > 30 GeV [@clustered_bjets] in
        let subevt @eta_selected_b = select if abs(Eta) < 4 [@pt_selected_b] in
        count [@eta_selected_b] >= 2
 
 scale = (eval Pt [extract index 1 [b]] + eval Pt [extract index 1 [B]]
        + eval Pt [extract index 1 [jet]]) / 2
 
-process nlo_eebbj = e1, E1 => b, B, jet { nlo_calculation = full }
-integrate (nlo_eebbj) { iterations = 10:100000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_eebbj_p1 = e1, E1 => b, B, jet { nlo_calculation = full }
+integrate (nlo_eebbj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettah.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettah.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettah.sin	(revision 8289)
@@ -1,31 +1,19 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
 real theta_0 = 0.7
 alias tops = t:T
 
 !!! No jets -> No photon isolation. Just use the Pt and Eta cuts on the photon
 cuts = all abs(Pt) > 20 GeV [A] and all abs(Eta) < 2 [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
        + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
        + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
        + eval Pt [extract index 1 [A]]) / 2
 
+#?combined_nlo_integration = true
 process nlo_eettah_p1 = e1, E1 => t, T, H, A { nlo_calculation = full }
-
-#integrate (nlo_eettah_p1) { iterations = 8:60000:"gw",3:30000 } # validation
-integrate (nlo_eettah_p1) { iterations = 4:5000:"gw",3:3000 }
+integrate (nlo_eettah_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettz.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettz.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettz.ref	(revision 8289)
@@ -1,177 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 3
 alphas_power = 0
 | Process library 'nlo_eettz_lib': recorded process 'nlo_eettz_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettz_lib': compiling ...
 | Process library 'nlo_eettz_lib': writing makefile
 | Process library 'nlo_eettz_lib': removing old files
 | Process library 'nlo_eettz_lib': writing driver
 | Process library 'nlo_eettz_lib': creating source code
 | Process library 'nlo_eettz_lib': compiling sources
 | Process library 'nlo_eettz_lib': linking
 | Process library 'nlo_eettz_lib': loading
 | Process library 'nlo_eettz_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettz_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettz_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettz_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettz_p1'
 |   Library name  = 'nlo_eettz_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eettz_p1_i1':   e-, e+ => t, tbar, Z [openloops]
 |     2: 'nlo_eettz_p1_i2':   e-, e+ => t, tbar, Z, gl [openloops], [real]
 |     3: 'nlo_eettz_p1_i3':   e-, e+ => t, tbar, Z [openloops], [virtual]
 |     4: 'nlo_eettz_p1_i4':   e-, e+ => t, tbar, Z [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 7 channels, 5 dimensions
 | Phase space: found 7 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 7 channels, 8 dimensions
 | Phase space: found 7 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 7 channels, 5 dimensions
 | Phase space: found 7 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettz_p1' part 'born'
-| Integrate: iterations = 3:7500:"gw", 2:7500
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 7 channels, 5 dimensions
-| Integrator: 7500 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       7497  4.5439136E+00  5.16E-02    1.14    0.98*  16.89
-   2       7493  4.6355403E+00  2.98E-02    0.64    0.56*  31.78
-   3       7491  4.6358703E+00  2.49E-02    0.54    0.46*  33.40
+   1         98  4.5721451E+00  3.97E-01    8.68    0.86*  34.70
 |-----------------------------------------------------------------------------|
-   3      22481  4.6246752E+00  1.79E-02    0.39    0.58   33.40    1.39   3
-|-----------------------------------------------------------------------------|
-   4       7491  4.6414736E+00  2.46E-02    0.53    0.46*  32.60
-   5       7491  4.6707054E+00  2.48E-02    0.53    0.46   32.64
-|-----------------------------------------------------------------------------|
-   5      14982  4.6559628E+00  1.75E-02    0.38    0.46   32.64    0.70   2
+   1         98  4.5721451E+00  3.97E-01    8.68    0.86   34.70
 |=============================================================================|
 | Starting integration for process 'nlo_eettz_p1' part 'real'
-| Integrate: iterations = 3:7500:"gw", 2:7500
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 7 channels, 8 dimensions
-| Integrator: 7500 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       7497 -1.0035749E+00  1.44E-02    1.44    1.24*  11.25
-   2       7495 -1.0130938E+00  7.94E-03    0.78    0.68*  22.77
-   3       7491 -1.0205518E+00  6.64E-03    0.65    0.56*  21.03
-|-----------------------------------------------------------------------------|
-   3      22483 -1.0159351E+00  4.80E-03    0.47    0.71   21.03    0.67   3
+   1         98 -9.5266775E-01  1.03E-01   10.80    1.07*  28.18
 |-----------------------------------------------------------------------------|
-   4       7491 -1.0143130E+00  6.61E-03    0.65    0.56   19.94
-   5       7491 -1.0219276E+00  7.09E-03    0.69    0.60   12.59
-|-----------------------------------------------------------------------------|
-   5      14982 -1.0178526E+00  4.83E-03    0.47    0.58   12.59    0.62   2
+   1         98 -9.5266775E-01  1.03E-01   10.80    1.07   28.18
 |=============================================================================|
 | Starting integration for process 'nlo_eettz_p1' part 'virtual'
-| Integrate: iterations = 3:7500:"gw", 2:7500
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 7 channels, 5 dimensions
-| Integrator: 7500 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       7497  1.3212111E+00  1.53E-02    1.16    1.00*  16.42
-   2       7492  1.3248826E+00  9.14E-03    0.69    0.60*  29.72
-   3       7487  1.3281148E+00  7.18E-03    0.54    0.47*  41.60
-|-----------------------------------------------------------------------------|
-   3      22476  1.3261999E+00  5.29E-03    0.40    0.60   41.60    0.10   3
-|-----------------------------------------------------------------------------|
-   4       7487  1.3286281E+00  7.20E-03    0.54    0.47   39.58
-   5       7487  1.3116100E+00  7.11E-03    0.54    0.47   38.63
+   1         98  1.4558321E+00  1.67E-01   11.49    1.14*  24.25
 |-----------------------------------------------------------------------------|
-   5      14974  1.3200151E+00  5.06E-03    0.38    0.47   38.63    2.83   2
+   1         98  1.4558321E+00  1.67E-01   11.49    1.14   24.25
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  4.9581253E+00  1.88E-02    0.38    0.00*  28.04
+   1          0  5.0753094E+00  4.43E-01    8.73    0.00*  26.46
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (  6.4898 +-   0.15220 ) %
+|  ( 11.0050 +-   4.39954 ) %
 |=============================================================================|
 | There were no errors and    1 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_ee4t.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_ee4t.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_ee4t.ref	(revision 8289)
@@ -1,135 +1,158 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 2
 alphas_power = 2
-?combined_nlo_integration = true
 | Process library 'nlo_ee4t_lib': recorded process 'nlo_ee4t_p1'
-mult_call_real =  5.000000000000E+00
 | Integrate: current process library needs compilation
 | Process library 'nlo_ee4t_lib': compiling ...
 | Process library 'nlo_ee4t_lib': writing makefile
 | Process library 'nlo_ee4t_lib': removing old files
 | Process library 'nlo_ee4t_lib': writing driver
 | Process library 'nlo_ee4t_lib': creating source code
 | Process library 'nlo_ee4t_lib': compiling sources
 | Process library 'nlo_ee4t_lib': linking
 | Process library 'nlo_ee4t_lib': loading
 | Process library 'nlo_ee4t_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_ee4t_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... failed.  Increasing phs_off_shell ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_ee4t_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... failed.  Increasing phs_off_shell ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_ee4t_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_ee4t_p1'
 |   Library name  = 'nlo_ee4t_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_ee4t_p1_i1':   e-, e+ => t, tbar, t, tbar [openloops]
 |     2: 'nlo_ee4t_p1_i2':   e-, e+ => t, tbar, t, tbar, gl [openloops], [real]
 |     3: 'nlo_ee4t_p1_i3':   e-, e+ => t, tbar, t, tbar [openloops], [virtual]
 |     4: 'nlo_ee4t_p1_i4':   e-, e+ => t, tbar, t, tbar [inactive], [subtraction]
 | ------------------------------------------------------------------------
-| Phase space: 16 channels, 11 dimensions
+| Phase space: 16 channels, 8 dimensions
 | Phase space: found 16 channels, collected in 2 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 16 channels, 11 dimensions
 | Phase space: found 16 channels, collected in 2 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
-| Phase space: 16 channels, 11 dimensions
+| Phase space: 16 channels, 8 dimensions
 | Phase space: found 16 channels, collected in 2 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
-| Starting integration for process 'nlo_ee4t_p1'
-| Integrate: iterations = 4:2000:"gw", 1:4000
-| Integrator: 2 chains, 16 channels, 11 dimensions
-| Integrator: 2000 initial calls, 20 bins, stratified = T
+| Starting integration for process 'nlo_ee4t_p1' part 'born'
+| Integrate: iterations = 1:100:"gw"
+| Integrator: 2 chains, 16 channels, 8 dimensions
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2000  1.2038719E-03  3.36E-05    2.79    1.25*  21.75
-   2       1992  1.2049494E-03  2.42E-05    2.01    0.90*  26.64
-   3       1984  1.1948645E-03  2.10E-05    1.76    0.78*  31.50
-   4       1976  1.1532634E-03  1.88E-05    1.63    0.72*  32.00
+   1        160  5.3359715E-04  6.03E-05   11.29    1.43*  26.59
 |-----------------------------------------------------------------------------|
-   4       7952  1.1827800E-03  1.14E-05    0.96    0.86   32.00    1.34   4
+   1        160  5.3359715E-04  6.03E-05   11.29    1.43   26.59
+|=============================================================================|
+| Starting integration for process 'nlo_ee4t_p1' part 'real'
+| Integrate: iterations = 1:100:"gw"
+| Integrator: 2 chains, 16 channels, 11 dimensions
+| Integrator: 100 initial calls, 20 bins, stratified = T
+| Integrator: VAMP
+|=============================================================================|
+| It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
+|=============================================================================|
+   1        160 -1.6988899E-04  1.82E-05   10.74    1.36*  29.33
 |-----------------------------------------------------------------------------|
-   5       3992  1.1900700E-03  1.35E-05    1.13    0.72*  29.16
+   1        160 -1.6988899E-04  1.82E-05   10.74    1.36   29.33
+|=============================================================================|
+| Starting integration for process 'nlo_ee4t_p1' part 'virtual'
+| Integrate: iterations = 1:100:"gw"
+| Integrator: 2 chains, 16 channels, 8 dimensions
+| Integrator: 100 initial calls, 20 bins, stratified = T
+| Integrator: VAMP
+|=============================================================================|
+| It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
+|=============================================================================|
+   1        160  6.4430751E-04  6.88E-05   10.68    1.35*  28.62
 |-----------------------------------------------------------------------------|
-   5       3992  1.1900700E-03  1.35E-05    1.13    0.72   29.16
+   1        160  6.4430751E-04  6.88E-05   10.68    1.35   28.62
+|=============================================================================|
+| Integrate: sum of all components
+|=============================================================================|
+| It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
+|=============================================================================|
+   1          0  1.0080157E-03  9.33E-05    9.25    0.00*  23.67
+| NLO Correction: [O(alpha_s+1)/O(alpha_s)]
+|  ( 88.9095 +-  16.70039 ) %
 |=============================================================================|
-| There were no errors and    1 warning(s).
+| There were no errors and    4 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eett.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eett.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eett.ref	(revision 8289)
@@ -1,183 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 2
 alphas_power = 0
 | Process library 'nlo_eett_lib': recorded process 'nlo_eett_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eett_lib': compiling ...
 | Process library 'nlo_eett_lib': writing makefile
 | Process library 'nlo_eett_lib': removing old files
 | Process library 'nlo_eett_lib': writing driver
 | Process library 'nlo_eett_lib': creating source code
 | Process library 'nlo_eett_lib': compiling sources
 | Process library 'nlo_eett_lib': linking
 | Process library 'nlo_eett_lib': loading
 | Process library 'nlo_eett_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eett_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eett_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eett_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eett_p1'
 |   Library name  = 'nlo_eett_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eett_p1_i1':   e-, e+ => t, tbar [openloops]
 |     2: 'nlo_eett_p1_i2':   e-, e+ => t, tbar, gl [openloops], [real]
 |     3: 'nlo_eett_p1_i3':   e-, e+ => t, tbar [openloops], [virtual]
 |     4: 'nlo_eett_p1_i4':   e-, e+ => t, tbar [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 1 channels, 2 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 1 channels, 5 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 1 channels, 2 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eett_p1' part 'born'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 2 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4608  1.6647708E+02  3.99E-02    0.02    0.02*  39.11
-   2       4608  1.6640219E+02  3.12E-02    0.02    0.01*  70.06
-   3       4608  1.6636660E+02  3.06E-02    0.02    0.01*  50.73
-   4       4608  1.6640966E+02  2.94E-02    0.02    0.01*  60.31
-   5       4608  1.6641809E+02  2.95E-02    0.02    0.01   57.07
+   1        100  1.5917129E+02  9.82E+00    6.17    0.62*  38.57
 |-----------------------------------------------------------------------------|
-   5      23040  1.6640932E+02  1.41E-02    0.01    0.01   57.07    1.24   5
-|-----------------------------------------------------------------------------|
-   6       4608  1.6635973E+02  2.98E-02    0.02    0.01   57.05
-   7       4608  1.6639689E+02  2.91E-02    0.02    0.01*  57.05
-|-----------------------------------------------------------------------------|
-   7       9216  1.6637871E+02  2.08E-02    0.01    0.01   57.05    0.80   2
+   1        100  1.5917129E+02  9.82E+00    6.17    0.62   38.57
 |=============================================================================|
 | Starting integration for process 'nlo_eett_p1' part 'real'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 5 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       5000 -3.9654482E+01  4.41E-01    1.11    0.79*  26.28
-   2       5000 -3.9459991E+01  1.24E-01    0.32    0.22*  59.63
-   3       5000 -3.9685842E+01  7.68E-02    0.19    0.14*  71.73
-   4       5000 -3.9660092E+01  7.40E-02    0.19    0.13*  68.67
-   5       5000 -3.9576908E+01  7.57E-02    0.19    0.14   68.47
-|-----------------------------------------------------------------------------|
-   5      25000 -3.9621322E+01  4.10E-02    0.10    0.16   68.47    0.75   5
+   1        100 -4.3822938E+01  3.58E+00    8.16    0.82*  28.50
 |-----------------------------------------------------------------------------|
-   6       5000 -3.9554813E+01  7.68E-02    0.19    0.14   65.75
-   7       5000 -3.9598419E+01  7.24E-02    0.18    0.13*  65.82
-|-----------------------------------------------------------------------------|
-   7      10000 -3.9577916E+01  5.27E-02    0.13    0.13   65.82    0.17   2
+   1        100 -4.3822938E+01  3.58E+00    8.16    0.82   28.50
 |=============================================================================|
 | Starting integration for process 'nlo_eett_p1' part 'virtual'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 2 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4608  4.8825118E+01  1.47E-02    0.03    0.02*  34.69
-   2       4608  4.8809896E+01  1.11E-02    0.02    0.02*  73.48
-   3       4608  4.8831846E+01  1.05E-02    0.02    0.01*  49.21
-   4       4608  4.8839326E+01  1.01E-02    0.02    0.01*  75.72
-   5       4608  4.8826609E+01  9.94E-03    0.02    0.01*  58.17
-|-----------------------------------------------------------------------------|
-   5      23040  4.8827310E+01  4.89E-03    0.01    0.02   58.17    1.02   5
-|-----------------------------------------------------------------------------|
-   6       4608  4.8804679E+01  9.82E-03    0.02    0.01*  58.15
-   7       4608  4.8819578E+01  9.98E-03    0.02    0.01   58.17
+   1        100  5.6940192E+01  3.72E+00    6.53    0.65*  41.09
 |-----------------------------------------------------------------------------|
-   7       9216  4.8812012E+01  7.00E-03    0.01    0.01   58.17    1.13   2
+   1        100  5.6940192E+01  3.72E+00    6.53    0.65   41.09
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  1.7561280E+02  5.71E-02    0.03    0.00*  46.76
+   1          0  1.7228855E+02  1.11E+01    6.44    0.00*  31.25
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (  5.5500 +-   0.03195 ) %
+|  (  8.2410 +-   3.28047 ) %
 |=============================================================================|
 | There were no errors and    1 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthz.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthz.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthz.ref	(revision 8289)
@@ -1,180 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 4
 alphas_power = 0
 | Process library 'nlo_eetthz_lib': recorded process 'nlo_eetthz_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eetthz_lib': compiling ...
 | Process library 'nlo_eetthz_lib': writing makefile
 | Process library 'nlo_eetthz_lib': removing old files
 | Process library 'nlo_eetthz_lib': writing driver
 | Process library 'nlo_eetthz_lib': creating source code
 | Process library 'nlo_eetthz_lib': compiling sources
 | Process library 'nlo_eetthz_lib': linking
 | Process library 'nlo_eetthz_lib': loading
 | Process library 'nlo_eetthz_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eetthz_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthz_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthz_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eetthz_p1'
 |   Library name  = 'nlo_eetthz_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eetthz_p1_i1':   e-, e+ => t, tbar, H, Z [openloops]
 |     2: 'nlo_eetthz_p1_i2':   e-, e+ => t, tbar, H, Z, gl [openloops], [real]
 |     3: 'nlo_eetthz_p1_i3':   e-, e+ => t, tbar, H, Z [openloops], [virtual]
 |     4: 'nlo_eetthz_p1_i4':   e-, e+ => t, tbar, H, Z [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 6 channels, 8 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 6 channels, 11 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 6 channels, 8 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eetthz_p1' part 'born'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996  3.5076988E-02  1.70E-03    4.84    3.06*   3.27
-   2       3996  3.5984811E-02  6.32E-04    1.76    1.11*  15.41
-   3       3996  3.5721868E-02  4.99E-04    1.40    0.88*  14.85
-   4       3996  3.5568363E-02  4.38E-04    1.23    0.78*  20.23
+   1         96  4.0465639E-02  1.20E-02   29.62    2.90*  11.23
 |-----------------------------------------------------------------------------|
-   4      15984  3.5691612E-02  2.88E-04    0.81    1.02   20.23    0.14   4
-|-----------------------------------------------------------------------------|
-   5       3996  3.6149414E-02  4.58E-04    1.27    0.80   17.48
-   6       3996  3.6374942E-02  4.48E-04    1.23    0.78*  16.68
-|-----------------------------------------------------------------------------|
-   6       7992  3.6264673E-02  3.20E-04    0.88    0.79   16.68    0.12   2
+   1         96  4.0465639E-02  1.20E-02   29.62    2.90   11.23
 |=============================================================================|
 | Starting integration for process 'nlo_eetthz_p1' part 'real'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 11 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996 -6.1575357E-03  3.57E-04    5.80    3.66*   2.19
-   2       3996 -6.4778881E-03  1.40E-04    2.16    1.36*   9.51
-   3       3996 -6.3076427E-03  1.01E-04    1.60    1.01*  13.41
-   4       3996 -6.4397118E-03  9.87E-05    1.53    0.97*  10.00
-|-----------------------------------------------------------------------------|
-   4      15984 -6.3889032E-03  6.21E-05    0.97    1.23   10.00    0.58   4
+   1         96 -6.4549955E-03  2.05E-03   31.74    3.11*  10.75
 |-----------------------------------------------------------------------------|
-   5       3996 -6.4596554E-03  8.94E-05    1.38    0.87*   9.59
-   6       3996 -6.3733207E-03  9.23E-05    1.45    0.92    8.35
-|-----------------------------------------------------------------------------|
-   6       7992 -6.4178861E-03  6.42E-05    1.00    0.89    8.35    0.45   2
+   1         96 -6.4549955E-03  2.05E-03   31.74    3.11   10.75
 |=============================================================================|
 | Starting integration for process 'nlo_eetthz_p1' part 'virtual'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996  6.2558822E-03  3.04E-04    4.85    3.07*   3.13
-   2       3996  6.2055720E-03  1.25E-04    2.02    1.27*  10.28
-   3       3996  6.1614648E-03  9.41E-05    1.53    0.97*  16.61
-   4       3996  6.1322337E-03  8.31E-05    1.36    0.86*  18.92
-|-----------------------------------------------------------------------------|
-   4      15984  6.1602927E-03  5.49E-05    0.89    1.13   18.92    0.11   4
-|-----------------------------------------------------------------------------|
-   5       3996  6.1528403E-03  8.24E-05    1.34    0.85*  17.04
-   6       3996  6.2415497E-03  8.57E-05    1.37    0.87   13.10
+   1         96  3.8163605E-03  1.35E-03   35.38    3.47*  12.98
 |-----------------------------------------------------------------------------|
-   6       7992  6.1954448E-03  5.94E-05    0.96    0.86   13.10    0.56   2
+   1         96  3.8163605E-03  1.35E-03   35.38    3.47   12.98
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  3.6042232E-02  3.32E-04    0.92    0.00*  13.62
+   1          0  3.7827004E-02  1.22E-02   32.34    0.00*   9.70
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  ( -0.6134 +-   0.24124 ) %
+|  ( -6.5207 +-   6.36341 ) %
 |=============================================================================|
 | There were no errors and    1 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzj.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzj.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzj.ref	(revision 8289)
@@ -1,178 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 3
 alphas_power = 1
-$exclude_gauge_splittings = "t:T"
 | Process library 'nlo_eettzj_lib': recorded process 'nlo_eettzj_p1'
-mult_call_real =  5.000000000000E+00
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettzj_lib': compiling ...
 | Process library 'nlo_eettzj_lib': writing makefile
 | Process library 'nlo_eettzj_lib': removing old files
 | Process library 'nlo_eettzj_lib': writing driver
 | Process library 'nlo_eettzj_lib': creating source code
 | Process library 'nlo_eettzj_lib': compiling sources
 | Process library 'nlo_eettzj_lib': linking
 | Process library 'nlo_eettzj_lib': loading
 | Process library 'nlo_eettzj_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettzj_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettzj_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettzj_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettzj_p1'
 |   Library name  = 'nlo_eettzj_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eettzj_p1_i1':   e-, e+ => t, tbar, Z, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops]
 |     2: 'nlo_eettzj_p1_i2':   e-, e+ => t, tbar, Z, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
 |     3: 'nlo_eettzj_p1_i3':   e-, e+ => t, tbar, Z, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops], [virtual]
 |     4: 'nlo_eettzj_p1_i4':   e-, e+ => t, tbar, Z, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 14 channels, 8 dimensions
 | Phase space: found 14 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 14 channels, 11 dimensions
 | Phase space: found 14 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 14 channels, 8 dimensions
 | Phase space: found 14 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Applying user-defined cuts.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettzj_p1' part 'born'
-| Integrate: iterations = 3:3000:"gw", 2:3000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 14 channels, 8 dimensions
-| Integrator: 3000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2996  4.9221785E-01  3.29E-02    6.68    3.66*   2.98
-   2       2990  5.6665648E-01  1.68E-02    2.97    1.62*   8.32
-   3       2980  6.0404710E-01  1.47E-02    2.43    1.33*  10.83
+   1        140  4.5914279E-01  8.73E-02   19.02    2.25*  18.74
 |-----------------------------------------------------------------------------|
-   3       8966  5.7813952E-01  1.05E-02    1.81    1.72   10.83    5.20   3
-|-----------------------------------------------------------------------------|
-   4       2980  6.0650458E-01  1.41E-02    2.32    1.27*   9.84
-   5       2980  6.0738174E-01  1.45E-02    2.38    1.30    9.29
-|-----------------------------------------------------------------------------|
-   5       5960  6.0693228E-01  1.01E-02    1.66    1.28    9.29    0.00   2
+   1        140  4.5914279E-01  8.73E-02   19.02    2.25   18.74
 |=============================================================================|
 | Starting integration for process 'nlo_eettzj_p1' part 'real'
-| Integrate: iterations = 3:15000:"gw", 2:15000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 14 channels, 11 dimensions
-| Integrator: 15000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      14994 -2.1277536E-02  5.62E-02  264.29  323.62*   0.31
-   2      14986 -2.6024947E-02  9.02E-03   34.66   42.44*   1.62
-   3      14980 -2.3953763E-02  7.65E-03   31.94   39.09*   1.63
-|-----------------------------------------------------------------------------|
-   3      44960 -2.4782337E-02  5.80E-03   23.42   49.65    1.63    0.02   3
+   1        140  2.3048638E-01  3.12E-01  135.16   15.99*  11.40
 |-----------------------------------------------------------------------------|
-   4      14980 -3.5994597E-03  1.48E-02  411.33  503.44    0.79
-   5      14980 -2.5320061E-02  8.70E-03   34.37   42.07*   0.66
-|-----------------------------------------------------------------------------|
-   5      29960 -1.9741531E-02  7.50E-03   38.01   65.79    0.66    1.60   2
+   1        140  2.3048638E-01  3.12E-01  135.16   15.99   11.40
 |=============================================================================|
 | Starting integration for process 'nlo_eettzj_p1' part 'virtual'
-| Integrate: iterations = 3:3000:"gw", 2:3000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 14 channels, 8 dimensions
-| Integrator: 3000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2996  1.2017429E-01  9.17E-03    7.63    4.17*   2.44
-   2       2986  1.1854948E-01  3.30E-03    2.78    1.52*   9.25
-   3       2982  1.1578756E-01  2.44E-03    2.11    1.15*  14.66
-|-----------------------------------------------------------------------------|
-   3       8964  1.1691605E-01  1.92E-03    1.64    1.55   14.66    0.29   3
-|-----------------------------------------------------------------------------|
-   4       2982  1.1364510E-01  2.43E-03    2.13    1.17   12.63
-   5       2982  1.1427450E-01  2.47E-03    2.16    1.18   10.61
+   1        140  7.0508191E-02  1.67E-02   23.70    2.80*  15.51
 |-----------------------------------------------------------------------------|
-   5       5964  1.1395440E-01  1.73E-03    1.52    1.17   10.61    0.03   2
+   1        140  7.0508191E-02  1.67E-02   23.70    2.80   15.51
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  7.0114516E-01  1.27E-02    1.81    0.00*   9.21
+   1          0  7.6013736E-01  3.24E-01   42.62    0.00*  15.43
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  ( 15.5228 +-   1.29468 ) %
+|  ( 65.5558 +-  69.07969 ) %
 |=============================================================================|
+| There were no errors and    3 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetth.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetth.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetth.ref	(revision 8289)
@@ -1,183 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 3
 alphas_power = 0
 | Process library 'nlo_eetth_lib': recorded process 'nlo_eetth_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eetth_lib': compiling ...
 | Process library 'nlo_eetth_lib': writing makefile
 | Process library 'nlo_eetth_lib': removing old files
 | Process library 'nlo_eetth_lib': writing driver
 | Process library 'nlo_eetth_lib': creating source code
 | Process library 'nlo_eetth_lib': compiling sources
 | Process library 'nlo_eetth_lib': linking
 | Process library 'nlo_eetth_lib': loading
 | Process library 'nlo_eetth_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eetth_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetth_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetth_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eetth_p1'
 |   Library name  = 'nlo_eetth_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eetth_p1_i1':   e-, e+ => t, tbar, H [openloops]
 |     2: 'nlo_eetth_p1_i2':   e-, e+ => t, tbar, H, gl [openloops], [real]
 |     3: 'nlo_eetth_p1_i3':   e-, e+ => t, tbar, H [openloops], [virtual]
 |     4: 'nlo_eetth_p1_i4':   e-, e+ => t, tbar, H [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 3 channels, 5 dimensions
 | Phase space: found 3 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 3 channels, 8 dimensions
 | Phase space: found 3 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 3 channels, 5 dimensions
 | Phase space: found 3 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eetth_p1' part 'born'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 3 channels, 5 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4998  2.0086517E+00  2.02E-02    1.01    0.71*  20.66
-   2       4998  2.0170052E+00  9.28E-03    0.46    0.33*  44.25
-   3       4998  2.0394562E+00  7.02E-03    0.34    0.24*  55.57
-   4       4998  2.0219769E+00  6.61E-03    0.33    0.23*  54.24
-   5       4998  2.0215560E+00  6.35E-03    0.31    0.22*  52.19
+   1         99  2.0057339E+00  1.49E-01    7.42    0.74*  32.01
 |-----------------------------------------------------------------------------|
-   5      24990  2.0250724E+00  3.49E-03    0.17    0.27   52.19    1.53   5
-|-----------------------------------------------------------------------------|
-   6       4998  2.0195356E+00  6.36E-03    0.32    0.22   50.53
-   7       4998  2.0185500E+00  6.25E-03    0.31    0.22*  50.20
-|-----------------------------------------------------------------------------|
-   7       9996  2.0190337E+00  4.46E-03    0.22    0.22   50.20    0.01   2
+   1         99  2.0057339E+00  1.49E-01    7.42    0.74   32.01
 |=============================================================================|
 | Starting integration for process 'nlo_eetth_p1' part 'real'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 3 channels, 8 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4998 -4.2283334E-01  5.99E-03    1.42    1.00*  11.67
-   2       4998 -4.1965589E-01  2.96E-03    0.70    0.50*  32.83
-   3       4998 -4.2293275E-01  2.37E-03    0.56    0.40*  33.85
-   4       4998 -4.1948615E-01  2.27E-03    0.54    0.38*  31.17
-   5       4998 -4.2329090E-01  2.17E-03    0.51    0.36*  26.41
-|-----------------------------------------------------------------------------|
-   5      24990 -4.2159956E-01  1.17E-03    0.28    0.44   26.41    0.57   5
+   1         99 -4.4658809E-01  3.70E-02    8.29    0.83*  28.37
 |-----------------------------------------------------------------------------|
-   6       4998 -4.1987657E-01  2.21E-03    0.53    0.37   23.87
-   7       4998 -4.2053164E-01  2.15E-03    0.51    0.36*  23.91
-|-----------------------------------------------------------------------------|
-   7       9996 -4.2021362E-01  1.54E-03    0.37    0.37   23.91    0.05   2
+   1         99 -4.4658809E-01  3.70E-02    8.29    0.83   28.37
 |=============================================================================|
 | Starting integration for process 'nlo_eetth_p1' part 'virtual'
-| Integrate: iterations = 5:5000:"gw", 2:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 3 channels, 5 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4998  3.1950516E-01  3.41E-03    1.07    0.75*  18.90
-   2       4998  3.1729827E-01  1.67E-03    0.52    0.37*  28.97
-   3       4998  3.1654229E-01  1.27E-03    0.40    0.28*  32.75
-   4       4998  3.1793758E-01  1.16E-03    0.36    0.26*  33.76
-   5       4998  3.1689153E-01  1.10E-03    0.35    0.24*  36.07
-|-----------------------------------------------------------------------------|
-   5      24990  3.1724357E-01  6.15E-04    0.19    0.31   36.07    0.30   5
-|-----------------------------------------------------------------------------|
-   6       4998  3.1612983E-01  1.14E-03    0.36    0.25   31.48
-   7       4998  3.1650679E-01  1.16E-03    0.37    0.26   25.31
+   1         99  2.8842196E-01  2.00E-02    6.95    0.69*  31.56
 |-----------------------------------------------------------------------------|
-   7       9996  3.1631480E-01  8.10E-04    0.26    0.26   25.31    0.05   2
+   1         99  2.8842196E-01  2.00E-02    6.95    0.69   31.56
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  1.9151349E+00  4.78E-03    0.25    0.00*  36.33
+   1          0  1.8475678E+00  1.55E-01    8.37    0.00*  25.73
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  ( -5.1460 +-   0.08693 ) %
+|  ( -7.8857 +-   2.17946 ) %
 |=============================================================================|
 | There were no errors and    1 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettj.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettj.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettj.ref	(revision 8289)
@@ -1,217 +1,155 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 2
 alphas_power = 1
-$exclude_gauge_splittings = "t:T"
-?nlo_use_real_partition = true
-real_partition_scale =  5.000000000000E+00
 | Process library 'nlo_eettj_lib': recorded process 'nlo_eettj_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettj_lib': compiling ...
 | Process library 'nlo_eettj_lib': writing makefile
 | Process library 'nlo_eettj_lib': removing old files
 | Process library 'nlo_eettj_lib': writing driver
 | Process library 'nlo_eettj_lib': creating source code
 | Process library 'nlo_eettj_lib': compiling sources
 | Process library 'nlo_eettj_lib': linking
 | Process library 'nlo_eettj_lib': loading
 | Process library 'nlo_eettj_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettj_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettj_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettj_p1.i3.phs'
-| Phase space: generating configuration ...
-Warning:  Intermediate decay of zero-width particle Z may be possible.
-Warning:  Intermediate decay of zero-width particle H may be possible.
-| Phase space: ... success.
-| Phase space: writing configuration file 'nlo_eettj_p1.i5.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettj_p1'
 |   Library name  = 'nlo_eettj_lib'
 |   Process index = 1
 |   Process components:
-|     1: 'nlo_eettj_p1_i1':   e-, e+ => t, tbar, gl [openloops]
-|     2: 'nlo_eettj_p1_i2':   e-, e+ => t, tbar, d:u:s:c:b:gl, dbar:ubar:sbar:cbar:bbar:gl [openloops], [real]
-|     3: 'nlo_eettj_p1_i3':   e-, e+ => t, tbar, gl [openloops], [virtual]
-|     4: 'nlo_eettj_p1_i4':   e-, e+ => t, tbar, gl [inactive], [subtraction]
-|     5: 'nlo_eettj_p1_i5':   e-, e+ => t, tbar, d:u:s:c:b:gl, dbar:ubar:sbar:cbar:bbar:gl [openloops], [real]
+|     1: 'nlo_eettj_p1_i1':   e-, e+ => t, tbar, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops]
+|     2: 'nlo_eettj_p1_i2':   e-, e+ => t, tbar, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
+|     3: 'nlo_eettj_p1_i3':   e-, e+ => t, tbar, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops], [virtual]
+|     4: 'nlo_eettj_p1_i4':   e-, e+ => t, tbar, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 2 channels, 5 dimensions
 | Phase space: found 2 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 2 channels, 8 dimensions
 | Phase space: found 2 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 2 channels, 5 dimensions
 | Phase space: found 2 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
-| Phase space: 18 channels, 8 dimensions
-| Phase space: found 18 channels, collected in 5 groves.
-| Phase space: no equivalences between channels used.
-| Phase space: wood
 | Applying user-defined cuts.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettj_p1' part 'born'
-| Integrate: iterations = 4:20000:"gw", 3:20000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 2 channels, 5 dimensions
-| Integrator: 20000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      20000  4.7726836E+01  8.44E-01    1.77    2.50*   2.66
-   2      20000  4.8236264E+01  2.77E-01    0.58    0.81*   6.30
-   3      20000  4.8014915E+01  2.61E-01    0.54    0.77*   6.63
-   4      20000  4.7641885E+01  2.51E-01    0.53    0.75*   7.19
-|-----------------------------------------------------------------------------|
-   4      80000  4.7938257E+01  1.49E-01    0.31    0.88    7.19    0.90   4
+   1        100  5.5260363E+01  1.35E+01   24.42    2.44*   7.07
 |-----------------------------------------------------------------------------|
-   5      20000  4.7968357E+01  2.56E-01    0.53    0.76    6.89
-   6      20000  4.8243827E+01  2.54E-01    0.53    0.75*   6.66
-   7      20000  4.8264320E+01  2.61E-01    0.54    0.76    6.67
-|-----------------------------------------------------------------------------|
-   7      60000  4.8158119E+01  1.48E-01    0.31    0.76    6.67    0.41   3
+   1        100  5.5260363E+01  1.35E+01   24.42    2.44    7.07
 |=============================================================================|
 | Starting integration for process 'nlo_eettj_p1' part 'real'
-| Integrate: iterations = 4:20000:"gw", 3:20000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 2 channels, 8 dimensions
-| Integrator: 20000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      20000 -6.4137709E+01  3.49E+00    5.44    7.69*   0.25
-   2      20000 -7.1046314E+01  1.30E+00    1.83    2.58*   1.10
-   3      20000 -7.0511913E+01  8.39E-01    1.19    1.68*   2.96
-   4      20000 -7.1943122E+01  2.17E+00    3.01    4.26    0.41
-|-----------------------------------------------------------------------------|
-   4      80000 -7.0554489E+01  6.58E-01    0.93    2.64    0.41    1.31   4
-|-----------------------------------------------------------------------------|
-   5      20000 -7.0139639E+01  1.46E+00    2.08    2.94*   0.39
-   6      20000 -6.9159910E+01  1.13E+00    1.63    2.31*   0.38
-   7      20000 -6.9701709E+01  7.99E-01    1.15    1.62*   0.37
+   1        100 -7.2035082E+00  6.95E+00   96.45    9.65*   7.31
 |-----------------------------------------------------------------------------|
-   7      60000 -6.9623990E+01  5.95E-01    0.86    2.09    0.37    0.15   3
+   1        100 -7.2035082E+00  6.95E+00   96.45    9.65    7.31
 |=============================================================================|
 | Starting integration for process 'nlo_eettj_p1' part 'virtual'
-| Integrate: iterations = 4:20000:"gw", 3:20000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 2 channels, 5 dimensions
-| Integrator: 20000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      20000  9.9917893E+00  1.73E-01    1.73    2.45*   2.91
-   2      20000  9.8649320E+00  4.80E-02    0.49    0.69*  17.06
-   3      20000  9.8700091E+00  4.16E-02    0.42    0.60*  14.69
-   4      20000  9.8348540E+00  4.25E-02    0.43    0.61   11.11
-|-----------------------------------------------------------------------------|
-   4      80000  9.8589844E+00  2.50E-02    0.25    0.72   11.11    0.33   4
-|-----------------------------------------------------------------------------|
-   5      20000  9.9095236E+00  4.24E-02    0.43    0.61*  11.21
-   6      20000  9.9079126E+00  4.21E-02    0.43    0.60*  10.90
-   7      20000  9.9283731E+00  4.03E-02    0.41    0.57*  10.88
-|-----------------------------------------------------------------------------|
-   7      60000  9.9156941E+00  2.40E-02    0.24    0.59   10.88    0.08   3
-|=============================================================================|
-| Starting integration for process 'nlo_eettj_p1' part 'real'
-| Integrate: iterations = 4:20000:"gw", 3:20000
-| Integrator: 5 chains, 18 channels, 8 dimensions
-| Integrator: 20000 initial calls, 20 bins, stratified = T
-| Integrator: VAMP
-|=============================================================================|
-| It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
-|=============================================================================|
-   1      19998  6.8440887E+01  3.53E+00    5.15    7.29*   0.85
-   2      19990  6.5222053E+01  7.09E-01    1.09    1.54*   6.34
-   3      19980  6.4714502E+01  5.13E-01    0.79    1.12*  10.69
-   4      19970  6.4821177E+01  4.78E-01    0.74    1.04*  10.02
-|-----------------------------------------------------------------------------|
-   4      79938  6.4887880E+01  3.12E-01    0.48    1.36   10.02    0.46   4
-|-----------------------------------------------------------------------------|
-   5      19970  6.5134719E+01  4.75E-01    0.73    1.03*   8.81
-   6      19970  6.4562469E+01  4.69E-01    0.73    1.03*   8.03
-   7      19970  6.5507380E+01  4.71E-01    0.72    1.02*   8.15
+   1        100  6.9622194E+00  1.65E+00   23.70    2.37*   8.71
 |-----------------------------------------------------------------------------|
-   7      59910  6.5066270E+01  2.72E-01    0.42    1.02    8.15    1.02   3
+   1        100  6.9622194E+00  1.65E+00   23.70    2.37    8.71
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  5.3516093E+01  6.72E-01    1.26    0.00*   3.32
+   1          0  5.5019074E+01  1.53E+01   27.75    0.00*   6.39
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (******** +-   1.29492 ) %
+|  ( -0.4366 +-  12.92311 ) %
 |=============================================================================|
-| There were no errors and    2 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettwjj.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettwjj.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettwjj.ref	(revision 8289)
@@ -1,186 +1,162 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 3
 alphas_power = 2
 [user variable] W = PDG(24, -24)
+mult_call_real =  2.000000000000E+00
 | Process library 'nlo_eettwjj_lib': recorded process 'nlo_eettwjj_p1'
-mult_call_real =  3.000000000000E+00
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettwjj_lib': compiling ...
 | Process library 'nlo_eettwjj_lib': writing makefile
 | Process library 'nlo_eettwjj_lib': removing old files
 | Process library 'nlo_eettwjj_lib': writing driver
 | Process library 'nlo_eettwjj_lib': creating source code
 | Process library 'nlo_eettwjj_lib': compiling sources
 | Process library 'nlo_eettwjj_lib': linking
 | Process library 'nlo_eettwjj_lib': loading
 | Process library 'nlo_eettwjj_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettwjj_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 Warning:  Intermediate decay of zero-width particle W+ may be possible.
 Warning:  Intermediate decay of zero-width particle Z may be possible.
 Warning:  Intermediate decay of zero-width particle H may be possible.
 Warning:  Intermediate decay of zero-width particle W- may be possible.
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettwjj_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettwjj_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettwjj_p1'
 |   Library name  = 'nlo_eettwjj_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eettwjj_p1_i1':   e-, e+ => t, tbar, W+:W-, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops]
 |     2: 'nlo_eettwjj_p1_i2':   e-, e+ => t, tbar, W+:W-, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
 |     3: 'nlo_eettwjj_p1_i3':   e-, e+ => t, tbar, W+:W-, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops], [virtual]
 |     4: 'nlo_eettwjj_p1_i4':   e-, e+ => t, tbar, W+:W-, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 4 channels, 11 dimensions
 | Phase space: found 4 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 4 channels, 14 dimensions
 | Phase space: found 4 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 4 channels, 11 dimensions
 | Phase space: found 4 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Applying user-defined cuts.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettwjj_p1' part 'born'
-| Integrate: iterations = 3:8000:"gw", 3:8000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 4 channels, 11 dimensions
-| Integrator: 8000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       8000  1.8988592E-04  7.15E-05   37.67   33.70*   0.11
-   2       8000  7.4285571E-04  5.45E-04   73.34   65.60    0.07
-   3       8000  2.2138833E-04  2.03E-05    9.16    8.19*   0.48
+   1        100  1.4862545E-03  1.49E-03   99.97   10.00*   4.00
 |-----------------------------------------------------------------------------|
-   3      24000  2.1971736E-04  1.95E-05    8.87   13.74    0.48    0.55   3
-|-----------------------------------------------------------------------------|
-   4       8000  2.6166698E-04  4.35E-05   16.62   14.87    0.21
-   5       8000  2.2026713E-04  1.87E-05    8.47    7.58*   0.16
-   6       8000  2.5344561E-04  2.79E-05   11.03    9.86    0.16
-|-----------------------------------------------------------------------------|
-   6      24000  2.3402042E-04  1.46E-05    6.25    9.68    0.16    0.72   3
+   1        100  1.4862545E-03  1.49E-03   99.97   10.00    4.00
 |=============================================================================|
 | Starting integration for process 'nlo_eettwjj_p1' part 'real'
-| Integrate: iterations = 3:24000:"gw", 3:24000
+| Integrate: iterations = 1:200:"gw"
 | Integrator: 1 chains, 4 channels, 14 dimensions
-| Integrator: 24000 initial calls, 20 bins, stratified = T
+| Integrator: 200 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      24000  2.6007852E-05  1.40E-05   53.65   83.11*   0.04
-   2      24000  1.3391496E-05  6.13E-06   45.80   70.95*   0.13
-   3      24000  1.6707784E-05  3.12E-06   18.68   28.93*   0.33
-|-----------------------------------------------------------------------------|
-   3      72000  1.6407221E-05  2.73E-06   16.62   44.61    0.33    0.36   3
+   1        200 -2.2143387E-05  2.18E-05   98.41   13.92*   2.00
 |-----------------------------------------------------------------------------|
-   4      24000  1.4175798E-05  1.07E-05   75.24  116.57    0.10
-   5      24000  2.4325747E-05  4.89E-06   20.11   31.16*   0.07
-   6      24000  2.3311816E-05  6.76E-06   28.98   44.90    0.07
-|-----------------------------------------------------------------------------|
-   6      72000  2.2788260E-05  3.71E-06   16.30   43.74    0.07    0.38   3
+   1        200 -2.2143387E-05  2.18E-05   98.41   13.92    2.00
 |=============================================================================|
 | Starting integration for process 'nlo_eettwjj_p1' part 'virtual'
-| Integrate: iterations = 3:8000:"gw", 3:8000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 4 channels, 11 dimensions
-| Integrator: 8000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       8000  4.2175662E-05  1.45E-05   34.43   30.80*   0.09
-   2       8000  8.9168208E-05  1.43E-05   16.04   14.35*   0.32
-   3       8000  1.4824049E-04  2.76E-05   18.65   16.68    0.19
-|-----------------------------------------------------------------------------|
-   3      24000  7.5860688E-05  9.56E-06   12.61   19.53    0.19    6.55   3
-|-----------------------------------------------------------------------------|
-   4       8000  1.0458991E-04  1.26E-05   12.08   10.80*   0.13
-   5       8000  1.1066412E-04  1.10E-05    9.91    8.87*   0.13
-   6       8000  1.4256992E-04  2.36E-05   16.56   14.81    0.17
+   1        100  6.0435938E-07  6.04E-07  100.00   10.00*   4.00
 |-----------------------------------------------------------------------------|
-   6      24000  1.1183566E-04  7.82E-06    6.99   10.83    0.17    1.02   3
+   1        100  6.0435938E-07  6.04E-07  100.00   10.00    4.00
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  3.6864435E-04  1.70E-05    4.61    0.00*   0.15
+   1          0  1.4647155E-03  1.49E-03  101.45    0.00*   3.94
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  ( 57.5266 +-   5.15594 ) %
+|  ( -1.4492 +-   2.06166 ) %
 |=============================================================================|
 | There were no errors and    4 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eejj.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eejj.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eejj.ref	(revision 8289)
@@ -1,186 +1,158 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 2
 alphas_power = 0
 | Process library 'nlo_eejj_lib': recorded process 'nlo_eejj_p1'
-mult_call_real =  2.000000000000E+00
 | Integrate: current process library needs compilation
 | Process library 'nlo_eejj_lib': compiling ...
 | Process library 'nlo_eejj_lib': writing makefile
 | Process library 'nlo_eejj_lib': removing old files
 | Process library 'nlo_eejj_lib': writing driver
 | Process library 'nlo_eejj_lib': creating source code
 | Process library 'nlo_eejj_lib': compiling sources
 | Process library 'nlo_eejj_lib': linking
 | Process library 'nlo_eejj_lib': loading
 | Process library 'nlo_eejj_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eejj_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 Warning:  Intermediate decay of zero-width particle Z may be possible.
 Warning:  Intermediate decay of zero-width particle H may be possible.
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eejj_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eejj_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eejj_p1'
 |   Library name  = 'nlo_eejj_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eejj_p1_i1':   e-, e+ => u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops]
 |     2: 'nlo_eejj_p1_i2':   e-, e+ => d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
 |     3: 'nlo_eejj_p1_i3':   e-, e+ => u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops], [virtual]
 |     4: 'nlo_eejj_p1_i4':   e-, e+ => u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 1 channels, 2 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 1 channels, 5 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 1 channels, 2 dimensions
 | Phase space: found 1 channel, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Applying user-defined cuts.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eejj_p1' part 'born'
-| Integrate: iterations = 5:5000:"gw", 2:2000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 2 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4608  6.2251435E+02  7.52E-01    0.12    0.08*  36.27
-   2       4608  6.2312254E+02  4.79E-01    0.08    0.05*  13.76
-   3       4608  6.2273952E+02  2.92E-01    0.05    0.03*  34.35
-   4       4608  6.2274718E+02  2.36E-01    0.04    0.03*  30.76
-   5       4608  6.2233636E+02  2.15E-01    0.03    0.02*  33.90
+   1        100  5.9277214E+02  4.38E+01    7.39    0.74*  35.26
 |-----------------------------------------------------------------------------|
-   5      23040  6.2261250E+02  1.32E-01    0.02    0.03   33.90    0.83   5
-|-----------------------------------------------------------------------------|
-   6       1568  6.2279502E+02  5.68E-01    0.09    0.04   45.55
-   7       1568  6.2310130E+02  5.61E-01    0.09    0.04*  45.27
-|-----------------------------------------------------------------------------|
-   7       3136  6.2295001E+02  3.99E-01    0.06    0.04   45.27    0.15   2
+   1        100  5.9277214E+02  4.38E+01    7.39    0.74   35.26
 |=============================================================================|
 | Starting integration for process 'nlo_eejj_p1' part 'real'
-| Integrate: iterations = 5:10000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 5 dimensions
-| Integrator: 10000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1      10000  3.4903577E+01  3.14E+00    9.00    9.00*   0.14
-   2      10000  3.4166116E+01  1.66E+00    4.85    4.85*   0.88
-   3      10000  3.4219544E+01  2.59E+00    7.57    7.57    0.24
-   4      10000  3.5921235E+01  1.34E+00    3.74    3.74*   0.99
-   5      10000  3.7951071E+01  5.54E-01    1.46    1.46*   1.84
-|-----------------------------------------------------------------------------|
-   5      50000  3.7189812E+01  4.76E-01    1.28    2.86    1.84    1.99   5
+   1        100  4.1152148E+01  5.10E+00   12.39    1.24*   9.91
 |-----------------------------------------------------------------------------|
-   6       4000  3.7335281E+01  8.34E-01    2.23    1.41*   3.09
-   7       4000  3.6697278E+01  1.08E+00    2.95    1.87    1.68
-|-----------------------------------------------------------------------------|
-   7       8000  3.7097852E+01  6.60E-01    1.78    1.59    1.68    0.22   2
+   1        100  4.1152148E+01  5.10E+00   12.39    1.24    9.91
 |=============================================================================|
 | Starting integration for process 'nlo_eejj_p1' part 'virtual'
-| Integrate: iterations = 5:5000:"gw", 2:2000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 1 channels, 2 dimensions
-| Integrator: 5000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4608 -2.0601744E+01  3.83E-02    0.19    0.13*  26.35
-   2       4608 -2.0625296E+01  2.02E-02    0.10    0.07*  13.62
-   3       4608 -2.0626468E+01  9.99E-03    0.05    0.03*  32.03
-   4       4608 -2.0611599E+01  8.47E-03    0.04    0.03*  36.24
-   5       4608 -2.0628778E+01  8.47E-03    0.04    0.03*  40.68
-|-----------------------------------------------------------------------------|
-   5      23040 -2.0621720E+01  4.94E-03    0.02    0.04   40.68    0.66   5
-|-----------------------------------------------------------------------------|
-   6       1568 -2.0616959E+01  2.51E-02    0.12    0.05   44.66
-   7       1568 -2.0677892E+01  2.38E-02    0.12    0.05*  44.71
+   1        100 -1.6182332E+01  1.31E+00    8.09    0.81*  28.82
 |-----------------------------------------------------------------------------|
-   7       3136 -2.0649035E+01  1.73E-02    0.08    0.05   44.71    3.11   2
+   1        100 -1.6182332E+01  1.31E+00    8.09    0.81   28.82
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  6.3939883E+02  7.72E-01    0.12    0.00*  17.84
+   1          0  6.1774196E+02  4.41E+01    7.14    0.00*  29.47
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (  2.6405 +-   0.10607 ) %
+|  (  4.2124 +-   0.94122 ) %
 |=============================================================================|
 | There were no errors and    2 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettww.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettww.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettww.ref	(revision 8289)
@@ -1,178 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 4
 alphas_power = 0
 | Process library 'nlo_eettww_lib': recorded process 'nlo_eettww_p1'
-mult_call_real =  2.000000000000E+00
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettww_lib': compiling ...
 | Process library 'nlo_eettww_lib': writing makefile
 | Process library 'nlo_eettww_lib': removing old files
 | Process library 'nlo_eettww_lib': writing driver
 | Process library 'nlo_eettww_lib': creating source code
 | Process library 'nlo_eettww_lib': compiling sources
 | Process library 'nlo_eettww_lib': linking
 | Process library 'nlo_eettww_lib': loading
 | Process library 'nlo_eettww_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettww_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettww_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettww_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettww_p1'
 |   Library name  = 'nlo_eettww_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eettww_p1_i1':   e-, e+ => t, tbar, W+, W- [openloops]
 |     2: 'nlo_eettww_p1_i2':   e-, e+ => t, tbar, W+, W-, gl [openloops], [real]
 |     3: 'nlo_eettww_p1_i3':   e-, e+ => t, tbar, W+, W- [openloops], [virtual]
 |     4: 'nlo_eettww_p1_i4':   e-, e+ => t, tbar, W+, W- [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 8 channels, 8 dimensions
 | Phase space: found 8 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 8 channels, 11 dimensions
 | Phase space: found 8 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 8 channels, 8 dimensions
 | Phase space: found 8 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettww_p1' part 'born'
-| Integrate: iterations = 3:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 8 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4000  1.3629646E-01  8.39E-03    6.15    3.89*   2.37
-   2       3998  1.3837125E-01  2.85E-03    2.06    1.30*  12.57
-   3       3996  1.3721280E-01  2.09E-03    1.53    0.96*  18.31
+   1         96  1.1905196E-01  3.68E-02   30.88    3.03*  16.21
 |-----------------------------------------------------------------------------|
-   3      11994  1.3756643E-01  1.65E-03    1.20    1.32   18.31    0.07   3
-|-----------------------------------------------------------------------------|
-   4       3996  1.3485496E-01  2.05E-03    1.52    0.96*  15.87
-   5       3996  1.3920585E-01  2.16E-03    1.55    0.98   15.33
-|-----------------------------------------------------------------------------|
-   5       7992  1.3691830E-01  1.49E-03    1.09    0.97   15.33    2.13   2
+   1         96  1.1905196E-01  3.68E-02   30.88    3.03   16.21
 |=============================================================================|
 | Starting integration for process 'nlo_eettww_p1' part 'real'
-| Integrate: iterations = 3:8000:"gw", 2:8000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 8 channels, 11 dimensions
-| Integrator: 8000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       8000 -2.4861635E-02  1.24E-03    4.97    4.44*   1.59
-   2       7996 -2.4916693E-02  4.14E-04    1.66    1.49*   7.37
-   3       7994 -2.5297293E-02  3.03E-04    1.20    1.07*  10.85
-|-----------------------------------------------------------------------------|
-   3      23990 -2.5152812E-02  2.40E-04    0.95    1.48   10.85    0.30   3
+   1         96 -1.5698720E-02  6.80E-03   43.33    4.25*  11.31
 |-----------------------------------------------------------------------------|
-   4       7994 -2.4668990E-02  3.03E-04    1.23    1.10    8.31
-   5       7994 -2.4589849E-02  2.96E-04    1.20    1.08*   8.00
-|-----------------------------------------------------------------------------|
-   5      15988 -2.4628504E-02  2.12E-04    0.86    1.09    8.00    0.03   2
+   1         96 -1.5698720E-02  6.80E-03   43.33    4.25   11.31
 |=============================================================================|
 | Starting integration for process 'nlo_eettww_p1' part 'virtual'
-| Integrate: iterations = 3:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 8 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       4000  4.0328121E-02  2.35E-03    5.83    3.69*   2.65
-   2       3998  4.3045349E-02  9.51E-04    2.21    1.40*   9.72
-   3       3992  4.1904655E-02  6.80E-04    1.62    1.03*  13.05
-|-----------------------------------------------------------------------------|
-   3      11990  4.2187670E-02  5.38E-04    1.28    1.40   13.05    0.81   3
-|-----------------------------------------------------------------------------|
-   4       3992  4.2182713E-02  6.57E-04    1.56    0.98*  13.12
-   5       3992  4.2762301E-02  6.65E-04    1.56    0.98*  11.94
+   1         96  2.8284721E-02  8.53E-03   30.15    2.95*  12.46
 |-----------------------------------------------------------------------------|
-   5       7984  4.2468965E-02  4.68E-04    1.10    0.98   11.94    0.38   2
+   1         96  2.8284721E-02  8.53E-03   30.15    2.95   12.46
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  1.5475876E-01  1.57E-03    1.02    0.00*  12.39
+   1          0  1.3163796E-01  3.83E-02   29.13    0.00*  13.69
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  ( 13.0300 +-   0.40074 ) %
+|  ( 10.5719 +-   9.72629 ) %
 |=============================================================================|
 | There were no errors and    1 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthh.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthh.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthh.ref	(revision 8289)
@@ -1,184 +1,158 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
-?nlo_use_born_scale = false
-?nlo_cut_all_sqmes = false
 | End of included 'nlo_settings.sin'
 alpha_power = 4
 alphas_power = 0
 | Process library 'nlo_eetthh_lib': recorded process 'nlo_eetthh_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eetthh_lib': compiling ...
 | Process library 'nlo_eetthh_lib': writing makefile
 | Process library 'nlo_eetthh_lib': removing old files
 | Process library 'nlo_eetthh_lib': writing driver
 | Process library 'nlo_eetthh_lib': creating source code
 | Process library 'nlo_eetthh_lib': compiling sources
 | Process library 'nlo_eetthh_lib': linking
 | Process library 'nlo_eetthh_lib': loading
 | Process library 'nlo_eetthh_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eetthh_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... failed.  Increasing phs_off_shell ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthh_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... failed.  Increasing phs_off_shell ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthh_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eetthh_p1'
 |   Library name  = 'nlo_eetthh_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eetthh_p1_i1':   e-, e+ => t, tbar, H, H [openloops]
 |     2: 'nlo_eetthh_p1_i2':   e-, e+ => t, tbar, H, H, gl [openloops], [real]
 |     3: 'nlo_eetthh_p1_i3':   e-, e+ => t, tbar, H, H [openloops], [virtual]
 |     4: 'nlo_eetthh_p1_i4':   e-, e+ => t, tbar, H, H [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 12 channels, 8 dimensions
 | Phase space: found 12 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 12 channels, 11 dimensions
 | Phase space: found 12 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 12 channels, 8 dimensions
 | Phase space: found 12 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eetthh_p1' part 'born'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 12 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996  1.3452733E-02  2.74E-04    2.03    1.29*  15.05
-   2       3996  1.3331953E-02  1.68E-04    1.26    0.80*  30.65
-   3       3996  1.3623728E-02  1.33E-04    0.98    0.62*  37.35
-   4       3996  1.3528791E-02  1.13E-04    0.84    0.53*  44.04
+   1        120  1.3572209E-02  1.66E-03   12.26    1.34*  26.86
 |-----------------------------------------------------------------------------|
-   4      15984  1.3514196E-02  7.39E-05    0.55    0.69   44.04    0.64   4
-|-----------------------------------------------------------------------------|
-   5       3996  1.3508607E-02  1.14E-04    0.85    0.53   42.55
-   6       3996  1.3672836E-02  1.12E-04    0.82    0.52*  41.91
-|-----------------------------------------------------------------------------|
-   6       7992  1.3592072E-02  8.01E-05    0.59    0.53   41.91    1.05   2
+   1        120  1.3572209E-02  1.66E-03   12.26    1.34   26.86
 |=============================================================================|
 | Starting integration for process 'nlo_eetthh_p1' part 'real'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 12 channels, 11 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996 -2.3120505E-03  6.08E-05    2.63    1.66*  10.03
-   2       3996 -2.2398800E-03  3.31E-05    1.48    0.94*  24.81
-   3       3996 -2.2839232E-03  2.64E-05    1.16    0.73*  30.28
-   4       3996 -2.2720226E-03  2.30E-05    1.01    0.64*  32.82
-|-----------------------------------------------------------------------------|
-   4      15984 -2.2717157E-03  1.49E-05    0.66    0.83   32.82    0.53   4
+   1        120 -2.4573051E-03  3.45E-04   14.05    1.54*  23.51
 |-----------------------------------------------------------------------------|
-   5       3996 -2.3315203E-03  2.32E-05    0.99    0.63*  29.69
-   6       3996 -2.3110610E-03  2.36E-05    1.02    0.64   26.87
-|-----------------------------------------------------------------------------|
-   6       7992 -2.3214606E-03  1.65E-05    0.71    0.64   26.87    0.38   2
+   1        120 -2.4573051E-03  3.45E-04   14.05    1.54   23.51
 |=============================================================================|
 | Starting integration for process 'nlo_eetthh_p1' part 'virtual'
-| Integrate: iterations = 4:4000:"gw", 2:4000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 12 channels, 8 dimensions
-| Integrator: 4000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       3996  8.3795281E-04  2.81E-05    3.35    2.12*   5.25
-   2       3996  8.1525249E-04  1.67E-05    2.05    1.29*  10.82
-   3       3996  8.1301957E-04  1.26E-05    1.55    0.98*  17.59
-   4       3996  8.2948276E-04  1.10E-05    1.33    0.84*  23.07
-|-----------------------------------------------------------------------------|
-   4      15984  8.2208174E-04  7.18E-06    0.87    1.10   23.07    0.48   4
-|-----------------------------------------------------------------------------|
-   5       3996  8.3102527E-04  1.07E-05    1.29    0.82*  20.90
-   6       3996  8.4633149E-04  1.08E-05    1.27    0.80*  20.03
+   1        120  7.6423731E-04  1.38E-04   18.03    1.98*  20.14
 |-----------------------------------------------------------------------------|
-   6       7992  8.3864774E-04  7.59E-06    0.91    0.81   20.03    1.02   2
+   1        120  7.6423731E-04  1.38E-04   18.03    1.98   20.14
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  1.2109259E-02  8.21E-05    0.68    0.00*  33.07
+   1          0  1.1879141E-02  1.70E-03   14.35    0.00*  21.87
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (-10.9094 +-   0.14839 ) %
+|  (-12.4745 +-   3.13624 ) %
 |=============================================================================|
-| There were no errors and    1 warning(s).
+| There were no errors and    4 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthj.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthj.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eetthj.ref	(revision 8289)
@@ -1,213 +1,155 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 3
 alphas_power = 1
-$exclude_gauge_splittings = "t"
-?nlo_use_real_partition = true
-real_partition_scale =  5.000000000000E+00
 | Process library 'nlo_eetthj_lib': recorded process 'nlo_eetthj_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eetthj_lib': compiling ...
 | Process library 'nlo_eetthj_lib': writing makefile
 | Process library 'nlo_eetthj_lib': removing old files
 | Process library 'nlo_eetthj_lib': writing driver
 | Process library 'nlo_eetthj_lib': creating source code
 | Process library 'nlo_eetthj_lib': compiling sources
 | Process library 'nlo_eetthj_lib': linking
 | Process library 'nlo_eetthj_lib': loading
 | Process library 'nlo_eetthj_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eetthj_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthj_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eetthj_p1.i3.phs'
-| Phase space: generating configuration ...
-Warning:  Intermediate decay of zero-width particle Z may be possible.
-Warning:  Intermediate decay of zero-width particle H may be possible.
-| Phase space: ... success.
-| Phase space: writing configuration file 'nlo_eetthj_p1.i5.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eetthj_p1'
 |   Library name  = 'nlo_eetthj_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eetthj_p1_i1':   e-, e+ => t, tbar, H, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops]
 |     2: 'nlo_eetthj_p1_i2':   e-, e+ => t, tbar, H, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
 |     3: 'nlo_eetthj_p1_i3':   e-, e+ => t, tbar, H, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [openloops], [virtual]
 |     4: 'nlo_eetthj_p1_i4':   e-, e+ => t, tbar, H, u:ubar:d:dbar:s:sbar:c:cbar:b:bbar:gl [inactive], [subtraction]
-|     5: 'nlo_eetthj_p1_i5':   e-, e+ => t, tbar, H, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl, d:dbar:u:ubar:s:sbar:c:cbar:b:bbar:gl [openloops], [real]
 | ------------------------------------------------------------------------
 | Phase space: 6 channels, 8 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 6 channels, 11 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 6 channels, 8 dimensions
 | Phase space: found 6 channels, collected in 1 grove.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
-| Phase space: 38 channels, 11 dimensions
-| Phase space: found 38 channels, collected in 2 groves.
-| Phase space: no equivalences between channels used.
-| Phase space: wood
 | Applying user-defined cuts.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eetthj_p1' part 'born'
-| Integrate: iterations = 3:10000:"gw", 3:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 8 dimensions
-| Integrator: 10000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       9996  2.5651935E-01  8.14E-03    3.17    3.17*   2.44
-   2       9996  2.5705624E-01  3.06E-03    1.19    1.19*  10.22
-   3       9996  2.5270135E-01  2.75E-03    1.09    1.09*   7.55
+   1         96  2.4208651E-01  4.65E-02   19.20    1.88*  16.34
 |-----------------------------------------------------------------------------|
-   3      29988  2.5476390E-01  1.98E-03    0.78    1.35    7.55    0.58   3
-|-----------------------------------------------------------------------------|
-   4       4998  2.4999417E-01  3.73E-03    1.49    1.06*  11.65
-   5       4998  2.5150055E-01  3.63E-03    1.44    1.02*  11.47
-   6       4998  2.5215111E-01  3.78E-03    1.50    1.06   10.17
-|-----------------------------------------------------------------------------|
-   6      14994  2.5121290E-01  2.14E-03    0.85    1.05   10.17    0.09   3
+   1         96  2.4208651E-01  4.65E-02   19.20    1.88   16.34
 |=============================================================================|
 | Starting integration for process 'nlo_eetthj_p1' part 'real'
-| Integrate: iterations = 3:10000:"gw", 3:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 11 dimensions
-| Integrator: 10000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       9996 -2.5759822E-01  2.43E-02    9.45    9.44*   0.45
-   2       9996 -3.0341182E-01  3.80E-02   12.54   12.54    0.48
-   3       9996 -2.5748306E-01  6.29E-03    2.44    2.44*   3.41
-|-----------------------------------------------------------------------------|
-   3      29988 -2.5863869E-01  6.02E-03    2.33    4.03    3.41    0.71   3
+   1         96 -6.9599117E-01  7.32E-01  105.19   10.31*   6.58
 |-----------------------------------------------------------------------------|
-   4       4998 -2.7696423E-01  1.16E-02    4.20    2.97    2.63
-   5       4998 -2.6861097E-01  9.03E-03    3.36    2.38*   2.22
-   6       4998 -2.6281810E-01  1.11E-02    4.23    2.99    1.96
-|-----------------------------------------------------------------------------|
-   6      14994 -2.6915170E-01  6.00E-03    2.23    2.73    1.96    0.39   3
+   1         96 -6.9599117E-01  7.32E-01  105.19   10.31    6.58
 |=============================================================================|
 | Starting integration for process 'nlo_eetthj_p1' part 'virtual'
-| Integrate: iterations = 3:10000:"gw", 3:5000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 1 chains, 6 channels, 8 dimensions
-| Integrator: 10000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       9996  1.9058146E-02  8.58E-04    4.50    4.50*   2.28
-   2       9996  1.8289855E-02  3.81E-04    2.08    2.08*   5.96
-   3       9996  1.8622907E-02  3.67E-04    1.97    1.97*   5.49
-|-----------------------------------------------------------------------------|
-   3      29988  1.8514370E-02  2.53E-04    1.36    2.36    5.49    0.42   3
-|-----------------------------------------------------------------------------|
-   4       4998  1.7885011E-02  5.04E-04    2.82    1.99    7.31
-   5       4998  1.8677735E-02  4.70E-04    2.52    1.78*   6.94
-   6       4998  1.8167683E-02  4.86E-04    2.68    1.89    6.01
-|-----------------------------------------------------------------------------|
-   6      14994  1.8261714E-02  2.81E-04    1.54    1.88    6.01    0.69   3
-|=============================================================================|
-| Starting integration for process 'nlo_eetthj_p1' part 'real'
-| Integrate: iterations = 3:10000:"gw", 3:5000
-| Integrator: 2 chains, 38 channels, 11 dimensions
-| Integrator: 10000 initial calls, 20 bins, stratified = T
-| Integrator: VAMP
-|=============================================================================|
-| It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
-|=============================================================================|
-   1       9994  2.3228856E-01  2.01E-02    8.67    8.67*   1.10
-   2       9976  2.5529707E-01  8.82E-03    3.46    3.45*   3.36
-   3       9956  2.4940631E-01  6.32E-03    2.53    2.53*   4.80
-|-----------------------------------------------------------------------------|
-   3      29926  2.5023617E-01  4.98E-03    1.99    3.44    4.80    0.57   3
-|-----------------------------------------------------------------------------|
-   4       4974  2.5493978E-01  8.53E-03    3.34    2.36*   6.35
-   5       4974  2.5484719E-01  9.80E-03    3.84    2.71    4.60
-   6       4974  2.4779278E-01  8.79E-03    3.55    2.50*   3.93
+   1         96  1.8794538E-02  9.02E-03   48.01    4.70*  11.19
 |-----------------------------------------------------------------------------|
-   6      14922  2.5241984E-01  5.19E-03    2.06    2.51    3.93    0.21   3
+   1         96  1.8794538E-02  9.02E-03   48.01    4.70   11.19
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  2.5274275E-01  8.23E-03    3.25    0.00*   2.75
+   1          0 -4.3511013E-01  7.34E-01  168.62    0.00* -26.38
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (-99.8715 +-   2.53967 ) %
+|  (******** +- 307.18098 ) %
 |=============================================================================|
-| There were no errors and    2 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzz.ref
===================================================================
--- trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzz.ref	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/ref-output/nlo_eettzz.ref	(revision 8289)
@@ -1,177 +1,156 @@
 ?openmp_logging = false
 ?vis_history = false
 ?integration_timer = false
 openmp_num_threads = 1
 ?debug_decay = false
 ?debug_process = false
 ?debug_verbose = false
 ?write_raw = false
-| Including Sindarin from 'nlo_settings.sin'
 | Switching to model 'SM', scheme 'GF_MW_MZ'
 $blha_ew_scheme = "alpha_qed"
 SM.mZ =>  9.118800000000E+01
 SM.mW =>  8.041900200000E+01
 SM.mH =>  1.250000000000E+02
 SM.GF =>  1.166390000000E-05
 SM.wZ =>  0.000000000000E+00
 SM.wtop =>  0.000000000000E+00
 SM.wW =>  0.000000000000E+00
 SM.wH =>  0.000000000000E+00
 SM.ms =>  0.000000000000E+00
 SM.mc =>  0.000000000000E+00
 SM.mb =>  0.000000000000E+00
 SM.mtop =>  1.732000000000E+02
 SM.me =>  0.000000000000E+00
 SM.mmu =>  0.000000000000E+00
 SM.mtau =>  1.777000000000E+00
 SM.alphas =>  1.180000000000E-01
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 [user variable] jet = PDG(2, -2, 1, -1, 3, -3, 4, -4, 5, -5, 21)
+$exclude_gauge_splittings = "t"
 $method = "openloops"
 seed = 8131
 sqrts =  1.000000000000E+03
 jet_algorithm = 2
 jet_r =  5.000000000000E-01
 ?use_vamp_equivalences = false
 | End of included 'nlo_settings.sin'
 alpha_power = 4
 alphas_power = 0
 | Process library 'nlo_eettzz_lib': recorded process 'nlo_eettzz_p1'
 | Integrate: current process library needs compilation
 | Process library 'nlo_eettzz_lib': compiling ...
 | Process library 'nlo_eettzz_lib': writing makefile
 | Process library 'nlo_eettzz_lib': removing old files
 | Process library 'nlo_eettzz_lib': writing driver
 | Process library 'nlo_eettzz_lib': creating source code
 | Process library 'nlo_eettzz_lib': compiling sources
 | Process library 'nlo_eettzz_lib': linking
 | Process library 'nlo_eettzz_lib': loading
 | Process library 'nlo_eettzz_lib': ... success.
 | Integrate: compilation done
 | QCD alpha: using a running strong coupling
 | RNG: Initializing TAO random-number generator
 | RNG: Setting seed for random-number generator to 8131
 | Initializing integration for process nlo_eettzz_p1:
 | Beam structure: [any particles]
 | Beam data (collision):
 |   e-  (mass = 0.0000000E+00 GeV)
 |   e+  (mass = 0.0000000E+00 GeV)
 |   sqrts = 1.000000000000E+03 GeV
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettzz_p1.i1.phs'
 | Phase space: generating configuration ...
 | Phase space: ... success.
 | Phase space: writing configuration file 'nlo_eettzz_p1.i3.phs'
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | One-Loop-Provider: Using OpenLoops
 | Loading library: [...]
 | ------------------------------------------------------------------------
 | Process [scattering]: 'nlo_eettzz_p1'
 |   Library name  = 'nlo_eettzz_lib'
 |   Process index = 1
 |   Process components:
 |     1: 'nlo_eettzz_p1_i1':   e-, e+ => t, tbar, Z, Z [openloops]
 |     2: 'nlo_eettzz_p1_i2':   e-, e+ => t, tbar, Z, Z, gl [openloops], [real]
 |     3: 'nlo_eettzz_p1_i3':   e-, e+ => t, tbar, Z, Z [openloops], [virtual]
 |     4: 'nlo_eettzz_p1_i4':   e-, e+ => t, tbar, Z, Z [inactive], [subtraction]
 | ------------------------------------------------------------------------
 | Phase space: 20 channels, 8 dimensions
 | Phase space: found 20 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 20 channels, 11 dimensions
 | Phase space: found 20 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 | Phase space: 20 channels, 8 dimensions
 | Phase space: found 20 channels, collected in 3 groves.
 | Phase space: no equivalences between channels used.
 | Phase space: wood
 Warning: No cuts have been defined.
 | Using user-defined general scale.
 | Starting integration for process 'nlo_eettzz_p1' part 'born'
-| Integrate: iterations = 3:3000:"gw", 2:3000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 20 channels, 8 dimensions
-| Integrator: 3000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2980  3.5031152E-02  2.04E-03    5.81    3.17*   4.42
-   2       2964  3.8002802E-02  1.08E-03    2.84    1.55*   9.75
-   3       2956  3.6010611E-02  7.00E-04    1.94    1.06*  16.92
+   1        180  3.9099082E-02  8.14E-03   20.83    2.79*  16.85
 |-----------------------------------------------------------------------------|
-   3       8900  3.6479781E-02  5.64E-04    1.55    1.46   16.92    1.47   3
-|-----------------------------------------------------------------------------|
-   4       2956  3.7828875E-02  7.30E-04    1.93    1.05*  15.60
-   5       2956  3.7521449E-02  7.35E-04    1.96    1.07   14.26
-|-----------------------------------------------------------------------------|
-   5       5912  3.7676155E-02  5.18E-04    1.38    1.06   14.26    0.09   2
+   1        180  3.9099082E-02  8.14E-03   20.83    2.79   16.85
 |=============================================================================|
 | Starting integration for process 'nlo_eettzz_p1' part 'real'
-| Integrate: iterations = 3:3000:"gw", 2:3000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 20 channels, 11 dimensions
-| Integrator: 3000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2980 -8.3146497E-03  5.97E-04    7.18    3.92*   3.25
-   2       2972 -6.7959193E-03  2.14E-04    3.15    1.72*   9.25
-   3       2960 -7.2207843E-03  1.80E-04    2.50    1.36*  11.20
-|-----------------------------------------------------------------------------|
-   3       8912 -7.1089271E-03  1.34E-04    1.89    1.79   11.20    3.30   3
+   1        180 -9.1336721E-03  1.99E-03   21.78    2.92*  16.95
 |-----------------------------------------------------------------------------|
-   4       2960 -7.3264668E-03  1.80E-04    2.45    1.33*   9.40
-   5       2960 -7.1726251E-03  1.75E-04    2.44    1.33*   8.39
-|-----------------------------------------------------------------------------|
-   5       5920 -7.2477376E-03  1.25E-04    1.73    1.33    8.39    0.38   2
+   1        180 -9.1336721E-03  1.99E-03   21.78    2.92   16.95
 |=============================================================================|
 | Starting integration for process 'nlo_eettzz_p1' part 'virtual'
-| Integrate: iterations = 3:3000:"gw", 2:3000
+| Integrate: iterations = 1:100:"gw"
 | Integrator: 3 chains, 20 channels, 8 dimensions
-| Integrator: 3000 initial calls, 20 bins, stratified = T
+| Integrator: 100 initial calls, 20 bins, stratified = T
 | Integrator: VAMP
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1       2980  9.0399025E-03  5.45E-04    6.03    3.29*   4.15
-   2       2968  9.5627995E-03  2.54E-04    2.65    1.44*  11.91
-   3       2960  9.7384654E-03  2.03E-04    2.09    1.13*  16.34
-|-----------------------------------------------------------------------------|
-   3       8908  9.6206713E-03  1.52E-04    1.58    1.49   16.34    0.76   3
-|-----------------------------------------------------------------------------|
-   4       2960  9.4927554E-03  1.94E-04    2.04    1.11*  14.66
-   5       2960  9.5107478E-03  1.92E-04    2.02    1.10*  13.57
+   1        180  6.7822495E-03  1.35E-03   19.93    2.67*  16.68
 |-----------------------------------------------------------------------------|
-   5       5920  9.5018553E-03  1.36E-04    1.44    1.10   13.57    0.00   2
+   1        180  6.7822495E-03  1.35E-03   19.93    2.67   16.68
 |=============================================================================|
 | Integrate: sum of all components
 |=============================================================================|
 | It      Calls  Integral[fb]  Error[fb]   Err[%]    Acc  Eff[%]   Chi2 N[It] |
 |=============================================================================|
-   1          0  3.9930272E-02  5.50E-04    1.38    0.00*  11.95
+   1          0  3.6747659E-02  8.49E-03   23.11    0.00*  13.47
 | NLO Correction: [O(alpha_s+1)/O(alpha_s)]
-|  (  5.9829 +-   0.49868 ) %
+|  ( -6.0140 +-   6.27729 ) %
 |=============================================================================|
-| There were no errors and    1 warning(s).
+| There were no errors and    4 warning(s).
 | WHIZARD run finished.
 |=============================================================================|
Index: trunk/share/tests/ext_tests_nlo/nlo_eettaj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettaj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettaj.sin	(revision 8289)
@@ -1,31 +1,21 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 1
 
 real theta_0 = 0.7
 ?openloops_use_cms = false
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
        and all abs(Pt) > 20 GeV [A] and all abs(Eta) < 2 [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
       +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
       + eval Pt [extract index 1 [A]] + eval Pt [extract index 1[jet]]) / 2
 
-process nlo_eettaj = e1, E1 => t, T, A, jet { nlo_calculation = full }
-integrate (nlo_eettaj) { iterations = 10:50000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_eettaj_p1 = e1, E1 => t, T, A, jet { nlo_calculation = full }
+integrate (nlo_eettaj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettwjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettwjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettwjj.sin	(revision 8289)
@@ -1,33 +1,33 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 2
 
 alias W = Wp:Wm
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [W]]**2 + eval M [extract index 1 [W]]**2)
-       + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
- 
-process nlo_eettwjj_p1 = e1, E1 => t, T, W, jet, jet { nlo_calculation = full }
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [W]]**2 + eval M [extract index 1 [W]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
+        elsif njet == 3 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [W]]**2 + eval M [extract index 1 [W]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+        endif
 
-#integrate (nlo_eettwjj_p1) { iterations = 10:50000:"gw",2:10000 } # validation
-mult_call_real = 3
-integrate (nlo_eettwjj_p1) { iterations = 3:8000:"gw",3:8000 }
+#?combined_nlo_integration = true
+mult_call_real = 2
+process nlo_eettwjj_p1 = e1, E1 => t, T, W, jet, jet { nlo_calculation = full }
+integrate (nlo_eettwjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eejj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eejj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eejj.sin	(revision 8289)
@@ -1,36 +1,24 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2
 
-scale = let int njet = count [jet] in
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
         if njet == 2 then
-           (eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
-        else
-           (eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]
-           +eval Pt [extract index 3 [jet]]) / 2
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]) / 2
+        elsif njet == 3 then
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]) / 2
         endif
 
 alpha_power = 2
 alphas_power = 0
 
 #?combined_nlo_integration = true
 process nlo_eejj_p1 = e1, E1 => jet, jet { nlo_calculation = full }
-
-mult_call_real = 2
-
-#integrate (nlo_eejj_p1) { iterations = 5:50000:"gw",2:20000 } # validation
-integrate (nlo_eejj_p1) { iterations = 5:5000:"gw",2:2000 }
+integrate (nlo_eejj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_ee4b.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_ee4b.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_ee4b.sin	(revision 8289)
@@ -1,33 +1,21 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alias bjet = b:B
 
 cuts = all Pt > 30 GeV [bjet] and all abs(Eta) < 4 [bjet]
        and count [cluster if E > 0 GeV [bjet]] > 3
 
 alpha_power = 2
 alphas_power = 2
 
 alphas_nf = 4
 mb = 4.75
 
 scale = (sqrt (eval Pt [extract index 1 [b]]**2 + eval M [extract index 1 [b]]**2)
       +  sqrt (eval Pt [extract index 2 [b]]**2 + eval M [extract index 2 [b]]**2)
       +  sqrt (eval Pt [extract index 1 [B]]**2 + eval M [extract index 1 [B]]**2)
       +  sqrt (eval Pt [extract index 2 [B]]**2 + eval M [extract index 2 [B]]**2)) / 2
 
-process nlo_ee4b = e1, E1 => b, B, b, B { nlo_calculation = full }
-mult_call_real = 2
-mult_call_virt = 0.1
-integrate (nlo_ee4b) { iterations = 10:20000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_ee4b_p1 = e1, E1 => b, B, b, B { nlo_calculation = full }
+integrate (nlo_ee4b_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettzjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettzjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettzjj.sin	(revision 8289)
@@ -1,30 +1,30 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 2
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
-       + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
-
-mult_call_virt = 0.1
-process nlo_eettzjj = e1, E1 => t, T, Z, jet, jet { nlo_calculation = full }
-
-integrate (nlo_eettzjj) { iterations = 10:50000:"gw",2:10000 }
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
+        elsif njet == 3 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+        endif
+
+#?combined_nlo_integration = true
+process nlo_eettzjj_p1 = e1, E1 => t, T, Z, jet, jet {nlo_calculation = full }
+integrate (nlo_eettzjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eebbjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eebbjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eebbjj.sin	(revision 8289)
@@ -1,29 +1,19 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 2
 
 alias jet = u:U:d:D:s:S:c:C:gl
 alias bjet = b:B:gl
 
 cuts = all abs(Pt) > 30 GeV [jet] and all abs(Eta) < 4 [jet]
        and count [cluster if E > 0 GeV [jet]] > 0
        and all abs(Pt) > 30 GeV [bjet] and all abs(Eta) < 4 [bjet]
        and count [cluster if E > 0 GeV [bjet]] > 1
 
 scale = (eval Pt [extract index 1 [b]] + eval Pt [extract index 1 [B]]
        + eval Pt [extract index 1 [jet]]) / 2
 
-process nlo_eebbjj = e1, E1 => b, B, u, U { nlo_calculation = full }
-integrate (nlo_eebbjj) { iterations = 10:100000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_eebbjj_p1 = e1, E1 => b, B, u, U { nlo_calculation = full }
+integrate (nlo_eebbjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettzz.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettzz.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettzz.sin	(revision 8289)
@@ -1,25 +1,23 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
-       + sqrt (eval Pt [extract index 2 [Z]]**2 + eval M [extract index 2 [Z]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + sqrt (eval Pt [extract index 2 [Z]]**2 + eval M [extract index 2 [Z]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + sqrt (eval Pt [extract index 2 [Z]]**2 + eval M [extract index 2 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eettzz_p1 = e1, E1 => t, T, Z, Z { nlo_calculation = full }
-
-#integrate (nlo_eettzz_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eettzz_p1) { iterations = 3:3000:"gw",2:3000 }
+integrate (nlo_eettzz_p1) { iterations = 1:200:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_ee4j.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_ee4j.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_ee4j.sin	(revision 8289)
@@ -1,39 +1,28 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 4
 
 scale = let subevt @clustered_jets = cluster [jet] in
-        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
-        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
-        let int njet = count [@eta_selected] in
+        let int njet = count [@clustered_jets] in
         if njet == 4 then
-          (eval Pt [extract index 1 [@eta_selected]] + eval Pt [extract index 2 [@eta_selected]]
-          + eval Pt [extract index 3 [@eta_selected]] + eval Pt [extract index 4 [@eta_selected]]) / 2
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]
+           + eval Pt [extract index 4 [@clustered_jets]]) / 2
         elsif njet == 5 then
-          ( eval Pt [extract index 1 [@eta_selected]] + eval Pt [extract index 2 [@eta_selected]]
-          + eval Pt [extract index 3 [@eta_selected]] + eval Pt [extract index 4 [@eta_selected]]
-          + eval Pt [extract index 5 [@eta_selected]]) / 2
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]
+           + eval Pt [extract index 4 [@clustered_jets]]
+           + eval Pt [extract index 5 [@clustered_jets]]) / 2
         endif
 
 alpha_power = 2
 alphas_power = 2
-?nlo_use_born_scale = false
-?nlo_cut_all_sqmes = false
-process nlo_ee4j = e1, E1 => jet, jet, jet, jet { nlo_calculation = full }
-mult_call_real = 3
 
-integrate (nlo_ee4j) {iterations = 10:50000:"gw"}
+#?combined_nlo_integration = true
+process nlo_ee4j_p1 = e1, E1 => jet, jet, jet, jet { nlo_calculation = full $restrictions = "!W+:W-" }
+integrate (nlo_ee4j_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eejjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eejjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eejjj.sin	(revision 8289)
@@ -1,52 +1,26 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
-# seed = 12334
-
-# alias jet = u:U:gl
-
-# $exclude_gauge_splittings = "u:d:s:c:b:t"
-
-cuts = let int njet = count [jet] in
-       let subevt @clustered_jets = cluster [jet] in
+cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 3
 
-alpha_power = 2
-alphas_power = 1
-
 scale = let subevt @clustered_jets = cluster [jet] in
         let int njet = count [@clustered_jets] in
         if njet == 3 then
-          ( eval Pt [extract index 1 [@clustered_jets]] + eval Pt [extract index 2 [@clustered_jets]]
-          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]) / 2
         elsif njet == 4 then
-          ( eval Pt [extract index 1 [@clustered_jets]] + eval Pt [extract index 2 [@clustered_jets]]
-          + eval Pt [extract index 3 [@clustered_jets]] + eval Pt [extract index 4 [@clustered_jets]]) / 2
-        else
-          sqrts
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]
+           + eval Pt [extract index 4 [@clustered_jets]]) / 2
         endif
 
-?nlo_cut_all_sqmes = false
-?nlo_use_born_scale = false
-
-?test_soft_limit = false
-?test_coll_limit = false
+alpha_power = 2
+alphas_power = 1
 
-?combined_nlo_integration = true
-process nlo_eejjj = e1, E1 => jet, jet, jet { nlo_calculation = full }
-# mult_call_real = 2
-integrate (nlo_eejjj) { iterations = 10:100000:"gw", 3:60000}
-# $select_alpha_regions = "4,5,6,14,15,16,28,29,30,34,35,36,38,39,40"
-# $select_alpha_regions = "1"
+#?combined_nlo_integration = true
+process nlo_eejjj_p1 = e1, E1 => jet, jet, jet { nlo_calculation = full }
+integrate (nlo_eejjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettaz.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettaz.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettaz.sin	(revision 8289)
@@ -1,32 +1,19 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
 real theta_0 = 0.7
 alias tops = t:T
 
 !!! No jets -> No photon isolation. Just use the Pt and Eta cuts on the photon
 cuts = all abs(Pt) > 20 GeV [A] and all abs(Eta) < 2 [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
        + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
        + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
        + eval Pt [extract index 1 [A]]) / 2
 
+#?combined_nlo_integration = true
 process nlo_eettaz_p1 = e1, E1 => t, T, Z, A { nlo_calculation = full }
-
-#integrate (nlo_eettaz_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-mult_call_real = 2
-integrate (nlo_eettaz_p1) { iterations = 4:4000:"gw",2:5000 }
+integrate (nlo_eettaz_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_settings.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_settings.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_settings.sin	(revision 8289)
@@ -1,41 +1,53 @@
+?logging = true
+?openmp_logging = false
+?vis_history = false
+?integration_timer = false
+openmp_num_threads = 1
+sample_format = debug
+?debug_decay = false
+?debug_process = false
+?debug_verbose = false
+?write_raw = false
+
 model = SM ("GF_MW_MZ")
 $blha_ew_scheme = "alpha_qed"
 
 mZ = 91.188
 mW = 80.419002
 mH = 125.0
 GF = 1.16639E-5
 wZ = 0.0
 wtop = 0.0
 wW = 0.0
 wH = 0.0
 
 ms = 0
 mc = 0
 mb = 0
 mtop = 173.2
 
 me = 0
 mmu = 0
 mtau = 1.777
 
 alphas = 0.118
 
 ?alphas_is_fixed = false
 ?alphas_from_mz = true
 ?alphas_from_lambda_qcd = false
 alphas_nf = 5
 alphas_order = 2
 
 alias jet = u:U:d:D:s:S:c:C:b:B:gl
+$exclude_gauge_splittings = "t"
 
 $method = "openloops"
 
 seed = 8131
 sqrts = 1 TeV
 scale = sqrts
 
 jet_algorithm = antikt_algorithm
 jet_r = 0.5
 
 ?use_vamp_equivalences = false
Index: trunk/share/tests/ext_tests_nlo/nlo_ee4t.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_ee4t.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_ee4t.sin	(revision 8289)
@@ -1,29 +1,23 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 2
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-      +  sqrt (eval Pt [extract index 2 [t]]**2 + eval M [extract index 2 [t]]**2)
-      +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-      +  sqrt (eval Pt [extract index 2 [T]]**2 + eval M [extract index 2 [T]]**2)) / 2
-
-?combined_nlo_integration = true
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+           +  sqrt (eval Pt [extract index 2 [t]]**2 + eval M [extract index 2 [t]]**2)
+           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+           +  sqrt (eval Pt [extract index 2 [T]]**2 + eval M [extract index 2 [T]]**2)) / 2
+        elsif njet == 1 then
+           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+           +  sqrt (eval Pt [extract index 2 [t]]**2 + eval M [extract index 2 [t]]**2)
+           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+           +  sqrt (eval Pt [extract index 2 [T]]**2 + eval M [extract index 2 [T]]**2)
+           + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_ee4t_p1 = e1, E1 => t, T, t, T { nlo_calculation = full }
-
-mult_call_real = 5
-# integrate (nlo_ee4t_p1) { iterations = 10:5000:"gw",2:20000 } # validation
-
-integrate (nlo_ee4t_p1) { iterations = 4:2000:"gw",1:4000 }
+integrate (nlo_ee4t_p1) { iterations = 1:160:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eett.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eett.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eett.sin	(revision 8289)
@@ -1,24 +1,19 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eett_p1 = e1, E1 => t, T { nlo_calculation = full }
-
-#integrate (nlo_eett_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eett_p1) { iterations = 5:5000:"gw",2:5000 }
-
+integrate (nlo_eett_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eetta.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetta.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetta.sin	(revision 8289)
@@ -1,30 +1,18 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 0
 
 real R_0 = 0.7
 alias tops = t:T
 
 !!! No jets -> No photon isolation. Just use the Pt and Eta cuts on the photon
 cuts = all abs(Pt) > 20 GeV [A] and all abs(Eta) < 2 [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
       +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
       + eval Pt [extract index 1 [A]]) / 2
 
+#?combined_nlo_integration = true
 process nlo_eetta_p1 = e1, E1 => t, T, A { nlo_calculation = full }
-
-#integrate (nlo_eetta_p1) { iterations = 10:50000:"gw",2:20000 } # validation
-integrate (nlo_eetta_p1) { iterations = 8:5000:"gw",2:2000 }
+integrate (nlo_eetta_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettbb.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettbb.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettbb.sin	(revision 8289)
@@ -1,45 +1,34 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alias bjet = b:B:gl
 
 cuts = let subevt @clustered_bjets = cluster [bjet] in
        let subevt @pt_selected_b = select if Pt > 30 GeV [@clustered_bjets] in
        let subevt @eta_selected_b = select if abs(Eta) < 4 [@pt_selected_b] in
        count [@eta_selected_b] >= 2
 
 mb = 4.75
 alphas_nf = 4
 
 
 alpha_power = 2
 alphas_power = 2
 
 scale = if count[gl] == 0 then
   (  sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
   +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
   +  sqrt (eval Pt [extract index 1 [b]]**2 + eval M [extract index 1 [b]]**2)
   +  sqrt (eval Pt [extract index 1 [B]]**2 + eval M [extract index 1 [B]]**2)) / 2
 elsif count[gl] > 0 then
   (  sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
   +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
   +  sqrt (eval Pt [extract index 1 [b]]**2 + eval M [extract index 1 [b]]**2)
   +  sqrt (eval Pt [extract index 1 [B]]**2 + eval M [extract index 1 [B]]**2)
   +  eval Pt [extract index 1 [gl]] ) / 2
 endif
 
 $exclude_gauge_splittings = "b:t"
 
-process nlo_eettbb = e1, E1 => t, T, b, B { nlo_calculation = full }
-mult_call_real = 5
-integrate (nlo_eettbb) { iterations = 10:50000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_eettbb_p1 = e1, E1 => t, T, b, B { nlo_calculation = full }
+integrate (nlo_eettbb_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eetth.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetth.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetth.sin	(revision 8289)
@@ -1,24 +1,21 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eetth_p1 = e1, E1 => t, T, H { nlo_calculation = full }
-
-#integrate (nlo_eetth_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eetth_p1) { iterations = 5:5000:"gw",2:5000 }
+integrate (nlo_eetth_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettj.sin	(revision 8289)
@@ -1,41 +1,26 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 1
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
 
-$exclude_gauge_splittings = "t:T"
-
-scale = let int njet = count [jet] in
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
         if njet == 1 then
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           + eval Pt [extract index 1 [jet]]) / 2
-        else
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        elsif njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
         endif
 
-?nlo_use_real_partition = true
-real_partition_scale = 5 GeV
-
-process nlo_eettj_p1 = e1, E1 => t, T, gl { nlo_calculation = full }
-
-#integrate (nlo_eettj_p1) { iterations = 10:250000:"gw",5:250000 } # validation
-integrate (nlo_eettj_p1) { iterations = 4:20000:"gw",3:20000 }
+#?combined_nlo_integration = true
+process nlo_eettj_p1 = e1, E1 => t, T, jet { nlo_calculation = full }
+integrate (nlo_eettj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_ee4tj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_ee4tj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_ee4tj.sin	(revision 8289)
@@ -1,41 +1,30 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 3
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
 
-scale = let int njet = count [jet] in
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
         if njet == 1 then
            (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
            +  sqrt (eval Pt [extract index 2 [t]]**2 + eval M [extract index 2 [t]]**2)
            +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
            +  sqrt (eval Pt [extract index 2 [T]]**2 + eval M [extract index 2 [T]]**2)
-           + eval Pt [extract index 1 [jet]]) / 2
-        else
+           + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        elsif njet == 2 then
            (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
            +  sqrt (eval Pt [extract index 2 [t]]**2 + eval M [extract index 2 [t]]**2)
            +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
            +  sqrt (eval Pt [extract index 2 [T]]**2 + eval M [extract index 2 [T]]**2)
-           + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
+           + eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]) / 2
         endif
 
-
-?combined_nlo_integration = true
-mult_call_virt = 0.2
-process nlo_ee4tj = e1, E1 => t, T, t, T, jet { nlo_calculation = full }
-integrate (nlo_4tj) { iterations = 10:50000:"gw",2:20000 }
+#?combined_nlo_integration = true
+process nlo_ee4tj_p1 = e1, E1 => t, T, t, T, jet { nlo_calculation = full }
+integrate (nlo_ee4tj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettww.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettww.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettww.sin	(revision 8289)
@@ -1,26 +1,23 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-      +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-      +  sqrt (eval Pt [extract index 1 [Wp]]**2 + eval M [extract index 1 [Wp]]**2)
-      +  sqrt (eval Pt [extract index 1 [Wm]]**2 + eval M [extract index 1 [Wm]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Wp]]**2 + eval M [extract index 1 [Wp]]**2)
+          + sqrt (eval Pt [extract index 1 [Wm]]**2 + eval M [extract index 1 [Wm]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Wp]]**2 + eval M [extract index 1 [Wp]]**2)
+          + sqrt (eval Pt [extract index 1 [Wm]]**2 + eval M [extract index 1 [Wm]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eettww_p1 = e1, E1 => t, T, Wp, Wm { nlo_calculation = full }
-
-mult_call_real = 2
-#integrate (nlo_eettww_p1) { iterations = 10:5000:"gw",2:20000 } # validation
-integrate (nlo_eettww_p1) { iterations = 3:4000:"gw",2:4000 }
+integrate (nlo_eettww_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eetthh.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetthh.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetthh.sin	(revision 8289)
@@ -1,25 +1,23 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 4
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
-       + sqrt (eval Pt [extract index 2 [H]]**2 + eval M [extract index 2 [H]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + sqrt (eval Pt [extract index 2 [H]]**2 + eval M [extract index 2 [H]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + sqrt (eval Pt [extract index 2 [H]]**2 + eval M [extract index 2 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eetthh_p1 = e1, E1 => t, T, H, H { nlo_calculation = full }
-
-#integrate (nlo_eetthh_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eetthh_p1) { iterations = 4:4000:"gw",2:4000 }
+integrate (nlo_eetthh_p1) { iterations = 1:120:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eetthj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetthj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetthj.sin	(revision 8289)
@@ -1,42 +1,28 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 1
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 1
 
-$exclude_gauge_splittings = "t"
-
-scale = let int njet = count [jet] in
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
         if njet == 1 then
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           +  sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
-           + eval Pt [extract index 1 [jet]]) / 2
-        else
-           (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-           +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-           +  sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
-           + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        elsif njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
         endif
 
-?nlo_use_real_partition = true
-real_partition_scale = 5 GeV
-
+#?combined_nlo_integration = true
 process nlo_eetthj_p1 = e1, E1 => t, T, H, jet {nlo_calculation = full }
-#integrate (nlo_eetthj_p1) { iterations = 10:100000:"gw",2:20000 } # validation
-integrate (nlo_eetthj_p1) { iterations = 3:10000:"gw",3:5000 }
+integrate (nlo_eetthj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettjj.sin	(revision 8289)
@@ -1,31 +1,28 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
-
 alpha_power = 2
 alphas_power = 2
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2
 
-$exclude_gauge_splittings = "t:T"
-
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-      +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-      + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
-
-?combined_nlo_integration = true
-process nlo_eettjj = e1, E1 => t, T, jet, jet { nlo_calculation = full }
-integrate (nlo_eettjj) { iterations = 10:10000:"gw",2:10000 }
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
+        elsif njet == 3 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+        endif
+
+#?combined_nlo_integration = true
+process nlo_eettjj_p1 = e1, E1 => t, T, jet, jet { nlo_calculation = full }
+integrate (nlo_eettjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettajj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettajj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettajj.sin	(revision 8289)
@@ -1,30 +1,20 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 2
 
 real theta_0 = 0.7
 alias tops = t:T
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2 and all abs(Eta) < 2 [A] and all Pt > 20 GeV [A]
 
 scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
       +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
       + eval Pt [extract index 1 [A]] + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
 
-process nlo_eettajj = e1, E1 => t, T, A, jet, jet { nlo_calculation = full }
-integrate (nlo_eettajj) { iterations = 10:200000:"gw",2:100000 }
+#?combined_nlo_integration = true
+process nlo_eettajj_p1 = e1, E1 => t, T, A, jet, jet { nlo_calculation = full }
+integrate (nlo_eettajj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_ee5j.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_ee5j.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_ee5j.sin	(revision 8289)
@@ -1,37 +1,30 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
+include("nlo_settings.sin")
 
-include ("nlo_settings.sin")
-
-cuts = let subevt @clustered_jets = cluster if E > 0 GeV [jet] in
+cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 5
 
-scale = let int njet = count [jet] in
-      if njet == 5 then
-         (eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]
-         + eval Pt [extract index 3 [jet]] + eval Pt [extract index 4 [jet]]
-         + eval Pt [extract index 5 [jet]]) / 2
-      else
-         (eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]
-         + eval Pt [extract index 3 [jet]] + eval Pt [extract index 4 [jet]]
-         + eval Pt [extract index 5 [jet]] + eval Pt [extract index 6 [jet]]) / 2
-      endif
-
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 5 then
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]
+           + eval Pt [extract index 4 [@clustered_jets]]
+           + eval Pt [extract index 5 [@clustered_jets]]) / 2
+        elsif njet == 6 then
+           ( eval Pt [extract index 1 [@clustered_jets]]
+           + eval Pt [extract index 2 [@clustered_jets]]
+           + eval Pt [extract index 3 [@clustered_jets]]
+           + eval Pt [extract index 4 [@clustered_jets]]
+           + eval Pt [extract index 5 [@clustered_jets]]
+           + eval Pt [extract index 6 [@clustered_jets]]) / 2
+        endif
 
 alpha_power = 2
 alphas_power = 3
-process nlo_ee5j = e1, E1 => jet, jet, jet, jet, jet { nlo_calculation = full }
-mult_call_real = 2
-mult_call_virt = 0.5
 
-integrate (nlo_ee5j) { iterations = 10:100000:"gw", 5:50000}
+#?combined_nlo_integration = true
+process nlo_ee5j_p1 = e1, E1 => jet, jet, jet, jet, jet { nlo_calculation = full $restrictions = "!W+:W-" }
+integrate (nlo_ee5j_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettz.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettz.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettz.sin	(revision 8289)
@@ -1,24 +1,21 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 3
 alphas_power = 0
 
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-       + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-       + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)) / 2
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 0 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)) / 2
+        elsif njet == 1 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [Z]]**2 + eval M [extract index 1 [Z]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]) / 2
+        endif
 
+#?combined_nlo_integration = true
 process nlo_eettz_p1 = e1, E1 => t, T, Z { nlo_calculation = full }
-
-#integrate (nlo_eettz_p1) { iterations = 5:10000:"gw",2:10000 } # validation
-integrate (nlo_eettz_p1) { iterations = 3:7500:"gw",2:7500 }
+integrate (nlo_eettz_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eetthjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eetthjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eetthjj.sin	(revision 8289)
@@ -1,31 +1,30 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
-
 alpha_power = 3
 alphas_power = 2
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 2
 
-$exclude_gauge_splittings = "t"
-
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-      +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-      +  sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
-      + eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]) / 2
-
-process nlo_eetthjj = e1, E1 => t, T, H, jet, jet {nlo_calculation = full }
-integrate (nlo_eetthjj) { iterations = 10:50000:"gw",2:20000 }
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 2 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]) / 2
+        elsif njet == 3 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + sqrt (eval Pt [extract index 1 [H]]**2 + eval M [extract index 1 [H]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+        endif
+
+#?combined_nlo_integration = true
+process nlo_eetthjj_p1 = e1, E1 => t, T, H, jet, jet {nlo_calculation = full }
+integrate (nlo_eetthjj_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eebb.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eebb.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eebb.sin	(revision 8289)
@@ -1,37 +1,25 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include("nlo_settings.sin")
 
 alpha_power = 2
 alphas_power = 0
 
 alphas_nf = 4
 mb = 4.75
 alias jet = u:U:d:D:s:S:c:C:gl
 
 $exclude_gauge_splittings = "t:b"
 ?combined_nlo_integration = true
 
 scale = let int njet = count [jet] in
         if njet == 0 then
            (sqrt (eval Pt [extract index 1 [b]]**2 + eval M [extract index 1 [b]]**2)
           + sqrt (eval Pt [extract index 1 [B]]**2 + eval M [extract index 1 [B]]**2)) / 2
         else
            (sqrt (eval Pt [extract index 1 [b]]**2 + eval M [extract index 1 [b]]**2)
           + sqrt (eval Pt [extract index 1 [B]]**2 + eval M [extract index 1 [B]]**2)
           + eval Pt [extract index 1 [jet]]) / 2
         endif
 
+#?combined_nlo_integration = true
 process nlo_eebb_p1 = e1, E1 => b, B { nlo_calculation = full }
-
-#integrate (nlo_eebb_p1) { iterations = 5:20000:"gw",2:10000 } # validation
-integrate (nlo_eebb_p1) { iterations = 5:2000:"gw",2:1000 }
+integrate (nlo_eebb_p1) { iterations = 1:100:"gw" }
Index: trunk/share/tests/ext_tests_nlo/nlo_eettjjj.sin
===================================================================
--- trunk/share/tests/ext_tests_nlo/nlo_eettjjj.sin	(revision 8288)
+++ trunk/share/tests/ext_tests_nlo/nlo_eettjjj.sin	(revision 8289)
@@ -1,32 +1,30 @@
-?logging = true
-?openmp_logging = false
-?vis_history = false
-?integration_timer = false
-openmp_num_threads = 1
-sample_format = debug
-?debug_decay = false
-?debug_process = false
-?debug_verbose = false
-?write_raw = false
-
 include ("nlo_settings.sin")
 
-
 alpha_power = 2
 alphas_power = 3
 
 cuts = let subevt @clustered_jets = cluster [jet] in
        let subevt @pt_selected = select if Pt > 30 GeV [@clustered_jets] in
        let subevt @eta_selected = select if abs(Eta) < 4 [@pt_selected] in
        count [@eta_selected] >= 3
 
-$exclude_gauge_splittings = "t:T"
-
-scale = (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
-      +  sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
-      +  eval Pt [extract index 1 [jet]] + eval Pt [extract index 2 [jet]]
-      +  eval Pt [extract index 3 [jet]]) / 2
-
-?combined_nlo_integration = true
-process nlo_eettjjj = e1, E1 => t, T, jet, jet, jet { nlo_calculation = full }
-integrate (nlo_eettjjj) { iterations = 10:50000:"gw",2:20000 }
+scale = let subevt @clustered_jets = cluster [jet] in
+        let int njet = count [@clustered_jets] in
+        if njet == 3 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]) / 2
+        elsif njet == 4 then
+          (sqrt (eval Pt [extract index 1 [t]]**2 + eval M [extract index 1 [t]]**2)
+          + sqrt (eval Pt [extract index 1 [T]]**2 + eval M [extract index 1 [T]]**2)
+          + eval Pt [extract index 1 [@clustered_jets]]
+          + eval Pt [extract index 2 [@clustered_jets]]
+          + eval Pt [extract index 3 [@clustered_jets]]
+          + eval Pt [extract index 4 [@clustered_jets]]) / 2
+        endif
+
+#?combined_nlo_integration = true
+process nlo_eettjjj_p1 = e1, E1 => t, T, jet, jet, jet { nlo_calculation = full }
+integrate (nlo_eettjjj_p1) { iterations = 1:100:"gw" }
Index: trunk/tests/ext_tests_nlo/nlo_eettzjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettzjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettzjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttzjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettww.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettww.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettww.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttWW at NLO
 # time ~ 10 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetthh.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetthh.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetthh.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tthh at NLO
 # time ~ 3min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetthj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetthj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetthj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tthj at NLO
 # time ~ 7 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettajj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettajj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettajj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttajj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eejjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eejjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eejjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> jjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettaz.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettaz.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettaz.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttaz at NLO
 # time ~ 10 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eebb.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eebb.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eebb.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> bb at NLO
 # time < 1 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetthz.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetthz.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetthz.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tthz at NLO
 # time ~ 8 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettaa.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettaa.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettaa.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttaa at NLO
 # time ~ 6 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettzj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettzj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettzj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttZj at NLO
 # time ~ 13 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetth.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetth.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetth.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tth at NLO
 # time ~ 1min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttj at NLO
 # time ~ 8 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_ee4tj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_ee4tj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_ee4tj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttttj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettwjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettwjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettwjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttWjj at NLO
 # time ~ 45 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eejj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eejj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eejj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> jj at NLO
 # time ~ 1 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_ee4b.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_ee4b.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_ee4b.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> bbbb at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eebbjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eebbjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eebbjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> bbjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettzz.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettzz.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettzz.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttZZ at NLO
 # time ~ 10 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_ee4j.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_ee4j.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_ee4j.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> jjjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/Makefile.am
===================================================================
--- trunk/tests/ext_tests_nlo/Makefile.am	(revision 8288)
+++ trunk/tests/ext_tests_nlo/Makefile.am	(revision 8289)
@@ -1,308 +1,305 @@
 ## Makefile.am -- Makefile for executable WHIZARD test scripts
 ##
 ## Process this file with automake to produce Makefile.in
 ##
 ########################################################################
 #
 # Copyright (C) 1999-2019 by
 #     Wolfgang Kilian <kilian@physik.uni-siegen.de>
 #     Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
 #     Juergen Reuter <juergen.reuter@desy.de>
 #     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
 # 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
 
 TESTS_EXTENDED = \
 	nlo_decay_tbw.run \
 	nlo_ee4b.run \
 	nlo_ee4j.run \
 	nlo_ee4t.run \
 	nlo_ee4tj.run \
 	nlo_ee5j.run \
 	nlo_eebb.run \
 	nlo_eebbj.run \
 	nlo_eebbjj.run \
 	nlo_eejj.run \
 	nlo_eejjj.run \
 	nlo_eett.run \
 	nlo_eetta.run \
 	nlo_eettaa.run \
 	nlo_eettah.run \
 	nlo_eettaj.run \
 	nlo_eettajj.run \
 	nlo_eettaz.run \
 	nlo_eettbb.run \
 	nlo_eetth.run \
 	nlo_eetthh.run \
 	nlo_eetthj.run \
 	nlo_eetthjj.run \
 	nlo_eetthz.run \
 	nlo_eettj.run \
 	nlo_eettjj.run \
 	nlo_eettjjj.run \
 	nlo_eettwjj.run \
 	nlo_eettww.run \
 	nlo_eettz.run \
 	nlo_eettzj.run \
 	nlo_eettzjj.run \
 	nlo_eettzz.run \
 	nlo_fks_delta_o_eejj.run \
 	nlo_fks_delta_i_ppee.run \
 	nlo_jets.run \
 	nlo_methods_gosam.run \
 	nlo_qq_powheg.run \
 	nlo_threshold_factorized.run \
 	nlo_threshold.run \
 	nlo_tt_powheg_sudakov.run \
 	nlo_tt_powheg.run \
 	nlo_tt.run \
 	nlo_uu_powheg.run \
 	nlo_uu.run
 
 XFAIL_TESTS_EXTENDED = \
 	nlo_ee4b.run \
-	nlo_ee4j.run \
-	nlo_ee4tj.run \
-	nlo_ee5j.run \
+	nlo_eebb.run \
 	nlo_eebbj.run \
 	nlo_eebbjj.run \
-	nlo_eejjj.run \
+	nlo_eetta.run \
+	nlo_eettaa.run \
+	nlo_eettah.run \
 	nlo_eettaj.run \
 	nlo_eettajj.run \
-	nlo_eettbb.run \
-	nlo_eetthjj.run \
-	nlo_eettjj.run \
-	nlo_eettjjj.run \
-	nlo_eettzjj.run
+	nlo_eettaz.run \
+	nlo_eettbb.run
 
 TESTS_REQ_GAMELAN = \
 	nlo_tt_powheg.run \
 	nlo_uu_powheg.run
 
 TEST_DRIVERS_RUN = \
     $(TESTS_EXTENDED)
 
 TEST_DRIVERS_SH = $(TEST_DRIVERS_RUN:.run=.sh)
 
 ########################################################################
 
 TESTS = $(TESTS_EXTENDED)
 XFAIL_TESTS = $(XFAIL_TESTS_EXTENDED)
 
 EXTRA_DIST = $(TEST_DRIVERS_SH)
 
 ########################################################################
 
 VPATH = $(srcdir)
 
 SUFFIXES = .sh .run
 
 .sh.run:
 	@rm -f $@
 	@if test -f $(top_builddir)/share/tests/ext_tests_nlo/$*.sin; then \
 	  $(SED) 's|@script@|$(top_builddir)/share/tests/ext_tests_nlo/$*|g' $< > $@; \
 	elif test -f $(top_srcdir)/share/tests/ext_tests_nlo/$*.sin; then \
 	  $(SED) 's|@script@|$(top_srcdir)/share/tests/ext_tests_nlo/$*|g' $< > $@; \
 	fi
 	$(SED) 's|@python_bin@|$(PYTHON_BIN)|g' $@ >> "$@.tmp" && mv "$@.tmp" $@
 	$(SED) 's|@share_dir@|$(top_srcdir)/share/tests|g' $@ >> "$@.tmp" && mv "$@.tmp" $@
 	@chmod +x $@
 
 nlo_eejj.run: nlo_settings.sin
 nlo_eejjj.run: nlo_settings.sin
 nlo_ee4j.run: nlo_settings.sin
 nlo_ee5j.run: nlo_settings.sin
 nlo_eebb.run: nlo_settings.sin
 nlo_eebbj.run: nlo_settings.sin
 nlo_eebbjj.run: nlo_settings.sin
 nlo_ee4b.run: nlo_settings.sin
 nlo_eett.run: nlo_settings.sin
 nlo_eettj.run: nlo_settings.sin
 nlo_eettjj.run: nlo_settings.sin
 nlo_eettjjj.run: nlo_settings.sin
 nlo_eettbb.run: nlo_settings.sin
 nlo_eetta.run: nlo_settings.sin
 nlo_eettaa.run: nlo_settings.sin
 nlo_eettaj.run: nlo_settings.sin
 nlo_eettajj.run: nlo_settings.sin
 nlo_eettah.run: nlo_settings.sin
 nlo_eettaz.run: nlo_settings.sin
 nlo_eettz.run: nlo_settings.sin
 nlo_eettzj.run: nlo_settings.sin
 nlo_eettzjj.run: nlo_settings.sin
 nlo_eettzz.run: nlo_settings.sin
 nlo_eettwjj.run: nlo_settings.sin
 nlo_eettww.run: nlo_settings.sin
 nlo_eetth.run: nlo_settings.sin
 nlo_eetthj.run: nlo_settings.sin
 nlo_eetthjj.run: nlo_settings.sin
 nlo_eetthh.run: nlo_settings.sin
 nlo_eetthz.run: nlo_settings.sin
 nlo_ee4t.run: nlo_settings.sin
 nlo_ee4tj.run: nlo_settings.sin
 nlo_settings.sin: $(top_builddir)/share/tests/ext_tests_nlo/nlo_settings.sin
 	cp $< $@
 
 if MPOST_AVAILABLE
 $(TESTS_REQ_GAMELAN): gamelan.sty
 $(UNIT_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
 
 BUILT_SOURCES = \
     TESTFLAG  \
     HEPMC_FLAG \
     LCIO_FLAG \
     FASTJET_FLAG \
     LHAPDF5_FLAG \
     LHAPDF6_FLAG \
     GAMELAN_FLAG \
     EVENT_ANALYSIS_FLAG \
     OCAML_FLAG \
     PYTHON_FLAG \
     PYTHIA6_FLAG \
     OPENLOOPS_FLAG \
     GOSAM_FLAG \
     STATIC_FLAG \
     ref-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 $@
 
 FASTJET_FLAG:
 if FASTJET_AVAILABLE
 	touch $@
 endif
 
 HEPMC_FLAG:
 if HEPMC_AVAILABLE
 	touch $@
 endif
 
 LCIO_FLAG:
 if LCIO_AVAILABLE
 	touch $@
 endif
 
 LHAPDF5_FLAG:
 if LHAPDF5_AVAILABLE
 	touch $@
 endif
 
 LHAPDF6_FLAG:
 if LHAPDF6_AVAILABLE
 	touch $@
 endif
 
 GAMELAN_FLAG:
 if MPOST_AVAILABLE
 	touch $@
 endif
 
 OCAML_FLAG:
 if OCAML_AVAILABLE
 	touch $@
 endif
 
 PYTHON_FLAG:
 if PYTHON_AVAILABLE
 	touch $@
 endif
 
 PYTHIA6_FLAG:
 if PYTHIA6_AVAILABLE
 	touch $@
 endif
 
 OPENLOOPS_FLAG:
 if OPENLOOPS_AVAILABLE
 	touch $@
 endif
 
 GOSAM_FLAG:
 if GOSAM_AVAILABLE
 	touch $@
 endif
 
 EVENT_ANALYSIS_FLAG:
 if EVENT_ANALYSIS_AVAILABLE
 	touch $@
 endif
 
 STATIC_FLAG:
 if STATIC_AVAILABLE
 	touch $@
 endif
 
 # The reference output files are in the source directory.  Copy them here.
 ref-output: $(top_srcdir)/share/tests/ext_tests_nlo/ref-output
 	mkdir -p ref-output
 	for f in $</*.ref; do cp $$f $@; done
 
 ## 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
 	rm -f TESTFLAG
 	rm -f *_FLAG
 	rm -f LHAPDF6_FLAG STATIC_FLAG static_1.exe
 	rm -f *.run *.log slha_test.out
 	rm -f core* stdhep_rd
 	rm -f *.f90 *.c *.$(FC_MODULE_EXT) *.o *.la *.f90.in
 	rm -f *.makefile
 	rm -rf ref-output
 	rm -f *.sin *.hbc
 	rm -f *.phs *.vg *.vgb *.evt *.evx *.lhe *.hepmc *.dat *.debug
 	rm -f *.tmp *.hepevt *.hepevt.verb *.lha *.lha.verb *.slcio
 	rm -f prc_omega_diags_1_p_i1_diags.out prc_omega_diags_1_p_i1_diags.toc
 	rm -f *.hep *.up.hep *.[1-9] *.[1-9][0-9] *.[1-9][0-9][0-9]
 	rm -f *.tex *.mp *.mpx *.t[1-9] *.t[1-9][0-9] *.t[1-9][0-9][0-9]
 	rm -f *.ltp *.aux *.dvi *.ps *.pdf so_test.*
 	rm -f *.tbl sps1ap_decays.slha bar structure_6[a-b].out
 	rm -f slhaspectrum.in suspect2.out suspect2_lha.out
 	rm -f susyhit.in susyhit_slha.out suspect2_lha.in
 	rm -f *.olc *.olp *.olp_parameters
 	rm -rf stability_log
 	rm -rf *olp_modules
 	rm -rf Generated_Loops
 	rm -rf include lib golem.in
 	rm -f SM_tt_threshold.grid
 	rm -f *fks_regions.out
 	rm -f *_powheg_*.pg
 if FC_SUBMODULES
 	rm -f *.smod
 endif
 
 ## Remove backup files
 maintainer-clean-local: maintainer-clean-fc
 	-rm -f *~
 .PHONY: maintainer-clean-local
Index: trunk/tests/ext_tests_nlo/nlo_ee5j.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_ee5j.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_ee5j.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> jjjjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettz.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettz.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettz.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttZ at NLO
 # time ~ 2 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetthjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetthjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetthjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tthjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettjjj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettjjj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettjjj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttjjj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_ee4t.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_ee4t.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_ee4t.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tttt at NLO
 # time ~ 3 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eett.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eett.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eett.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tt at NLO
 # time ~ 1min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 77
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eetta.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eetta.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eetta.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> tta at NLO
 # time ~ 1 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettbb.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettbb.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettbb.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttbb at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eebbj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eebbj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eebbj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> bbj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettah.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettah.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettah.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttah at NLO
 # time ~ 4 min
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi
Index: trunk/tests/ext_tests_nlo/nlo_eettaj.sh
===================================================================
--- trunk/tests/ext_tests_nlo/nlo_eettaj.sh	(revision 8288)
+++ trunk/tests/ext_tests_nlo/nlo_eettaj.sh	(revision 8289)
@@ -1,33 +1,33 @@
 #!/bin/sh
 # Check stable result of ee -> ttaj at NLO
 # time ~
 echo "Running script $0"
 
 name=`basename @script@`
 
 if test -f ref-output/$name.ref; then
   if test -f OCAML_FLAG -a -f OPENLOOPS_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 77
+      exit 99
     fi
     exit $diffrc
   else
     echo "|=============================================================================|"
     echo "No O'Mega/OpenLoops matrix elements available"
     exit 77
   fi
 else
   echo "|=============================================================================|"
   echo "$name.ref not found"
   exit 1
 fi