Index: trunk/share/tests/functional_tests/ref-output/vars.ref =================================================================== --- trunk/share/tests/functional_tests/ref-output/vars.ref (revision 8444) +++ trunk/share/tests/functional_tests/ref-output/vars.ref (revision 8445) @@ -1,377 +1,378 @@ ?openmp_logging = false [user variable] foo = -7.800000000000E-02 [user variable] bar = 1 [user variable] a = 2.010000000000E-05 [user variable] i = 3 [user variable] foo = 2.922000000000E+00 [user variable] i = 9 [user variable] foo = 2.922000000000E+00 [user variable] bar = 1 [user variable] i = 9 [user variable] k = 1 [user variable] k2 = 1.000000000000E+00 [user variable] i = -1 [user variable] k = 2 [user variable] k2 = 4.000000000000E+00 [user variable] i = -2 [user variable] k = 3 [user variable] k2 = 9.000000000000E+00 [user variable] i = -3 [user variable] k = 4 [user variable] k2 = 1.600000000000E+01 [user variable] i = -4 [user variable] k = 8 [user variable] k2 = 6.400000000000E+01 [user variable] i = -8 [user variable] i = 9 [user variable] MW = 7.980000000000E+01 [user variable] MW = 7.980000000000E+01 SM.mtau => 8.000000000000E-01 SM.mW => 8.011900000000E+01 SM.mW => 8.011900000000E+01 SM.sw* => 4.775372811515E-01 SM.mW => 7.500000000000E+01 SM.sw* => 5.688014954824E-01 SM.mW => 8.000000000000E+01 SM.sw* => 4.799305327664E-01 SM.mW => 8.050000000000E+01 SM.sw* => 4.697684723671E-01 SM.mW => 8.100000000000E+01 SM.sw* => 4.593162187090E-01 SM.mW => 8.150000000000E+01 SM.sw* => 4.485534858838E-01 SM.mW => 8.200000000000E+01 SM.sw* => 4.374573583998E-01 SM.mW => 8.300000000000E+01 SM.sw* => 4.141569403361E-01 SM.mW => 8.469722796445E+01 SM.sw* => 3.705366373038E-01 SM.mW => 8.642916174533E+01 SM.sw* => 3.188332912310E-01 SM.mW => 8.819651102555E+01 SM.sw* => 2.540459583362E-01 SM.mW => 9.000000000000E+01 SM.sw* => 1.609055729882E-01 mW is 80.119 and sw is: 0.4775 seed = 32 seed = 32 seed = 30 seed = 30 seed = 28 seed = 28 seed = 26 seed = 26 seed = 24 seed = 24 seed = 22 seed = 22 seed = 20 seed = 20 seed = 18 seed = 18 seed = 16 seed = 16 seed = 14 seed = 14 seed = 12 seed = 12 seed = 10 seed = 10 seed = 8 seed = 8 seed = 6 seed = 6 seed = 4 seed = 4 seed = 2 seed = 2 [user variable] $str = "foo" [user variable] $str = "bar" [user variable] ?ok = false [user variable] ?ok = false [user variable] ?ok = true ?sf_trace = false ?sf_allow_s_mapping = true ?hoppet_b_matching = false ?isr_recoil = false ?isr_keep_energy = false ?isr_handler = false ?isr_handler_keep_mass = true ?epa_recoil = false ?epa_keep_energy = false ?epa_handler = false ?ewa_recoil = false ?ewa_keep_energy = false ?circe1_photon1 = false ?circe1_photon2 = false ?circe1_generate = true ?circe1_map = true ?circe1_with_radiation = false ?circe2_polarized = true ?beam_events_warn_eof = true ?energy_scan_normalize = false ?logging => true ?proc_as_run_id = true ?report_progress = true [user variable] ?me_verbose = false ?omega_write_phs_output = false ?read_color_factors = true ?slha_read_input = true ?slha_read_spectrum = true ?slha_read_decays = false ?alphas_is_fixed = true ?alphas_from_lhapdf = false ?alphas_from_pdf_builtin = false ?alphas_from_mz = false ?alphas_from_lambda_qcd = false ?fatal_beam_decay = true ?helicity_selection_active = true ?vis_diags = false ?vis_diags_color = false ?check_event_file = true ?unweighted = true ?negative_weights = false ?resonance_history = false ?keep_beams = false ?keep_remnants = true ?recover_beams = true ?update_event = false ?update_sqme = false ?update_weight = false ?use_alphas_from_file = false ?use_scale_from_file = false ?allow_decays = true ?auto_decays = false ?auto_decays_radiative = false ?decay_rest_frame = false ?isotropic_decay = false ?diagonal_decay = false ?polarized_events = false ?colorize_subevt = false ?pacify = false ?out_advance = true ?stratified = true ?use_vamp_equivalences = true ?vamp_verbose = false ?vamp_history_global = true ?vamp_history_global_verbose = false ?vamp_history_channels = false ?vamp_history_channels_verbose = false ?integration_timer = true ?check_grid_file = true ?vis_channels = false ?check_phs_file = true ?phs_only = false ?phs_keep_nonresonant = true ?phs_step_mapping = true ?phs_step_mapping_exp = true ?phs_s_mapping = true ?vis_history = false ?normalize_bins = false ?y_log = false ?x_log = false [undefined] ?draw_histogram = [unknown logical] [undefined] ?draw_base = [unknown logical] [undefined] ?draw_piecewise = [unknown logical] [undefined] ?fill_curve = [unknown logical] [undefined] ?draw_curve = [unknown logical] [undefined] ?draw_errors = [unknown logical] [undefined] ?draw_symbols = [unknown logical] ?analysis_file_only = false ?keep_flavors_when_clustering = false ?sample_pacify = false ?sample_select = true ?read_raw = true ?write_raw = true ?debug_process = true ?debug_transforms = true ?debug_decay = true ?debug_verbose = true ?dump_compressed = false ?dump_weights = false ?dump_summary = false ?dump_screen = false ?hepevt_ensure_order = false ?lhef_write_sqme_prc = true ?lhef_write_sqme_ref = false ?lhef_write_sqme_alt = true ?hepmc_output_cross_section = false ?allow_shower = true ?ps_fsr_active = false ?ps_isr_active = false ?ps_taudec_active = false ?muli_active = false ?shower_verbose = false ?ps_isr_alphas_running = true ?ps_fsr_alphas_running = true ?ps_isr_pt_ordered = false ?ps_isr_angular_ordered = true ?ps_isr_only_onshell_emitted_partons = false ?allow_hadronization = true ?hadronization_active = false ?ps_tauola_photos = false ?ps_tauola_transverse = false ?ps_tauola_dec_rad_cor = true ?ps_tauola_pol_vector = false ?mlm_matching = false ?powheg_matching = false ?powheg_use_singular_jacobian = false ?powheg_test_sudakov = false ?powheg_disable_sudakov = false ?ckkw_matching = false ?omega_openmp => false ?openmp_is_active* = false ?openmp_logging = false ?mpi_logging = false ?test_soft_limit = false ?test_coll_limit = false ?test_anti_coll_limit = false ?virtual_collinear_resonance_aware = true ?openloops_use_cms = true ?openloops_switch_off_muon_yukawa = false ?disable_subtraction = false ?vis_fks_regions = false ?combined_nlo_integration = false ?fixed_order_nlo_events = false ?check_event_weights_against_xsection = false ?keep_failed_events = false ?nlo_use_born_scale = false ?nlo_cut_all_real_sqmes = false ?nlo_use_real_partition = false +?nlo_reuse_amplitudes_fks = false ?rebuild_library = true ?recompile_library = false ?rebuild_phase_space = true ?rebuild_grids = true ?rebuild_events = true [user variable] ?ok = true [user variable] $str = "foo" [user variable] $str = "foobar" $sf_trace_file = "" $lhapdf_dir = "" $lhapdf_file = "" $lhapdf_photon_file = "" $pdf_builtin_set = "CTEQ6L" $isr_handler_mode = "trivial" $epa_mode = "default" $epa_handler_mode = "trivial" $circe1_acc = "SBAND" [undefined] $circe2_file = [unknown string] $circe2_design = "*" [undefined] $beam_events_file = [unknown string] [undefined] $job_id = [unknown string] [undefined] $compile_workspace = [unknown string] $model_name = "SM" $method = "omega" $restrictions = "" $omega_flags = "" $library_name = "vars_lib" $rng_method = "tao" $event_file_version = "" $polarization_mode = "helicity" $out_file = "" $integration_method = "vamp" $run_id = "" [undefined] $integrate_workspace = [unknown string] $vamp_grid_format = "ascii" $phs_method = "default" $phs_file = "" $obs_label = "" $obs_unit = "" $title = "" $description = "" $x_label = "" $y_label = "" $gmlcode_bg = "" $gmlcode_fg = "" [undefined] $fill_options = [unknown string] [undefined] $draw_options = [unknown string] [undefined] $err_options = [unknown string] [undefined] $symbol = [unknown string] $sample = "" $sample_normalization = "auto" $rescan_input_format = "raw" $extension_raw = "evx" $extension_default = "evt" $debug_extension = "debug" $dump_extension = "pset.dat" $extension_hepevt = "hepevt" $extension_ascii_short = "short.evt" $extension_ascii_long = "long.evt" $extension_athena = "athena.evt" $extension_mokka = "mokka.evt" $lhef_version = "2.0" $lhef_extension = "lhe" $extension_lha = "lha" $extension_hepmc = "hepmc" $hepmc3_mode = "HepMC3" $extension_lcio = "slcio" $extension_stdhep = "hep" $extension_stdhep_up = "up.hep" $extension_stdhep_ev4 = "ev4.hep" $extension_hepevt_verb = "hepevt.verb" $extension_lha_verb = "lha.verb" $shower_method = "WHIZARD" $ps_PYTHIA_PYGIVE = "" $ps_PYTHIA8_config = "" $ps_PYTHIA8_config_file = "" $hadronization_method = "PYTHIA6" $born_me_method = "" $loop_me_method = "" $correlation_me_method = "" $real_tree_me_method = "" $dglap_me_method = "" $select_alpha_regions = "" $virtual_selection = "Full" $blha_ew_scheme = "alpha_internal" $openloops_extra_cmd = "" $fks_mapping_type = "default" $resonances_exclude_particles = "default" $gosam_filter_lo = "" $gosam_filter_nlo = "" $gosam_symmetries = "family,generation" $gosam_fc = "" $dalitz_plot = "" $nlo_correction_type = "QCD" $exclude_gauge_splittings = "c:b:t:e2:e3" $fc => Fortran-compiler $fcflags => Fortran-flags [user variable] $str = "foobar" [user variable] q = PDG(2) [user variable] q = PDG(2, 1, -2, -1) Q is only local and hence not not defined ****************************************************************************** *** ERROR: show: object 'Q' not found ****************************************************************************** | (WHIZARD run continues) SM.u* = PDG(2) [user variable] q = PDG(2, 1, -2, -1) [user variable] i = 1 one = 1 [user variable] i = 2 two [user variable] i = 3 three [user variable] i = 4 four [user variable] i = -1 [user variable] $str = "i<=0" [user variable] i = 1 [user variable] $str = "i>0" [user variable] i = 2 [user variable] $str = "i>1" Testing the complex calculus [user variable] ca = ( 2.000000000000E+00, 1.000000000000E+00) [user variable] ca = ( 2.000000000000E+00, 1.000000000000E+00) [user variable] ia = 2 [user variable] ia = 2 [user variable] ra = 2.000000000000E+00 [user variable] ra = 2.000000000000E+00 [user variable] cb = ( 3.000000000000E+00, 4.000000000000E+00) [user variable] cb = ( 3.000000000000E+00, 4.000000000000E+00) ?pacify = true [user variable] cc = ( 1.00000E+00, 0.00000E+00) ?pacify = true [user variable] cc = ( 1.00000E+00, 0.00000E+00) | There were 1 error(s) and no warnings. | WHIZARD run finished. |=============================================================================| Index: trunk/share/tests/functional_tests/ref-output/process_log.ref =================================================================== --- trunk/share/tests/functional_tests/ref-output/process_log.ref (revision 8444) +++ trunk/share/tests/functional_tests/ref-output/process_log.ref (revision 8445) @@ -1,552 +1,553 @@ ############################################################################### Process [scattering]: 'process_log_1_p1' Run ID = '' Library name = 'process_log_lib' Process index = 1 Process components: 1: 'process_log_1_p1_i1': e-, e+ => m-, m+ [omega] ------------------------------------------------------------------------ ############################################################################### Integral = 8.3556567814E+03 Error = 3.2359019246E+00 Accuracy = 1.8972317270E-02 Chi2 = 5.2032955661E-01 Efficiency = 7.8315602603E-01 T(10k evt) =