Merge lp:~maddevelopers/mg5amcnlo/2.3.4 into lp:mg5amcnlo/lts

Proposed by Olivier Mattelaer
Status: Merged
Merge reported by: Olivier Mattelaer
Merged at revision: not available
Proposed branch: lp:~maddevelopers/mg5amcnlo/2.3.4
Merge into: lp:mg5amcnlo/lts
Diff against target: 177347 lines (+81698/-53804)
830 files modified
MadSpin/decay.py (+95/-23)
MadSpin/interface_madspin.py (+83/-25)
MadSpin/src/driver.f (+1/-1)
Template/Common/Cards/delphes_card_ATLAS.dat (+125/-80)
Template/Common/Cards/delphes_card_CMS.dat (+126/-85)
Template/Common/Cards/delphes_card_default.dat (+126/-85)
Template/Common/Cards/reweight_card_default.dat (+36/-18)
Template/Common/bin/internal/run_pythia (+2/-2)
Template/LO/Source/PDF/makefile (+5/-1)
Template/LO/Source/PDF/pdf_lhapdf6.cc (+1120/-0)
Template/LO/Source/PDF/pdg2pdf_lhapdf6.f (+112/-0)
Template/LO/Source/genps.inc (+2/-2)
Template/LO/Source/kin_functions.f (+1/-1)
Template/LO/Source/make_opts (+70/-40)
Template/LO/Source/setrun.f (+1/-1)
Template/LO/SubProcesses/makefile (+3/-3)
Template/LO/SubProcesses/myamp.f (+8/-29)
Template/LO/SubProcesses/reweight.f (+30/-13)
Template/LO/SubProcesses/setcuts.f (+2/-2)
Template/LO/bin/internal/make_gridpack (+1/-1)
Template/LO/bin/madevent (+4/-1)
Template/NLO/Cards/run_card.dat (+54/-54)
Template/NLO/Cards/shower_card.dat (+47/-32)
Template/NLO/FixedOrderAnalysis/HwU.f (+7/-8)
Template/NLO/FixedOrderAnalysis/HwU.inc (+2/-2)
Template/NLO/FixedOrderAnalysis/analysis_HwU_pp_lplm.f (+45/-45)
Template/NLO/FixedOrderAnalysis/analysis_root_pp_lplm.f (+1/-1)
Template/NLO/FixedOrderAnalysis/analysis_td_pp_lplm.f (+1/-1)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f (+6/-4)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f (+6/-4)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f (+5/-3)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f (+2/-3)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f (+1/-2)
Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f (+1/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_V.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_h.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_hjj.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_leptons.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lplm.f (+9/-3)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lvl.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_taptam.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_tj.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx_v2.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_rates.f (+8/-2)
Template/NLO/MCatNLO/HWPPAnalyzer/mcatnlo_hwan_pp_lplm_hepmc.f (+1/-1)
Template/NLO/MCatNLO/Makefile_MadFKS (+24/-55)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f (+4/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f (+4/-6)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f (+3/-5)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f (+10/-11)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_h.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_hjj.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_leptons.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lplm.f (+12/-13)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_taptam.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_tj.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx_v2.f (+11/-12)
Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_rates.f (+11/-12)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_V.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_h.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_hjj.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_leptons.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lplm.f (+2/-3)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lvl.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_taptam.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_tj.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx_v2.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_rates.f (+1/-2)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_V.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_h.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_hjj.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_leptons.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lplm.f (+6/-4)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lvl.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_taptam.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_tj.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx_v2.f (+5/-3)
Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_rates.f (+5/-3)
Template/NLO/MCatNLO/Scripts/MCatNLO_MadFKS_PYTHIA8.Script (+81/-89)
Template/NLO/MCatNLO/include/LHEFRead.h (+16/-51)
Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f (+55/-205)
Template/NLO/MCatNLO/srcPythia/madfks_pylhin.f (+54/-201)
Template/NLO/MCatNLO/srcPythia8/Makefile (+4/-31)
Template/NLO/MCatNLO/srcPythia8/Makefile_hep (+5/-31)
Template/NLO/MCatNLO/srcPythia8/Pythia8.cc (+4/-3)
Template/NLO/MCatNLO/srcPythia8/Pythia82.cc (+4/-3)
Template/NLO/Source/PDF/makefile (+9/-1)
Template/NLO/Source/PDF/pdf_lhapdf6.cc (+1120/-0)
Template/NLO/Source/PDF/pdfwrap.f (+27/-0)
Template/NLO/Source/PDF/pdg2pdf_lhapdf.f (+7/-13)
Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f (+132/-0)
Template/NLO/Source/make_opts.inc (+32/-8)
Template/NLO/Source/run.inc (+7/-6)
Template/NLO/Source/setrun.f (+30/-1)
Template/NLO/SubProcesses/BinothLHA.f (+11/-30)
Template/NLO/SubProcesses/BinothLHA_OLP.f (+5/-23)
Template/NLO/SubProcesses/BinothLHA_user.f (+3/-22)
Template/NLO/SubProcesses/add_write_info.f (+2/-2)
Template/NLO/SubProcesses/c_weight.inc (+13/-12)
Template/NLO/SubProcesses/check_poles.f (+3/-3)
Template/NLO/SubProcesses/cluster.f (+4/-4)
Template/NLO/SubProcesses/collect_events.f (+29/-10)
Template/NLO/SubProcesses/cuts.f (+4/-4)
Template/NLO/SubProcesses/driver_mintFO.f (+6/-0)
Template/NLO/SubProcesses/driver_mintMC.f (+8/-2)
Template/NLO/SubProcesses/fjcore.cc (+1929/-154)
Template/NLO/SubProcesses/fjcore.hh (+147/-66)
Template/NLO/SubProcesses/fks_singular.f (+304/-159)
Template/NLO/SubProcesses/handling_lhe_events.f (+480/-615)
Template/NLO/SubProcesses/iproc_map.f (+11/-10)
Template/NLO/SubProcesses/leshouche_inc_chooser.f (+9/-6)
Template/NLO/SubProcesses/madfks_plot.f (+152/-97)
Template/NLO/SubProcesses/makefile (+1/-0)
Template/NLO/SubProcesses/makefile_fks_dir (+6/-1)
Template/NLO/SubProcesses/makefile_loop.inc (+13/-2)
Template/NLO/SubProcesses/mint-integrator2.f (+9/-38)
Template/NLO/SubProcesses/montecarlocounter.f (+5/-3)
Template/NLO/SubProcesses/pythia_unlops.f (+2/-2)
Template/NLO/SubProcesses/reweight.f (+2/-2)
Template/NLO/SubProcesses/reweight.inc (+2/-2)
Template/NLO/SubProcesses/reweight0.inc (+22/-5)
Template/NLO/SubProcesses/reweightNLO.inc (+0/-5)
Template/NLO/SubProcesses/reweight_xsec_events.f (+368/-481)
Template/NLO/SubProcesses/setcuts.f (+4/-4)
Template/NLO/SubProcesses/setscales.f (+6/-2)
Template/NLO/SubProcesses/symmetry_fks_test_MC.f (+2/-1)
Template/NLO/SubProcesses/symmetry_fks_test_ME.f (+2/-1)
Template/NLO/SubProcesses/symmetry_fks_v3.f (+3/-2)
Template/NLO/SubProcesses/write_event.f (+1/-1)
Template/NLO/Utilities/split_events.f (+5/-3)
Template/NLO/bin/aMCatNLO (+4/-1)
Template/RWGTNLO/alfas.inc (+11/-0)
Template/RWGTNLO/alfas_functions_lhapdf.f (+167/-0)
Template/RWGTNLO/makefile (+19/-0)
Template/RWGTNLO/rwgt.f (+114/-0)
Template/RWGTNLO/setrun.f (+88/-0)
Template/RWGTNLO/timing_variables.inc (+9/-0)
Template/loop_material/Checks/StabilityCheckDriver.f (+6/-6)
Template/loop_material/Checks/StabilityCheckDriver_loop_induced.f (+6/-6)
Template/loop_material/StandAlone/Cards/MadLoopParams.dat (+18/-3)
Template/loop_material/StandAlone/SubProcesses/MadLoopCommons.inc (+134/-41)
Template/loop_material/StandAlone/SubProcesses/MadLoopParamReader.f (+21/-5)
Template/loop_material/StandAlone/SubProcesses/MadLoopParams.inc (+3/-2)
Template/loop_material/StandAlone/SubProcesses/makefile (+31/-16)
UpdateNotes.txt (+43/-7)
VERSION (+2/-2)
aloha/aloha_lib.py (+11/-0)
aloha/aloha_writers.py (+11/-2)
aloha/create_aloha.py (+3/-4)
aloha/template_files/aloha_functions_loop.f (+4/-4)
aloha/template_files/wavefunctions.py (+13/-5)
bin/mg5 (+1/-1)
bin/mg5_aMC (+1/-1)
input/.mg5_configuration_default.txt (+17/-5)
madgraph/core/base_objects.py (+109/-11)
madgraph/core/color_algebra.py (+45/-0)
madgraph/core/diagram_generation.py (+40/-14)
madgraph/core/drawing.py (+1/-1)
madgraph/fks/fks_base.py (+79/-60)
madgraph/fks/fks_common.py (+9/-1)
madgraph/fks/fks_helas_objects.py (+449/-45)
madgraph/interface/amcatnlo_interface.py (+172/-50)
madgraph/interface/amcatnlo_run_interface.py (+477/-271)
madgraph/interface/coloring_logging.py (+3/-0)
madgraph/interface/common_run_interface.py (+382/-148)
madgraph/interface/extended_cmd.py (+98/-21)
madgraph/interface/launch_ext_program.py (+0/-2)
madgraph/interface/loop_interface.py (+40/-20)
madgraph/interface/madevent_interface.py (+187/-60)
madgraph/interface/madgraph_interface.py (+568/-127)
madgraph/interface/madweight_interface.py (+2/-2)
madgraph/interface/reweight_interface.py (+715/-265)
madgraph/iolibs/drawing_eps.py (+155/-13)
madgraph/iolibs/export_fks.py (+79/-64)
madgraph/iolibs/export_v4.py (+108/-69)
madgraph/iolibs/file_writers.py (+36/-9)
madgraph/iolibs/files.py (+10/-1)
madgraph/iolibs/template_files/born_fks.inc (+3/-0)
madgraph/iolibs/template_files/loop/CT_interface.inc (+2/-2)
madgraph/iolibs/template_files/loop/check_sa.inc (+10/-10)
madgraph/iolibs/template_files/loop/check_sa_loop_induced.inc (+7/-7)
madgraph/iolibs/template_files/loop/loop_matrix_standalone.inc (+59/-2)
madgraph/iolibs/template_files/loop_optimized/CT_interface.inc (+977/-18)
madgraph/iolibs/template_files/loop_optimized/GOLEM_interface.inc (+35/-56)
madgraph/iolibs/template_files/loop_optimized/TIR_interface.inc (+115/-33)
madgraph/iolibs/template_files/loop_optimized/check_py.f.inc (+7/-5)
madgraph/iolibs/template_files/loop_optimized/check_sa.py.inc (+106/-0)
madgraph/iolibs/template_files/loop_optimized/compute_color_flows.inc (+11/-11)
madgraph/iolibs/template_files/loop_optimized/helas_calls_split.inc (+5/-5)
madgraph/iolibs/template_files/loop_optimized/helas_loop_amplitude.inc (+56/-9)
madgraph/iolibs/template_files/loop_optimized/loop_matrix_standalone.inc (+176/-55)
madgraph/iolibs/template_files/loop_optimized/loop_num.inc (+2/-4)
madgraph/iolibs/template_files/loop_optimized/mp_compute_loop_coefs.inc (+210/-33)
madgraph/iolibs/template_files/loop_optimized/mp_helas_calls_split.inc (+3/-6)
madgraph/iolibs/template_files/loop_optimized/polynomial.inc (+26/-8)
madgraph/iolibs/template_files/madevent_makefile_source (+3/-3)
madgraph/iolibs/template_files/matrix_loop_induced_madevent.inc (+2/-2)
madgraph/iolibs/template_files/matrix_loop_induced_madevent_group.inc (+2/-2)
madgraph/iolibs/template_files/matrix_madevent_group_v4.inc (+8/-4)
madgraph/iolibs/template_files/matrix_standalone_splitOrders_v4.inc (+11/-0)
madgraph/iolibs/template_files/matrix_standalone_v4.inc (+12/-1)
madgraph/iolibs/template_files/realmatrix_fks.inc (+3/-0)
madgraph/iolibs/ufo_expression_parsers.py (+14/-3)
madgraph/loop/loop_diagram_generation.py (+27/-18)
madgraph/loop/loop_exporters.py (+317/-147)
madgraph/loop/loop_helas_objects.py (+16/-1)
madgraph/madevent/gen_crossxhtml.py (+6/-1)
madgraph/madevent/sum_html.py (+10/-1)
madgraph/various/banner.py (+249/-75)
madgraph/various/cluster.py (+15/-2)
madgraph/various/histograms.py (+1643/-224)
madgraph/various/lhe_parser.py (+458/-18)
madgraph/various/misc.py (+199/-12)
madgraph/various/process_checks.py (+141/-53)
madgraph/various/q_polynomial.py (+206/-67)
madgraph/various/shower_card.py (+3/-3)
models/TopEffTh/CT_couplings.py (+11/-0)
models/TopEffTh/TopEffTh.log (+87/-79)
models/TopEffTh/__init__.py (+31/-5)
models/TopEffTh/coupling_orders.py (+20/-20)
models/TopEffTh/couplings.py (+691/-535)
models/TopEffTh/decays.py (+55/-0)
models/TopEffTh/function_library.py (+24/-7)
models/TopEffTh/lorentz.py (+350/-367)
models/TopEffTh/object_library.py (+145/-13)
models/TopEffTh/parameters.py (+383/-705)
models/TopEffTh/particles.py (+387/-449)
models/TopEffTh/propagators.py (+35/-0)
models/TopEffTh/vertices.py (+1091/-863)
models/TopEffTh/write_param_card.py (+207/-181)
models/check_param_card.py (+14/-3)
models/import_ufo.py (+79/-55)
models/model_reader.py (+2/-0)
models/usermod.py (+47/-13)
models/write_param_card.py (+3/-3)
tests/acceptance_tests/test_cmd.py (+36/-15)
tests/acceptance_tests/test_cmd_amcatnlo.py (+8/-7)
tests/acceptance_tests/test_cmd_madloop.py (+6/-2)
tests/acceptance_tests/test_cmd_reweight.py (+164/-0)
tests/acceptance_tests/test_export_fks.py (+90/-0)
tests/acceptance_tests/test_histograms.py (+52/-0)
tests/input_files/IOTestsComparison/ExportV4IOTest/export_matrix_element_v4_standalone/matrix.f (+0/-272)
tests/input_files/IOTestsComparison/FKS/gg_ttx/b_sf_001.f (+0/-156)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born.f (+0/-300)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_conf.inc (+0/-16)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_decayBW.inc (+0/-1)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_hel.f (+0/-153)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_leshouche.inc (+0/-7)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_nhel.inc (+0/-3)
tests/input_files/IOTestsComparison/FKS/gg_ttx/born_props.inc (+0/-9)
tests/input_files/IOTestsComparison/FKS/gg_ttx/coloramps.inc (+0/-4)
tests/input_files/IOTestsComparison/FKS/gg_ttx/fks_info.inc (+0/-64)
tests/input_files/IOTestsComparison/FKS/gg_ttx/leshouche_info.inc (+0/-156)
tests/input_files/IOTestsComparison/FKS/gg_ttx/matrix_1.f (+0/-246)
tests/input_files/IOTestsComparison/FKS/gg_ttx/maxconfigs.inc (+0/-2)
tests/input_files/IOTestsComparison/FKS/gg_ttx/maxparticles.inc (+0/-3)
tests/input_files/IOTestsComparison/FKS/gg_ttx/nFKSconfigs.inc (+0/-4)
tests/input_files/IOTestsComparison/FKS/gg_ttx/nexternal.inc (+0/-4)
tests/input_files/IOTestsComparison/FKS/gg_ttx/parton_lum_1.f (+0/-99)
tests/input_files/IOTestsComparison/FKS/gg_ttx/parton_lum_chooser.f (+0/-31)
tests/input_files/IOTestsComparison/FKS/gg_ttx/pmass.inc (+0/-5)
tests/input_files/IOTestsComparison/FKS/gg_ttx/real_me_chooser.f (+0/-30)
tests/input_files/IOTestsComparison/FKS/gg_ttx/sborn_sf.f (+0/-45)
tests/input_files/IOTestsComparison/FKS/xaa (+0/-722)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_001.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_002.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_003.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_004.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_005.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_006.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_007.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%b_sf_008.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born.f (+16/-12)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%born_hel.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%fks_info.inc (+5/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_gg_ttx%parton_lum_0.f (+1/-1)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_001.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_002.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_003.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_004.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_005.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_006.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_007.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%b_sf_008.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born.f (+22/-18)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%born_hel.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%fks_info.inc (+3/-2)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uux_ttx%parton_lum_0.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_001.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_002.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_003.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_004.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_005.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_006.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_007.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%b_sf_008.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born.f (+22/-18)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%born_hel.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%fks_info.inc (+3/-2)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fks_loonly/%SubProcesses%P0_uxu_ttx%parton_lum_0.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_001.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_002.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_003.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_004.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_005.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_006.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_007.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%b_sf_008.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born.f (+16/-12)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%born_hel.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%fks_info.inc (+44/-36)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_1.f (+5/-2)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_2.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_3.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_4.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%matrix_5.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%parton_lum_1.f (+1/-1)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%parton_lum_2.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%parton_lum_3.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%parton_lum_4.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_gg_ttx%parton_lum_5.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_001.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_002.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_003.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_004.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_005.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_006.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_007.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%b_sf_008.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born.f (+22/-18)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%born_hel.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%fks_info.inc (+28/-22)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_1.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_2.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%matrix_3.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%parton_lum_1.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%parton_lum_2.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uux_ttx%parton_lum_3.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_001.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_002.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_003.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_004.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_005.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_006.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_007.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%b_sf_008.f (+16/-16)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born.f (+22/-18)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%born_hel.f (+14/-14)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%fks_info.inc (+28/-22)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_1.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_2.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%matrix_3.f (+11/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%parton_lum_1.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%parton_lum_2.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_pptt_fksreal/%SubProcesses%P0_uxu_ttx%parton_lum_3.f (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%CT_interface.f (+994/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%GOLEM_interface.f (+747/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%TIR_interface.f (+554/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%born_matrix.f (+557/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%check_sa.f (+755/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%check_sa_born_splitOrders.f (+524/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%coef_construction_1.f (+115/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%helas_calls_ampb_1.f (+114/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%improve_ps.f (+981/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_CT_calls_1.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_matrix.f (+2393/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%loop_num.f (+129/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%mp_coef_construction_1.f (+99/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%mp_compute_loop_coefs.f (+407/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%mp_helas_calls_ampb_1.f (+98/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%nsqso_born.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%nsquaredSO.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%pmass.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%polynomial.f (+519/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%V0_dxu_wp%process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%b_sf_001.f (+153/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born.f (+296/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_conf.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_hel.f (+151/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_leshouche.inc (+8/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_maxamps.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%born_nhel.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%coloramps.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%config_subproc_map.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%configs_and_props_decl.inc (+12/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%fks_info.inc (+53/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%get_color.f (+48/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%leshouche_decl.inc (+7/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_1.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_2.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%matrix_3.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%nFKSconfigs.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%ncombs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%parton_lum_1.f (+112/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%parton_lum_2.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%parton_lum_3.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%parton_lum_chooser.f (+23/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%pmass.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%real_from_born_configs.inc (+6/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%real_me_chooser.f (+22/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%sborn_sf.f (+17/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_dxu_wp%sborn_sf_dum.f (+13/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%CT_interface.f (+994/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%GOLEM_interface.f (+747/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%TIR_interface.f (+554/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%born_matrix.f (+557/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%check_sa.f (+755/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%check_sa_born_splitOrders.f (+524/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%coef_construction_1.f (+115/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%helas_calls_ampb_1.f (+114/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%improve_ps.f (+981/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_CT_calls_1.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_matrix.f (+2393/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%loop_num.f (+129/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%mp_coef_construction_1.f (+99/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%mp_compute_loop_coefs.f (+407/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%mp_helas_calls_ampb_1.f (+98/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%nsqso_born.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%nsquaredSO.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%pmass.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%polynomial.f (+519/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%V0_udx_wp%process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%b_sf_001.f (+153/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born.f (+296/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_conf.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_hel.f (+151/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_leshouche.inc (+8/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_maxamps.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%born_nhel.inc (+3/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%coloramps.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%config_subproc_map.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%configs_and_props_decl.inc (+12/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%fks_info.inc (+53/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%get_color.f (+48/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%leshouche_decl.inc (+7/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_1.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_2.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%matrix_3.f (+175/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%nFKSconfigs.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%ncombs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%parton_lum_1.f (+112/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%parton_lum_2.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%parton_lum_3.f (+110/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%parton_lum_chooser.f (+23/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%pmass.inc (+4/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%real_from_born_configs.inc (+6/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%real_me_chooser.f (+22/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%sborn_sf.f (+17/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_ppw_fksall/%SubProcesses%P0_udx_wp%sborn_sf_dum.f (+13/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_001.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_002.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_003.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_004.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_005.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_006.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_007.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%b_sf_008.f (+8/-8)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born.f (+14/-10)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%born_hel.f (+6/-6)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%configs_and_props_decl.inc (+4/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%fks_info.inc (+15/-12)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%leshouche_decl.inc (+1/-0)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%matrix_1.f (+7/-4)
tests/input_files/IOTestsComparison/IOExportFKSTest/test_tdecay_fksreal/%SubProcesses%P0_t_budx%parton_lum_1.f (+2/-2)
tests/input_files/IOTestsComparison/IOExportPythia8Test/write_dec_multiprocess_files/write_dec_multiprocess_files.cc (+36/-36)
tests/input_files/IOTestsComparison/IOExportPythia8Test/write_dec_multiprocess_files/write_dec_multiprocess_files.h (+36/-36)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/matrix1.f (+23/-19)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/super_auto_dsig.f (+10/-10)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_nogroup/matrix.f (+15/-15)
tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_standalone/matrix.f (+18/-0)
tests/input_files/IOTestsComparison/IOTest_Histogram.moved/gnuplot_histo_output/HistoOut.HwU (+869/-0)
tests/input_files/IOTestsComparison/IOTest_Histogram.moved/gnuplot_histo_output/HistoOut.gnuplot (+1205/-0)
tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.HwU (+741/-741)
tests/input_files/IOTestsComparison/IOTest_Histogram/gnuplot_histo_output/HistoOut.gnuplot (+259/-320)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_QCDsq_eq_4.f (+356/-1282)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_QCDsq_gt_0_QEDAmpAndQEDsq_gt_2.f (+358/-7597)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_QCDsq_gt_4.f (+346/-416)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_QEDsq_le_4.f (+365/-7814)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_WGTsq_le_10_QEDAmpAndQEDsq_gt_2.f (+358/-7597)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDQEDpert_default.f (+356/-1282)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QCDpert_default.f (+346/-416)
tests/input_files/IOTestsComparison/LoopSquaredOrder_IOTest/Loop_sqso_uux_ddx/loop_matrix_QEDpert_default.f (+346/-543)
tests/input_files/IOTestsComparison/MECmdShell.moved/check_html_long_process_strings/info.html (+139/-0)
tests/input_files/IOTestsComparison/MECmdShell/check_html_long_process_strings/info.html (+10/-10)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f (+203/-99)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopParamReader.f (+21/-5)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%CT_interface.f (+881/-80)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%GOLEM_interface.f (+70/-82)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%TIR_interface.f (+125/-35)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%born_matrix.f (+31/-14)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%check_sa.f (+56/-57)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%check_sa_born_splitOrders.f (+13/-13)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%coef_construction_1.f (+385/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_ampb_1.f (+218/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%helas_calls_uvct_1.f (+131/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%loop_CT_calls_1.f (+180/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%loop_matrix.f (+348/-835)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_coef_construction_1.f (+462/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_compute_loop_coefs.f (+172/-648)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_helas_calls_ampb_1.f (+203/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%mp_helas_calls_uvct_1.f (+115/-0)
tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%P0_gg_ttx%polynomial.f (+234/-234)
tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_NoSQSO.f (+45/-33)
tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_QCDsq_le_6.f (+56/-45)
tests/input_files/IOTestsComparison/SquaredOrder_IOTest/sqso_uux_uuxuuxx/matrix_ampOrderQED2_eq_2_WGTsq_le_14_QCDsq_gt_4.f (+58/-47)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%matrix.f (+367/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%pmass.inc (+4/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%CT_interface.f (+525/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%GOLEM_interface.f (+772/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%TIR_interface.f (+422/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%born_matrix.f (+754/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%check_sa.f (+757/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%check_sa_born_splitOrders.f (+524/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%improve_ps.f (+989/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_matrix.f (+2586/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_num.f (+129/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%mp_compute_loop_coefs.f (+597/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%nexternal.inc (+4/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%ngraphs.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%nsqso_born.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%nsquaredSO.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%pmass.inc (+4/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%polynomial.f (+593/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox.moved/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%polynomial_specs.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P0_wpwm_wpwm%matrix.f (+3/-3)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%CT_interface.f (+817/-56)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%GOLEM_interface.f (+70/-82)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%TIR_interface.f (+123/-35)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%born_matrix.f (+13/-13)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%check_sa.f (+56/-57)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%check_sa_born_splitOrders.f (+13/-13)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%coef_construction_1.f (+251/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%coef_specs.inc (+0/-6)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%helas_calls_ampb_1.f (+187/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_CT_calls_1.f (+140/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_matrix.f (+347/-522)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%mp_coef_construction_1.f (+267/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%mp_compute_loop_coefs.f (+171/-364)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%mp_helas_calls_ampb_1.f (+171/-0)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%polynomial.f (+151/-86)
tests/input_files/IOTestsComparison/TestCmdMatchBox/MatchBoxOutput/%TEST%SubProcesses%P1_uux_uux%process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc (+5/-5)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%couplings1.f (+2/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%couplings2.f (+8/-6)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%input.inc (+30/-28)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc (+56/-56)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc (+4/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_couplings2.f (+12/-12)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc (+38/-34)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc (+36/-36)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/CT_interface.f (+9/-8)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_matrix.f (+205/-131)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/loop_num.f (+46/-46)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/mp_born_amps_and_wfs.f (+8/-8)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/dux_mumvmxg/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%coupl.inc (+12/-12)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings1.f (+2/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%couplings2.f (+10/-8)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%input.inc (+41/-39)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc (+69/-69)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc (+15/-13)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_couplings2.f (+36/-35)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_couplings3.f (+4/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc (+45/-42)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/CT_interface.f (+12/-11)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_matrix.f (+323/-249)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/loop_num.f (+260/-260)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/mp_born_amps_and_wfs.f (+82/-82)
tests/input_files/IOTestsComparison/long_ML_SMQCD_default/gg_wmtbx/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%coupl.inc (+5/-5)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%couplings1.f (+2/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%couplings2.f (+8/-6)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%input.inc (+30/-28)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%intparam_definition.inc (+56/-56)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_coupl.inc (+4/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_couplings2.f (+12/-12)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_input.inc (+38/-34)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/%..%..%Source%MODEL%mp_intparam_definition.inc (+36/-36)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/CT_interface.f (+260/-57)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/TIR_interface.f (+119/-34)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/coef_construction_1.f (+180/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/coef_specs.inc (+0/-6)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_ampb_1.f (+148/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/helas_calls_uvct_1.f (+116/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/loop_CT_calls_1.f (+129/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/loop_matrix.f (+347/-371)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_coef_construction_1.f (+177/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_compute_loop_coefs.f (+173/-221)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_ampb_1.f (+132/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/mp_helas_calls_uvct_1.f (+100/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/polynomial.f (+177/-214)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/dux_mumvmxg/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%coupl.inc (+12/-12)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings1.f (+2/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%couplings2.f (+10/-8)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%input.inc (+41/-39)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%intparam_definition.inc (+69/-69)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_coupl.inc (+15/-13)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_couplings2.f (+36/-35)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_couplings3.f (+4/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_input.inc (+45/-42)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/%..%..%Source%MODEL%mp_intparam_definition.inc (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/CT_interface.f (+348/-105)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/TIR_interface.f (+135/-34)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/coef_construction_1.f (+26/-26)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/coef_specs.inc (+0/-6)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_ampb_1.f (+8/-8)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/helas_calls_uvct_1.f (+40/-40)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/loop_CT_calls_1.f (+88/-88)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/loop_matrix.f (+343/-193)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_coef_construction_1.f (+187/-190)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_compute_loop_coefs.f (+173/-41)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_ampb_1.f (+13/-16)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/mp_helas_calls_uvct_1.f (+37/-40)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/polynomial.f (+301/-540)
tests/input_files/IOTestsComparison/long_ML_SMQCD_optimized/gg_wmtbx/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%coupl.inc (+2/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%couplings2.f (+10/-10)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%input.inc (+28/-26)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%intparam_definition.inc (+45/-45)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_couplings2.f (+4/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_input.inc (+44/-42)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/%..%..%Source%MODEL%mp_intparam_definition.inc (+26/-26)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/CT_interface.f (+7/-6)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/check_sa.f (+38/-39)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/loop_matrix.f (+259/-173)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/loop_num.f (+4/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/mp_born_amps_and_wfs.f (+2/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_LoopInduced/gg_hh/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/CT_interface.f (+9/-8)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/loop_matrix.f (+197/-123)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/loop_num.f (+30/-30)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/mp_born_amps_and_wfs.f (+2/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/ddx_ttx/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%coupl.inc (+10/-10)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%couplings2.f (+10/-8)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%input.inc (+19/-17)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc (+65/-65)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc (+10/-9)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_couplings2.f (+31/-30)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_couplings3.f (+4/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_input.inc (+38/-34)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc (+37/-37)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/CT_interface.f (+12/-11)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/loop_matrix.f (+241/-167)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/loop_num.f (+90/-90)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/mp_born_amps_and_wfs.f (+16/-16)
tests/input_files/IOTestsComparison/short_ML_SMQCD_default/gg_ttx/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/CT_interface.f (+260/-57)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/TIR_interface.f (+119/-34)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/coef_construction_1.f (+178/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/coef_specs.inc (+0/-6)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/helas_calls_ampb_1.f (+146/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/helas_calls_uvct_1.f (+110/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/loop_CT_calls_1.f (+125/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/loop_matrix.f (+347/-366)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/mp_coef_construction_1.f (+177/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/mp_compute_loop_coefs.f (+173/-211)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/mp_helas_calls_ampb_1.f (+130/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/mp_helas_calls_uvct_1.f (+94/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/polynomial.f (+106/-78)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/ddx_ttx/process_info.inc (+6/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%coupl.inc (+10/-10)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%couplings.f (+1/-1)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%couplings2.f (+10/-8)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%input.inc (+19/-17)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%intparam_definition.inc (+65/-65)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%model_functions.f (+7/-7)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl.inc (+10/-9)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_coupl_same_name.inc (+5/-5)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_couplings2.f (+31/-30)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_couplings3.f (+4/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_input.inc (+38/-34)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/%..%..%Source%MODEL%mp_intparam_definition.inc (+37/-37)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/CT_interface.f (+304/-81)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/TIR_interface.f (+123/-34)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/born_matrix.f (+20/-2)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/check_sa.f (+52/-53)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/coef_construction_1.f (+382/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/coef_specs.inc (+0/-6)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/f2py_wrapper.f (+117/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/helas_calls_ampb_1.f (+215/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/helas_calls_uvct_1.f (+128/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/improve_ps.f (+38/-38)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/loop_CT_calls_1.f (+177/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/loop_matrix.f (+347/-823)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/loop_max_coefs.inc (+2/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/loop_num.f (+2/-4)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_coef_construction_1.f (+459/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_compute_loop_coefs.f (+173/-640)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_helas_calls_ampb_1.f (+200/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/mp_helas_calls_uvct_1.f (+112/-0)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/polynomial.f (+189/-226)
tests/input_files/IOTestsComparison/short_ML_SMQCD_optimized/gg_ttx/process_info.inc (+6/-0)
tests/input_files/madspin_event.lhe (+1/-1)
tests/parallel_tests/compare_with_old_mg5_version.py (+1/-1)
tests/parallel_tests/loop_me_comparator.py (+3/-2)
tests/parallel_tests/test_aloha.py (+8/-0)
tests/test_manager.py (+13/-4)
tests/time_db (+236/-223)
tests/unit_tests/core/test_base_objects.py (+5/-1)
tests/unit_tests/core/test_color_amp.py (+3/-5)
tests/unit_tests/interface/test_edit_card.py (+8/-0)
tests/unit_tests/iolibs/test_drawing_eps.py (+2/-2)
tests/unit_tests/iolibs/test_export_fks.py (+86/-42)
tests/unit_tests/iolibs/test_export_fks_EW.py (+6/-3)
tests/unit_tests/iolibs/test_export_v4.py (+5/-5)
tests/unit_tests/iolibs/test_file_writers.py (+2/-3)
tests/unit_tests/iolibs/test_group_subprocs.py (+33/-33)
tests/unit_tests/loop/test_loop_exporters.py (+21/-6)
tests/unit_tests/various/test_banner.py (+56/-2)
tests/unit_tests/various/test_check_param_card.py (+688/-688)
tests/unit_tests/various/test_diquark_models.py (+6/-5)
tests/unit_tests/various/test_histograms.py (+4/-15)
tests/unit_tests/various/test_import_ufo.py (+14/-0)
tests/unit_tests/various/test_lhe_parser.py (+89/-3)
tests/unit_tests/various/test_model_reader.py (+1/-1)
tests/unit_tests/various/test_usermod.py (+108/-4)
vendor/CutTools/makefile (+4/-0)
vendor/CutTools/src/cts/cts_combinatorics.f90 (+1/-1)
vendor/CutTools/src/cts/cts_cuttools.f90 (+2/-0)
To merge this branch: bzr merge lp:~maddevelopers/mg5amcnlo/2.3.4
Reviewer Review Type Date Requested Status
MadTeam Pending
Review via email: mp+291117@code.launchpad.net

Description of the change

Hi,

I have release this version (as beta).
Please restrict yourself to important bug-fixing in this branch.
Please ensure to run ALL (unittest and acceptance) tests before pushing in this branch.

All other small fixes/small features should be put in the 2.4.1 branch.
ongoing merge should be proposed in 2.4.1

I plan to release this version out of beta in around one month (enough time for us to be 100% confident in those important changes)

Cheers,

Olivier

To post a comment you must log in.
lp:~maddevelopers/mg5amcnlo/2.3.4 updated
395. By Valentin Hirschi

1. Added Ninja+MadLoop's paper ref when installing it.

396. By Olivier Mattelaer

update Date/time before freeze out

397. By Olivier Mattelaer

fix some merging issue between the update of Rik and the nlo_reweighting

398. By Olivier Mattelaer

change the LHA strategy to 3 if the events are normalised to the sum

399. By Valentin Hirschi

1. Changed the default value of the option 'samurai' in the configuration from 'auto' to 'None', because it often caused issues to users who had GoSam installed on their computer, with a version of Samurai not compatible with MadLoop interface. If the user really wants Samurai, then he can change this option manually, but at least he will know where his troubles come from.

400. By Valentin Hirschi

1. Fixed a bug in the Samurai interface where ABS_TMP had a typo and should have read ABSP_TMP.

401. By Valentin Hirschi

1. Fixed a small issue in the histogram parsing when there is a suffix '#x' in the histogram name.

402. By Valentin Hirschi

1. Moved problematic IOTests to acceptance so that they can be skipped for the auto-update.

403. By Valentin Hirschi

1. Removed the IOTests from unit tests (they were moved to acceptance)

404. By Olivier Mattelaer

prevent installation of py8 interface on MG5 update

405. By Olivier Mattelaer

fix two small but annoying bug

406. By Olivier Mattelaer

fix a bug in the photon energy cut

407. By Valentin Hirschi

1. Also turned off Samurai in the default options in madgraph_interface.py.

408. By Valentin Hirschi

1. Fixed the test_config acceptance test.

409. By Valentin Hirschi

1. Changing the way MadLoopParams.dat template is read when running from within MadEvent.
   Now, the file in <proc_output>/Cards/MadLoopParams_default.dat is used instead of
   <proc_output>/SubProcesses/MadLoop5_resources/MadLoopParams.dat

410. By Olivier Mattelaer

fix a bug in the selection of the non-zero helicites. Ensure that each matrix element probe all helicity for the two first PS point

411. By Olivier Mattelaer

Fixing the mess of the last commit of Valentin

412. By Olivier Mattelaer

fixing one parralel test

413. By Paolo Torrielli

Fixed a bug in analysis_HwU_pp_lplm.f, thanks to Roberto Franceschini.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MadSpin/decay.py'
2--- MadSpin/decay.py 2015-08-26 23:03:01 +0000
3+++ MadSpin/decay.py 2016-05-12 15:13:37 +0000
4@@ -1749,7 +1749,7 @@
5
6 return finalfound
7
8-
9+
10 def reorder_branch(self,branch):
11 """ branch is a string with the definition of a decay chain
12 If branch contains " A > B C , B > ... "
13@@ -1764,19 +1764,31 @@
14 if list_branch[index]==' ' or list_branch[index]=='': del list_branch[index]
15 #print list_branch
16 for index, item in enumerate(list_branch):
17- if item =="," and list_branch[index+1]!="(":
18- if list_branch[index-2]==list_branch[index+1]:
19- # swap the two particles before the comma:
20- temp=list_branch[index-2]
21- list_branch[index-2]=list_branch[index-1]
22- list_branch[index-1]=temp
23- if item =="," and list_branch[index+1]=="(":
24- if list_branch[index-2]==list_branch[index+2]:
25- # swap the two particles before the comma:
26- temp=list_branch[index-2]
27- list_branch[index-2]=list_branch[index-1]
28- list_branch[index-1]=temp
29
30+ if item[-1] =="," and list_branch[index+1]!="(":
31+ # search pos of B and C
32+ counter=1
33+ while 1:
34+ if list_branch[index-counter].find("=")<0:
35+ break
36+ counter+=1
37+ if list_branch[index-counter-1]==list_branch[index+1]:
38+ # swap the two particles before the comma:
39+ temp=list_branch[index-counter-1]
40+ list_branch[index-counter-1]=list_branch[index-counter]
41+ list_branch[index-counter]=temp
42+ if item[-1] =="," and list_branch[index+1]=="(":
43+ # search pos of B and C
44+ counter=1
45+ while 1:
46+ if list_branch[index-counter].find("=")<0:
47+ break
48+ counter+=1
49+ if list_branch[index-counter -1]==list_branch[index+2]:
50+ # swap the two particles before the comma:
51+ temp=list_branch[index-counter-1]
52+ list_branch[index-counter-1]=list_branch[index-counter]
53+ list_branch[index-counter]=temp
54
55 new_branch=""
56 for item in list_branch:
57@@ -1784,7 +1796,6 @@
58
59 return new_branch, list_branch[0]
60
61-
62 def set_light_parton_massless(self,topo):
63 """ masses of light partons are set to zero for
64 the evaluation of the matrix elements
65@@ -2405,7 +2416,13 @@
66 self.curr_event.particle[part_for_curr_evt]['momentum']=ext_mom[prod2full[part-1]-1]
67 self.curr_event.particle[part_for_curr_evt]['helicity']=helicities[prod2full[part-1]-1]
68 if not use_mc_masses or abs(pid) not in self.MC_masses:
69- self.curr_event.particle[part_for_curr_evt]['mass']=self.banner.get('param_card','mass', abs(pid)).value
70+ try:
71+ self.curr_event.particle[part_for_curr_evt]['mass']=self.banner.get('param_card','mass', abs(pid)).value
72+ except KeyError:
73+ if self.model.get_particle(abs(pid)).get('mass').lower() == 'zero':
74+ self.curr_event.particle[part_for_curr_evt]['mass'] = 0
75+ else:
76+ raise
77 else:
78 self.curr_event.particle[part_for_curr_evt]['mass']=self.MC_masses[abs(pid)]
79
80@@ -2595,7 +2612,7 @@
81 return decay_mapping
82
83
84- @misc.mute_logger()
85+ #@misc.mute_logger()
86 @test_aloha.set_global()
87 def generate_all_matrix_element(self):
88 """generate the full series of matrix element needed by Madspin.
89@@ -2642,6 +2659,16 @@
90
91 commandline="import model %s " % modelpath
92 mgcmd.exec_cmd(commandline)
93+ # Handle the multiparticle of the banner
94+ #for name, definition in self.mscmd.multiparticles:
95+ if hasattr(self.mscmd, 'multiparticles_ms'):
96+ for name, pdgs in self.mscmd.multiparticles_ms.items():
97+ if name == 'all':
98+ continue
99+ #self.banner.get('proc_card').get('multiparticles'):
100+ mgcmd.do_define("%s = %s" % (name, ' '.join(`i` for i in pdgs)))
101+
102+
103 mgcmd.exec_cmd("set group_subprocesses False")
104
105 logger.info('generating the production square matrix element')
106@@ -2659,6 +2686,10 @@
107 else:
108 proc_nb = ''
109
110+ if ',' in proc:
111+ raise MadSpinError, 'MadSpin can not decay event which comes from a decay chain.'+\
112+ '\n The full decay chain should either be handle by MadGraph or by Masdspin.'
113+
114 if '[' not in proc:
115 commandline+="add process %s --no_warning=duplicate;" % proc
116 else:
117@@ -3205,14 +3236,16 @@
118 logger.debug('Decay channel %s :Using maximum weight %s (BR: %s)' % \
119 (','.join(associated_decay), max_weight, br/nb_finals))
120
121- if __debug__:
122+# if __debug__:
123 # check that all decay have a max_weight and fix it if not the case.
124- for prod in self.all_ME.values():
125- for dec in prod['decays']:
126- if dec['decay_tag']:
127- assert 'max_weight' in dec and dec['max_weight'] ,\
128- 'fail for %s (%s)' % (str(dec['decay_tag']), \
129- os.path.basename(prod['path']))
130+ for prod in self.all_ME.values():
131+ for dec in prod['decays']:
132+ if dec['decay_tag'] and not 'max_weight' in dec:
133+ dec['max_weight'] = 0.
134+
135+# assert 'max_weight' in dec and dec['max_weight'] ,\
136+# 'fail for %s (%s)' % (str(dec['decay_tag']), \
137+# os.path.basename(prod['path']))
138 self.evtfile.seek(0)
139 return
140
141@@ -3656,6 +3689,45 @@
142 d1colup1=maxcol
143 d2colup2=maxcol
144 d2colup1=0
145+ elif colord1==-3 and colord2==-3 and colormother == 3:
146+ maxcol+=2
147+ d1colup1=0
148+ d1colup2=maxcol
149+ d2colup1=0
150+ d2colup2=maxcol-1
151+ elif (colord1==-3 and colord2==3 and colormother == 3) or\
152+ (colord1==-3 and colord2==3 and colormother == -3):
153+ maxcol+=2
154+ d1colup1 = 0
155+ d1colup2 = maxcol
156+ d2colup1 = maxcol-1
157+ d2colup2 = 0
158+ elif (colord1==3 and colord2==-3 and colormother == 3) or\
159+ (colord1==3 and colord2==-3 and colormother == -3):
160+ maxcol+=2
161+ d1colup1=maxcol
162+ d1colup2=0
163+ d2colup1=0
164+ d2colup2=maxcol-1
165+ elif colord1==3 and colord2==3 and colormother == -3:
166+ maxcol+=2
167+ d1colup1=maxcol
168+ d1colup2=0
169+ d2colup1=maxcol-1
170+ d2colup2=0
171+ elif colord2==8 and colord1==8 and colormother ==8:
172+ maxcol+=1
173+ ran = random.random()
174+ if ran> 0.5:
175+ d1colup2=colup2
176+ d1colup1=maxcol
177+ d2colup2=maxcol
178+ d2colup1=colup1
179+ else:
180+ d1colup2=maxcol
181+ d1colup1=colup1
182+ d2colup2=colup2
183+ d2colup1=maxcol
184 else:
185 raise Exception, 'color combination not treated by MadSpin (yet). (%s,%s,%s)' \
186 % (colord1,colord2,colormother)
187
188=== modified file 'MadSpin/interface_madspin.py'
189--- MadSpin/interface_madspin.py 2015-10-15 10:10:38 +0000
190+++ MadSpin/interface_madspin.py 2016-05-12 15:13:37 +0000
191@@ -32,6 +32,7 @@
192 import madgraph.interface.extended_cmd as extended_cmd
193 import madgraph.interface.madgraph_interface as mg_interface
194 import madgraph.interface.master_interface as master_interface
195+import madgraph.interface.madevent_interface as madevent_interface
196 import madgraph.various.misc as misc
197 import madgraph.iolibs.files as files
198 import madgraph.iolibs.export_v4 as export_v4
199@@ -177,7 +178,13 @@
200 logger.info("process: %s" % process)
201 logger.info("options: %s" % option)
202
203-
204+ if not hasattr(self,'multiparticles_ms'):
205+ for key, value in self.banner.get_detail('proc_card','multiparticles'):
206+ try:
207+ self.do_define('%s = %s' % (key, value))
208+ except self.mg5cmd.InvalidCmd:
209+ pass
210+
211 # Read the final state of the production process:
212 # "_full" means with the complete decay chain syntax
213 # "_compact" means without the decay chain syntax
214@@ -208,6 +215,7 @@
215
216 # check particle which can be decayed:
217 self.final_state = set()
218+ final_model = False
219 for line in self.banner.proc_card:
220 line = ' '.join(line.strip().split())
221 if line.startswith('generate'):
222@@ -215,9 +223,20 @@
223 elif line.startswith('add process'):
224 self.final_state.update(self.mg5cmd.get_final_part(line[11:]))
225 elif line.startswith('define'):
226- self.mg5cmd.exec_cmd(line, printcmd=False, precmd=False, postcmd=False)
227+ try:
228+ self.mg5cmd.exec_cmd(line, printcmd=False, precmd=False, postcmd=False)
229+ except self.mg5cmd.InvalidCmd:
230+ if final_model:
231+ raise
232+ else:
233+ key = line.split()[1]
234+ if key in self.multiparticles_ms:
235+ del self.multiparticles_ms[key]
236 elif line.startswith('set'):
237 self.mg5cmd.exec_cmd(line, printcmd=False, precmd=False, postcmd=False)
238+ elif line.startswith('import model'):
239+ if model_name in line:
240+ final_model = True
241
242
243
244@@ -378,7 +397,6 @@
245 if args[0] == 'ms_dir':
246 self.options['curr_dir'] = self.options['ms_dir']
247 elif args[0] == 'seed':
248- import random
249 random.seed(int(args[1]))
250 self.seed = int(args[1])
251 elif args[0] == 'BW_cut':
252@@ -440,7 +458,19 @@
253
254 def do_define(self, line):
255 """ """
256- return self.mg5cmd.do_define(line)
257+
258+ try:
259+ self.mg5cmd.do_define(line)
260+ except:
261+ #cleaning if the error is recover later
262+ key = line.split()[0]
263+ if hasattr(self, 'multiparticles_ms' and key in self.multiparticles_ms):
264+ del self.multiparticles_ms[key]
265+ raise
266+
267+ self.multiparticles_ms = dict([(k,list(pdgs)) for k, pdgs in \
268+ self.mg5cmd._multiparticles.items()])
269+
270
271 def update_status(self, *args, **opts):
272 """ """
273@@ -514,7 +544,6 @@
274 model_line = self.banner.get('proc_card', 'full_model_line')
275
276 if not self.seed:
277- import random
278 self.seed = random.randint(0, int(30081*30081))
279 self.do_set('seed %s' % self.seed)
280 logger.info('Will use seed %s' % self.seed)
281@@ -693,24 +722,54 @@
282 else:
283 mg5.exec_cmd("generate %s" % proc)
284 mg5.exec_cmd("output %s -f" % decay_dir)
285- options = dict(mg5.options)
286- import madgraph.interface.madevent_interface as madevent_interface
287- me5_cmd = madevent_interface.MadEventCmdShell(me_dir=os.path.realpath(\
288+
289+ options = dict(mg5.options)
290+ if self.options['ms_dir']:
291+ misc.sprint("start gridpack!")
292+ # we are in gridpack mode -> create it
293+ me5_cmd = madevent_interface.MadEventCmdShell(me_dir=os.path.realpath(\
294 decay_dir), options=options)
295- me5_cmd.options["automatic_html_opening"] = False
296- if self.options["run_card"]:
297- run_card = self.options["run_card"]
298+ me5_cmd.options["automatic_html_opening"] = False
299+ if self.options["run_card"]:
300+ run_card = self.options["run_card"]
301+ else:
302+ run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))
303+
304+ run_card["iseed"] = self.seed
305+ run_card['gridpack'] = True
306+ run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
307+ param_card = self.banner['slha']
308+ open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)
309+ self.seed += 1
310+ # actually creation
311+ me5_cmd.exec_cmd("generate_events run_01 -f")
312+ me5_cmd.exec_cmd("exit")
313+ #remove pointless informat
314+ misc.call(["rm", "Cards", "bin", 'Source', 'SubProcesses'], cwd=decay_dir)
315+ misc.call(['tar', '-xzpvf', 'run_01_gridpack.tar.gz'], cwd=decay_dir)
316+
317+ # Now generate the events
318+
319+ if not self.options['ms_dir']:
320+ me5_cmd = madevent_interface.MadEventCmdShell(me_dir=os.path.realpath(\
321+ decay_dir), options=mg5.options)
322+ me5_cmd.options["automatic_html_opening"] = False
323+ if self.options["run_card"]:
324+ run_card = self.options["run_card"]
325+ else:
326+ run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))
327+ run_card["nevents"] = int(1.2*nb_event)
328+ run_card["iseed"] = self.seed
329+ run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
330+ param_card = self.banner['slha']
331+ open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)
332+ self.seed += 1
333+ me5_cmd.exec_cmd("generate_events run_01 -f")
334+ me5_cmd.exec_cmd("exit")
335+ out[i] = lhe_parser.EventFile(pjoin(decay_dir, "Events", 'run_01', 'unweighted_events.lhe.gz'))
336 else:
337- run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))
338- run_card["nevents"] = int(1.2*nb_event)
339- run_card["iseed"] = self.seed
340- run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
341- param_card = self.banner['slha']
342- open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)
343- self.seed += 1
344- me5_cmd.exec_cmd("generate_events run_01 -f")
345- me5_cmd.exec_cmd("exit")
346- out[i] = lhe_parser.EventFile(pjoin(decay_dir, "Events", 'run_01', 'unweighted_events.lhe.gz'))
347+ misc.call(['run.sh', str(int(1.2*nb_event)), str(self.seed)], cwd=decay_dir)
348+ out[i] = lhe_parser.EventFile(pjoin(decay_dir, 'events.lhe.gz'))
349 if cumul:
350 break
351
352@@ -744,7 +803,6 @@
353
354 # Handle the banner of the output file
355 if not self.seed:
356- import random
357 self.seed = random.randint(0, int(30081*30081))
358 self.do_set('seed %s' % self.seed)
359 logger.info('Will use seed %s' % self.seed)
360@@ -866,10 +924,10 @@
361 else:
362 #need to select the file according to the associate cross-section
363 r = random.random()
364- tot = sum(events.cross for events in to_event[particle.pdg])
365+ tot = sum(to_event[particle.pdg][key].cross for key in to_event[particle.pdg])
366 r = r * tot
367 cumul = 0
368- for j,events in enumerate(to_event[particle.pdg]):
369+ for j,events in to_event[particle.pdg].items():
370 cumul += events.cross
371 if r < cumul:
372 decay_file = events
373@@ -924,6 +982,7 @@
374 def load_model(self, name, use_mg_default, complex_mass=False):
375 """load the model"""
376
377+
378 loop = False
379 #if (name.startswith('loop_')):
380 # logger.info("The model in the banner is %s" % name)
381@@ -946,7 +1005,6 @@
382 self.model = base_model
383 self.mg5cmd._curr_model = self.model
384 self.mg5cmd.process_model()
385-
386
387 if __name__ == '__main__':
388
389
390=== modified file 'MadSpin/src/driver.f'
391--- MadSpin/src/driver.f 2015-01-29 14:35:06 +0000
392+++ MadSpin/src/driver.f 2016-05-12 15:13:37 +0000
393@@ -907,7 +907,7 @@
394 if (index_p2.gt.0) then
395 m2_tchan(i)=m(index_p2)
396 else
397- write(*,*) 'Warning: m_2^2 is negative in t-channel branching '
398+ write(*,*) 'Warning: m_2^2 is negative in t-channel branching ',m2_tchan(i)
399 endif
400 endif
401 ! extract phi
402
403=== modified file 'Template/Common/Cards/delphes_card_ATLAS.dat'
404--- Template/Common/Cards/delphes_card_ATLAS.dat 2014-05-13 14:23:18 +0000
405+++ Template/Common/Cards/delphes_card_ATLAS.dat 2016-05-12 15:13:37 +0000
406@@ -10,7 +10,7 @@
407 MuonTrackingEfficiency
408
409 ChargedHadronMomentumSmearing
410- ElectronEnergySmearing
411+ ElectronMomentumSmearing
412 MuonMomentumSmearing
413
414 TrackMerger
415@@ -20,6 +20,7 @@
416 PhotonEfficiency
417 PhotonIsolation
418
419+ ElectronFilter
420 ElectronEfficiency
421 ElectronIsolation
422
423@@ -28,10 +29,13 @@
424
425 MissingET
426
427+ NeutrinoFilter
428 GenJetFinder
429 FastJetFinder
430
431 JetEnergyScale
432+
433+ JetFlavorAssociation
434
435 BTagging
436 TauTagging
437@@ -75,11 +79,11 @@
438 # add EfficiencyFormula {efficiency formula as a function of eta and pt}
439
440 # tracking efficiency formula for charged hadrons
441- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
442- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
443- (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) + \
444- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) + \
445- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) + \
446+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
447+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
448+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) +
449+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) +
450+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) +
451 (abs(eta) > 2.5) * (0.00)}
452 }
453
454@@ -94,13 +98,13 @@
455 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
456
457 # tracking efficiency formula for electrons
458- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
459- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) + \
460- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) + \
461- (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) + \
462- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) + \
463- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) + \
464- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) + \
465+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
466+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) +
467+ (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) +
468+ (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) +
469+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) +
470+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) +
471+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) +
472 (abs(eta) > 2.5) * (0.00)}
473 }
474
475@@ -115,11 +119,11 @@
476 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
477
478 # tracking efficiency formula for muons
479- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
480- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) + \
481- (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) + \
482- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
483- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) + \
484+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
485+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) +
486+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) +
487+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
488+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) +
489 (abs(eta) > 2.5) * (0.00)}
490 }
491
492@@ -134,31 +138,25 @@
493 # set ResolutionFormula {resolution formula as a function of eta and pt}
494
495 # resolution formula for charged hadrons
496- set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.02) + \
497- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e1) * (0.01) + \
498- (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
499- (abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05) + \
500- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.03) + \
501- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e1) * (0.02) + \
502- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
503- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2) * (0.05)}
504+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
505+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
506+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
507 }
508
509-#################################
510-# Energy resolution for electrons
511-#################################
512+###################################
513+# Momentum resolution for electrons
514+###################################
515
516-module EnergySmearing ElectronEnergySmearing {
517+module MomentumSmearing ElectronMomentumSmearing {
518 set InputArray ElectronTrackingEfficiency/electrons
519 set OutputArray electrons
520
521 # set ResolutionFormula {resolution formula as a function of eta and energy}
522
523- set ResolutionFormula { (abs(eta) <= 2.5) * (energy > 0.1 && energy <= 2.5e1) * (energy*0.015) + \
524- (abs(eta) <= 2.5) * (energy > 2.5e1) * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
525- (abs(eta) > 2.5 && abs(eta) <= 3.0) * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
526- (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
527-
528+ # resolution formula for electrons
529+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
530+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
531+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
532 }
533
534 ###############################
535@@ -172,14 +170,9 @@
536 # set ResolutionFormula {resolution formula as a function of eta and pt}
537
538 # resolution formula for muons
539- set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.03) + \
540- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 5.0e1) * (0.03) + \
541- (abs(eta) <= 1.5) * (pt > 5.0e1 && pt <= 1.0e2) * (0.04) + \
542- (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.07) + \
543- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.04) + \
544- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 5.0e1) * (0.04) + \
545- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 5.0e1 && pt <= 1.0e2) * (0.05) + \
546- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.10)}
547+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.02^2 + pt^2*2.0e-4^2) +
548+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.03^2 + pt^2*3.0e-4^2) +
549+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*6.0e-4^2)}
550 }
551
552 ##############
553@@ -189,7 +182,7 @@
554 module Merger TrackMerger {
555 # add InputArray InputArray
556 add InputArray ChargedHadronMomentumSmearing/chargedHadrons
557- add InputArray ElectronEnergySmearing/electrons
558+ add InputArray ElectronMomentumSmearing/electrons
559 add InputArray MuonMomentumSmearing/muons
560 set OutputArray tracks
561 }
562@@ -209,6 +202,14 @@
563 set EFlowPhotonOutputArray eflowPhotons
564 set EFlowNeutralHadronOutputArray eflowNeutralHadrons
565
566+ set ECalEnergyMin 0.5
567+ set HCalEnergyMin 1.0
568+
569+ set ECalEnergySignificanceMin 1.0
570+ set HCalEnergySignificanceMin 1.0
571+
572+ set SmearTowerCenter true
573+
574 set pi [expr {acos(-1)}]
575
576 # lists of the edges of each tower in eta and phi
577@@ -257,15 +258,15 @@
578 # http://arxiv.org/pdf/physics/0608012v1 jinst8_08_s08003
579 # http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
580 # http://www.physics.utoronto.ca/~krieger/procs/ComoProceedings.pdf
581- set ECalResolutionFormula { (abs(eta) <= 3.2) * sqrt(energy^2*0.0017^2 + energy*0.101^2) + \
582+ set ECalResolutionFormula { (abs(eta) <= 3.2) * sqrt(energy^2*0.0017^2 + energy*0.101^2) +
583 (abs(eta) > 3.2 && abs(eta) <= 4.9) * sqrt(energy^2*0.0350^2 + energy*0.285^2)}
584
585 # set HCalResolutionFormula {resolution formula as a function of eta and energy}
586 # http://arxiv.org/pdf/hep-ex/0004009v1
587 # http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
588- set HCalResolutionFormula { (abs(eta) <= 1.7) * sqrt(energy^2*0.0302^2 + energy*0.5205^2 + 1.59^2) + \
589- (abs(eta) > 1.7 && abs(eta) <= 3.2) * sqrt(energy^2*0.0500^2 + energy*0.706^2) + \
590- (abs(eta) > 3.2 && abs(eta) <= 4.9) * sqrt(energy^2*0.9420^2 + energy*0.075^2)}
591+ set HCalResolutionFormula { (abs(eta) <= 1.7) * sqrt(energy^2*0.0302^2 + energy*0.5205^2 + 1.59^2) +
592+ (abs(eta) > 1.7 && abs(eta) <= 3.2) * sqrt(energy^2*0.0500^2 + energy*0.706^2) +
593+ (abs(eta) > 3.2 && abs(eta) <= 4.9) * sqrt(energy^2*0.09420^2 + energy*1.00^2)}
594 }
595
596 ####################
597@@ -285,15 +286,15 @@
598 ###################
599
600 module Efficiency PhotonEfficiency {
601- set InputArray Calorimeter/photons
602+ set InputArray Calorimeter/eflowPhotons
603 set OutputArray photons
604
605 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
606
607 # efficiency formula for photons
608- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
609- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
610- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
611+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
612+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
613+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
614 (abs(eta) > 2.5) * (0.00)}
615 }
616
617@@ -314,20 +315,32 @@
618 set PTRatioMax 0.1
619 }
620
621+#################
622+# Electron filter
623+#################
624+
625+module PdgCodeFilter ElectronFilter {
626+ set InputArray Calorimeter/eflowTracks
627+ set OutputArray electrons
628+ set Invert true
629+ add PdgCode {11}
630+ add PdgCode {-11}
631+}
632+
633 #####################
634 # Electron efficiency
635 #####################
636
637 module Efficiency ElectronEfficiency {
638- set InputArray ElectronEnergySmearing/electrons
639+ set InputArray ElectronFilter/electrons
640 set OutputArray electrons
641
642 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
643
644 # efficiency formula for electrons
645- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
646- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
647- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
648+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
649+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
650+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
651 (abs(eta) > 2.5) * (0.00)}
652 }
653
654@@ -359,9 +372,9 @@
655 # set EfficiencyFormula {efficiency as a function of eta and pt}
656
657 # efficiency formula for muons
658- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
659- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
660- (abs(eta) > 1.5 && abs(eta) <= 2.7) * (pt > 10.0) * (0.85) + \
661+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
662+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
663+ (abs(eta) > 1.5 && abs(eta) <= 2.7) * (pt > 10.0) * (0.85) +
664 (abs(eta) > 2.7) * (0.00)}
665 }
666
667@@ -405,12 +418,33 @@
668 set EnergyOutputArray energy
669 }
670
671+
672+#####################
673+# Neutrino Filter
674+#####################
675+
676+module PdgCodeFilter NeutrinoFilter {
677+
678+ set InputArray Delphes/stableParticles
679+ set OutputArray filteredParticles
680+
681+ set PTMin 0.0
682+
683+ add PdgCode {12}
684+ add PdgCode {14}
685+ add PdgCode {16}
686+ add PdgCode {-12}
687+ add PdgCode {-14}
688+ add PdgCode {-16}
689+
690+}
691+
692 #####################
693 # MC truth jet finder
694 #####################
695
696 module FastJetFinder GenJetFinder {
697- set InputArray Delphes/stableParticles
698+ set InputArray NeutrinoFilter/filteredParticles
699
700 set OutputArray jets
701
702@@ -421,6 +455,7 @@
703 set JetPTMin 20.0
704 }
705
706+
707 ############
708 # Jet finder
709 ############
710@@ -445,8 +480,25 @@
711 set InputArray FastJetFinder/jets
712 set OutputArray jets
713
714- # scale formula for jets
715- set ScaleFormula {1.00}
716+ # scale formula for jets
717+ set ScaleFormula { sqrt( (3.0 - 0.2*(abs(eta)))^2 / pt + 1.0 ) }
718+}
719+
720+########################
721+# Jet Flavor Association
722+########################
723+
724+module JetFlavorAssociation JetFlavorAssociation {
725+
726+ set PartonInputArray Delphes/partons
727+ set ParticleInputArray Delphes/allParticles
728+ set ParticleLHEFInputArray Delphes/allParticlesLHEF
729+ set JetInputArray JetEnergyScale/jets
730+
731+ set DeltaR 0.5
732+ set PartonPTMin 1.0
733+ set PartonEtaMax 2.5
734+
735 }
736
737 ###########
738@@ -454,37 +506,30 @@
739 ###########
740
741 module BTagging BTagging {
742- set PartonInputArray Delphes/partons
743 set JetInputArray JetEnergyScale/jets
744
745 set BitNumber 0
746
747- set DeltaR 0.5
748-
749- set PartonPTMin 1.0
750-
751- set PartonEtaMax 2.5
752-
753 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
754 # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
755 # gluon's PDG code has the lowest priority
756
757+ # based on ATL-PHYS-PUB-2015-022
758+
759 # default efficiency formula (misidentification rate)
760- add EfficiencyFormula {0} {0.001}
761+ add EfficiencyFormula {0} {0.002+7.3e-06*pt}
762
763 # efficiency formula for c-jets (misidentification rate)
764- add EfficiencyFormula {4} { (pt <= 15.0) * (0.000) + \
765- (abs(eta) <= 1.2) * (pt > 15.0) * (0.2*tanh(pt*0.03 - 0.4)) + \
766- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.1*tanh(pt*0.03 - 0.4)) + \
767- (abs(eta) > 2.5) * (0.000)}
768+ add EfficiencyFormula {4} {0.20*tanh(0.02*pt)*(1/(1+0.0034*pt))}
769
770 # efficiency formula for b-jets
771- add EfficiencyFormula {5} { (pt <= 15.0) * (0.000) + \
772- (abs(eta) <= 1.2) * (pt > 15.0) * (0.5*tanh(pt*0.03 - 0.4)) + \
773- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.4*tanh(pt*0.03 - 0.4)) + \
774- (abs(eta) > 2.5) * (0.000)}
775+ add EfficiencyFormula {5} {0.80*tanh(0.003*pt)*(30/(1+0.086*pt))}
776 }
777
778+#############
779+# tau-tagging
780+#############
781+
782 module TauTagging TauTagging {
783 set ParticleInputArray Delphes/allParticles
784 set PartonInputArray Delphes/partons
785@@ -499,9 +544,9 @@
786 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
787
788 # default efficiency formula (misidentification rate)
789- add EfficiencyFormula {0} {0.001}
790+ add EfficiencyFormula {0} {0.01}
791 # efficiency formula for tau-jets
792- add EfficiencyFormula {15} {0.4}
793+ add EfficiencyFormula {15} {0.6}
794 }
795
796 #####################################################
797
798=== modified file 'Template/Common/Cards/delphes_card_CMS.dat'
799--- Template/Common/Cards/delphes_card_CMS.dat 2014-05-13 14:23:18 +0000
800+++ Template/Common/Cards/delphes_card_CMS.dat 2016-05-12 15:13:37 +0000
801@@ -10,7 +10,7 @@
802 MuonTrackingEfficiency
803
804 ChargedHadronMomentumSmearing
805- ElectronEnergySmearing
806+ ElectronMomentumSmearing
807 MuonMomentumSmearing
808
809 TrackMerger
810@@ -20,6 +20,7 @@
811 PhotonEfficiency
812 PhotonIsolation
813
814+ ElectronFilter
815 ElectronEfficiency
816 ElectronIsolation
817
818@@ -28,11 +29,14 @@
819
820 MissingET
821
822+ NeutrinoFilter
823 GenJetFinder
824 FastJetFinder
825
826 JetEnergyScale
827
828+ JetFlavorAssociation
829+
830 BTagging
831 TauTagging
832
833@@ -75,11 +79,11 @@
834 # add EfficiencyFormula {efficiency formula as a function of eta and pt}
835
836 # tracking efficiency formula for charged hadrons
837- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
838- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
839- (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) + \
840- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) + \
841- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) + \
842+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
843+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
844+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) +
845+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) +
846+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) +
847 (abs(eta) > 2.5) * (0.00)}
848 }
849
850@@ -94,13 +98,13 @@
851 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
852
853 # tracking efficiency formula for electrons
854- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
855- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) + \
856- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) + \
857- (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) + \
858- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) + \
859- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) + \
860- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) + \
861+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
862+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) +
863+ (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) +
864+ (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) +
865+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) +
866+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) +
867+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) +
868 (abs(eta) > 2.5) * (0.00)}
869 }
870
871@@ -115,11 +119,11 @@
872 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
873
874 # tracking efficiency formula for muons
875- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
876- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) + \
877- (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) + \
878- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
879- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) + \
880+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
881+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) +
882+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) +
883+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
884+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) +
885 (abs(eta) > 2.5) * (0.00)}
886 }
887
888@@ -134,32 +138,27 @@
889 # set ResolutionFormula {resolution formula as a function of eta and pt}
890
891 # resolution formula for charged hadrons
892- set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.02) + \
893- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e1) * (0.01) + \
894- (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
895- (abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05) + \
896- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.03) + \
897- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e1) * (0.02) + \
898- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
899- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2) * (0.05)}
900+ # based on arXiv:1405.6569
901+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
902+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
903+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
904 }
905
906-#################################
907-# Energy resolution for electrons
908-#################################
909+###################################
910+# Momentum resolution for electrons
911+###################################
912
913-module EnergySmearing ElectronEnergySmearing {
914+module MomentumSmearing ElectronMomentumSmearing {
915 set InputArray ElectronTrackingEfficiency/electrons
916 set OutputArray electrons
917
918 # set ResolutionFormula {resolution formula as a function of eta and energy}
919
920 # resolution formula for electrons
921- set ResolutionFormula { (abs(eta) <= 2.5) * (energy > 0.1 && energy <= 2.0e1) * (energy*0.0225) + \
922- (abs(eta) <= 2.5) * (energy > 2.0e1) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
923- (abs(eta) > 2.5 && abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
924- (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
925-
926+ # based on arXiv:1405.6569
927+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
928+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
929+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
930 }
931
932 ###############################
933@@ -173,18 +172,9 @@
934 # set ResolutionFormula {resolution formula as a function of eta and pt}
935
936 # resolution formula for muons
937- set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1 && pt <= 5.0) * (0.02) + \
938- (abs(eta) <= 0.5) * (pt > 5.0 && pt <= 1.0e2) * (0.015) + \
939- (abs(eta) <= 0.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.03) + \
940- (abs(eta) <= 0.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \
941- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1 && pt <= 5.0) * (0.03) + \
942- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 5.0 && pt <= 1.0e2) * (0.02) + \
943- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.04) + \
944- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \
945- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 5.0) * (0.04) + \
946- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 5.0 && pt <= 1.0e2) * (0.035) + \
947- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.05) + \
948- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4)}
949+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.01^2 + pt^2*2.0e-4^2) +
950+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.02^2 + pt^2*3.0e-4^2) +
951+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.05^2 + pt^2*6.0e-4^2)}
952 }
953
954 ##############
955@@ -194,7 +184,7 @@
956 module Merger TrackMerger {
957 # add InputArray InputArray
958 add InputArray ChargedHadronMomentumSmearing/chargedHadrons
959- add InputArray ElectronEnergySmearing/electrons
960+ add InputArray ElectronMomentumSmearing/electrons
961 add InputArray MuonMomentumSmearing/muons
962 set OutputArray tracks
963 }
964@@ -214,6 +204,14 @@
965 set EFlowPhotonOutputArray eflowPhotons
966 set EFlowNeutralHadronOutputArray eflowNeutralHadrons
967
968+ set ECalEnergyMin 0.5
969+ set HCalEnergyMin 1.0
970+
971+ set ECalEnergySignificanceMin 1.0
972+ set HCalEnergySignificanceMin 1.0
973+
974+ set SmearTowerCenter true
975+
976 set pi [expr {acos(-1)}]
977
978 # lists of the edges of each tower in eta and phi
979@@ -268,11 +266,11 @@
980 add EnergyFraction {3122} {0.3 0.7}
981
982 # set ECalResolutionFormula {resolution formula as a function of eta and energy}
983- set ECalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
984+ set ECalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) +
985 (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
986
987 # set HCalResolutionFormula {resolution formula as a function of eta and energy}
988- set HCalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.050^2 + energy*1.50^2) + \
989+ set HCalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.050^2 + energy*1.50^2) +
990 (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.130^2 + energy*2.70^2)}
991 }
992
993@@ -299,9 +297,9 @@
994 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
995
996 # efficiency formula for photons
997- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
998- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
999- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
1000+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1001+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
1002+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
1003 (abs(eta) > 2.5) * (0.00)}
1004 }
1005
1006@@ -322,20 +320,32 @@
1007 set PTRatioMax 0.1
1008 }
1009
1010+#################
1011+# Electron filter
1012+#################
1013+
1014+module PdgCodeFilter ElectronFilter {
1015+ set InputArray Calorimeter/eflowTracks
1016+ set OutputArray electrons
1017+ set Invert true
1018+ add PdgCode {11}
1019+ add PdgCode {-11}
1020+}
1021+
1022 #####################
1023 # Electron efficiency
1024 #####################
1025
1026 module Efficiency ElectronEfficiency {
1027- set InputArray ElectronEnergySmearing/electrons
1028+ set InputArray ElectronFilter/electrons
1029 set OutputArray electrons
1030
1031 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
1032
1033 # efficiency formula for electrons
1034- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
1035- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
1036- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
1037+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1038+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
1039+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
1040 (abs(eta) > 2.5) * (0.00)}
1041 }
1042
1043@@ -367,11 +377,11 @@
1044 # set EfficiencyFormula {efficiency as a function of eta and pt}
1045
1046 # efficiency formula for muons
1047- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
1048- (abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) + \
1049- (abs(eta) <= 1.5) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) + \
1050- (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) + \
1051- (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) + \
1052+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1053+ (abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
1054+ (abs(eta) <= 1.5) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) +
1055+ (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
1056+ (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) +
1057 (abs(eta) > 2.4) * (0.00)}
1058 }
1059
1060@@ -415,12 +425,34 @@
1061 set EnergyOutputArray energy
1062 }
1063
1064+
1065+#####################
1066+# Neutrino Filter
1067+#####################
1068+
1069+module PdgCodeFilter NeutrinoFilter {
1070+
1071+ set InputArray Delphes/stableParticles
1072+ set OutputArray filteredParticles
1073+
1074+ set PTMin 0.0
1075+
1076+ add PdgCode {12}
1077+ add PdgCode {14}
1078+ add PdgCode {16}
1079+ add PdgCode {-12}
1080+ add PdgCode {-14}
1081+ add PdgCode {-16}
1082+
1083+}
1084+
1085+
1086 #####################
1087 # MC truth jet finder
1088 #####################
1089
1090 module FastJetFinder GenJetFinder {
1091- set InputArray Delphes/stableParticles
1092+ set InputArray NeutrinoFilter/filteredParticles
1093
1094 set OutputArray jets
1095
1096@@ -431,6 +463,7 @@
1097 set JetPTMin 20.0
1098 }
1099
1100+
1101 ############
1102 # Jet finder
1103 ############
1104@@ -456,8 +489,25 @@
1105 set InputArray FastJetFinder/jets
1106 set OutputArray jets
1107
1108- # scale formula for jets
1109- set ScaleFormula {1.00}
1110+ # scale formula for jets
1111+ set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
1112+}
1113+
1114+########################
1115+# Jet Flavor Association
1116+########################
1117+
1118+module JetFlavorAssociation JetFlavorAssociation {
1119+
1120+ set PartonInputArray Delphes/partons
1121+ set ParticleInputArray Delphes/allParticles
1122+ set ParticleLHEFInputArray Delphes/allParticlesLHEF
1123+ set JetInputArray JetEnergyScale/jets
1124+
1125+ set DeltaR 0.5
1126+ set PartonPTMin 1.0
1127+ set PartonEtaMax 2.5
1128+
1129 }
1130
1131 ###########
1132@@ -465,38 +515,30 @@
1133 ###########
1134
1135 module BTagging BTagging {
1136- set PartonInputArray Delphes/partons
1137 set JetInputArray JetEnergyScale/jets
1138
1139 set BitNumber 0
1140
1141- set DeltaR 0.5
1142-
1143- set PartonPTMin 1.0
1144-
1145- set PartonEtaMax 2.5
1146-
1147 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
1148 # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
1149 # gluon's PDG code has the lowest priority
1150
1151- # https://twiki.cern.ch/twiki/bin/view/CMSPublic/PhysicsResultsBTV
1152+ # based on arXiv:1211.4462
1153+
1154 # default efficiency formula (misidentification rate)
1155- add EfficiencyFormula {0} {0.001}
1156+ add EfficiencyFormula {0} {0.01+0.00038*pt}
1157
1158 # efficiency formula for c-jets (misidentification rate)
1159- add EfficiencyFormula {4} { (pt <= 15.0) * (0.000) + \
1160- (abs(eta) <= 1.2) * (pt > 15.0) * (0.2*tanh(pt*0.03 - 0.4)) + \
1161- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.1*tanh(pt*0.03 - 0.4)) + \
1162- (abs(eta) > 2.5) * (0.000)}
1163+ add EfficiencyFormula {4} {0.25*tanh(0.018*pt)*(1/(1+ 0.0013*pt))}
1164
1165 # efficiency formula for b-jets
1166- add EfficiencyFormula {5} { (pt <= 15.0) * (0.000) + \
1167- (abs(eta) <= 1.2) * (pt > 15.0) * (0.5*tanh(pt*0.03 - 0.4)) + \
1168- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.4*tanh(pt*0.03 - 0.4)) + \
1169- (abs(eta) > 2.5) * (0.000)}
1170+ add EfficiencyFormula {5} {0.85*tanh(0.0025*pt)*(25.0/(1+0.063*pt))}
1171 }
1172
1173+#############
1174+# tau-tagging
1175+#############
1176+
1177 module TauTagging TauTagging {
1178 set ParticleInputArray Delphes/allParticles
1179 set PartonInputArray Delphes/partons
1180@@ -511,9 +553,9 @@
1181 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
1182
1183 # default efficiency formula (misidentification rate)
1184- add EfficiencyFormula {0} {0.001}
1185+ add EfficiencyFormula {0} {0.01}
1186 # efficiency formula for tau-jets
1187- add EfficiencyFormula {15} {0.4}
1188+ add EfficiencyFormula {15} {0.6}
1189 }
1190
1191 #####################################################
1192@@ -556,4 +598,3 @@
1193 add Branch MissingET/momentum MissingET MissingET
1194 add Branch ScalarHT/energy ScalarHT ScalarHT
1195 }
1196-
1197
1198=== modified file 'Template/Common/Cards/delphes_card_default.dat'
1199--- Template/Common/Cards/delphes_card_default.dat 2015-06-17 13:28:26 +0000
1200+++ Template/Common/Cards/delphes_card_default.dat 2016-05-12 15:13:37 +0000
1201@@ -10,7 +10,7 @@
1202 MuonTrackingEfficiency
1203
1204 ChargedHadronMomentumSmearing
1205- ElectronEnergySmearing
1206+ ElectronMomentumSmearing
1207 MuonMomentumSmearing
1208
1209 TrackMerger
1210@@ -20,6 +20,7 @@
1211 PhotonEfficiency
1212 PhotonIsolation
1213
1214+ ElectronFilter
1215 ElectronEfficiency
1216 ElectronIsolation
1217
1218@@ -28,11 +29,14 @@
1219
1220 MissingET
1221
1222+ NeutrinoFilter
1223 GenJetFinder
1224 FastJetFinder
1225
1226 JetEnergyScale
1227
1228+ JetFlavorAssociation
1229+
1230 BTagging
1231 TauTagging
1232
1233@@ -75,11 +79,11 @@
1234 # add EfficiencyFormula {efficiency formula as a function of eta and pt}
1235
1236 # tracking efficiency formula for charged hadrons
1237- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
1238- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
1239- (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) + \
1240- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) + \
1241- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) + \
1242+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
1243+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
1244+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.95) +
1245+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.60) +
1246+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.85) +
1247 (abs(eta) > 2.5) * (0.00)}
1248 }
1249
1250@@ -94,13 +98,13 @@
1251 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
1252
1253 # tracking efficiency formula for electrons
1254- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
1255- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) + \
1256- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) + \
1257- (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) + \
1258- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) + \
1259- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) + \
1260- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) + \
1261+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
1262+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.73) +
1263+ (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e2) * (0.95) +
1264+ (abs(eta) <= 1.5) * (pt > 1.0e2) * (0.99) +
1265+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.50) +
1266+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e2) * (0.83) +
1267+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2) * (0.90) +
1268 (abs(eta) > 2.5) * (0.00)}
1269 }
1270
1271@@ -115,11 +119,11 @@
1272 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
1273
1274 # tracking efficiency formula for muons
1275- set EfficiencyFormula { (pt <= 0.1) * (0.00) + \
1276- (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) + \
1277- (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) + \
1278- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) + \
1279- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) + \
1280+ set EfficiencyFormula { (pt <= 0.1) * (0.00) +
1281+ (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.75) +
1282+ (abs(eta) <= 1.5) * (pt > 1.0) * (0.99) +
1283+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.70) +
1284+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0) * (0.98) +
1285 (abs(eta) > 2.5) * (0.00)}
1286 }
1287
1288@@ -134,32 +138,27 @@
1289 # set ResolutionFormula {resolution formula as a function of eta and pt}
1290
1291 # resolution formula for charged hadrons
1292- set ResolutionFormula { (abs(eta) <= 1.5) * (pt > 0.1 && pt <= 1.0) * (0.02) + \
1293- (abs(eta) <= 1.5) * (pt > 1.0 && pt <= 1.0e1) * (0.01) + \
1294- (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
1295- (abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05) + \
1296- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 1.0) * (0.03) + \
1297- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0 && pt <= 1.0e1) * (0.02) + \
1298- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
1299- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2) * (0.05)}
1300+ # based on arXiv:1405.6569
1301+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
1302+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
1303+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
1304 }
1305
1306-#################################
1307-# Energy resolution for electrons
1308-#################################
1309+###################################
1310+# Momentum resolution for electrons
1311+###################################
1312
1313-module EnergySmearing ElectronEnergySmearing {
1314+module MomentumSmearing ElectronMomentumSmearing {
1315 set InputArray ElectronTrackingEfficiency/electrons
1316 set OutputArray electrons
1317
1318 # set ResolutionFormula {resolution formula as a function of eta and energy}
1319
1320 # resolution formula for electrons
1321- set ResolutionFormula { (abs(eta) <= 2.5) * (energy > 0.1 && energy <= 2.0e1) * (energy*0.0225) + \
1322- (abs(eta) <= 2.5) * (energy > 2.0e1) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
1323- (abs(eta) > 2.5 && abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
1324- (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
1325-
1326+ # based on arXiv:1405.6569
1327+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
1328+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
1329+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
1330 }
1331
1332 ###############################
1333@@ -173,18 +172,9 @@
1334 # set ResolutionFormula {resolution formula as a function of eta and pt}
1335
1336 # resolution formula for muons
1337- set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1 && pt <= 5.0) * (0.02) + \
1338- (abs(eta) <= 0.5) * (pt > 5.0 && pt <= 1.0e2) * (0.015) + \
1339- (abs(eta) <= 0.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.03) + \
1340- (abs(eta) <= 0.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \
1341- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1 && pt <= 5.0) * (0.03) + \
1342- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 5.0 && pt <= 1.0e2) * (0.02) + \
1343- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.04) + \
1344- (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4) + \
1345- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1 && pt <= 5.0) * (0.04) + \
1346- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 5.0 && pt <= 1.0e2) * (0.035) + \
1347- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2 && pt <= 2.0e2) * (0.05) + \
1348- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2) * (0.05 + pt*1.e-4)}
1349+ set ResolutionFormula { (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.01^2 + pt^2*2.0e-4^2) +
1350+ (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.02^2 + pt^2*3.0e-4^2) +
1351+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.05^2 + pt^2*6.0e-4^2)}
1352 }
1353
1354 ##############
1355@@ -194,7 +184,7 @@
1356 module Merger TrackMerger {
1357 # add InputArray InputArray
1358 add InputArray ChargedHadronMomentumSmearing/chargedHadrons
1359- add InputArray ElectronEnergySmearing/electrons
1360+ add InputArray ElectronMomentumSmearing/electrons
1361 add InputArray MuonMomentumSmearing/muons
1362 set OutputArray tracks
1363 }
1364@@ -214,6 +204,14 @@
1365 set EFlowPhotonOutputArray eflowPhotons
1366 set EFlowNeutralHadronOutputArray eflowNeutralHadrons
1367
1368+ set ECalEnergyMin 0.5
1369+ set HCalEnergyMin 1.0
1370+
1371+ set ECalEnergySignificanceMin 1.0
1372+ set HCalEnergySignificanceMin 1.0
1373+
1374+ set SmearTowerCenter true
1375+
1376 set pi [expr {acos(-1)}]
1377
1378 # lists of the edges of each tower in eta and phi
1379@@ -268,11 +266,11 @@
1380 add EnergyFraction {3122} {0.3 0.7}
1381
1382 # set ECalResolutionFormula {resolution formula as a function of eta and energy}
1383- set ECalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) + \
1384+ set ECalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.007^2 + energy*0.07^2 + 0.35^2) +
1385 (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
1386
1387 # set HCalResolutionFormula {resolution formula as a function of eta and energy}
1388- set HCalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.050^2 + energy*1.50^2) + \
1389+ set HCalResolutionFormula { (abs(eta) <= 3.0) * sqrt(energy^2*0.050^2 + energy*1.50^2) +
1390 (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.130^2 + energy*2.70^2)}
1391 }
1392
1393@@ -299,9 +297,9 @@
1394 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
1395
1396 # efficiency formula for photons
1397- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
1398- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
1399- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
1400+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1401+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
1402+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
1403 (abs(eta) > 2.5) * (0.00)}
1404 }
1405
1406@@ -322,20 +320,32 @@
1407 set PTRatioMax 0.1
1408 }
1409
1410+#################
1411+# Electron filter
1412+#################
1413+
1414+module PdgCodeFilter ElectronFilter {
1415+ set InputArray Calorimeter/eflowTracks
1416+ set OutputArray electrons
1417+ set Invert true
1418+ add PdgCode {11}
1419+ add PdgCode {-11}
1420+}
1421+
1422 #####################
1423 # Electron efficiency
1424 #####################
1425
1426 module Efficiency ElectronEfficiency {
1427- set InputArray ElectronEnergySmearing/electrons
1428+ set InputArray ElectronFilter/electrons
1429 set OutputArray electrons
1430
1431 # set EfficiencyFormula {efficiency formula as a function of eta and pt}
1432
1433 # efficiency formula for electrons
1434- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
1435- (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) + \
1436- (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) + \
1437+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1438+ (abs(eta) <= 1.5) * (pt > 10.0) * (0.95) +
1439+ (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0) * (0.85) +
1440 (abs(eta) > 2.5) * (0.00)}
1441 }
1442
1443@@ -367,11 +377,11 @@
1444 # set EfficiencyFormula {efficiency as a function of eta and pt}
1445
1446 # efficiency formula for muons
1447- set EfficiencyFormula { (pt <= 10.0) * (0.00) + \
1448- (abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) + \
1449- (abs(eta) <= 1.5) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) + \
1450- (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) + \
1451- (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) + \
1452+ set EfficiencyFormula { (pt <= 10.0) * (0.00) +
1453+ (abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
1454+ (abs(eta) <= 1.5) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) +
1455+ (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
1456+ (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3) * (0.95 * exp(0.5 - pt*5.0e-4)) +
1457 (abs(eta) > 2.4) * (0.00)}
1458 }
1459
1460@@ -415,12 +425,34 @@
1461 set EnergyOutputArray energy
1462 }
1463
1464+
1465+#####################
1466+# Neutrino Filter
1467+#####################
1468+
1469+module PdgCodeFilter NeutrinoFilter {
1470+
1471+ set InputArray Delphes/stableParticles
1472+ set OutputArray filteredParticles
1473+
1474+ set PTMin 0.0
1475+
1476+ add PdgCode {12}
1477+ add PdgCode {14}
1478+ add PdgCode {16}
1479+ add PdgCode {-12}
1480+ add PdgCode {-14}
1481+ add PdgCode {-16}
1482+
1483+}
1484+
1485+
1486 #####################
1487 # MC truth jet finder
1488 #####################
1489
1490 module FastJetFinder GenJetFinder {
1491- set InputArray Delphes/stableParticles
1492+ set InputArray NeutrinoFilter/filteredParticles
1493
1494 set OutputArray jets
1495
1496@@ -431,6 +463,7 @@
1497 set JetPTMin 20.0
1498 }
1499
1500+
1501 ############
1502 # Jet finder
1503 ############
1504@@ -456,8 +489,25 @@
1505 set InputArray FastJetFinder/jets
1506 set OutputArray jets
1507
1508- # scale formula for jets
1509- set ScaleFormula {1.00}
1510+ # scale formula for jets
1511+ set ScaleFormula {sqrt( (2.5 - 0.15*(abs(eta)))^2 / pt + 1.0 )}
1512+}
1513+
1514+########################
1515+# Jet Flavor Association
1516+########################
1517+
1518+module JetFlavorAssociation JetFlavorAssociation {
1519+
1520+ set PartonInputArray Delphes/partons
1521+ set ParticleInputArray Delphes/allParticles
1522+ set ParticleLHEFInputArray Delphes/allParticlesLHEF
1523+ set JetInputArray JetEnergyScale/jets
1524+
1525+ set DeltaR 0.5
1526+ set PartonPTMin 1.0
1527+ set PartonEtaMax 2.5
1528+
1529 }
1530
1531 ###########
1532@@ -465,38 +515,30 @@
1533 ###########
1534
1535 module BTagging BTagging {
1536- set PartonInputArray Delphes/partons
1537 set JetInputArray JetEnergyScale/jets
1538
1539 set BitNumber 0
1540
1541- set DeltaR 0.5
1542-
1543- set PartonPTMin 1.0
1544-
1545- set PartonEtaMax 2.5
1546-
1547 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
1548 # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
1549 # gluon's PDG code has the lowest priority
1550
1551- # https://twiki.cern.ch/twiki/bin/view/CMSPublic/PhysicsResultsBTV
1552+ # based on arXiv:1211.4462
1553+
1554 # default efficiency formula (misidentification rate)
1555- add EfficiencyFormula {0} {0.001}
1556+ add EfficiencyFormula {0} {0.01+0.00038*pt}
1557
1558 # efficiency formula for c-jets (misidentification rate)
1559- add EfficiencyFormula {4} { (pt <= 15.0) * (0.000) + \
1560- (abs(eta) <= 1.2) * (pt > 15.0) * (0.2*tanh(pt*0.03 - 0.4)) + \
1561- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.1*tanh(pt*0.03 - 0.4)) + \
1562- (abs(eta) > 2.5) * (0.000)}
1563+ add EfficiencyFormula {4} {0.25*tanh(0.018*pt)*(1/(1+ 0.0013*pt))}
1564
1565 # efficiency formula for b-jets
1566- add EfficiencyFormula {5} { (pt <= 15.0) * (0.000) + \
1567- (abs(eta) <= 1.2) * (pt > 15.0) * (0.5*tanh(pt*0.03 - 0.4)) + \
1568- (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.4*tanh(pt*0.03 - 0.4)) + \
1569- (abs(eta) > 2.5) * (0.000)}
1570+ add EfficiencyFormula {5} {0.85*tanh(0.0025*pt)*(25.0/(1+0.063*pt))}
1571 }
1572
1573+#############
1574+# tau-tagging
1575+#############
1576+
1577 module TauTagging TauTagging {
1578 set ParticleInputArray Delphes/allParticles
1579 set PartonInputArray Delphes/partons
1580@@ -511,9 +553,9 @@
1581 # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
1582
1583 # default efficiency formula (misidentification rate)
1584- add EfficiencyFormula {0} {0.001}
1585+ add EfficiencyFormula {0} {0.01}
1586 # efficiency formula for tau-jets
1587- add EfficiencyFormula {15} {0.4}
1588+ add EfficiencyFormula {15} {0.6}
1589 }
1590
1591 #####################################################
1592@@ -556,4 +598,3 @@
1593 add Branch MissingET/momentum MissingET MissingET
1594 add Branch ScalarHT/energy ScalarHT ScalarHT
1595 }
1596-
1597
1598=== modified file 'Template/Common/Cards/reweight_card_default.dat'
1599--- Template/Common/Cards/reweight_card_default.dat 2015-08-11 12:18:25 +0000
1600+++ Template/Common/Cards/reweight_card_default.dat 2016-05-12 15:13:37 +0000
1601@@ -1,13 +1,9 @@
1602 #*************************************************************************
1603-# Reweight Module *
1604+# Reweight Module *
1605+# Matrix-Element reweighting at LO/NLO *
1606+# Mattelaer Olivier arxiv:xxxx.xxxx *
1607 #*************************************************************************
1608-#
1609-# Reweighting by Leading Order (tree-level / loop-induced) matrix
1610-# elements
1611-#
1612-# Caution: this is not (in general) NLO accurate, even when starting
1613-# with NLO accurate events.
1614-#
1615+#
1616 # Note:
1617 # 1) the value of alpha_s will be used from the event so the value in
1618 # the param_card is not taken into account.
1619@@ -17,15 +13,32 @@
1620 # width leads to very inaccurate result). In such a case, separate
1621 # event generation runs are needed.
1622 #
1623+#************************************************************************
1624+# ENTER YOUR COMMANDS BELOW.
1625+#************************************************************************
1626+
1627+change mode NLO # Define type of Reweighting. For LO sample this command
1628+ # has no effect since only "LO" mode is allowed.
1629+
1630+launch
1631+# SPECIFY A PATH OR USE THE SET COMMAND LIKE THIS:
1632+# set sminputs 1 130 # modify 1/alpha_EW
1633+
1634+
1635+
1636+#************************************************************************
1637+# Manual: https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/Reweight
1638+#************************************************************************
1639 #
1640 # Example of (standard) code for the computation of two weights:
1641 #
1642-# launch ! tag to start the computat'n of the first weight
1643+# launch ! tag to start the computation of the first weight
1644 # set BLOCKNAME ID VALUE ! rule to modify the current param_card
1645 # set BLOCKNAME ID VALUE ! rule to modify the current param_card
1646 # launch ! start to compute a second weight
1647 # /home/Cards/param_card_2.dat ! you can also enter a path to a valid card
1648 #
1649+# Note: The command to specify the parameter are AFTER the associated "launch"
1650 #
1651 # Possible options:
1652 # You can enter one of the following lines to customize the reweighting
1653@@ -35,17 +48,22 @@
1654 # with. In this case you need to provide the path to a correct
1655 # param_card for the new model; you cannot modify the original one
1656 # with the 'set' command.
1657-# change process DEF [-add]: change the process by which you reweight.
1658+# change process DEF [--add]: change the process by which you reweight.
1659 # The initial and final state particles of the new process should
1660 # be exactly identical to the ones in the original process.
1661 # change helicity False: perform the reweighting by helicity summed
1662 # matrix-elements even if the events have been written with a
1663-# single helicity state.
1664-#
1665-#*************************************************************************
1666-# ENTER YOUR COMMANDS BELOW.
1667-#*************************************************************************
1668+# single helicity state.
1669+# change mode XXX: change the type of reweighting performed.
1670+# allowed values: LO, NLO, LO+NLO
1671+# - This command has no effect for reweighting an .lhe event file with LO accuracy.
1672+# In that case LO mode is always used (whatever entry is set).
1673+# - When the .lhe file reweighted is at NLO accuracy, then all modes are allowed.
1674+# * "LO" is an approximate leading order method
1675+# * "NLO" is the NLO accurate method
1676+# * "LO+NLO" runs both
1677+# - "NLO" and "LO+NLO" modes requires 'store_rwgt_info' equals True (run_card.dat)
1678+# If the reweighting is done at generation level this parameter will
1679+# automatically be set on True.
1680+#************************************************************************
1681
1682-launch
1683-# SPECIFY A PATH OR USE THE SET COMMAND LIKE THIS:
1684-# set sminputs 1 130 # modify 1/alpha_EW
1685
1686=== modified file 'Template/Common/bin/internal/run_pythia'
1687--- Template/Common/bin/internal/run_pythia 2013-11-05 10:16:20 +0000
1688+++ Template/Common/bin/internal/run_pythia 2016-05-12 15:13:37 +0000
1689@@ -15,8 +15,8 @@
1690
1691 echo $$ >> ../myprocid
1692 # shower and hadronize event through Pythia
1693-echo " " >> ../Cards/pythia_card.dat
1694-echo " LHAPATH=$pydir/PDFsets" >> ../Cards/pythia_card.dat
1695+#echo "" >> ../Cards/pythia_card.dat
1696+#echo " LHAPATH=$pydir/PDFsets" >> ../Cards/pythia_card.dat
1697 export PDG_MASS_TBL=$pydir/mass_width_2004.mc
1698 rm -rf Events/hepmv_event.hepmc &> /dev/null
1699 $pydir/pythia && touch pythia.done
1700
1701=== modified file 'Template/LO/Source/PDF/makefile'
1702--- Template/LO/Source/PDF/makefile 2014-09-05 11:30:25 +0000
1703+++ Template/LO/Source/PDF/makefile 2016-05-12 15:13:37 +0000
1704@@ -11,7 +11,11 @@
1705 include ../make_opts
1706
1707 ifdef lhapdf
1708- PDF = pdfwrap_lhapdf.o pdf_lhapdf.o pdg2pdf_lhapdf.o opendata.o
1709+ ifeq ($(lhapdfversion),5)
1710+ PDF = pdfwrap_lhapdf.o pdf_lhapdf.o pdg2pdf_lhapdf.o opendata.o
1711+ else
1712+ PDF = pdfwrap_lhapdf.o pdf_lhapdf6.o pdg2pdf_lhapdf6.o opendata.o
1713+ endif
1714 else
1715 PDF = Ctq4Fn.o Ctq5Par.o Ctq5Pdf.o Partonx5.o Ctq6Pdf.o cteq3.o \
1716 mrs98.o mrs98lo.o mrs98ht.o mrs99.o mrst2001.o mrst2002.o jeppe02.o \
1717
1718=== added file 'Template/LO/Source/PDF/pdf_lhapdf6.cc'
1719--- Template/LO/Source/PDF/pdf_lhapdf6.cc 1970-01-01 00:00:00 +0000
1720+++ Template/LO/Source/PDF/pdf_lhapdf6.cc 2016-05-12 15:13:37 +0000
1721@@ -0,0 +1,1120 @@
1722+// -*- C++ -*-
1723+//
1724+// This file is part of LHAPDF
1725+// Copyright (C) 2012-2014 The LHAPDF collaboration (see AUTHORS for details)
1726+//
1727+#include "LHAPDF/PDF.h"
1728+#include "LHAPDF/PDFSet.h"
1729+#include "LHAPDF/PDFIndex.h"
1730+#include "LHAPDF/Factories.h"
1731+#include "LHAPDF/Utils.h"
1732+#include "LHAPDF/Paths.h"
1733+#include "LHAPDF/Version.h"
1734+#include "LHAPDF/LHAGlue.h"
1735+
1736+using namespace std;
1737+
1738+
1739+// We have to create and initialise some common blocks here for backwards compatibility
1740+struct w50512 {
1741+ double qcdl4, qcdl5;
1742+};
1743+w50512 w50512_;
1744+
1745+struct w50513 {
1746+ double xmin, xmax, q2min, q2max;
1747+};
1748+w50513 w50513_;
1749+
1750+struct lhapdfr {
1751+ double qcdlha4, qcdlha5;
1752+ int nfllha;
1753+};
1754+lhapdfr lhapdfr_;
1755+
1756+
1757+
1758+namespace lhapdf_amc { //< Unnamed namespace to restrict visibility to this file
1759+
1760+ /// @brief PDF object storage here is a smart pointer to ensure deletion of created PDFs
1761+ ///
1762+ /// NB. std::auto_ptr cannot be stored in STL containers, hence we use
1763+ /// boost::shared_ptr. std::unique_ptr is the nature replacement when C++11
1764+ /// is globally available.
1765+ typedef boost::shared_ptr<LHAPDF::PDF> PDFPtr;
1766+
1767+ /// @brief A struct for handling the active PDFs for the Fortran interface.
1768+ ///
1769+ /// We operate in a string-based way, since maybe there will be sets with names, but no
1770+ /// index entry in pdfsets.index.
1771+ ///
1772+ /// @todo Can we avoid the strings and just work via the LHAPDF ID and factory construction?
1773+ ///
1774+ /// Smart pointers are used in the native map used for PDF member storage so
1775+ /// that they auto-delete if the PDFSetHandler that holds them goes out of
1776+ /// scope (i.e. is overwritten).
1777+ struct PDFSetHandler {
1778+
1779+ /// Default constructor
1780+ PDFSetHandler() : currentmem(0)
1781+ { } //< It'll be stored in a map so we need one of these...
1782+
1783+ /// Constructor from a PDF set name
1784+ PDFSetHandler(const string& name)
1785+ : setname(name)
1786+ {
1787+ loadMember(0);
1788+ }
1789+
1790+ /// Constructor from a PDF set's LHAPDF ID code
1791+ PDFSetHandler(int lhaid) {
1792+ pair<string,int> set_mem = LHAPDF::lookupPDF(lhaid);
1793+ // First check that the lookup was successful, i.e. it was a valid ID for the LHAPDF6 set collection
1794+ if (set_mem.first.empty() || set_mem.second < 0)
1795+ throw LHAPDF::UserError("Could not find a valid PDF with LHAPDF ID = " + LHAPDF::to_str(lhaid));
1796+ // Try to load this PDF (checking that the member number is in the set's range is done in mkPDF, called by loadMember)
1797+ setname = set_mem.first;
1798+ loadMember(set_mem.second);
1799+ }
1800+
1801+ /// @brief Load a new PDF member
1802+ ///
1803+ /// If it's already loaded, the existing object will not be reloaded.
1804+ void loadMember(int mem) {
1805+ if (mem < 0)
1806+ throw LHAPDF::UserError("Tried to load a negative PDF member ID: " + LHAPDF::to_str(mem) + " in set " + setname);
1807+ if (members.find(mem) == members.end())
1808+ members[mem] = PDFPtr(LHAPDF::mkPDF(setname, mem));
1809+ currentmem = mem;
1810+ }
1811+
1812+ /// Actively delete a PDF member to save memory
1813+ void unloadMember(int mem) {
1814+ members.erase(mem);
1815+ const int nextmem = (!members.empty()) ? members.begin()->first : 0;
1816+ loadMember(nextmem);
1817+ }
1818+
1819+ /// @brief Get a PDF member
1820+ ///
1821+ /// Non-const because it can secretly load the member. Not that constness
1822+ /// matters in a Fortran interface utility function!
1823+ const PDFPtr member(int mem) {
1824+ loadMember(mem);
1825+ return members.find(mem)->second;
1826+ }
1827+
1828+ /// Get the currently active PDF member
1829+ ///
1830+ /// Non-const because it can secretly load the member. Not that constness
1831+ /// matters in a Fortran interface utility function!
1832+ const PDFPtr activemember() {
1833+ return member(currentmem);
1834+ }
1835+
1836+ /// The currently active member in this set
1837+ int currentmem;
1838+
1839+ /// Name of this set
1840+ string setname;
1841+
1842+ /// Map of pointers to selected member PDFs
1843+ ///
1844+ // /// It's mutable so that a "const" member-getting operation can implicitly
1845+ // /// load a new PDF object. Good idea / bad idea? Disabled for now.
1846+ // mutable map<int, PDFPtr> members;
1847+ map<int, PDFPtr> members;
1848+ };
1849+
1850+
1851+ /// Collection of active sets
1852+ static map<int, PDFSetHandler> ACTIVESETS;
1853+
1854+ /// The currently active set
1855+ int CURRENTSET = 0;
1856+
1857+}
1858+
1859+
1860+
1861+string lhaglue_get_current_pdf(int nset) {
1862+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
1863+ return "NONE";
1864+ lhapdf_amc::CURRENTSET = nset;
1865+ return lhapdf_amc::ACTIVESETS[nset].activemember()->set().name() + " (" +
1866+ LHAPDF::to_str(lhapdf_amc::ACTIVESETS[nset].activemember()->lhapdfID()) + ")";
1867+}
1868+
1869+
1870+
1871+extern "C" {
1872+
1873+ // NEW FORTRAN INTERFACE FUNCTIONS
1874+
1875+ /// List of available sets
1876+ void lhapdf_getversion_(char* s, size_t len) {
1877+ strncpy(s, LHAPDF_VERSION, len);
1878+ }
1879+
1880+ /// List of available PDF sets, returned as a space-separated string
1881+ void lhapdf_getpdfsetlist_(char* s, size_t len) {
1882+ string liststr;
1883+ BOOST_FOREACH(const string& setname, LHAPDF::availablePDFSets()) {
1884+ if (!liststr.empty()) liststr += " ";
1885+ liststr += setname;
1886+ }
1887+ strncpy(s, liststr.c_str(), len);
1888+ }
1889+
1890+
1891+ //////////////////
1892+
1893+ // LHAPDF5 / PDFLIB COMPATIBILITY INTERFACE FUNCTIONS
1894+
1895+
1896+ // System-level info
1897+
1898+ /// LHAPDF library version
1899+ void getlhapdfversion_(char* s, size_t len) {
1900+ /// @todo Works? Need to check Fortran string return, string macro treatment, etc.
1901+ strncpy(s, LHAPDF_VERSION, len);
1902+ }
1903+
1904+
1905+ /// Does nothing, only provided for backward compatibility
1906+ void lhaprint_(int& a) { }
1907+
1908+
1909+ /// Set LHAPDF parameters -- does nothing in LHAPDF6!
1910+ void setlhaparm_(const char* par, int parlength) {
1911+ /// @todo Can any Fortran LHAPDF params be usefully mapped?
1912+ }
1913+
1914+
1915+ /// Return a dummy max number of sets (there is no limitation now)
1916+ void getmaxnumsets_(int& nmax) {
1917+ nmax = 1000;
1918+ }
1919+
1920+
1921+ /// Set PDF data path
1922+ void setpdfpath_(const char* s, size_t len) {
1923+ /// @todo Works? Need to check C-string copying, null termination
1924+ char s2[1024];
1925+ s2[len] = '\0';
1926+ strncpy(s2, s, len);
1927+ LHAPDF::pathsPrepend(s2);
1928+ }
1929+
1930+ /// Get PDF data path (colon-separated if there is more than one element)
1931+ void getdatapath_(char* s, size_t len) {
1932+ /// @todo Works? Need to check Fortran string return, string macro treatment, etc.
1933+ string pathstr;
1934+ BOOST_FOREACH(const string& path, LHAPDF::paths()) {
1935+ if (!pathstr.empty()) pathstr += ":";
1936+ pathstr += path;
1937+ }
1938+ strncpy(s, pathstr.c_str(), len);
1939+ }
1940+
1941+
1942+ // PDF initialisation and focus-switching
1943+
1944+ /// Load a PDF set
1945+ ///
1946+ /// @todo Does this version actually take a *path*? What to do?
1947+ void initpdfsetm_(const int& nset, const char* setpath, int setpathlength) {
1948+ // Strip file extension for backward compatibility
1949+ string fullp = string(setpath, setpathlength);
1950+ // Remove trailing whitespace
1951+ fullp.erase( std::remove_if( fullp.begin(), fullp.end(), ::isspace ), fullp.end() );
1952+ // Use only items after the last /
1953+ const string pap = LHAPDF::dirname(fullp);
1954+ const string p = LHAPDF::basename(fullp);
1955+ // Prepend path to search area
1956+ LHAPDF::pathsPrepend(pap);
1957+ // Handle extensions
1958+ string path = LHAPDF::file_extn(p).empty() ? p : LHAPDF::file_stem(p);
1959+ /// @note We correct the misnamed CTEQ6L1/CTEQ6ll set name as a backward compatibility special case.
1960+ if (boost::algorithm::to_lower_copy(path) == "cteq6ll") path = "cteq6l1";
1961+ // Create the PDF set with index nset
1962+ // if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
1963+ lhapdf_amc::ACTIVESETS[nset] = lhapdf_amc::PDFSetHandler(path); //< @todo Will be wrong if a structured path is given
1964+ lhapdf_amc::CURRENTSET = nset;
1965+ }
1966+ /// Load a PDF set (non-multiset version)
1967+ void initpdfset_(const char* setpath, int setpathlength) {
1968+ int nset1 = 1;
1969+ initpdfsetm_(nset1, setpath, setpathlength);
1970+ }
1971+
1972+
1973+ /// Load a PDF set by name
1974+ void initpdfsetbynamem_(const int& nset, const char* setname, int setnamelength) {
1975+ // Truncate input to size setnamelength
1976+ string p = setname;
1977+ p.erase(setnamelength, std::string::npos);
1978+ // Strip file extension for backward compatibility
1979+ string name = LHAPDF::file_extn(p).empty() ? p : LHAPDF::file_stem(p);
1980+ // Remove trailing whitespace
1981+ name.erase( std::remove_if( name.begin(), name.end(), ::isspace ), name.end() );
1982+ /// @note We correct the misnamed CTEQ6L1/CTEQ6ll set name as a backward compatibility special case.
1983+ if (boost::algorithm::to_lower_copy(name) == "cteq6ll") name = "cteq6l1";
1984+ // Create the PDF set with index nset
1985+ // if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
1986+ lhapdf_amc::ACTIVESETS[nset] = lhapdf_amc::PDFSetHandler(name);
1987+ // Update current set focus
1988+ lhapdf_amc::CURRENTSET = nset;
1989+ }
1990+ /// Load a PDF set by name (non-multiset version)
1991+ void initpdfsetbyname_(const char* setname, int setnamelength) {
1992+ int nset1 = 1;
1993+ initpdfsetbynamem_(nset1, setname, setnamelength);
1994+ }
1995+
1996+
1997+ /// Load a PDF in current set
1998+ void initpdfm_(const int& nset, const int& nmember) {
1999+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2000+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2001+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmember);
2002+ // Update current set focus
2003+ lhapdf_amc::CURRENTSET = nset;
2004+ }
2005+ /// Load a PDF in current set (non-multiset version)
2006+ void initpdf_(const int& nmember) {
2007+ int nset1 = 1;
2008+ initpdfm_(nset1, nmember);
2009+ }
2010+
2011+
2012+ /// Get the current set number (i.e. allocation slot index)
2013+ void getnset_(int& nset) {
2014+ nset = lhapdf_amc::CURRENTSET;
2015+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2016+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2017+ }
2018+
2019+ /// Explicitly set the current set number (i.e. allocation slot index)
2020+ void setnset_(const int& nset) {
2021+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2022+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2023+ lhapdf_amc::CURRENTSET = nset;
2024+ }
2025+
2026+
2027+ /// Get the current member number in slot nset
2028+ void getnmem_(int& nset, int& nmem) {
2029+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2030+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2031+ nmem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2032+ // Update current set focus
2033+ lhapdf_amc::CURRENTSET = nset;
2034+ }
2035+
2036+ /// Set the current member number in slot nset
2037+ void setnmem_(const int& nset, const int& nmem) {
2038+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2039+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" +
2040+ LHAPDF::to_str(nset) + " but it is not initialised");
2041+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2042+ // Update current set focus
2043+ lhapdf_amc::CURRENTSET = nset;
2044+ }
2045+
2046+
2047+
2048+ // PDF evolution functions
2049+
2050+ /// Get xf(x) values for common partons from current PDF
2051+ void evolvepdfm_(const int& nset, const double& x, const double& q, double* fxq) {
2052+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2053+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2054+ // Evaluate for the 13 LHAPDF5 standard partons (-6..6)
2055+ for (size_t i = 0; i < 13; ++i) {
2056+ try {
2057+ fxq[i] = lhapdf_amc::ACTIVESETS[nset].activemember()->xfxQ(i-6, x, q);
2058+ } catch (const exception& e) {
2059+ fxq[i] = 0;
2060+ }
2061+ }
2062+ // Update current set focus
2063+ lhapdf_amc::CURRENTSET = nset;
2064+ }
2065+ /// Get xf(x) values for common partons from current PDF (non-multiset version)
2066+ void evolvepdf_(const double& x, const double& q, double* fxq) {
2067+ int nset1 = 1;
2068+ evolvepdfm_(nset1, x, q, fxq);
2069+ }
2070+
2071+ // PDF evolution functions
2072+ // NEW BY MZ to evolve one single parton
2073+
2074+ /// Get xf(x) values for common partons from current PDF
2075+ void evolvepartm_(const int& nset, const int& ipart, const double& x, const double& q, double& fxq) {
2076+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2077+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2078+ int ipart_copy; // this is to deal with photons, which are labeled 7 in MG5aMC
2079+ ipart_copy = ipart;
2080+ if (ipart==7) ipart_copy = 22;
2081+ try {
2082+ fxq = lhapdf_amc::ACTIVESETS[nset].activemember()->xfxQ(ipart_copy, x, q);
2083+ } catch (const exception& e) {
2084+ fxq = 0;
2085+ }
2086+ // Update current set focus
2087+ lhapdf_amc::CURRENTSET = nset;
2088+ }
2089+ /// Get xf(x) values for common partons from current PDF (non-multiset version)
2090+ void evolvepart_( const int& ipart, const double& x, const double& q, double& fxq) {
2091+ int nset1 = 1;
2092+ evolvepartm_(nset1, ipart, x, q, fxq);
2093+ }
2094+
2095+
2096+ /// Determine if the current PDF has a photon flavour (historically only MRST2004QED)
2097+ /// @todo Function rather than subroutine?
2098+ /// @note There is no multiset version. has_photon will respect the current set slot.
2099+ bool has_photon_() {
2100+ return lhapdf_amc::ACTIVESETS[lhapdf_amc::CURRENTSET].activemember()->hasFlavor(22);
2101+ }
2102+
2103+
2104+ /// Get xfx values from current PDF, including an extra photon flavour
2105+ void evolvepdfphotonm_(const int& nset, const double& x, const double& q, double* fxq, double& photonfxq) {
2106+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2107+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2108+ // First evaluate the "normal" partons
2109+ evolvepdfm_(nset, x, q, fxq);
2110+ // Then evaluate the photon flavor (historically only for MRST2004QED)
2111+ try {
2112+ photonfxq = lhapdf_amc::ACTIVESETS[nset].activemember()->xfxQ(22, x, q);
2113+ } catch (const exception& e) {
2114+ photonfxq = 0;
2115+ }
2116+ // Update current set focus
2117+ lhapdf_amc::CURRENTSET = nset;
2118+ }
2119+ /// Get xfx values from current PDF, including an extra photon flavour (non-multiset version)
2120+ void evolvepdfphoton_(const double& x, const double& q, double* fxq, double& photonfxq) {
2121+ int nset1 = 1;
2122+ evolvepdfphotonm_(nset1, x, q, fxq, photonfxq);
2123+ }
2124+
2125+
2126+ /// Get xf(x) values for common partons from a photon PDF
2127+ void evolvepdfpm_(const int& nset, const double& x, const double& q, const double& p2, const int& ip2, double& fxq) {
2128+ // Update current set focus
2129+ lhapdf_amc::CURRENTSET = nset;
2130+ throw LHAPDF::NotImplementedError("Photon structure functions are not yet supported in LHAPDF6");
2131+ }
2132+ /// Get xf(x) values for common partons from a photon PDF (non-multiset version)
2133+ void evolvepdfp_(const double& x, const double& q, const double& p2, const int& ip2, double& fxq) {
2134+ int nset1 = 1;
2135+ evolvepdfpm_(nset1, x, q, p2, ip2, fxq);
2136+ }
2137+
2138+
2139+ // alpha_s evolution
2140+
2141+ /// Get the alpha_s order for the set
2142+ void getorderasm_(const int& nset, int& oas) {
2143+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2144+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2145+ // Set equal to the number of members for the requested set
2146+ oas = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<int>("AlphaS_OrderQCD");
2147+ // Update current set focus
2148+ lhapdf_amc::CURRENTSET = nset;
2149+ }
2150+ /// Get the alpha_s order for the set (non-multiset version)
2151+ void getorderas_(int& oas) {
2152+ int nset1 = 1;
2153+ getorderasm_(nset1, oas);
2154+ }
2155+
2156+
2157+ /// Get the alpha_s(Q) value for set nset
2158+ double alphaspdfm_(const int& nset, const double& Q){
2159+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2160+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2161+ return lhapdf_amc::ACTIVESETS[nset].activemember()->alphasQ(Q);
2162+ // Update current set focus
2163+ lhapdf_amc::CURRENTSET = nset;
2164+ }
2165+ /// Get the alpha_s(Q) value for the set (non-multiset version)
2166+ double alphaspdf_(const double& Q){
2167+ int nset1 = 1;
2168+ return alphaspdfm_(nset1, Q);
2169+ }
2170+
2171+
2172+ // Metadata functions
2173+
2174+ /// Get the number of error members in the set (with special treatment for single member sets)
2175+ void numberpdfm_(const int& nset, int& numpdf) {
2176+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2177+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2178+ // Set equal to the number of members for the requested set
2179+ numpdf= lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<int>("NumMembers");
2180+ // Reproduce old LHAPDF v5 behaviour, i.e. subtract 1 if more than 1 member set
2181+ if (numpdf > 1) numpdf -= 1;
2182+ // Update current set focus
2183+ lhapdf_amc::CURRENTSET = nset;
2184+ }
2185+ /// Get the number of error members in the set (non-multiset version)
2186+ void numberpdf_(int& numpdf) {
2187+ int nset1 = 1;
2188+ numberpdfm_(nset1, numpdf);
2189+ }
2190+
2191+
2192+ /// Get the max number of active flavours
2193+ void getnfm_(const int& nset, int& nf) {
2194+ //nf = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<int>("AlphaS_NumFlavors");
2195+ nf = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<int>("NumFlavors");
2196+ // Update current set focus
2197+ lhapdf_amc::CURRENTSET = nset;
2198+ }
2199+ /// Get the max number of active flavours (non-multiset version)
2200+ void getnf_(int& nf) {
2201+ int nset1 = 1;
2202+ getnfm_(nset1, nf);
2203+ }
2204+
2205+
2206+ /// Get nf'th quark mass
2207+ void getqmassm_(const int& nset, const int& nf, double& mass) {
2208+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2209+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2210+ if (nf*nf == 1) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MDown");
2211+ else if (nf*nf == 4) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MUp");
2212+ else if (nf*nf == 9) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MStrange");
2213+ else if (nf*nf == 16) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MCharm");
2214+ else if (nf*nf == 25) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MBottom");
2215+ else if (nf*nf == 36) mass = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("MTop");
2216+ else throw LHAPDF::UserError("Trying to get quark mass for invalid quark ID #" + LHAPDF::to_str(nf));
2217+ // Update current set focus
2218+ lhapdf_amc::CURRENTSET = nset;
2219+ }
2220+ /// Get nf'th quark mass (non-multiset version)
2221+ void getqmass_(const int& nf, double& mass) {
2222+ int nset1 = 1;
2223+ getqmassm_(nset1, nf, mass);
2224+ }
2225+
2226+
2227+ /// Get the nf'th quark threshold
2228+ void getthresholdm_(const int& nset, const int& nf, double& Q) {
2229+ try {
2230+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2231+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2232+ if (nf*nf == 1) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdDown");
2233+ else if (nf*nf == 4) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdUp");
2234+ else if (nf*nf == 9) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdStrange");
2235+ else if (nf*nf == 16) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdCharm");
2236+ else if (nf*nf == 25) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdBottom");
2237+ else if (nf*nf == 36) Q = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("ThresholdTop");
2238+ //else throw LHAPDF::UserError("Trying to get quark threshold for invalid quark ID #" + LHAPDF::to_str(nf));
2239+ } catch (...) {
2240+ getqmassm_(nset, nf, Q);
2241+ }
2242+ // Update current set focus
2243+ lhapdf_amc::CURRENTSET = nset;
2244+ }
2245+ /// Get the nf'th quark threshold
2246+ void getthreshold_(const int& nf, double& Q) {
2247+ int nset1 = 1;
2248+ getthresholdm_(nset1, nf, Q);
2249+ }
2250+
2251+
2252+ /// Print PDF set's description to stdout
2253+ void getdescm_(const int& nset) {
2254+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2255+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2256+ cout << lhapdf_amc::ACTIVESETS[nset].activemember()->description() << endl;
2257+ // Update current set focus
2258+ lhapdf_amc::CURRENTSET = nset;
2259+ }
2260+ void getdesc_() {
2261+ int nset1 = 1;
2262+ getdescm_(nset1);
2263+ }
2264+
2265+
2266+ void getxminm_(const int& nset, const int& nmem, double& xmin) {
2267+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2268+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2269+ const int activemem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2270+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2271+ xmin = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMin");
2272+ lhapdf_amc::ACTIVESETS[nset].loadMember(activemem);
2273+ // Update current set focus
2274+ lhapdf_amc::CURRENTSET = nset;
2275+ }
2276+ void getxmin_(const int& nmem, double& xmin) {
2277+ int nset1 = 1;
2278+ getxminm_(nset1, nmem, xmin);
2279+ }
2280+
2281+
2282+ void getxmaxm_(const int& nset, const int& nmem, double& xmax) {
2283+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2284+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2285+ const int activemem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2286+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2287+ xmax = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMax");
2288+ lhapdf_amc::ACTIVESETS[nset].loadMember(activemem);
2289+ // Update current set focus
2290+ lhapdf_amc::CURRENTSET = nset;
2291+ }
2292+ void getxmax_(const int& nmem, double& xmax) {
2293+ int nset1 = 1;
2294+ getxmaxm_(nset1, nmem, xmax);
2295+ }
2296+
2297+
2298+ void getq2minm_(const int& nset, const int& nmem, double& q2min) {
2299+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2300+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2301+ const int activemem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2302+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2303+ q2min = LHAPDF::sqr(lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMin"));
2304+ lhapdf_amc::ACTIVESETS[nset].loadMember(activemem);
2305+ // Update current set focus
2306+ lhapdf_amc::CURRENTSET = nset;
2307+ }
2308+ void getq2min_(const int& nmem, double& q2min) {
2309+ int nset1 = 1;
2310+ getq2minm_(nset1, nmem, q2min);
2311+ }
2312+
2313+
2314+ void getq2maxm_(const int& nset, const int& nmem, double& q2max) {
2315+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2316+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2317+ const int activemem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2318+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2319+ q2max = LHAPDF::sqr(lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMax"));
2320+ lhapdf_amc::ACTIVESETS[nset].loadMember(activemem);
2321+ // Update current set focus
2322+ lhapdf_amc::CURRENTSET = nset;
2323+ }
2324+ void getq2max_(const int& nmem, double& q2max) {
2325+ int nset1 = 1;
2326+ getq2maxm_(nset1, nmem, q2max);
2327+ }
2328+
2329+
2330+ void getminmaxm_(const int& nset, const int& nmem, double& xmin, double& xmax, double& q2min, double& q2max) {
2331+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2332+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2333+ const int activemem = lhapdf_amc::ACTIVESETS[nset].currentmem;
2334+ lhapdf_amc::ACTIVESETS[nset].loadMember(nmem);
2335+ xmin = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMin");
2336+ xmax = lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMax");
2337+ q2min = LHAPDF::sqr(lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMin"));
2338+ q2max = LHAPDF::sqr(lhapdf_amc::ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMax"));
2339+ lhapdf_amc::ACTIVESETS[nset].loadMember(activemem);
2340+ // Update current set focus
2341+ lhapdf_amc::CURRENTSET = nset;
2342+ }
2343+ void getminmax_(const int& nmem, double& xmin, double& xmax, double& q2min, double& q2max) {
2344+ int nset1 = 1;
2345+ getminmaxm_(nset1, nmem, xmin, xmax, q2min, q2max);
2346+ }
2347+
2348+
2349+
2350+ /// Backwards compatibility functions for LHAPDF5 calculations of
2351+ /// PDF uncertainties and PDF correlations (G. Watt, March 2014).
2352+
2353+ // subroutine GetPDFUncTypeM(nset,lMonteCarlo,lSymmetric)
2354+ void getpdfunctypem_(const int& nset, int& lmontecarlo, int& lsymmetric) {
2355+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2356+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2357+ const string errorType = lhapdf_amc::ACTIVESETS[nset].activemember()->set().errorType();
2358+ if (errorType == "replicas") { // Monte Carlo PDF sets
2359+ lmontecarlo = 1;
2360+ lsymmetric = 1;
2361+ } else if (errorType == "symmhessian") { // symmetric eigenvector PDF sets
2362+ lmontecarlo = 0;
2363+ lsymmetric = 1;
2364+ } else { // default: assume asymmetric Hessian eigenvector PDF sets
2365+ lmontecarlo = 0;
2366+ lsymmetric = 0;
2367+ }
2368+ // Update current set focus
2369+ lhapdf_amc::CURRENTSET = nset;
2370+ }
2371+ // subroutine GetPDFUncType(lMonteCarlo,lSymmetric)
2372+ void getpdfunctype_(int& lmontecarlo, int& lsymmetric) {
2373+ int nset1 = 1;
2374+ getpdfunctypem_(nset1, lmontecarlo, lsymmetric);
2375+ }
2376+
2377+
2378+ // subroutine GetPDFuncertaintyM(nset,values,central,errplus,errminus,errsym)
2379+ void getpdfuncertaintym_(const int& nset, const double* values, double& central, double& errplus, double& errminus, double& errsymm) {
2380+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2381+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2382+ const size_t nmem = lhapdf_amc::ACTIVESETS[nset].activemember()->set().size()-1;
2383+ const vector<double> vecvalues(values, values + nmem + 1);
2384+ LHAPDF::PDFUncertainty err = lhapdf_amc::ACTIVESETS[nset].activemember()->set().uncertainty(vecvalues, -1);
2385+ central = err.central;
2386+ errplus = err.errplus;
2387+ errminus = err.errminus;
2388+ errsymm = err.errsymm;
2389+ // Update current set focus
2390+ lhapdf_amc::CURRENTSET = nset;
2391+ }
2392+ // subroutine GetPDFuncertainty(values,central,errplus,errminus,errsym)
2393+ void getpdfuncertainty_(const double* values, double& central, double& errplus, double& errminus, double& errsymm) {
2394+ int nset1 = 1;
2395+ getpdfuncertaintym_(nset1, values, central, errplus, errminus, errsymm);
2396+ }
2397+
2398+
2399+ // subroutine GetPDFcorrelationM(nset,valuesA,valuesB,correlation)
2400+ void getpdfcorrelationm_(const int& nset, const double* valuesA, const double* valuesB, double& correlation) {
2401+ if (lhapdf_amc::ACTIVESETS.find(nset) == lhapdf_amc::ACTIVESETS.end())
2402+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2403+ const size_t nmem = lhapdf_amc::ACTIVESETS[nset].activemember()->set().size()-1;
2404+ const vector<double> vecvaluesA(valuesA, valuesA + nmem + 1);
2405+ const vector<double> vecvaluesB(valuesB, valuesB + nmem + 1);
2406+ correlation = lhapdf_amc::ACTIVESETS[nset].activemember()->set().correlation(vecvaluesA,vecvaluesB);
2407+ // Update current set focus
2408+ lhapdf_amc::CURRENTSET = nset;
2409+ }
2410+ // subroutine GetPDFcorrelation(valuesA,valuesB,correlation)
2411+ void getpdfcorrelation_(const double* valuesA, const double* valuesB, double& correlation) {
2412+ int nset1 = 1;
2413+ getpdfcorrelationm_(nset1, valuesA, valuesB, correlation);
2414+ }
2415+
2416+
2417+ ///////////////////////////////////////
2418+
2419+
2420+ /// REALLY OLD PDFLIB COMPATILITY FUNCTIONS
2421+
2422+ /// PDFLIB initialisation function
2423+ void pdfset_(const char* par, const double* value, int parlength) {
2424+
2425+ // Identify the calling program (yuck!)
2426+ string my_par(par);
2427+ if (my_par.find("NPTYPE") != string::npos) {
2428+ cout << "==== LHAPDF6 USING PYTHIA-TYPE LHAGLUE INTERFACE ====" << endl;
2429+ // Take PDF ID from value[2]
2430+ lhapdf_amc::ACTIVESETS[1] = lhapdf_amc::PDFSetHandler(value[2]+1000*value[1]);
2431+ } else if (my_par.find("HWLHAPDF") != string::npos) {
2432+ cout << "==== LHAPDF6 USING HERWIG-TYPE LHAGLUE INTERFACE ====" << endl;
2433+ // Take PDF ID from value[0]
2434+ lhapdf_amc::ACTIVESETS[1] = lhapdf_amc::PDFSetHandler(value[0]);
2435+ } else if (my_par.find("DEFAULT") != string::npos) {
2436+ cout << "==== LHAPDF6 USING DEFAULT-TYPE LHAGLUE INTERFACE ====" << endl;
2437+ // Take PDF ID from value[0]
2438+ lhapdf_amc::ACTIVESETS[1] = lhapdf_amc::PDFSetHandler(value[0]);
2439+ } else {
2440+ cout << "==== LHAPDF6 USING PDFLIB-TYPE LHAGLUE INTERFACE ====" << endl;
2441+ // Take PDF ID from value[2]
2442+ lhapdf_amc::ACTIVESETS[1] = lhapdf_amc::PDFSetHandler(value[2]+1000*value[1]);
2443+ }
2444+
2445+ lhapdf_amc::CURRENTSET = 1;
2446+
2447+ // Extract parameters for common blocks (with sensible fallback values)
2448+ lhapdf_amc::PDFPtr pdf = lhapdf_amc::ACTIVESETS[1].activemember();
2449+ w50513_.xmin = pdf->info().get_entry_as<double>("XMin", 0.0);
2450+ w50513_.xmax = pdf->info().get_entry_as<double>("XMax", 1.0);
2451+ w50513_.q2min = LHAPDF::sqr(pdf->info().get_entry_as<double>("QMin", 1.0));
2452+ w50513_.q2max = LHAPDF::sqr(pdf->info().get_entry_as<double>("QMax", 1.0e5));
2453+ w50512_.qcdl4 = pdf->info().get_entry_as<double>("AlphaS_Lambda4", 0.0);
2454+ w50512_.qcdl5 = pdf->info().get_entry_as<double>("AlphaS_Lambda5", 0.0);
2455+ lhapdfr_.qcdlha4 = pdf->info().get_entry_as<double>("AlphaS_Lambda4", 0.0);
2456+ lhapdfr_.qcdlha5 = pdf->info().get_entry_as<double>("AlphaS_Lambda5", 0.0);
2457+ lhapdfr_.nfllha = 4;
2458+ // Activate legacy/compatibility LHAPDF5-type behaviour re. broken Lambda values
2459+ if (pdf->info().get_entry_as<bool>("Pythia6LambdaV5Compat", true)) {
2460+ w50512_.qcdl4 = 0.192;
2461+ w50512_.qcdl5 = 0.192;
2462+ lhapdfr_.qcdlha4 = 0.192;
2463+ lhapdfr_.qcdlha5 = 0.192;
2464+ }
2465+ }
2466+
2467+ /// PDFLIB nucleon structure function querying
2468+ void structm_(const double& x, const double& q,
2469+ double& upv, double& dnv, double& usea, double& dsea,
2470+ double& str, double& chm, double& bot, double& top, double& glu) {
2471+ lhapdf_amc::CURRENTSET = 1;
2472+ /// Fill (partial) parton return variables
2473+ lhapdf_amc::PDFPtr pdf = lhapdf_amc::ACTIVESETS[1].activemember();
2474+ dsea = pdf->xfxQ(-1, x, q);
2475+ usea = pdf->xfxQ(-2, x, q);
2476+ dnv = pdf->xfxQ(1, x, q) - dsea;
2477+ upv = pdf->xfxQ(2, x, q) - usea;
2478+ str = pdf->xfxQ(3, x, q);
2479+ chm = (pdf->hasFlavor(4)) ? pdf->xfxQ(4, x, q) : 0;
2480+ bot = (pdf->hasFlavor(5)) ? pdf->xfxQ(5, x, q) : 0;
2481+ top = (pdf->hasFlavor(6)) ? pdf->xfxQ(6, x, q) : 0;
2482+ glu = pdf->xfxQ(21, x, q);
2483+ }
2484+
2485+ /// PDFLIB photon structure function querying
2486+ void structp_(const double& x, const double& q2, const double& p2, const double& ip2,
2487+ double& upv, double& dnv, double& usea, double& dsea,
2488+ double& str, double& chm, double& bot, double& top, double& glu) {
2489+ throw LHAPDF::NotImplementedError("Photon structure functions are not yet supported");
2490+ }
2491+
2492+ /// PDFLIB statistics on PDF under/overflows
2493+ void pdfsta_() {
2494+ /// @note Can't do anything...
2495+ }
2496+
2497+
2498+}
2499+
2500+
2501+// LHAPDF namespace C++ compatibility code
2502+#ifdef ENABLE_LHAGLUE_CXX
2503+
2504+
2505+void LHAPDF::setVerbosity(LHAPDF::Verbosity noiselevel) {
2506+ LHAPDF::setVerbosity((int) noiselevel);
2507+}
2508+
2509+void LHAPDF::setPDFPath(const string& path) {
2510+ pathsPrepend(path);
2511+}
2512+
2513+string LHAPDF::pdfsetsPath() {
2514+ return paths()[0];
2515+}
2516+
2517+int LHAPDF::numberPDF() {
2518+ int nmem;
2519+ numberpdf_(nmem);
2520+ return nmem;
2521+}
2522+int LHAPDF::numberPDF(int nset) {
2523+ int nmem;
2524+ numberpdfm_(nset,nmem);
2525+ return nmem;
2526+}
2527+
2528+void LHAPDF::initPDF( int memset) {
2529+ int nset1 = 1;
2530+ initpdfm_(nset1, memset);
2531+}
2532+void LHAPDF::initPDF(int nset, int memset) {
2533+ initpdfm_(nset, memset);
2534+}
2535+
2536+
2537+double LHAPDF::xfx(double x, double Q, int fl) {
2538+ vector<double> r(13);
2539+ evolvepdf_(x, Q, &r[0]);
2540+ return r[fl+6];
2541+}
2542+double LHAPDF::xfx(int nset, double x, double Q, int fl) {
2543+ vector<double> r(13);
2544+ evolvepdfm_(nset, x, Q, &r[0]);
2545+ return r[fl+6];
2546+}
2547+
2548+vector<double> LHAPDF::xfx(double x, double Q) {
2549+ vector<double> r(13);
2550+ evolvepdf_(x, Q, &r[0]);
2551+ return r;
2552+}
2553+vector<double> LHAPDF::xfx(int nset, double x, double Q) {
2554+ vector<double> r(13);
2555+ evolvepdfm_(nset, x, Q, &r[0]);
2556+ return r;
2557+}
2558+
2559+void LHAPDF::xfx(double x, double Q, double* results) {
2560+ evolvepdf_(x, Q, results);
2561+}
2562+void LHAPDF::xfx(int nset, double x, double Q, double* results) {
2563+ evolvepdfm_(nset, x, Q, results);
2564+}
2565+
2566+
2567+vector<double> LHAPDF::xfxphoton(double x, double Q) {
2568+ vector<double> r(13);
2569+ double mphoton;
2570+ evolvepdfphoton_(x, Q, &r[0], mphoton);
2571+ r.push_back(mphoton);
2572+ return r;
2573+}
2574+vector<double> LHAPDF::xfxphoton(int nset, double x, double Q) {
2575+ vector<double> r(13);
2576+ double mphoton;
2577+ evolvepdfphotonm_(nset, x, Q, &r[0], mphoton);
2578+ r.push_back(mphoton);
2579+ return r;
2580+}
2581+
2582+void LHAPDF::xfxphoton(double x, double Q, double* results) {
2583+ evolvepdfphoton_(x, Q, results, results[13]);
2584+}
2585+void LHAPDF::xfxphoton(int nset, double x, double Q, double* results) {
2586+ evolvepdfphotonm_(nset, x, Q, results, results[13]);
2587+}
2588+
2589+double LHAPDF::xfxphoton(double x, double Q, int fl) {
2590+ vector<double> r(13);
2591+ double mphoton;
2592+ evolvepdfphoton_(x, Q, &r[0], mphoton);
2593+ if (fl == 7) return mphoton;
2594+ return r[fl+6];
2595+}
2596+double LHAPDF::xfxphoton(int nset, double x, double Q, int fl) {
2597+ vector<double> r(13);
2598+ double mphoton;
2599+ evolvepdfphotonm_(nset, x, Q, &r[0], mphoton);
2600+ if ( fl == 7 ) return mphoton;
2601+ return r[fl+6];
2602+}
2603+
2604+
2605+void LHAPDF::initPDFSet(const string& filename, int nmem) {
2606+ initPDFSet(1,filename, nmem);
2607+}
2608+
2609+void LHAPDF::initPDFSet(int nset, const string& filename, int nmem) {
2610+ initPDFSetByName(nset,filename);
2611+ ACTIVESETS[nset].loadMember(nmem);
2612+ CURRENTSET = nset;
2613+}
2614+
2615+
2616+void LHAPDF::initPDFSet(const string& filename, SetType type ,int nmem) {
2617+ // silently ignore type
2618+ initPDFSet(1,filename, nmem);
2619+}
2620+
2621+void LHAPDF::initPDFSet(int nset, const string& filename, SetType type ,int nmem) {
2622+ // silently ignore type
2623+ initPDFSetByName(nset,filename);
2624+ ACTIVESETS[nset].loadMember(nmem);
2625+ CURRENTSET = nset;
2626+}
2627+
2628+void LHAPDF::initPDFSet(int nset, int setid, int nmem) {
2629+ ACTIVESETS[nset] = PDFSetHandler(setid); //
2630+ CURRENTSET = nset;
2631+}
2632+
2633+void LHAPDF::initPDFSet(int setid, int nmem) {
2634+ initPDFSet(1,setid,nmem);
2635+}
2636+
2637+#define SIZE 999
2638+void LHAPDF::initPDFSetByName(const string& filename) {
2639+ std::cout << "initPDFSetByName: " << filename << std::endl;
2640+ char cfilename[SIZE+1];
2641+ strncpy(cfilename, filename.c_str(), SIZE);
2642+ initpdfsetbyname_(cfilename, filename.length());
2643+}
2644+
2645+void LHAPDF::initPDFSetByName(int nset, const string& filename) {
2646+ char cfilename[SIZE+1];
2647+ strncpy(cfilename, filename.c_str(), SIZE);
2648+ initpdfsetbynamem_(nset, cfilename, filename.length());
2649+}
2650+
2651+void LHAPDF::initPDFSetByName(const string& filename, SetType type) {
2652+ //silently ignore type
2653+ std::cout << "initPDFSetByName: " << filename << std::endl;
2654+ char cfilename[SIZE+1];
2655+ strncpy(cfilename, filename.c_str(), SIZE);
2656+ initpdfsetbyname_(cfilename, filename.length());
2657+}
2658+
2659+void LHAPDF::initPDFSetByName(int nset, const string& filename, SetType type) {
2660+ //silently ignore type
2661+ char cfilename[SIZE+1];
2662+ strncpy(cfilename, filename.c_str(), SIZE);
2663+ initpdfsetbynamem_(nset, cfilename, filename.length());
2664+}
2665+
2666+
2667+void LHAPDF::getDescription() {
2668+ getDescription(1);
2669+}
2670+
2671+void LHAPDF::getDescription(int nset) {
2672+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2673+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2674+ cout << ACTIVESETS[nset].activemember()->set().description() << endl;
2675+}
2676+
2677+
2678+double LHAPDF::alphasPDF(double Q) {
2679+ return LHAPDF::alphasPDF(1, Q) ;
2680+}
2681+
2682+double LHAPDF::alphasPDF(int nset, double Q) {
2683+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2684+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2685+ CURRENTSET = nset;
2686+ // return alphaS for the requested set
2687+ return ACTIVESETS[nset].activemember()->alphasQ(Q);
2688+}
2689+
2690+
2691+bool LHAPDF::hasPhoton(){
2692+ return has_photon_();
2693+}
2694+
2695+
2696+int LHAPDF::getOrderAlphaS() {
2697+ return LHAPDF::getOrderAlphaS(1) ;
2698+}
2699+
2700+int LHAPDF::getOrderAlphaS(int nset) {
2701+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2702+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2703+ CURRENTSET = nset;
2704+ // return alphaS Order for the requested set
2705+ return ACTIVESETS[nset].activemember()->info().get_entry_as<int>("AlphaS_OrderQCD", -1);
2706+}
2707+
2708+
2709+int LHAPDF::getOrderPDF() {
2710+ return LHAPDF::getOrderPDF(1) ;
2711+}
2712+
2713+int LHAPDF::getOrderPDF(int nset) {
2714+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2715+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2716+ CURRENTSET = nset;
2717+ // return PDF order for the requested set
2718+ return ACTIVESETS[nset].activemember()->info().get_entry_as<int>("OrderQCD", -1);
2719+}
2720+
2721+
2722+double LHAPDF::getLam4(int nmem) {
2723+ return LHAPDF::getLam4(1, nmem) ;
2724+}
2725+
2726+double LHAPDF::getLam4(int nset, int nmem) {
2727+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2728+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2729+ CURRENTSET = nset;
2730+ ACTIVESETS[nset].loadMember(nmem);
2731+ return ACTIVESETS[nset].activemember()->info().get_entry_as<double>("AlphaS_Lambda4", -1.0);
2732+}
2733+
2734+
2735+double LHAPDF::getLam5(int nmem) {
2736+ return LHAPDF::getLam5(1, nmem) ;
2737+}
2738+
2739+double LHAPDF::getLam5(int nset, int nmem) {
2740+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2741+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2742+ CURRENTSET = nset;
2743+ ACTIVESETS[nset].loadMember(nmem);
2744+ return ACTIVESETS[nset].activemember()->info().get_entry_as<double>("AlphaS_Lambda5", -1.0);
2745+}
2746+
2747+
2748+int LHAPDF::getNf() {
2749+ return LHAPDF::getNf(1) ;
2750+}
2751+
2752+int LHAPDF::getNf(int nset) {
2753+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2754+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2755+ CURRENTSET = nset;
2756+ // return alphaS Order for the requested set
2757+ return ACTIVESETS[nset].activemember()->info().get_entry_as<int>("NumFlavors");
2758+}
2759+
2760+
2761+double LHAPDF::getXmin(int nmem) {
2762+ return LHAPDF::getXmin(1, nmem) ;
2763+}
2764+
2765+double LHAPDF::getXmin(int nset, int nmem) {
2766+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2767+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2768+ CURRENTSET = nset;
2769+ // return alphaS Order for the requested set
2770+ ACTIVESETS[nset].loadMember(nmem);
2771+ return ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMin");
2772+}
2773+
2774+double LHAPDF::getXmax(int nmem) {
2775+ return LHAPDF::getXmax(1, nmem) ;
2776+}
2777+
2778+double LHAPDF::getXmax(int nset, int nmem) {
2779+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2780+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2781+ CURRENTSET = nset;
2782+ // return alphaS Order for the requested set
2783+ ACTIVESETS[nset].loadMember(nmem);
2784+ return ACTIVESETS[nset].activemember()->info().get_entry_as<double>("XMax");
2785+}
2786+
2787+double LHAPDF::getQ2min(int nmem) {
2788+ return LHAPDF::getQ2min(1, nmem) ;
2789+}
2790+
2791+double LHAPDF::getQ2min(int nset, int nmem) {
2792+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2793+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2794+ CURRENTSET = nset;
2795+ // return alphaS Order for the requested set
2796+ ACTIVESETS[nset].loadMember(nmem);
2797+ return pow(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMin"),2);
2798+}
2799+
2800+double LHAPDF::getQ2max(int nmem) {
2801+ return LHAPDF::getQ2max(1,nmem) ;
2802+}
2803+
2804+double LHAPDF::getQ2max(int nset, int nmem) {
2805+ if (ACTIVESETS.find(nset) == ACTIVESETS.end())
2806+ throw LHAPDF::UserError("Trying to use LHAGLUE set #" + LHAPDF::to_str(nset) + " but it is not initialised");
2807+ CURRENTSET = nset;
2808+ // return alphaS Order for the requested set
2809+ ACTIVESETS[nset].loadMember(nmem);
2810+ return pow(ACTIVESETS[nset].activemember()->info().get_entry_as<double>("QMax"),2);
2811+}
2812+
2813+double LHAPDF::getQMass(int nf) {
2814+ return LHAPDF::getQMass(1, nf) ;
2815+}
2816+
2817+double LHAPDF::getQMass(int nset, int nf) {
2818+ double mass;
2819+ getqmassm_(nset, nf, mass);
2820+ return mass;
2821+}
2822+
2823+double LHAPDF::getThreshold(int nf) {
2824+ return LHAPDF::getThreshold(1, nf) ;
2825+}
2826+
2827+double LHAPDF::getThreshold(int nset, int nf) {
2828+ double thres;
2829+ getthresholdm_(nset, nf, thres);
2830+ return thres;
2831+}
2832+
2833+void LHAPDF::usePDFMember(int member) {
2834+ initpdf_(member);
2835+}
2836+
2837+void LHAPDF::usePDFMember(int nset, int member) {
2838+ initpdfm_(nset, member);
2839+}
2840+
2841+#endif // ENABLE_LHAGLUE_CXX
2842
2843=== added file 'Template/LO/Source/PDF/pdg2pdf_lhapdf6.f'
2844--- Template/LO/Source/PDF/pdg2pdf_lhapdf6.f 1970-01-01 00:00:00 +0000
2845+++ Template/LO/Source/PDF/pdg2pdf_lhapdf6.f 2016-05-12 15:13:37 +0000
2846@@ -0,0 +1,112 @@
2847+ double precision function pdg2pdf(ih,ipdg,x,xmu)
2848+c***************************************************************************
2849+c Based on pdf.f, wrapper for calling the pdf of MCFM
2850+c***************************************************************************
2851+ implicit none
2852+c
2853+c Arguments
2854+c
2855+ DOUBLE PRECISION x,xmu
2856+ INTEGER IH,ipdg
2857+C
2858+C Include
2859+C
2860+ include 'pdf.inc'
2861+C
2862+ integer i,j,ihlast(20),ipart,iporg,ireuse,imemlast(20),iset,imem
2863+ & ,i_replace,ii,ipartlast(20)
2864+ double precision xlast(20),xmulast(20),pdflast(20)
2865+ save ihlast,xlast,xmulast,pdflast,imemlast,ipartlast
2866+ data ihlast/20*-99/
2867+ data ipartlast/20*-99/
2868+ data xlast/20*-99d9/
2869+ data xmulast/20*-99d9/
2870+ data pdflast/20*-99d9/
2871+ data imemlast/20*-99/
2872+ data i_replace/20/
2873+
2874+c Make sure we have a reasonable Bjorken x. Note that even though
2875+c x=0 is not reasonable, we prefer to simply return pdg2pdf=0
2876+c instead of stopping the code, as this might accidentally happen.
2877+ if (x.eq.0d0) then
2878+ pdg2pdf=0d0
2879+ return
2880+ elseif (x.lt.0d0 .or. x.gt.1d0) then
2881+ write (*,*) 'PDF not supported for Bjorken x ', x
2882+ open(unit=26,file='../../../error',status='unknown')
2883+ write(26,*) 'Error: PDF not supported for Bjorken x ',x
2884+ stop 1
2885+ endif
2886+
2887+ ipart=ipdg
2888+ if(iabs(ipart).eq.21) ipart=0
2889+ if(iabs(ipart).eq.22) ipart=7
2890+ iporg=ipart
2891+
2892+c This will be called for any PDG code, but we only support up to 7
2893+ if(iabs(ipart).gt.7)then
2894+ write(*,*) 'PDF not supported for pdg ',ipdg
2895+ write(*,*) 'For lepton colliders, please set the lpp* '//
2896+ $ 'variables to 0 in the run_card'
2897+ open(unit=26,file='../../../error',status='unknown')
2898+ write(26,*) 'Error: PDF not supported for pdg ',ipdg
2899+ stop 1
2900+ endif
2901+
2902+c Determine the iset used in lhapdf
2903+ call getnset(iset)
2904+ if (iset.ne.1) then
2905+ write (*,*) 'PDF not supported for Bjorken x ', x
2906+ open(unit=26,file='../../../error',status='unknown')
2907+ write(26,*) 'Error: PDF not supported for Bjorken x ',x
2908+ stop 1
2909+ endif
2910+
2911+c Determine the member of the set (function of lhapdf)
2912+ call getnmem(iset,imem)
2913+
2914+ ireuse = 0
2915+ ii=i_replace
2916+ do i=1,20
2917+c Check if result can be reused since any of last twenty
2918+c calls. Start checking with the last call and move back in time
2919+ if (ih.eq.ihlast(ii)) then
2920+ if (ipart.eq.ipartlast(ii)) then
2921+ if (x.eq.xlast(ii)) then
2922+ if (xmu.eq.xmulast(ii)) then
2923+ if (imem.eq.imemlast(ii)) then
2924+ ireuse = ii
2925+ exit
2926+ endif
2927+ endif
2928+ endif
2929+ endif
2930+ endif
2931+ ii=ii-1
2932+ if (ii.eq.0) ii=ii+20
2933+ enddo
2934+
2935+c Reuse previous result, if possible
2936+ if (ireuse.gt.0) then
2937+ if (pdflast(ireuse).ne.-99d9) then
2938+ pdg2pdf=pdflast(ireuse)
2939+ return
2940+ endif
2941+ endif
2942+
2943+c Calculated a new value: replace the value computed longest ago
2944+ i_replace=mod(i_replace,20)+1
2945+
2946+c Call lhapdf and give the current values to the arrays that should
2947+c be saved
2948+ call evolvepart(ipart,x,xmu,pdg2pdf)
2949+ pdg2pdf=pdg2pdf/x
2950+ pdflast(i_replace)=pdg2pdf
2951+ xlast(i_replace)=x
2952+ xmulast(i_replace)=xmu
2953+ ihlast(i_replace)=ih
2954+ imemlast(i_replace)=imem
2955+c
2956+ return
2957+ end
2958+
2959
2960=== modified file 'Template/LO/Source/genps.inc'
2961--- Template/LO/Source/genps.inc 2014-11-24 00:33:21 +0000
2962+++ Template/LO/Source/genps.inc 2016-05-12 15:13:37 +0000
2963@@ -30,9 +30,9 @@
2964 c Parameters for helicity sums in matrixN.f
2965 c*************************************************************************
2966 REAL*8 LIMHEL
2967- PARAMETER(LIMHEL=1e-6)
2968+ PARAMETER(LIMHEL=1e-8)
2969 INTEGER MAXTRIES
2970- PARAMETER(MAXTRIES=10)
2971+ PARAMETER(MAXTRIES=25)
2972 C To pass the helicity configuration chosen by the DiscreteSampler to
2973 C matrix<i>.f
2974 double precision hel_jacobian
2975
2976=== modified file 'Template/LO/Source/kin_functions.f'
2977--- Template/LO/Source/kin_functions.f 2015-10-15 20:22:39 +0000
2978+++ Template/LO/Source/kin_functions.f 2016-05-12 15:13:37 +0000
2979@@ -127,7 +127,7 @@
2980 c pm=dsqrt(p(1)**2+p(2)**2+p(3)**2)
2981
2982 pm = p(0)
2983- if (pm.gt.p(3)) then
2984+ if (pm.gt.abs(p(3))) then
2985 rap = .5d0*dlog((pm+p(3))/(pm-p(3)))+cm_rap
2986 else
2987 rap = -1d99
2988
2989=== modified file 'Template/LO/Source/make_opts'
2990--- Template/LO/Source/make_opts 2015-08-19 14:05:58 +0000
2991+++ Template/LO/Source/make_opts 2016-05-12 15:13:37 +0000
2992@@ -1,63 +1,93 @@
2993-# Environment variables
2994+DEFAULT_F2PY_COMPILER=f2py
2995+DEFAULT_F_COMPILER=gfortran
2996+MACFLAG=-mmacosx-version-min=10.7
2997+DEFAULT_CPP_COMPILER=clang
2998+STDLIB=-lc++
2999+STDLIB_FLAG=-stdlib=libc++
3000+#end_of_make_opts_variables
3001+# Rest of the makefile
3002
3003 ifeq ($(origin FFLAGS),undefined)
3004- FFLAGS= -O -w -fbounds-check -fPIC
3005- #FFLAGS+= -g -fbounds-check -ffpe-trap=invalid,zero,overflow,underflow,denormal -Wall
3006-endif
3007+FFLAGS= -O -w -fbounds-check -fPIC
3008+#FFLAGS+= -g -fbounds-check -ffpe-trap=invalid,zero,overflow,underflow,denormal -Wall
3009+endif
3010+
3011+
3012+# REMOVE MACFLAG IF NOT ON MAC OR FOR F2PY
3013+UNAME := $(shell uname -s)
3014+ifdef f2pymode
3015+MACFLAG=
3016+else
3017+ifneq ($(UNAME), Darwin)
3018+MACFLAG=
3019+endif
3020+endif
3021+
3022+
3023+ifeq ($(origin CXXFLAGS),undefined)
3024+CXXFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
3025+endif
3026+
3027+ifeq ($(origin CFLAGS),undefined)
3028+CFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
3029+endif
3030+
3031+# Increase the number of allowed charcters in a Fortran line
3032 FFLAGS+= -ffixed-line-length-132
3033
3034 # Set FC unless it's defined by an environment variable
3035 ifeq ($(origin FC),default)
3036- FC=gfortran
3037+FC=gfortran
3038 endif
3039 ifeq ($(origin F2PY), undefined)
3040- F2PY=f2py
3041-endif
3042-
3043-
3044+F2PY=f2py
3045+endif
3046+
3047+UNAME := $(shell uname -s)
3048+ifeq ($(origin LDFLAGS), undefined)
3049+LDFLAGS=$(STDLIB) $(MACFLAG)
3050+endif
3051
3052 # Options: dynamic, lhapdf
3053-
3054-UNAME := $(shell uname)
3055-
3056 # Option dynamic
3057
3058 ifeq ($(UNAME), Darwin)
3059- dylibext=dylib
3060+dylibext=dylib
3061 else
3062- dylibext=so
3063+dylibext=so
3064 endif
3065
3066 ifdef dynamic
3067- ifeq ($(UNAME), Darwin)
3068- libext=dylib
3069- FFLAGS+= -fno-common
3070- LDFLAGS += -bundle
3071- define CREATELIB
3072- $(FC) -dynamiclib -undefined dynamic_lookup -o $(1) $(2)
3073- endef
3074- else
3075- libext=so
3076- FFLAGS+= -fPIC
3077- LDFLAGS += -shared
3078- define CREATELIB
3079- $(FC) $(FFLAGS) $(LDFLAGS) -o $(1) $(2)
3080- endef
3081- endif
3082-else
3083- libext=a
3084- define CREATELIB
3085- $(AR) cru $(1) $(2)
3086- ranlib $(1)
3087- endef
3088+ifeq ($(UNAME), Darwin)
3089+libext=dylib
3090+FFLAGS+= -fno-common
3091+LDFLAGS += -bundle
3092+define CREATELIB
3093+$(FC) -dynamiclib -undefined dynamic_lookup -o $(1) $(2)
3094+endef
3095+else
3096+libext=so
3097+FFLAGS+= -fPIC
3098+LDFLAGS += -shared
3099+define CREATELIB
3100+$(FC) $(FFLAGS) $(LDFLAGS) -o $(1) $(2)
3101+endef
3102+endif
3103+else
3104+libext=a
3105+define CREATELIB
3106+$(AR) cru $(1) $(2)
3107+ranlib $(1)
3108+endef
3109 endif
3110
3111 # Option lhapdf
3112
3113 ifdef lhapdf
3114- alfas_functions=alfas_functions_lhapdf
3115- lhapdf=-lLHAPDF -lstdc++
3116+CXXFLAGS += $(shell $(lhapdf) --cppflags)
3117+alfas_functions=alfas_functions_lhapdf
3118+llhapdf+= -lLHAPDF
3119 else
3120- alfas_functions=alfas_functions
3121- lhapdf=
3122-endif
3123+alfas_functions=alfas_functions
3124+llhapdf=
3125+endif
3126\ No newline at end of file
3127
3128=== modified file 'Template/LO/Source/setrun.f'
3129--- Template/LO/Source/setrun.f 2015-04-09 01:31:09 +0000
3130+++ Template/LO/Source/setrun.f 2016-05-12 15:13:37 +0000
3131@@ -199,7 +199,7 @@
3132 $ 10042,
3133 $ 246800,
3134 $ 247000,
3135- $ 244600/
3136+ $ 244800/
3137
3138
3139 if(pdfin.eq."lhapdf") then
3140
3141=== modified file 'Template/LO/SubProcesses/makefile'
3142--- Template/LO/SubProcesses/makefile 2015-06-14 23:14:26 +0000
3143+++ Template/LO/SubProcesses/makefile 2016-05-12 15:13:37 +0000
3144@@ -17,7 +17,7 @@
3145 MADLOOP_LIB =
3146 endif
3147
3148-LINKLIBS = $(LINK_MADLOOP_LIB) $(LINK_LOOP_LIBS) -L../../lib/ -ldhelas -ldsample -lmodel -lgeneric -lpdf -lcernlib $(lhapdf)
3149+LINKLIBS = $(LINK_MADLOOP_LIB) $(LINK_LOOP_LIBS) -L../../lib/ -ldhelas -ldsample -lmodel -lgeneric -lpdf -lcernlib $(llhapdf)
3150
3151 LIBS = $(LIBDIR)libdhelas.$(libext) $(LIBDIR)libdsample.$(libext) $(LIBDIR)libgeneric.$(libext) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libcernlib.$(libext) $(MADLOOP_LIB) $(LOOP_LIBS)
3152
3153@@ -34,10 +34,10 @@
3154 # Binaries
3155
3156 $(PROG): $(PROCESS) auto_dsig.o $(LIBS)
3157- $(FC) $(FFLAGS) -o $(PROG) $(PROCESS) $(LINKLIBS)
3158+ $(FC) $(LDFLAGS) -o $(PROG) $(PROCESS) $(LINKLIBS)
3159
3160 gensym: $(SYMMETRY) configs.inc $(LIBDIR)libmodel.$(libext) $(LIBDIR)libgeneric.$(libext)
3161- $(FC) $(FFLAGS) -o gensym $(SYMMETRY) -L../../lib/ -lmodel -lgeneric
3162+ $(FC) $(LDFLAGS) -o gensym $(SYMMETRY) -L../../lib/ -lmodel -lgeneric
3163
3164 $(LIBDIR)libmodel.$(libext): ../../Cards/param_card.dat
3165 cd ../../Source/MODEL; make
3166
3167=== modified file 'Template/LO/SubProcesses/myamp.f'
3168--- Template/LO/SubProcesses/myamp.f 2015-08-12 09:28:33 +0000
3169+++ Template/LO/SubProcesses/myamp.f 2016-05-12 15:13:37 +0000
3170@@ -327,6 +327,9 @@
3171 c
3172 c Global
3173 c
3174+ double precision Smin
3175+ common/to_smin/ Smin
3176+
3177 integer iforest(2,-max_branch:-1,lmaxconfigs)
3178 common/to_forest/ iforest
3179
3180@@ -590,34 +593,7 @@
3181 i = max(1,3*(nexternal-2) - 4 + 1)
3182 xo = max(min(etot**2/stot, 1d0-1d-8),1d0/stot)
3183 c Take into account special cuts
3184- xo = max(xo, xptj*dabs(xptj)/stot)
3185- xo = max(xo, xptb*dabs(xptb)/stot)
3186- xo = max(xo, xpta*dabs(xpta)/stot)
3187- xo = max(xo, xptl*dabs(xptl)/stot)
3188- xo = max(xo, xmtc*dabs(xmtc)/stot)
3189- xo = max(xo, htjmin**2/stot)
3190- xo = max(xo, ptj1min**2/stot)
3191- xo = max(xo, (2*ptj2min)**2/stot)
3192- xo = max(xo, (3*ptj3min)**2/stot)
3193- xo = max(xo, (4*ptj4min)**2/stot)
3194- xo = max(xo, ht2min**2/stot)
3195- xo = max(xo, ht3min**2/stot)
3196- xo = max(xo, ht4min**2/stot)
3197- xo = max(xo, misset**2/stot)
3198- xo = max(xo, ptllmin**2/stot)
3199- xo = max(xo, ptl1min**2/stot)
3200- xo = max(xo, (2*ptl2min)**2/stot)
3201- xo = max(xo, (3*ptl3min)**2/stot)
3202- xo = max(xo, (4*ptl4min)**2/stot)
3203- xo = max(xo, mmnl**2/stot)
3204- if (mmjj.ne.0d0) then
3205- njet = 0
3206- do k=nincoming+1,nexternal
3207- if (is_a_j(k)) njet = njet + 1
3208- enddo
3209- xo = max(xo, njet*(njet -1)/2d0*mmjj**2/stot)
3210- endif
3211-
3212+c already done in smin
3213 c Include mass scale from BWs
3214 xo = max(xo, spmass**2/stot)
3215 if (swidth(i).eq.0.and.xo.eq.1d0/stot) then
3216@@ -628,9 +604,12 @@
3217 c tjs 4/29/2008 use analytic transform for s-hat
3218 c-----------------------
3219 if (swidth(i) .eq. 0d0) then
3220+ if (xo.lt.smin/stot)then
3221+ xo = -1d0*smin/stot
3222+ endif
3223 swidth(i) = xo
3224 spole(i)= -2.0d0 ! 1/s pole
3225- write(*,*) "Transforming s_hat 1/s ",i,xo
3226+ write(*,*) "Transforming s_hat 1/s ",i,xo, smin, stot
3227 else
3228 write(*,*) "Transforming s_hat BW ",spole(i),swidth(i)
3229 endif
3230
3231=== modified file 'Template/LO/SubProcesses/reweight.f'
3232--- Template/LO/SubProcesses/reweight.f 2015-04-21 15:18:04 +0000
3233+++ Template/LO/SubProcesses/reweight.f 2016-05-12 15:13:37 +0000
3234@@ -498,7 +498,8 @@
3235 integer jlast(2)
3236 integer njetstore(lmaxconfigs),iqjetstore(nexternal-2,lmaxconfigs)
3237 real*8 q2bck(2)
3238- common /to_rw/jlast,njetstore,iqjetstore,q2bck
3239+ integer njets,iqjets(nexternal)
3240+ common /to_rw/jlast,njetstore,iqjetstore,njets,iqjets,q2bck
3241 data njetstore/lmaxconfigs*-1/
3242 real*8 xptj,xptb,xpta,xptl,xmtc
3243 real*8 xetamin,xqcut,deltaeta
3244@@ -526,7 +527,6 @@
3245
3246 c Variables for keeping track of jets
3247 logical goodjet(n_max_cl)
3248- integer njets,iqjets(nexternal)
3249 integer fsnum(2),ida(2),imo,jcode
3250 logical chclusold,fail,increasecode
3251 save chclusold
3252@@ -1128,17 +1128,19 @@
3253 integer jlast(2)
3254 integer njetstore(lmaxconfigs),iqjetstore(nexternal-2,lmaxconfigs)
3255 real*8 q2bck(2)
3256- common /to_rw/jlast,njetstore,iqjetstore,q2bck
3257+ integer njets,iqjets(nexternal)
3258+ common /to_rw/jlast,njetstore,iqjetstore,njets,iqjets,q2bck
3259 integer idup(nexternal,maxproc,maxsproc)
3260 integer mothup(2,nexternal)
3261 integer icolup(2,nexternal,maxflow,maxsproc)
3262 include 'leshouche.inc'
3263
3264 C local variables
3265- integer i, j, idi, idj,ijet
3266+ integer i, j, idi, idj
3267 real*8 PI
3268 parameter( PI = 3.14159265358979323846d0 )
3269
3270+ logical setclscales
3271 integer mapconfig(0:lmaxconfigs), this_config
3272 integer iforest(2,-max_branch:-1,lmaxconfigs)
3273 integer sprop(maxsproc,-max_branch:-1,lmaxconfigs)
3274@@ -1196,7 +1198,29 @@
3275
3276 endif
3277
3278-c Store pdf information for systematics studies (initial)
3279+
3280+ if(ickkw.le.0)then
3281+c Store pdf information for systematics studies (initial)
3282+ if(use_syst)then
3283+ do j=1,2
3284+ n_pdfrw(j)=1
3285+ i_pdgpdf(1,j)=ipdgcl(j,igraphs(1),iproc)
3286+ s_xpdf(1,j)=xbk(ib(j))
3287+ s_qpdf(1,j)=sqrt(q2fact(j))
3288+ enddo
3289+ endif
3290+ asref=0 ! usefull for syscalc
3291+ goto 100
3292+ endif
3293+
3294+
3295+ if(.not.setclscales(p)) then ! recluster to have the correct iqjets
3296+ write(*,*) "Fail to cluster the events from the rewgt function"
3297+ stop
3298+ endif
3299+
3300+c Store pdf information for systematics studies (initial)
3301+c need to be done after setclscales since that one clean the syscalc value
3302 if(use_syst)then
3303 do j=1,2
3304 n_pdfrw(j)=1
3305@@ -1206,10 +1230,6 @@
3306 enddo
3307 endif
3308
3309- if(ickkw.le.0)then
3310- asref=0 ! usefull for syscalc
3311- goto 100
3312- endif
3313 c Preparing graph particle information (ipart, needed to keep track of
3314 c external particle clustering scales)
3315 do i=1,nexternal
3316@@ -1259,7 +1279,6 @@
3317 endif
3318
3319 c Prepare checking for parton vertices
3320- ijet=1
3321 do i=1,nexternal
3322 j=ishft(1,i-1)
3323 c Set jet identities according to chosen subprocess
3324@@ -1270,10 +1289,8 @@
3325 $ i,ipdgcl(j,igraphs(1),iproc)
3326 if(i.le.2)then
3327 goodjet(j)=isparton(ipdgcl(j,igraphs(1),iproc))
3328- elseif(ijet.le.njetstore(iconfig).and.
3329- $ i.eq. iqjetstore(ijet,iconfig)) then
3330+ elseif(iqjets(i).gt.0) then
3331 goodjet(j)=.true.
3332- ijet=ijet+1
3333 elseif(isparton(ipdgcl(j,igraphs(1),iproc)).and.
3334 $ .not.isjet(ipdgcl(j,igraphs(1),iproc))) then
3335 goodjet(j)=.true.
3336
3337=== modified file 'Template/LO/SubProcesses/setcuts.f'
3338--- Template/LO/SubProcesses/setcuts.f 2015-08-11 00:35:53 +0000
3339+++ Template/LO/SubProcesses/setcuts.f 2016-05-12 15:13:37 +0000
3340@@ -320,8 +320,8 @@
3341 endif
3342 c PHOTON
3343 if(is_a_a(i))then
3344- etmin(i) = max(pta, ptgmin, ea)
3345- SMIN = SMIN + etmin(i)
3346+ etmin(i) = max(pta, ptgmin)
3347+ SMIN = SMIN + max(etmin(i),ea)
3348 etmax(i)=ptamax
3349 emin(i)=ea
3350 emax(i)=eamax
3351
3352=== modified file 'Template/LO/bin/internal/make_gridpack'
3353--- Template/LO/bin/internal/make_gridpack 2015-04-21 15:18:04 +0000
3354+++ Template/LO/bin/internal/make_gridpack 2016-05-12 15:13:37 +0000
3355@@ -9,7 +9,7 @@
3356 cp bin/internal/Gridpack/run.sh ./
3357 cp bin/internal/Gridpack/* bin/
3358 mv -f $FILES madevent
3359-tar -cf gridpack.tar madevent run.sh README
3360+tar -cf gridpack.tar madevent run.sh
3361 mv -f madevent/* ./
3362 rmdir madevent
3363 rm run.sh
3364
3365=== modified file 'Template/LO/bin/madevent'
3366--- Template/LO/bin/madevent 2015-03-14 02:21:38 +0000
3367+++ Template/LO/bin/madevent 2016-05-12 15:13:37 +0000
3368@@ -164,7 +164,10 @@
3369 cmd_line.run_cmd('quit')
3370 elif args:
3371 # a single command is provided
3372- cmd_line = cmd_interface.MadEventCmd()
3373+ if options.web:
3374+ cmd_line = cmd_interface.MadEventCmd()
3375+ else:
3376+ cmd_line = cmd_interface.MadEventCmdShell()
3377 if not hasattr(cmd_line, 'do_%s' % args[0]):
3378 if parser_error:
3379 print parser_error
3380
3381=== modified file 'Template/NLO/Cards/run_card.dat'
3382--- Template/NLO/Cards/run_card.dat 2015-09-14 18:56:28 +0000
3383+++ Template/NLO/Cards/run_card.dat 2016-05-12 15:13:37 +0000
3384@@ -10,6 +10,9 @@
3385 # Lines starting with a hash (#) are info or comments *
3386 # *
3387 # mind the format: value = variable ! comment *
3388+# *
3389+# Some of the values of variables can be list. These can either be *
3390+# comma or space separated. *
3391 #***********************************************************************
3392 #
3393 #*******************
3394@@ -58,8 +61,10 @@
3395 #***********************************************************************
3396 # PDF choice: this automatically fixes also alpha_s(MZ) and its evol. *
3397 #***********************************************************************
3398- %(pdlabel)s = pdlabel ! PDF set
3399- %(lhaid)s = lhaid ! if pdlabel=lhapdf, this is the lhapdf number
3400+ %(pdlabel)s = pdlabel ! PDF set
3401+ %(lhaid)s = lhaid ! If pdlabel=lhapdf, this is the lhapdf number. Only
3402+ ! numbers for central PDF sets are allowed. Can be a list;
3403+ ! PDF sets beyond the first are included via reweighting.
3404 #***********************************************************************
3405 # Include the NLO Monte Carlo subtr. terms for the following parton *
3406 # shower (HERWIG6 | HERWIGPP | PYTHIA6Q | PYTHIA6PT | PYTHIA8) *
3407@@ -71,37 +76,36 @@
3408 #***********************************************************************
3409 # Renormalization and factorization scales *
3410 # (Default functional form for the non-fixed scales is the sum of *
3411-# the transverse masses of all final state particles and partons. This *
3412-# can be changed in SubProcesses/set_scales.f) *
3413+# the transverse masses divided by two of all final state particles *
3414+# and partons. This can be changed in SubProcesses/set_scales.f or via *
3415+# dynamical_scale_choice option) *
3416 #***********************************************************************
3417- %(fixed_ren_scale)s = fixed_ren_scale ! if .true. use fixed ren scale
3418- %(fixed_fac_scale)s = fixed_fac_scale ! if .true. use fixed fac scale
3419+ %(fixed_ren_scale)s = fixed_ren_scale ! if .true. use fixed ren scale
3420+ %(fixed_fac_scale)s = fixed_fac_scale ! if .true. use fixed fac scale
3421 %(mur_ref_fixed)s = muR_ref_fixed ! fixed ren reference scale
3422- %(muf1_ref_fixed)s = muF1_ref_fixed ! fixed fact reference scale for pdf1
3423- %(muf2_ref_fixed)s = muF2_ref_fixed ! fixed fact reference scale for pdf2
3424- %(dynamical_scale_choice)s = dynamical_scale_choice ! Choose one of the preselected dynamical choices
3425-#***********************************************************************
3426-# Renormalization and factorization scales (advanced and NLO options) *
3427-#***********************************************************************
3428- %(fixed_qes_scale)s = fixed_QES_scale ! if .true. use fixed Ellis-Sexton scale
3429- %(qes_ref_fixed)s = QES_ref_fixed ! fixed Ellis-Sexton reference scale
3430- %(mur_over_ref)s = muR_over_ref ! ratio of current muR over reference muR
3431- %(muf1_over_ref)s = muF1_over_ref ! ratio of current muF1 over reference muF1
3432- %(muf2_over_ref)s = muF2_over_ref ! ratio of current muF2 over reference muF2
3433- %(qes_over_ref)s = QES_over_ref ! ratio of current QES over reference QES
3434+ %(muf_ref_fixed)s = muF_ref_fixed ! fixed fact reference scale
3435+ %(dynamical_scale_choice)s = dynamical_scale_choice ! Choose one (or more) of the predefined
3436+ ! dynamical choices. Can be a list; scale choices beyond the
3437+ ! first are included via reweighting
3438+ %(mur_over_ref)s = muR_over_ref ! ratio of current muR over reference muR
3439+ %(muf_over_ref)s = muF_over_ref ! ratio of current muF over reference muF
3440 #***********************************************************************
3441-# Reweight flags to get scale dependence and PDF uncertainty *
3442-# For scale dependence: factor rw_scale_up/down around central scale *
3443-# For PDF uncertainty: use LHAPDF with supported set *
3444-#***********************************************************************
3445- %(reweight_scale)s = reweight_scale ! reweight to get scale dependence
3446- %(rw_rscale_down)s = rw_Rscale_down ! lower bound for ren scale variations
3447- %(rw_rscale_up)s = rw_Rscale_up ! upper bound for ren scale variations
3448- %(rw_fscale_down)s = rw_Fscale_down ! lower bound for fact scale variations
3449- %(rw_fscale_up)s = rw_Fscale_up ! upper bound for fact scale variations
3450- %(reweight_pdf)s = reweight_PDF ! reweight to get PDF uncertainty
3451- %(pdf_set_min)s = PDF_set_min ! First of the error PDF sets
3452- %(pdf_set_max)s = PDF_set_max ! Last of the error PDF sets
3453+# Reweight variables for scale dependence and PDF uncertainty *
3454+#***********************************************************************
3455+ %(rw_rscale)s = rw_rscale ! muR factors to be included by reweighting
3456+ %(rw_fscale)s = rw_fscale ! muF factors to be included by reweighting
3457+ %(reweight_scale)s = reweight_scale ! Reweight to get scale variation using the
3458+ ! rw_rscale and rw_fscale factors. Should be a list of
3459+ ! booleans of equal length to dynamical_scale_choice to
3460+ ! specify for which choice to include scale dependence.
3461+ %(reweight_pdf)s = reweight_PDF ! Reweight to get PDF uncertainty. Should be a
3462+ ! list booleans of equal length to lhaid to specify for
3463+ ! which PDF set to include the uncertainties.
3464+#***********************************************************************
3465+# Store reweight information in the LHE file for off-line model- *
3466+# parameter reweighting at NLO+PS accuracy *
3467+#***********************************************************************
3468+ %(store_rwgt_info)s = store_rwgt_info ! Store info for reweighting in LHE file
3469 #***********************************************************************
3470 # ickkw parameter: *
3471 # 0: No merging *
3472@@ -116,47 +120,43 @@
3473 #***********************************************************************
3474 #
3475 #***********************************************************************
3476-# BW cutoff (M+/-bwcutoff*Gamma) *
3477+# BW cutoff (M+/-bwcutoff*Gamma). Determines which resonances are *
3478+# written in the LHE event file *
3479 #***********************************************************************
3480 %(bwcutoff)s = bwcutoff
3481 #***********************************************************************
3482-# Cuts on the jets *
3483-# Jet clustering is performed by FastJet.
3484-# When matching to a parton shower, these generation cuts should be *
3485-# considerably softer than the analysis cuts. *
3486-# (more specific cuts can be specified in SubProcesses/cuts.f) *
3487+# Cuts on the jets. Jet clustering is performed by FastJet. *
3488+# - When matching to a parton shower, these generation cuts should be *
3489+# considerably softer than the analysis cuts. *
3490+# - More specific cuts can be specified in SubProcesses/cuts.f *
3491 #***********************************************************************
3492- %(jetalgo)s = jetalgo ! FastJet jet algorithm (1=kT, 0=C/A, -1=anti-kT)
3493- %(jetradius)s = jetradius ! The radius parameter for the jet algorithm
3494+ %(jetalgo)s = jetalgo ! FastJet jet algorithm (1=kT, 0=C/A, -1=anti-kT)
3495+ %(jetradius)s = jetradius ! The radius parameter for the jet algorithm
3496 %(ptj)s = ptj ! Min jet transverse momentum
3497 %(etaj)s = etaj ! Max jet abs(pseudo-rap) (a value .lt.0 means no cut)
3498 #***********************************************************************
3499 # Cuts on the charged leptons (e+, e-, mu+, mu-, tau+ and tau-) *
3500-# (more specific gen cuts can be specified in SubProcesses/cuts.f) *
3501+# More specific cuts can be specified in SubProcesses/cuts.f *
3502 #***********************************************************************
3503 %(ptl)s = ptl ! Min lepton transverse momentum
3504- %(etal)s = etal ! Max lepton abs(pseudo-rap) (a value .lt.0 means no cut)
3505+ %(etal)s = etal ! Max lepton abs(pseudo-rap) (a value .lt.0 means no cut)
3506 %(drll)s = drll ! Min distance between opposite sign lepton pairs
3507 %(drll_sf)s = drll_sf ! Min distance between opp. sign same-flavor lepton pairs
3508 %(mll)s = mll ! Min inv. mass of all opposite sign lepton pairs
3509- %(mll_sf)s = mll_sf ! Min inv. mass of all opp. sign same-flavor lepton pairs
3510-#***********************************************************************
3511-# Photon-isolation cuts, according to hep-ph/9801442 *
3512-# When ptgmin=0, all the other parameters are ignored *
3513-#***********************************************************************
3514- %(ptgmin)s = ptgmin ! Min photon transverse momentum
3515- %(etagamma)s = etagamma ! Max photon abs(pseudo-rap)
3516+ %(mll_sf)s = mll_sf ! Min inv. mass of all opp. sign same-flavor lepton pairs
3517+#***********************************************************************
3518+# Photon-isolation cuts, according to hep-ph/9801442. When ptgmin=0, *
3519+# all the other parameters are ignored. *
3520+# More specific cuts can be specified in SubProcesses/cuts.f *
3521+#***********************************************************************
3522+ %(ptgmin)s = ptgmin ! Min photon transverse momentum
3523+ %(etagamma)s = etagamma ! Max photon abs(pseudo-rap)
3524 %(r0gamma)s = R0gamma ! Radius of isolation code
3525 %(xn)s = xn ! n parameter of eq.(3.4) in hep-ph/9801442
3526 %(epsgamma)s = epsgamma ! epsilon_gamma parameter of eq.(3.4) in hep-ph/9801442
3527- %(isoem)s = isoEM ! isolate photons from EM energy (photons and leptons)
3528-#***********************************************************************
3529-# Maximal PDG code for quark to be considered a jet when applying cuts.*
3530-# At least all massless quarks of the model should be included here. *
3531-#***********************************************************************
3532- %(maxjetflavor)s = maxjetflavor
3533+ %(isoem)s = isoEM ! isolate photons from EM energy (photons and leptons)
3534 #***********************************************************************
3535 # For aMCfast+APPLGRID use in PDF fitting (http://amcfast.hepforge.org)*
3536 #***********************************************************************
3537- %(iappl)s = iappl ! aMCfast switch (0=OFF, 1=prepare APPLgrids, 2=fill grids)
3538+ %(iappl)s = iappl ! aMCfast switch (0=OFF, 1=prepare grids, 2=fill grids)
3539 #***********************************************************************
3540
3541=== modified file 'Template/NLO/Cards/shower_card.dat'
3542--- Template/NLO/Cards/shower_card.dat 2015-10-03 07:54:16 +0000
3543+++ Template/NLO/Cards/shower_card.dat 2016-05-12 15:13:37 +0000
3544@@ -12,10 +12,8 @@
3545 # mind the format: variable = value # comment *
3546 #***********************************************************************
3547 #
3548-#****************
3549-# Shower settings
3550-#****************
3551-#
3552+#***********************************************************************
3553+# Shower settings *
3554 #***********************************************************************
3555 # Number of events, jobs, errors, and random seeds *
3556 #***********************************************************************
3557@@ -62,40 +60,57 @@
3558 njmax = 0 # Maximal multiplicity in the merging
3559 #***********************************************************************
3560 # Decay channels *
3561-# Write down the decay channels for the resonances, to be performed by *
3562-# the shower. *
3563-# The syntax (for a two-body decay) is *
3564-# DM_I = M > D1 D2 @ BR @ ME *
3565-# where I < 100, M is the decaying resonance, D1, D2 are the decay *
3566-# products (up to D5 if such a decay is supported by the shower), BR *
3567-# is the branching ratio (only used by the HERWIG6 shower, ignored *
3568-# otherwise) and ME is the type of matrix element to be used in the *
3569-# decay (only used by HERWIG6, ignored otherwise). *
3570-# BR's are correctly understood by HERWIG6 only if they add up to 1 *
3571-# and only if no more than three modes are required for a given *
3572-# resonance. *
3573-# ME corresponds to the third entry of subroutine HWMODK, see the *
3574-# relevant manual. *
3575-# *
3576-# WARNING: in HERWIG6, the order of decay products in > 2-body decays *
3577-# IS RELEVANT. *
3578-# WARNING: in PYTHIA6, turning hadronisation off disables top decays *
3579-# WARNING: in PYTHIA6 and PYTHIA8, 1 -> n decays (with n > 2) are *
3580-# handled through a sequence of 1 -> 2 decays. *
3581-# *
3582-# Examples of syntax: *
3583-# Z -> e+ e- or mu+ mu- with BR = 0.5 each *
3584+#***********************************************************************
3585+# Syntax for HERWIG6 *
3586+# DM_I = M > D1 D2 @ BR @ ME *
3587+# corresponding to call to HWMODK(M,BR,ME,D1,D2) *
3588+# I < 100, M is the decaying resonance, D1, D2, ... are the decay *
3589+# products (up to five), BR is the branching ratio and ME is the type *
3590+# of matrix element to be used in the decay. *
3591+# BR's are correctly understood only if they add up to 1, and only if *
3592+# no more than three modes are required for a given resonance. *
3593+# WARNING: the order of decay products in > 2-body decays IS RELEVANT. *
3594+# *
3595+# Syntax for PYTHIA6 *
3596+# DM_I = M > D1 D2 @ BR @ ME *
3597+# WARNING: turning hadronisation off disables top decays *
3598+# WARNING: 1 -> n decays (with n > 2) are handled through a sequence *
3599+# of 1 -> 2 decays. *
3600+# WARNING: entries BR and ME are ignored *
3601+# *
3602+# Syntax for HERWIG++ *
3603+# DM_I = M > D1 D2 @ BR @ ME *
3604+# WARNING: entries BR and ME are ignored *
3605+# *
3606+# Syntax for PYTHIA8 *
3607+# DM_I = M:onIfAny = D1 D2 *
3608+# or similar, according to the offical PYTHIA8 decay syntax, see *
3609+# the online PYTHIA8 manual *
3610+# WARNING: 1 -> n decays (with n > 2) are handled through a sequence *
3611+# of 1 -> 2 decays. *
3612+# *
3613+# Examples *
3614+# Z -> e+ e- or mu+ mu- with BR = 0.5 each, HERWIG6 *
3615 # DM_1 = 23 > -11 11 @ 0.5d0 @ 100
3616 # DM_2 = 23 > -13 13 @ 0.5d0 @ 100
3617-# H -> tau+ tau- with BR = 1 *
3618+# H -> ta+ ta- with BR = 1, HERWIG6 or HERWIG++ *
3619 # DM_3 = 25 > -15 15 @ 1.0d0 @ 0
3620-# t -> nu_e e+ b with BR = 1 (HERWIG) *
3621+# t -> ve e+ b with BR = 1, HERWIG6 or HERWIG++ *
3622 # DM_4 = 6 > 12 -11 5 @ 1d0 @ 100
3623-# t -> nu_e e+ b with BR = 1 (PYTHIA) *
3624+# t -> ve e+ b with BR = 1, PYTHIA6 *
3625 # DM_5 = 6 > 24 5 @ 1d0 @ 100
3626 # DM_6 = 24 > 12 -11 @ 1d0 @ 100
3627-#***********************************************************************
3628-# Extra Libraries/analyses *
3629+# W+ -> ve e+, W- -> vm~ mu-, PYTHIA8 *
3630+# DM_1 = 24:onMode = off
3631+# DM_2 = 24:onPosIfAny = 11 12
3632+# DM_3 = 24:onNegIfAny = 13 14
3633+# W+ -> ve e+, W- -> ve~ e- and vm~ mu-, PYTHIA8 *
3634+# DM_1 = 24:onMode = off
3635+# DM_2 = 24:onIfAny = 11 12
3636+# DM_3 = 24:onNegIfAny = 13 14
3637+#***********************************************************************
3638+# Extra libraries/analyses *
3639+#***********************************************************************
3640 # The following lines need to be changed if the user does not want to *
3641 # create a StdHEP/HepMC file, but to directly run an own analysis (to *
3642 # be placed in HWAnalyzer or analogous MCatNLO subfolders). *
3643
3644=== modified file 'Template/NLO/FixedOrderAnalysis/HwU.f'
3645--- Template/NLO/FixedOrderAnalysis/HwU.f 2015-03-05 19:51:04 +0000
3646+++ Template/NLO/FixedOrderAnalysis/HwU.f 2016-05-12 15:13:37 +0000
3647@@ -360,16 +360,15 @@
3648 character*4 str_nbin
3649 double precision xnorm
3650 c column info: x_min, x_max, y (central value), dy, {extra
3651-c weights}. Use columns with a width of 17 characters.
3652- write (buffer( 1:17),'(a)')'##& xmin &'
3653- write (buffer(18:34),'(a)')' xmax '
3654- write (buffer(35:51),'(a2,a15)') ' &',wgts_info(1)(1:15)
3655- write (buffer(52:68),'(a)')' & dy '
3656+c weights}.
3657+ write (unit,'(a$)') '##& xmin'
3658+ write (unit,'(a$)') ' & xmax'
3659+ write (unit,'(a$)') ' & '//trim(adjustl(wgts_info(1)))
3660+ write (unit,'(a$)') ' & dy'
3661 do j=2,nwgts
3662- write (buffer((j+2)*17+1:(j+3)*17),'(a2,a15)')
3663- $ ' &',wgts_info(j)(1:15)
3664+ write (unit,'(a$)') ' & '//trim(adjustl(wgts_info(j)))
3665 enddo
3666- write (unit,'(a)') buffer(1:(nwgts+3)*17)
3667+ write (unit,'(a)') ''
3668 write (unit,'(a)') ''
3669 do label=1,max_plots
3670 if (.not. booked(label)) cycle
3671
3672=== modified file 'Template/NLO/FixedOrderAnalysis/HwU.inc'
3673--- Template/NLO/FixedOrderAnalysis/HwU.inc 2015-03-05 19:51:04 +0000
3674+++ Template/NLO/FixedOrderAnalysis/HwU.inc 2016-05-12 15:13:37 +0000
3675@@ -3,14 +3,14 @@
3676 integer max_plots,max_bins,max_wgts,max_points
3677 parameter (max_plots=200)
3678 parameter (max_bins=100)
3679- parameter (max_wgts=300)
3680+ parameter (max_wgts=1024)
3681 parameter (max_points=max_plots*40)
3682
3683 logical booked(max_plots)
3684 integer nbin(max_plots),nwgts,np,p_bin(max_points)
3685 & ,p_label(max_points),histi(max_plots,max_bins)
3686 character*50 title(max_plots)
3687- character*15 wgts_info(max_wgts)
3688+ character*50 wgts_info(max_wgts)
3689 double precision histy(max_wgts,max_plots,max_bins)
3690 $ ,histy_acc(max_wgts,max_plots,max_bins),histy2(max_plots
3691 $ ,max_bins),histy_err(max_plots,max_bins),histxl(max_plots
3692
3693=== modified file 'Template/NLO/FixedOrderAnalysis/analysis_HwU_pp_lplm.f'
3694--- Template/NLO/FixedOrderAnalysis/analysis_HwU_pp_lplm.f 2014-12-03 11:51:14 +0000
3695+++ Template/NLO/FixedOrderAnalysis/analysis_HwU_pp_lplm.f 2016-05-12 15:13:37 +0000
3696@@ -130,73 +130,73 @@
3697 etalb=getpseudorap(pplb(0),pplb(1),pplb(2),pplb(3))
3698 c
3699 ptpair=ptv
3700- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
3701+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
3702 azinorm=(pi-azi)/pi
3703 xmll=xmv
3704 detallb=etal-etalb
3705 c
3706 l=0
3707- call HwU_fill(l+1,(ptv),(WGTS))
3708- call HwU_fill(l+2,(ptv),(WGTS))
3709- if(ptv.gt.0.d0)call HwU_fill(l+3,(log10(ptv)),(WGTS))
3710- call HwU_fill(l+4,(yv),(WGTS))
3711- call HwU_fill(l+5,(etav),(WGTS))
3712- call HwU_fill(l+6,(xmv),(WGTS))
3713-c
3714- call HwU_fill(l+7,(ptl),(WGTS))
3715- call HwU_fill(l+8,(ptl),(WGTS))
3716- if(ptl.gt.0.d0)call HwU_fill(l+9,(log10(ptl)),(WGTS))
3717- call HwU_fill(l+10,(etal),(WGTS))
3718- call HwU_fill(l+11,(ptlb),(WGTS))
3719- call HwU_fill(l+12,(ptlb),(WGTS))
3720- if(ptlb.gt.0.d0)call HwU_fill(l+13,(log10(ptlb)),(WGTS))
3721- call HwU_fill(l+14,(etalb),(WGTS))
3722-c
3723- call HwU_fill(l+15,(detallb),(WGTS))
3724- call HwU_fill(l+16,(azi),(WGTS))
3725- if(azinorm.gt.0.d0) call HwU_fill(l+17,(log10(azinorm)),(WGTS))
3726- call HwU_fill(l+18,(xmll),(WGTS))
3727- call HwU_fill(l+19,(ptpair),(WGTS))
3728- if(ptpair.gt.0)call HwU_fill(l+20,(log10(ptpair)),(WGTS))
3729- call HwU_fill(l+21,(0d0),(WGTS))
3730+ call HwU_fill(l+1,(ptv),WGTS)
3731+ call HwU_fill(l+2,(ptv),WGTS)
3732+ if(ptv.gt.0.d0)call HwU_fill(l+3,(log10(ptv)),WGTS)
3733+ call HwU_fill(l+4,(yv),WGTS)
3734+ call HwU_fill(l+5,(etav),WGTS)
3735+ call HwU_fill(l+6,(xmv),WGTS)
3736+c
3737+ call HwU_fill(l+7,(ptl),WGTS)
3738+ call HwU_fill(l+8,(ptl),WGTS)
3739+ if(ptl.gt.0.d0)call HwU_fill(l+9,(log10(ptl)),WGTS)
3740+ call HwU_fill(l+10,(etal),WGTS)
3741+ call HwU_fill(l+11,(ptlb),WGTS)
3742+ call HwU_fill(l+12,(ptlb),WGTS)
3743+ if(ptlb.gt.0.d0)call HwU_fill(l+13,(log10(ptlb)),WGTS)
3744+ call HwU_fill(l+14,(etalb),WGTS)
3745+c
3746+ call HwU_fill(l+15,(detallb),WGTS)
3747+ call HwU_fill(l+16,(azi),WGTS)
3748+ if(azinorm.gt.0.d0) call HwU_fill(l+17,(log10(azinorm)),WGTS)
3749+ call HwU_fill(l+18,(xmll),WGTS)
3750+ call HwU_fill(l+19,(ptpair),WGTS)
3751+ if(ptpair.gt.0)call HwU_fill(l+20,(log10(ptpair)),WGTS)
3752+ call HwU_fill(l+21,(0d0),WGTS)
3753 c
3754 l=l+21
3755
3756 if(abs(etav).lt.ycut)then
3757- call HwU_fill(l+1,(ptv),(WGTS))
3758- call HwU_fill(l+2,(ptv),(WGTS))
3759- if(ptv.gt.0.d0)call HwU_fill(l+3,(log10(ptv)),(WGTS))
3760+ call HwU_fill(l+1,(ptv),WGTS)
3761+ call HwU_fill(l+2,(ptv),WGTS)
3762+ if(ptv.gt.0.d0)call HwU_fill(l+3,(log10(ptv)),WGTS)
3763 endif
3764 if(ptv.gt.20.d0)then
3765- call HwU_fill(l+4,(yv),(WGTS))
3766- call HwU_fill(l+5,(etav),(WGTS))
3767+ call HwU_fill(l+4,(yv),WGTS)
3768+ call HwU_fill(l+5,(etav),WGTS)
3769 endif
3770 if(abs(etav).lt.ycut.and.ptv.gt.20.d0)then
3771- call HwU_fill(l+6,(xmv),(WGTS))
3772- call HwU_fill(l+21,(0d0),(WGTS))
3773+ call HwU_fill(l+6,(xmv),WGTS)
3774+ call HwU_fill(l+21,(0d0),WGTS)
3775 endif
3776 c
3777 if(abs(etal).lt.ycut)then
3778- call HwU_fill(l+7,(ptl),(WGTS))
3779- call HwU_fill(l+8,(ptl),(WGTS))
3780- if(ptl.gt.0.d0)call HwU_fill(l+9,(log10(ptl)),(WGTS))
3781+ call HwU_fill(l+7,(ptl),WGTS)
3782+ call HwU_fill(l+8,(ptl),WGTS)
3783+ if(ptl.gt.0.d0)call HwU_fill(l+9,(log10(ptl)),WGTS)
3784 endif
3785- if(ptl.gt.20.d0)call HwU_fill(l+10,(etal),(WGTS))
3786+ if(ptl.gt.20.d0)call HwU_fill(l+10,(etal),WGTS)
3787 if(abs(etalb).lt.ycut)then
3788- call HwU_fill(l+11,(ptlb),(WGTS))
3789- call HwU_fill(l+12,(ptlb),(WGTS))
3790- if(ptlb.gt.0.d0)call HwU_fill(l+13,(log10(ptlb)),(WGTS))
3791+ call HwU_fill(l+11,(ptlb),WGTS)
3792+ call HwU_fill(l+12,(ptlb),WGTS)
3793+ if(ptlb.gt.0.d0)call HwU_fill(l+13,(log10(ptlb)),WGTS)
3794 endif
3795- if(ptlb.gt.20.d0)call HwU_fill(l+14,(etalb),(WGTS))
3796+ if(ptlb.gt.20.d0)call HwU_fill(l+14,(etalb),WGTS)
3797 c
3798 if( abs(etal).lt.ycut.and.abs(etalb).lt.ycut .and.
3799 & ptl.gt.20.d0.and.ptlb.gt.20.d0)then
3800- call HwU_fill(l+15,(detallb),(WGTS))
3801- call HwU_fill(l+16,(azi),(WGTS))
3802- if(azinorm.gt.0.d0) call HwU_fill(l+17,(log10(azinorm)),(WGTS))
3803- call HwU_fill(l+18,(xmll),(WGTS))
3804- call HwU_fill(l+19,(ptpair),(WGTS))
3805- if(ptpair.gt.0) call HwU_fill(l+20,(log10(ptpair)),(WGTS))
3806+ call HwU_fill(l+15,(detallb),WGTS)
3807+ call HwU_fill(l+16,(azi),WGTS)
3808+ if(azinorm.gt.0.d0) call HwU_fill(l+17,(log10(azinorm)),WGTS)
3809+ call HwU_fill(l+18,(xmll),WGTS)
3810+ call HwU_fill(l+19,(ptpair),WGTS)
3811+ if(ptpair.gt.0) call HwU_fill(l+20,(log10(ptpair)),WGTS)
3812 endif
3813
3814 999 return
3815
3816=== modified file 'Template/NLO/FixedOrderAnalysis/analysis_root_pp_lplm.f'
3817--- Template/NLO/FixedOrderAnalysis/analysis_root_pp_lplm.f 2014-01-30 12:29:34 +0000
3818+++ Template/NLO/FixedOrderAnalysis/analysis_root_pp_lplm.f 2016-05-12 15:13:37 +0000
3819@@ -170,7 +170,7 @@
3820 etalb=getpseudorap(pplb(0),pplb(1),pplb(2),pplb(3))
3821 c
3822 ptpair=ptv
3823- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
3824+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
3825 azinorm=(pi-azi)/pi
3826 xmll=xmv
3827 detallb=etal-etalb
3828
3829=== modified file 'Template/NLO/FixedOrderAnalysis/analysis_td_pp_lplm.f'
3830--- Template/NLO/FixedOrderAnalysis/analysis_td_pp_lplm.f 2014-01-30 12:29:34 +0000
3831+++ Template/NLO/FixedOrderAnalysis/analysis_td_pp_lplm.f 2016-05-12 15:13:37 +0000
3832@@ -205,7 +205,7 @@
3833 etalb=getpseudorap(pplb(0),pplb(1),pplb(2),pplb(3))
3834 c
3835 ptpair=ptv
3836- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
3837+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
3838 azinorm=(pi-azi)/pi
3839 xmll=xmv
3840 detallb=etal-etalb
3841
3842=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f'
3843--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f 2015-03-20 16:09:31 +0000
3844+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f 2016-05-12 15:13:37 +0000
3845@@ -49,8 +49,7 @@
3846 integer nwgt,max_weight,nwgt_analysis
3847 common/cnwgt/nwgt
3848 common/c_analysis/nwgt_analysis
3849- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3850- character*15 weights_info(max_weight)
3851+ character*50 weights_info(max_weight_shower)
3852 common/cwgtsinfo/weights_info
3853 c Initialize histograms
3854 call HwU_inithist(nwgt,weights_info)
3855@@ -112,7 +111,10 @@
3856 DATA XME/5.11D-4/
3857 integer nwgt_analysis,max_weight
3858 common/c_analysis/nwgt_analysis
3859- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3860+ integer maxRWGT
3861+ parameter (maxRWGT=100)
3862+ double precision wgtxsecRWGT(maxRWGT)
3863+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
3864 double precision ww(max_weight),www(max_weight)
3865 common/cww/ww
3866 c
3867@@ -123,7 +125,7 @@
3868 ENDIF
3869 c
3870 c CHOOSE IDENT=24 FOR W+, IDENT=-24 FOR W-, IDENT=23 FOR Z0
3871- IDENT=24
3872+ IDENT=23
3873 C INCOMING PARTONS MAY TRAVEL IN THE SAME DIRECTION: IT''S A POWER-SUPPRESSED
3874 C EFFECT, SO THROW THE EVENT AWAY
3875 IF(SIGN(1.D0,PHEP(3,4)).EQ.SIGN(1.D0,PHEP(3,5)))THEN
3876
3877=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f'
3878--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f 2015-03-20 16:09:31 +0000
3879+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f 2016-05-12 15:13:37 +0000
3880@@ -46,8 +46,7 @@
3881 integer nwgt,max_weight,nwgt_analysis,kk,l
3882 common/cnwgt/nwgt
3883 common/c_analysis/nwgt_analysis
3884- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3885- character*15 weights_info(max_weight)
3886+ character*50 weights_info(max_weight_shower)
3887 common/cwgtsinfo/weights_info
3888 c Initialize histograms
3889 call HwU_inithist(nwgt,weights_info)
3890@@ -149,7 +148,10 @@
3891 # njdble,njcdble,y_central
3892 integer nwgt_analysis,max_weight,l
3893 common/c_analysis/nwgt_analysis
3894- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3895+ integer maxRWGT
3896+ parameter (maxRWGT=100)
3897+ double precision wgtxsecRWGT(maxRWGT)
3898+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
3899 double precision ww(max_weight),www(max_weight)
3900 common/cww/ww
3901 DATA TINY/.1D-5/
3902
3903=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f'
3904--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f 2015-03-23 15:52:14 +0000
3905+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f 2016-05-12 15:13:37 +0000
3906@@ -51,8 +51,7 @@
3907 common /to_veto_hist/vetomin,vetomax,nbinveto
3908 common/cnwgt/nwgt
3909 common/c_analysis/nwgt_analysis
3910- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3911- character*15 weights_info(max_weight)
3912+ character*50 weights_info(max_weight_shower)
3913 common/cwgtsinfo/weights_info
3914 c Initialize histograms
3915 call HwU_inithist(nwgt,weights_info)
3916@@ -202,7 +201,10 @@
3917 double precision pt_veto, pjveto(4), xsecup2
3918 integer nwgt_analysis,max_weight
3919 common/c_analysis/nwgt_analysis
3920- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3921+ integer maxRWGT
3922+ parameter (maxRWGT=100)
3923+ double precision wgtxsecRWGT(maxRWGT)
3924+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
3925 double precision ww(max_weight),www(max_weight)
3926 common/cww/ww
3927 c
3928
3929=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f'
3930--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f 2015-03-23 15:52:14 +0000
3931+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f 2016-05-12 15:13:37 +0000
3932@@ -60,8 +60,7 @@
3933 integer nwgt,max_weight,nwgt_analysis
3934 common/cnwgt/nwgt
3935 common/c_analysis/nwgt_analysis
3936- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3937- character*15 weights_info(max_weight)
3938+ character*50 weights_info(max_weight_shower)
3939 common/cwgtsinfo/weights_info
3940 c Initialize histograms
3941 call HwU_inithist(nwgt,weights_info)
3942@@ -193,7 +192,10 @@
3943 LOGICAL DIDSOF
3944 integer nwgt_analysis,max_weight
3945 common/c_analysis/nwgt_analysis
3946- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3947+ integer maxRWGT
3948+ parameter (maxRWGT=100)
3949+ double precision wgtxsecRWGT(maxRWGT)
3950+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
3951 double precision ww(max_weight),www(max_weight)
3952 common/cww/ww
3953 c
3954
3955=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f'
3956--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f 2015-03-20 16:09:31 +0000
3957+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f 2016-05-12 15:13:37 +0000
3958@@ -48,8 +48,7 @@
3959 integer nwgt,max_weight,nwgt_analysis
3960 common/cnwgt/nwgt
3961 common/c_analysis/nwgt_analysis
3962- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3963- character*15 weights_info(max_weight)
3964+ character*50 weights_info(max_weight_shower)
3965 common/cwgtsinfo/weights_info
3966 c Initialize histograms
3967 call HwU_inithist(nwgt,weights_info)
3968@@ -126,7 +125,10 @@
3969 DATA TINY/.1D-5/
3970 integer nwgt_analysis,max_weight
3971 common/c_analysis/nwgt_analysis
3972- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3973+ integer maxRWGT
3974+ parameter (maxRWGT=100)
3975+ double precision wgtxsecRWGT(maxRWGT)
3976+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
3977 double precision ww(max_weight),www(max_weight)
3978 common/cww/ww
3979 c
3980@@ -221,7 +223,7 @@
3981 etalb=getpseudorap(pplb(4),pplb(1),pplb(2),pplb(3))
3982 c
3983 ptpair=ptv
3984- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
3985+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
3986 azinorm=(pi-azi)/pi
3987 xmll=xmv
3988 detallb=etal-etalb
3989
3990=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f'
3991--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f 2015-03-20 16:09:31 +0000
3992+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f 2016-05-12 15:13:37 +0000
3993@@ -48,8 +48,7 @@
3994 integer nwgt,max_weight,nwgt_analysis
3995 common/cnwgt/nwgt
3996 common/c_analysis/nwgt_analysis
3997- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
3998- character*15 weights_info(max_weight)
3999+ character*50 weights_info(max_weight_shower)
4000 common/cwgtsinfo/weights_info
4001 c Initialize histograms
4002 call HwU_inithist(nwgt,weights_info)
4003@@ -110,7 +109,10 @@
4004 DATA TINY/.1D-5/
4005 integer nwgt_analysis,max_weight
4006 common/c_analysis/nwgt_analysis
4007- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4008+ integer maxRWGT
4009+ parameter (maxRWGT=100)
4010+ double precision wgtxsecRWGT(maxRWGT)
4011+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4012 double precision ww(max_weight),www(max_weight)
4013 common/cww/ww
4014 c
4015
4016=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f'
4017--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f 2015-03-20 16:09:31 +0000
4018+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f 2016-05-12 15:13:37 +0000
4019@@ -46,8 +46,7 @@
4020 integer nwgt,max_weight,nwgt_analysis,kk,l
4021 common/cnwgt/nwgt
4022 common/c_analysis/nwgt_analysis
4023- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4024- character*15 weights_info(max_weight)
4025+ character*50 weights_info(max_weight_shower)
4026 common/cwgtsinfo/weights_info
4027 c Initialize histograms
4028 call HwU_inithist(nwgt,weights_info)
4029@@ -107,7 +106,10 @@
4030 DATA TINY/.1D-5/
4031 integer nwgt_analysis,max_weight
4032 common/c_analysis/nwgt_analysis
4033- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4034+ integer maxRWGT
4035+ parameter (maxRWGT=100)
4036+ double precision wgtxsecRWGT(maxRWGT)
4037+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4038 double precision ww(max_weight),www(max_weight)
4039 common/cww/ww
4040 IF (IERROR.NE.0) RETURN
4041
4042=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f'
4043--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f 2015-03-23 15:52:14 +0000
4044+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f 2016-05-12 15:13:37 +0000
4045@@ -46,8 +46,7 @@
4046 integer nwgt,max_weight,nwgt_analysis
4047 common/cnwgt/nwgt
4048 common/c_analysis/nwgt_analysis
4049- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4050- character*15 weights_info(max_weight)
4051+ character*50 weights_info(max_weight_shower)
4052 common/cwgtsinfo/weights_info
4053 c Initialize histograms
4054 call HwU_inithist(nwgt,weights_info)
4055@@ -137,7 +136,10 @@
4056 integer btrack(maxnum),ib(maxnum)
4057 integer nwgt_analysis,max_weight
4058 common/c_analysis/nwgt_analysis
4059- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4060+ integer maxRWGT
4061+ parameter (maxRWGT=100)
4062+ double precision wgtxsecRWGT(maxRWGT)
4063+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4064 double precision ww(max_weight),www(max_weight)
4065 common/cww/ww
4066 c
4067
4068=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f'
4069--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f 2015-03-09 17:19:46 +0000
4070+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f 2016-05-12 15:13:37 +0000
4071@@ -46,8 +46,7 @@
4072 integer nwgt,max_weight,nwgt_analysis
4073 common/cnwgt/nwgt
4074 common/c_analysis/nwgt_analysis
4075- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4076- character*15 weights_info(max_weight)
4077+ character*50 weights_info(max_weight_shower)
4078 common/cwgtsinfo/weights_info
4079 c Initialize histograms
4080 call HwU_inithist(nwgt,weights_info)
4081@@ -135,7 +134,10 @@
4082 COMMON/VVLIN/IVLEP1,IVLEP2
4083 integer nwgt_analysis,max_weight
4084 common/c_analysis/nwgt_analysis
4085- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4086+ integer maxRWGT
4087+ parameter (maxRWGT=100)
4088+ double precision wgtxsecRWGT(maxRWGT)
4089+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4090 double precision ww(max_weight),www(max_weight)
4091 common/cww/ww
4092 c
4093
4094=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f'
4095--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f 2015-03-23 15:52:14 +0000
4096+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f 2016-05-12 15:13:37 +0000
4097@@ -46,8 +46,7 @@
4098 integer nwgt,max_weight,nwgt_analysis
4099 common/cnwgt/nwgt
4100 common/c_analysis/nwgt_analysis
4101- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4102- character*15 weights_info(max_weight)
4103+ character*50 weights_info(max_weight_shower)
4104 common/cwgtsinfo/weights_info
4105 c Initialize histograms
4106 call HwU_inithist(nwgt,weights_info)
4107@@ -118,7 +117,10 @@
4108 COMMON/VVLIN/IVLEP1,IVLEP2
4109 integer nwgt_analysis,max_weight
4110 common/c_analysis/nwgt_analysis
4111- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4112+ integer maxRWGT
4113+ parameter (maxRWGT=100)
4114+ double precision wgtxsecRWGT(maxRWGT)
4115+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4116 double precision ww(max_weight),www(max_weight)
4117 common/cww/ww
4118 c
4119
4120=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f'
4121--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f 2015-03-20 16:09:31 +0000
4122+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f 2016-05-12 15:13:37 +0000
4123@@ -42,8 +42,7 @@
4124 integer nwgt,max_weight,nwgt_analysis
4125 common/cnwgt/nwgt
4126 common/c_analysis/nwgt_analysis
4127- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4128- character*15 weights_info(max_weight)
4129+ character*50 weights_info(max_weight_shower)
4130 common/cwgtsinfo/weights_info
4131 c Initialize histograms
4132 call HwU_inithist(nwgt,weights_info)
4133@@ -91,7 +90,10 @@
4134 data tot/0.5d0/
4135 integer nwgt_analysis,max_weight
4136 common/c_analysis/nwgt_analysis
4137- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4138+ integer maxRWGT
4139+ parameter (maxRWGT=100)
4140+ double precision wgtxsecRWGT(maxRWGT)
4141+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4142 double precision ww(max_weight),www(max_weight)
4143 common/cww/ww
4144 c
4145
4146=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f'
4147--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f 2014-03-07 07:46:55 +0000
4148+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f 2016-05-12 15:13:37 +0000
4149@@ -25,8 +25,7 @@
4150 integer nwgt,max_weight,nwgt_analysis
4151 common/cnwgt/nwgt
4152 common/c_analysis/nwgt_analysis
4153- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4154- character*15 weights_info(max_weight)
4155+ character*50 weights_info(max_weight_shower)
4156 common/cwgtsinfo/weights_info
4157 c
4158 call inihist
4159
4160=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f'
4161--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f 2014-03-07 07:46:55 +0000
4162+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f 2016-05-12 15:13:37 +0000
4163@@ -17,8 +17,7 @@
4164 integer nwgt,max_weight,nwgt_analysis,kk,l
4165 common/cnwgt/nwgt
4166 common/c_analysis/nwgt_analysis
4167- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4168- character*15 weights_info(max_weight)
4169+ character*50 weights_info(max_weight_shower)
4170 common/cwgtsinfo/weights_info
4171 call inihist
4172 nwgt_analysis=nwgt
4173
4174=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f'
4175--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f 2014-03-07 07:46:55 +0000
4176+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f 2016-05-12 15:13:37 +0000
4177@@ -17,8 +17,7 @@
4178 integer nwgt,max_weight,nwgt_analysis
4179 common/cnwgt/nwgt
4180 common/c_analysis/nwgt_analysis
4181- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4182- character*15 weights_info(max_weight)
4183+ character*50 weights_info(max_weight_shower)
4184 common/cwgtsinfo/weights_info
4185 character*8 cc(2)
4186 data cc/' ','vbfcuts '/
4187
4188=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f'
4189--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f 2014-02-12 10:28:36 +0000
4190+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f 2016-05-12 15:13:37 +0000
4191@@ -17,8 +17,7 @@
4192 integer nwgt,max_weight,nwgt_analysis
4193 common/cnwgt/nwgt
4194 common/c_analysis/nwgt_analysis
4195- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4196- character*15 weights_info(max_weight)
4197+ character*50 weights_info(max_weight_shower)
4198 common/cwgtsinfo/weights_info
4199 integer nsingle,ncorr,nlepton,nplots,ncuts
4200 common/cplots/nsingle,ncorr,nlepton,nplots,ncuts
4201
4202=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f'
4203--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f 2014-03-07 07:46:55 +0000
4204+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f 2016-05-12 15:13:37 +0000
4205@@ -22,8 +22,7 @@
4206 integer nwgt,max_weight,nwgt_analysis
4207 common/cnwgt/nwgt
4208 common/c_analysis/nwgt_analysis
4209- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4210- character*15 weights_info(max_weight)
4211+ character*50 weights_info(max_weight_shower)
4212 common/cwgtsinfo/weights_info
4213 call inihist
4214 nwgt_analysis=nwgt
4215@@ -251,7 +250,7 @@
4216 etalb=getpseudorap(pplb(4),pplb(1),pplb(2),pplb(3))
4217 c
4218 ptpair=ptv
4219- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
4220+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
4221 azinorm=(pi-azi)/pi
4222 xmll=xmv
4223 detallb=etal-etalb
4224
4225=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f'
4226--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f 2014-03-07 07:46:55 +0000
4227+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f 2016-05-12 15:13:37 +0000
4228@@ -25,8 +25,7 @@
4229 integer nwgt,max_weight,nwgt_analysis
4230 common/cnwgt/nwgt
4231 common/c_analysis/nwgt_analysis
4232- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4233- character*15 weights_info(max_weight)
4234+ character*50 weights_info(max_weight_shower)
4235 common/cwgtsinfo/weights_info
4236 c
4237 call inihist
4238
4239=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f'
4240--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f 2014-03-07 07:46:55 +0000
4241+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f 2016-05-12 15:13:37 +0000
4242@@ -20,8 +20,7 @@
4243 integer nwgt,max_weight,nwgt_analysis
4244 common/cnwgt/nwgt
4245 common/c_analysis/nwgt_analysis
4246- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4247- character*15 weights_info(max_weight)
4248+ character*50 weights_info(max_weight_shower)
4249 common/cwgtsinfo/weights_info
4250 call inihist
4251 nwgt_analysis=nwgt
4252
4253=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f'
4254--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f 2014-03-07 07:46:55 +0000
4255+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f 2016-05-12 15:13:37 +0000
4256@@ -22,8 +22,7 @@
4257 integer nwgt,max_weight,nwgt_analysis
4258 common/cnwgt/nwgt
4259 common/c_analysis/nwgt_analysis
4260- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4261- character*15 weights_info(max_weight)
4262+ character*50 weights_info(max_weight_shower)
4263 common/cwgtsinfo/weights_info
4264 call inihist
4265 nwgt_analysis=nwgt
4266
4267=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f'
4268--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f 2014-03-07 07:46:55 +0000
4269+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f 2016-05-12 15:13:37 +0000
4270@@ -22,8 +22,7 @@
4271 integer nwgt,max_weight,nwgt_analysis
4272 common/cnwgt/nwgt
4273 common/c_analysis/nwgt_analysis
4274- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4275- character*15 weights_info(max_weight)
4276+ character*50 weights_info(max_weight_shower)
4277 common/cwgtsinfo/weights_info
4278 c
4279 call inihist
4280
4281=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f'
4282--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f 2014-03-07 07:46:55 +0000
4283+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f 2016-05-12 15:13:37 +0000
4284@@ -22,8 +22,7 @@
4285 integer nwgt,max_weight,nwgt_analysis
4286 common/cnwgt/nwgt
4287 common/c_analysis/nwgt_analysis
4288- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4289- character*15 weights_info(max_weight)
4290+ character*50 weights_info(max_weight_shower)
4291 common/cwgtsinfo/weights_info
4292 c
4293 call inihist
4294
4295=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f'
4296--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f 2014-03-07 07:46:55 +0000
4297+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f 2016-05-12 15:13:37 +0000
4298@@ -16,8 +16,7 @@
4299 integer nwgt,max_weight,nwgt_analysis
4300 common/cnwgt/nwgt
4301 common/c_analysis/nwgt_analysis
4302- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4303- character*15 weights_info(max_weight)
4304+ character*50 weights_info(max_weight_shower)
4305 common/cwgtsinfo/weights_info
4306 c
4307 call inihist
4308
4309=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_V.f'
4310--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_V.f 2015-03-20 16:09:31 +0000
4311+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_V.f 2016-05-12 15:13:37 +0000
4312@@ -49,7 +49,10 @@
4313 integer nwgt,max_weight,nwgt_analysis
4314 common/cnwgt/nwgt
4315 common/c_analysis/nwgt_analysis
4316- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4317+ integer maxRWGT
4318+ parameter (maxRWGT=100)
4319+ double precision wgtxsecRWGT(maxRWGT)
4320+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4321 character*15 weights_info(max_weight)
4322 common/cwgtsinfo/weights_info
4323 c
4324@@ -117,7 +120,10 @@
4325 DATA XME/5.11D-4/
4326 integer nwgt_analysis,max_weight
4327 common/c_analysis/nwgt_analysis
4328- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4329+ integer maxRWGT
4330+ parameter (maxRWGT=100)
4331+ double precision wgtxsecRWGT(maxRWGT)
4332+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4333 double precision ww(max_weight),www(max_weight)
4334 common/cww/ww
4335 c
4336
4337=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_h.f'
4338--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_h.f 2015-03-20 16:09:31 +0000
4339+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_h.f 2016-05-12 15:13:37 +0000
4340@@ -46,7 +46,10 @@
4341 integer nwgt,max_weight,nwgt_analysis
4342 common/cnwgt/nwgt
4343 common/c_analysis/nwgt_analysis
4344- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4345+ integer maxRWGT
4346+ parameter (maxRWGT=100)
4347+ double precision wgtxsecRWGT(maxRWGT)
4348+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4349 character*15 weights_info(max_weight)
4350 common/cwgtsinfo/weights_info
4351 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4352@@ -155,7 +158,10 @@
4353 # njdble,njcdble,y_central
4354 integer nwgt_analysis,max_weight,l
4355 common/c_analysis/nwgt_analysis
4356- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4357+ integer maxRWGT
4358+ parameter (maxRWGT=100)
4359+ double precision wgtxsecRWGT(maxRWGT)
4360+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4361 double precision ww(max_weight),www(max_weight)
4362 common/cww/ww
4363 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4364
4365=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_hjj.f'
4366--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_hjj.f 2015-03-23 15:52:14 +0000
4367+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_hjj.f 2016-05-12 15:13:37 +0000
4368@@ -46,7 +46,10 @@
4369 integer nwgt,max_weight,nwgt_analysis
4370 common/cnwgt/nwgt
4371 common/c_analysis/nwgt_analysis
4372- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4373+ integer maxRWGT
4374+ parameter (maxRWGT=100)
4375+ double precision wgtxsecRWGT(maxRWGT)
4376+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4377 character*15 weights_info(max_weight)
4378 common/cwgtsinfo/weights_info
4379 character*8 cc(2)
4380@@ -206,7 +209,10 @@
4381 double precision pt_veto, pjveto(4), xsecup2
4382 integer nwgt_analysis,max_weight
4383 common/c_analysis/nwgt_analysis
4384- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4385+ integer maxRWGT
4386+ parameter (maxRWGT=100)
4387+ double precision wgtxsecRWGT(maxRWGT)
4388+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4389 double precision ww(max_weight),www(max_weight)
4390 common/cww/ww
4391 c
4392
4393=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_leptons.f'
4394--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_leptons.f 2015-03-23 15:52:14 +0000
4395+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_leptons.f 2016-05-12 15:13:37 +0000
4396@@ -44,7 +44,10 @@
4397 integer nwgt,max_weight,nwgt_analysis
4398 common/cnwgt/nwgt
4399 common/c_analysis/nwgt_analysis
4400- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4401+ integer maxRWGT
4402+ parameter (maxRWGT=100)
4403+ double precision wgtxsecRWGT(maxRWGT)
4404+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4405 character*15 weights_info(max_weight)
4406 common/cwgtsinfo/weights_info
4407 integer nsingle,ncorr,nlepton,nplots,ncuts
4408@@ -200,7 +203,10 @@
4409 LOGICAL DIDSOF
4410 integer nwgt_analysis,max_weight
4411 common/c_analysis/nwgt_analysis
4412- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4413+ integer maxRWGT
4414+ parameter (maxRWGT=100)
4415+ double precision wgtxsecRWGT(maxRWGT)
4416+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4417 double precision ww(max_weight),www(max_weight)
4418 common/cww/ww
4419 c
4420
4421=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lplm.f'
4422--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lplm.f 2015-03-20 16:09:31 +0000
4423+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lplm.f 2016-05-12 15:13:37 +0000
4424@@ -48,7 +48,10 @@
4425 integer nwgt,max_weight,nwgt_analysis
4426 common/cnwgt/nwgt
4427 common/c_analysis/nwgt_analysis
4428- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4429+ integer maxRWGT
4430+ parameter (maxRWGT=100)
4431+ double precision wgtxsecRWGT(maxRWGT)
4432+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4433 character*15 weights_info(max_weight)
4434 common/cwgtsinfo/weights_info
4435 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4436@@ -131,7 +134,10 @@
4437 DATA TINY/.1D-5/
4438 integer nwgt_analysis,max_weight
4439 common/c_analysis/nwgt_analysis
4440- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4441+ integer maxRWGT
4442+ parameter (maxRWGT=100)
4443+ double precision wgtxsecRWGT(maxRWGT)
4444+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4445 double precision ww(max_weight),www(max_weight)
4446 common/cww/ww
4447 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4448@@ -209,7 +215,7 @@
4449 etalb=getpseudorap(pplb(4),pplb(1),pplb(2),pplb(3))
4450 c
4451 ptpair=ptv
4452- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
4453+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
4454 azinorm=(pi-azi)/pi
4455 xmll=xmv
4456 detallb=etal-etalb
4457
4458=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lvl.f'
4459--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lvl.f 2015-03-20 16:09:31 +0000
4460+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_lvl.f 2016-05-12 15:13:37 +0000
4461@@ -48,7 +48,10 @@
4462 integer nwgt,max_weight,nwgt_analysis
4463 common/cnwgt/nwgt
4464 common/c_analysis/nwgt_analysis
4465- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4466+ integer maxRWGT
4467+ parameter (maxRWGT=100)
4468+ double precision wgtxsecRWGT(maxRWGT)
4469+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4470 character*15 weights_info(max_weight)
4471 common/cwgtsinfo/weights_info
4472 c
4473@@ -115,7 +118,10 @@
4474 DATA TINY/.1D-5/
4475 integer nwgt_analysis,max_weight
4476 common/c_analysis/nwgt_analysis
4477- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4478+ integer maxRWGT
4479+ parameter (maxRWGT=100)
4480+ double precision wgtxsecRWGT(maxRWGT)
4481+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4482 double precision ww(max_weight),www(max_weight)
4483 common/cww/ww
4484 c
4485
4486=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_taptam.f'
4487--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_taptam.f 2015-03-20 16:09:31 +0000
4488+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_taptam.f 2016-05-12 15:13:37 +0000
4489@@ -44,7 +44,10 @@
4490 integer nwgt,max_weight,nwgt_analysis
4491 common/cnwgt/nwgt
4492 common/c_analysis/nwgt_analysis
4493- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4494+ integer maxRWGT
4495+ parameter (maxRWGT=100)
4496+ double precision wgtxsecRWGT(maxRWGT)
4497+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4498 character*15 weights_info(max_weight)
4499 common/cwgtsinfo/weights_info
4500 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4501@@ -111,7 +114,10 @@
4502 DATA TINY/.1D-5/
4503 integer nwgt_analysis,max_weight
4504 common/c_analysis/nwgt_analysis
4505- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4506+ integer maxRWGT
4507+ parameter (maxRWGT=100)
4508+ double precision wgtxsecRWGT(maxRWGT)
4509+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4510 double precision ww(max_weight),www(max_weight)
4511 common/cww/ww
4512 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4513
4514=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_tj.f'
4515--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_tj.f 2015-03-23 15:52:14 +0000
4516+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_tj.f 2016-05-12 15:13:37 +0000
4517@@ -46,7 +46,10 @@
4518 integer nwgt,max_weight,nwgt_analysis
4519 common/cnwgt/nwgt
4520 common/c_analysis/nwgt_analysis
4521- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4522+ integer maxRWGT
4523+ parameter (maxRWGT=100)
4524+ double precision wgtxsecRWGT(maxRWGT)
4525+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4526 character*15 weights_info(max_weight)
4527 common/cwgtsinfo/weights_info
4528 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4529@@ -142,7 +145,10 @@
4530 integer btrack(maxnum),ib(maxnum)
4531 integer nwgt_analysis,max_weight
4532 common/c_analysis/nwgt_analysis
4533- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4534+ integer maxRWGT
4535+ parameter (maxRWGT=100)
4536+ double precision wgtxsecRWGT(maxRWGT)
4537+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4538 double precision ww(max_weight),www(max_weight)
4539 common/cww/ww
4540 c
4541
4542=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx.f'
4543--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx.f 2015-03-09 17:19:46 +0000
4544+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx.f 2016-05-12 15:13:37 +0000
4545@@ -46,7 +46,10 @@
4546 integer nwgt,max_weight,nwgt_analysis
4547 common/cnwgt/nwgt
4548 common/c_analysis/nwgt_analysis
4549- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4550+ integer maxRWGT
4551+ parameter (maxRWGT=100)
4552+ double precision wgtxsecRWGT(maxRWGT)
4553+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4554 character*15 weights_info(max_weight)
4555 common/cwgtsinfo/weights_info
4556 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4557@@ -139,7 +142,10 @@
4558 COMMON/VVLIN/IVLEP1,IVLEP2
4559 integer nwgt_analysis,max_weight
4560 common/c_analysis/nwgt_analysis
4561- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4562+ integer maxRWGT
4563+ parameter (maxRWGT=100)
4564+ double precision wgtxsecRWGT(maxRWGT)
4565+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4566 double precision ww(max_weight),www(max_weight)
4567 common/cww/ww
4568 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4569
4570=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx_v2.f'
4571--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx_v2.f 2015-03-23 15:52:14 +0000
4572+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_pp_ttx_v2.f 2016-05-12 15:13:37 +0000
4573@@ -46,7 +46,10 @@
4574 integer nwgt,max_weight,nwgt_analysis
4575 common/cnwgt/nwgt
4576 common/c_analysis/nwgt_analysis
4577- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4578+ integer maxRWGT
4579+ parameter (maxRWGT=100)
4580+ double precision wgtxsecRWGT(maxRWGT)
4581+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4582 character*15 weights_info(max_weight)
4583 common/cwgtsinfo/weights_info
4584 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4585@@ -123,7 +126,10 @@
4586 COMMON/VVLIN/IVLEP1,IVLEP2
4587 integer nwgt_analysis,max_weight
4588 common/c_analysis/nwgt_analysis
4589- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4590+ integer maxRWGT
4591+ parameter (maxRWGT=100)
4592+ double precision wgtxsecRWGT(maxRWGT)
4593+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4594 double precision ww(max_weight),www(max_weight)
4595 common/cww/ww
4596 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4597
4598=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_rates.f'
4599--- Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_rates.f 2015-03-20 16:09:31 +0000
4600+++ Template/NLO/MCatNLO/HWPPAnalyzer/hwppan_HwU_rates.f 2016-05-12 15:13:37 +0000
4601@@ -42,7 +42,10 @@
4602 integer nwgt,max_weight,nwgt_analysis
4603 common/cnwgt/nwgt
4604 common/c_analysis/nwgt_analysis
4605- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4606+ integer maxRWGT
4607+ parameter (maxRWGT=100)
4608+ double precision wgtxsecRWGT(maxRWGT)
4609+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4610 character*15 weights_info(max_weight)
4611 common/cwgtsinfo/weights_info
4612 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4613@@ -96,7 +99,10 @@
4614 data tot/0.5d0/
4615 integer nwgt_analysis,max_weight
4616 common/c_analysis/nwgt_analysis
4617- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4618+ integer maxRWGT
4619+ parameter (maxRWGT=100)
4620+ double precision wgtxsecRWGT(maxRWGT)
4621+ parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
4622 double precision ww(max_weight),www(max_weight)
4623 common/cww/ww
4624 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
4625
4626=== modified file 'Template/NLO/MCatNLO/HWPPAnalyzer/mcatnlo_hwan_pp_lplm_hepmc.f'
4627--- Template/NLO/MCatNLO/HWPPAnalyzer/mcatnlo_hwan_pp_lplm_hepmc.f 2014-03-07 07:46:55 +0000
4628+++ Template/NLO/MCatNLO/HWPPAnalyzer/mcatnlo_hwan_pp_lplm_hepmc.f 2016-05-12 15:13:37 +0000
4629@@ -239,7 +239,7 @@
4630 etalb=getpseudorap(pplb(4),pplb(1),pplb(2),pplb(3))
4631 c
4632 ptpair=ptv
4633- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
4634+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
4635 azinorm=(pi-azi)/pi
4636 xmll=xmv
4637 detallb=etal-etalb
4638
4639=== modified file 'Template/NLO/MCatNLO/Makefile_MadFKS'
4640--- Template/NLO/MCatNLO/Makefile_MadFKS 2013-09-26 09:34:42 +0000
4641+++ Template/NLO/MCatNLO/Makefile_MadFKS 2016-05-12 15:13:37 +0000
4642@@ -1,71 +1,39 @@
4643-# Use this file as follows:
4644-# gmake -f Makefile_MadFKS EXTRAOBJ=<alpha,linux>.o VPATH=<vpath> <EXENAME>
4645-# See below for a list of name of executables. This is usually unnecessary,
4646-# the relevant operations being done by the scripts. If done manually, the
4647-# proper <vpath> must be entered at runtime
4648-
4649-ifeq ($(shell uname),AIX)
4650-F77=xlf -qextname -qflttrap=overflow:zerodivide:invalid:enable -O3 -qstrict \
4651-# -qautodbl=dblpad
4652-SYSOBJ=
4653-AUTODBL=-qautodbl=dblpad
4654-endif
4655-ifeq ($(shell uname),SunOS)
4656-F77= f77 -fnonstd
4657-SYSOBJ=
4658-endif
4659-ifeq ($(shell uname),Linux)
4660-F77=gfortran -w -fno-automatic -ffixed-line-length-132
4661-CPP= g++ $(INCLOPTION)
4662-SYSOBJ=trapfpe.o
4663-endif
4664-ifeq ($(shell uname),HP-UX)
4665-F77=gfortran -w -fno-automatic -ffixed-line-length-132
4666-SYSOBJ=
4667-endif
4668-ifeq ($(shell uname),OSF1)
4669-F77= f77
4670-CPP= g++ $(INCLOPTION)
4671-SYSOBJ=
4672-endif
4673-ifeq ($(shell uname),Darwin)
4674-F77=gfortran -w -fno-automatic -ffixed-line-length-132
4675-CPP= g++ $(INCLOPTION)
4676-endif
4677+-include ../../Source/make_opts
4678
4679 DEBUG=
4680-FF=$(F77) $(DEBUG)
4681-
4682+FF=$(FC) $(FFLAGS) $(DEBUG)
4683+CPP=$(CXX) $(CXXFLAGS) $(DEBUG) $(INCLOPTION)
4684+CC=$(CXX) $(CFLAGS) $(DEBUG) $(INCLOPTION)
4685
4686 $(OBJDIR)/%.o: $(HWSDIR)/%.f
4687- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4688+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4689 $(OBJDIR)/%.o: $(PYSDIR)/%.f
4690- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4691+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4692 $(OBJDIR)/%.o: $(SRCDIR)/%.f
4693- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4694+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4695 $(OBJDIR)/%.o: $(COMSRC)/%.f
4696- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4697+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4698 $(OBJDIR)/%.o: $(ANADIR)/%.f
4699- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4700+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4701
4702 $(OBJDIR)/%.o: $(SRCDIR)/%.for
4703- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4704+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4705 $(OBJDIR)/%.o: $(COMSRC)/%.for
4706- $(F77) -I$(INCDIR) $(DEBUG) $(AUTODBL) -c $< -o $@
4707+ $(FF) -I$(INCDIR) $(AUTODBL) -c $< -o $@
4708
4709 $(OBJDIR)/%.o: $(SRCDIR)/%.cc
4710- $(CPP) -I$(INCDIR) $(DEBUG) -c $< -o $@
4711+ $(CPP) -I$(INCDIR) -c $< -o $@
4712 $(OBJDIR)/%.o: $(COMSRC)/%.cc
4713- $(CPP) -I$(INCDIR) $(DEBUG) -c $< -o $@
4714+ $(CPP) -I$(INCDIR) -c $< -o $@
4715 $(OBJDIR)/%.o: $(ANADIR)/%.cc
4716- $(CPP) -I$(INCDIR) $(DEBUG) -c $< -o $@
4717+ $(CPP) -I$(INCDIR) -c $< -o $@
4718
4719 $(OBJDIR)/%.o: $(SRCDIR)/%.c
4720- $(CC) -I$(INCDIR) $(DEBUG) -c $^ -o $@
4721+ $(CC) -I$(INCDIR) -c $^ -o $@
4722 $(OBJDIR)/%.o: $(COMSRC)/%.c
4723- $(CC) -I$(INCDIR) $(DEBUG) -c $^ -o $@
4724+ $(CC) -I$(INCDIR) -c $^ -o $@
4725 $(OBJDIR)/%.o: $(ANADIR)/%.c
4726- $(CC) -I$(INCDIR) $(DEBUG) -c $< -o $@
4727+ $(CC) -I$(INCDIR) -c $< -o $@
4728
4729
4730 UTIFILES=$(OBJDIR)/mcatnlo_date.o $(OBJDIR)/mcatnlo_int.o $(OBJDIR)/mcatnlo_uxdate.o $(OBJDIR)/mcatnlo_uti.o \
4731@@ -82,19 +50,20 @@
4732
4733
4734 HW_EXE_DEFAULT : $(HWFILES) $(PDFFILES)
4735- $(FF) $^ $(EXTRAPATHS) $(EXTRALIBS) -o $@
4736+ $(FC) $(LDFLAGS) $^ $(EXTRAPATHS) $(EXTRALIBS) -o $@
4737
4738 HW_EXE_PDFLIB : $(HWFILES) $(CPDFFILES)
4739- $(FF) $^ $(LIBS) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4740+ $(FC) $(LDFLAGS) $^ $(LIBS) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4741
4742 HW_EXE_LHAPDF : $(HWFILES) $(LPDFFILES)
4743- $(FF) $^ $(LHALIB) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4744+ $(FC) $(LDFLAGS) $^ $(LHALIB) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4745+
4746
4747 PY_EXE_DEFAULT : $(PYFILES) $(PDFFILES)
4748- $(FF) $^ $(EXTRAPATHS) $(EXTRALIBS) -o $@
4749+ $(FC) $(LDFLAGS) $^ $(EXTRAPATHS) $(EXTRALIBS) -o $@
4750
4751 PY_EXE_PDFLIB : $(PYFILES) $(CPDFFILES)
4752- $(FF) $^ $(LIBS) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4753+ $(FC) $(LDFLAGS) $^ $(LIBS) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4754
4755 PY_EXE_LHAPDF : $(PYFILES) $(LPDFFILES)
4756- $(FF) $^ $(LHALIB) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4757\ No newline at end of file
4758+ $(FC) $(LDFLAGS) $^ $(LHALIB) $(EXTRAPATHS) $(EXTRALIBS) -o $@
4759
4760=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f'
4761--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f 2014-05-16 13:57:11 +0000
4762+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f 2016-05-12 15:13:37 +0000
4763@@ -22,12 +22,10 @@
4764 integer j,kk,l,jpr,i,nnn
4765 character*5 cc(2)
4766 data cc/' ','Born '/
4767- integer nwgt,max_weight,nwgt_analysis
4768- common/cnwgt/nwgt
4769+ integer nwgt_analysis
4770 common/c_analysis/nwgt_analysis
4771- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4772- character*15 weights_info(max_weight),wwwi(max_weight)
4773- common/cwgtsinfo/weights_info
4774+ character*50 weights_info(max_weight_shower)
4775+ $ ,wwwi(max_weight_shower)
4776 c
4777 call inihist
4778 weights_info(1)="central value "
4779
4780=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f'
4781--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f 2014-05-16 13:57:11 +0000
4782+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f 2016-05-12 15:13:37 +0000
4783@@ -14,12 +14,11 @@
4784 C----------------------------------------------------------------------
4785 INCLUDE 'HEPMC.INC'
4786 include 'reweight0.inc'
4787- integer nwgt,max_weight,nwgt_analysis,kk,l,nnn
4788- common/cnwgt/nwgt
4789+ integer nwgt,nwgt_analysis,kk,l,nnn
4790+ integer nwgt_analysis
4791 common/c_analysis/nwgt_analysis
4792- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4793- character*15 weights_info(max_weight),wwwi(max_weight)
4794- common/cwgtsinfo/weights_info
4795+ character*50 weights_info(max_weight_shower)
4796+ $ ,wwwi(max_weight_shower)
4797 c
4798 call inihist
4799 weights_info(1)="central value "
4800
4801=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f'
4802--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f 2014-05-16 13:57:11 +0000
4803+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f 2016-05-12 15:13:37 +0000
4804@@ -17,12 +17,10 @@
4805 REAL*8 pi
4806 PARAMETER (PI=3.14159265358979312D0)
4807 integer j,kk,l,i,nnn
4808- integer nwgt,max_weight,nwgt_analysis
4809- common/cnwgt/nwgt
4810+ integer nwgt_analysis
4811 common/c_analysis/nwgt_analysis
4812- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4813- character*15 weights_info(max_weight),wwwi(max_weight)
4814- common/cwgtsinfo/weights_info
4815+ character*50 weights_info(max_weight_shower)
4816+ $ ,wwwi(max_weight_shower)
4817 character*8 cc(2)
4818 data cc/' ','vbfcuts '/
4819 real*8 vetomin, vetomax
4820
4821=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f'
4822--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f 2014-05-16 13:57:11 +0000
4823+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f 2016-05-12 15:13:37 +0000
4824@@ -14,12 +14,10 @@
4825 C----------------------------------------------------------------------
4826 INCLUDE 'HEPMC.INC'
4827 include 'reweight0.inc'
4828- integer nwgt,max_weight,nwgt_analysis
4829- common/cnwgt/nwgt
4830+ integer nwgt_analysis
4831 common/c_analysis/nwgt_analysis
4832- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4833- character*15 weights_info(max_weight),wwwi(max_weight)
4834- common/cwgtsinfo/weights_info
4835+ character*50 weights_info(max_weight_shower)
4836+ $ ,wwwi(max_weight_shower)
4837 integer nsingle,ncorr,nlepton,nplots,ncuts
4838 common/cplots/nsingle,ncorr,nlepton,nplots,ncuts
4839 integer MAXELM,MAXELP,MAXMUM,MAXMUP
4840
4841=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f'
4842--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f 2014-05-16 13:57:11 +0000
4843+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f 2016-05-12 15:13:37 +0000
4844@@ -19,12 +19,10 @@
4845 integer j,kk,l,jpr,i,nnn
4846 character*5 cc(2)
4847 data cc/' ','cuts '/
4848- integer nwgt,max_weight,nwgt_analysis
4849- common/cnwgt/nwgt
4850+ integer nwgt_analysis
4851 common/c_analysis/nwgt_analysis
4852- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4853- character*15 weights_info(max_weight),wwwi(max_weight)
4854- common/cwgtsinfo/weights_info
4855+ character*50 weights_info(max_weight_shower)
4856+ $ ,wwwi(max_weight_shower)
4857 c
4858 call inihist
4859 weights_info(1)="central value "
4860@@ -242,7 +240,7 @@
4861 etalb=getpseudorap(pplb(4),pplb(1),pplb(2),pplb(3))
4862 c
4863 ptpair=ptv
4864- azi=getdelphi(ppl(1),pplb(1),ppl(2),pplb(2))
4865+ azi=getdelphi(ppl(1),ppl(2),pplb(1),pplb(2))
4866 azinorm=(pi-azi)/pi
4867 xmll=xmv
4868 detallb=etal-etalb
4869
4870=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f'
4871--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f 2014-05-16 13:57:11 +0000
4872+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f 2016-05-12 15:13:37 +0000
4873@@ -22,12 +22,10 @@
4874 integer j,kk,l,i,nnn
4875 character*5 cc(2)
4876 data cc/' ','Born '/
4877- integer nwgt,max_weight,nwgt_analysis
4878- common/cnwgt/nwgt
4879+ integer nwgt_analysis
4880 common/c_analysis/nwgt_analysis
4881- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4882- character*15 weights_info(max_weight),wwwi(max_weight)
4883- common/cwgtsinfo/weights_info
4884+ character*50 weights_info(max_weight_shower)
4885+ $ ,wwwi(max_weight_shower)
4886 c
4887 call inihist
4888 weights_info(1)="central value "
4889
4890=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f'
4891--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f 2014-05-16 13:57:11 +0000
4892+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f 2016-05-12 15:13:37 +0000
4893@@ -17,12 +17,10 @@
4894 integer j,kk,l,i,nnn
4895 character*5 cc(2)
4896 data cc/' ','Born '/
4897- integer nwgt,max_weight,nwgt_analysis
4898- common/cnwgt/nwgt
4899+ integer nwgt_analysis
4900 common/c_analysis/nwgt_analysis
4901- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4902- character*15 weights_info(max_weight),wwwi(max_weight)
4903- common/cwgtsinfo/weights_info
4904+ character*50 weights_info(max_weight_shower)
4905+ $ ,wwwi(max_weight_shower)
4906 c
4907 call inihist
4908 weights_info(1)="central value "
4909
4910=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f'
4911--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f 2014-05-16 13:57:11 +0000
4912+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f 2016-05-12 15:13:37 +0000
4913@@ -21,12 +21,10 @@
4914 integer j,kk,l,i,nnn
4915 character*5 cc(2)
4916 data cc/' ','Born '/
4917- integer nwgt,max_weight,nwgt_analysis
4918- common/cnwgt/nwgt
4919+ integer nwgt_analysis
4920 common/c_analysis/nwgt_analysis
4921- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4922- character*15 weights_info(max_weight),wwwi(max_weight)
4923- common/cwgtsinfo/weights_info
4924+ character*50 weights_info(max_weight_shower)
4925+ $ ,wwwi(max_weight_shower)
4926 c
4927 call inihist
4928 weights_info(1)="central value "
4929
4930=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f'
4931--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f 2014-05-16 13:57:11 +0000
4932+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f 2016-05-12 15:13:37 +0000
4933@@ -19,12 +19,10 @@
4934 integer j,kk,l,i,nnn
4935 character*5 cc(2)
4936 data cc/' ','cuts '/
4937- integer nwgt,max_weight,nwgt_analysis
4938- common/cnwgt/nwgt
4939+ integer nwgt_analysis
4940 common/c_analysis/nwgt_analysis
4941- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4942- character*15 weights_info(max_weight),wwwi(max_weight)
4943- common/cwgtsinfo/weights_info
4944+ character*50 weights_info(max_weight_shower)
4945+ $ ,wwwi(max_weight_shower)
4946 c
4947 call inihist
4948 weights_info(1)="central value "
4949
4950=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f'
4951--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f 2014-05-16 13:57:11 +0000
4952+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f 2016-05-12 15:13:37 +0000
4953@@ -19,12 +19,10 @@
4954 integer j,kk,l,i,nnn
4955 character*5 cc(2)
4956 data cc/' ','Born '/
4957- integer nwgt,max_weight,nwgt_analysis
4958- common/cnwgt/nwgt
4959+ integer nwgt_analysis
4960 common/c_analysis/nwgt_analysis
4961- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4962- character*15 weights_info(max_weight),wwwi(max_weight)
4963- common/cwgtsinfo/weights_info
4964+ character*50 weights_info(max_weight_shower)
4965+ $ ,wwwi(max_weight_shower)
4966 c
4967 call inihist
4968 weights_info(1)="central value "
4969
4970=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f'
4971--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f 2014-05-16 13:57:11 +0000
4972+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f 2016-05-12 15:13:37 +0000
4973@@ -14,12 +14,10 @@
4974 integer j,kk,l,i,nnn
4975 character*5 cc(2)
4976 data cc/' ','Born '/
4977- integer nwgt,max_weight,nwgt_analysis
4978- common/cnwgt/nwgt
4979+ integer nwgt_analysis
4980 common/c_analysis/nwgt_analysis
4981- parameter (max_weight=maxscales*maxscales+maxpdfs+1)
4982- character*15 weights_info(max_weight),wwwi(max_weight)
4983- common/cwgtsinfo/weights_info
4984+ character*50 weights_info(max_weight_shower)
4985+ $ ,wwwi(max_weight_shower)
4986 c
4987 call inihist
4988 weights_info(1)="central value "
4989
4990=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f'
4991--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f 2015-03-20 16:09:31 +0000
4992+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f 2016-05-12 15:13:37 +0000
4993@@ -46,18 +46,15 @@
4994 integer j,kk,l,jpr,i,nnn
4995 character*5 cc(2)
4996 data cc/' ','Born '/
4997- integer nwgt,max_weight,nwgt_analysis
4998- common/cnwgt/nwgt
4999+ integer nwgt_analysis
5000 common/c_analysis/nwgt_analysis
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: