Diffusion sherpasvn rSHERPASVN31837

SHERPA .
rSHERPASVN31837
Actions

Description

Merge -r31771:31832 ^/trunk/SHERPA .

Details

Provenance

ebothmann

Authored on

Parents

rSHERPASVN31836: compile fix for MCFM process

Branches

Unknown

Tags

Unknown

Event Timeline

ebothmann committed rSHERPASVN31837: Merge -r31771:31832 ^/trunk/SHERPA ..Mar 16 2018, 12:28 PM

Changes (177)

Path

Size

branches/

yamlread2/

ATOOLS/

Org/

CXXFLAGS_PACKAGES.H.in

Phys/

AddOns/

BlackHat/

DiHiggsNLO/

HepMC/

Higgs/

PS3/

OpenLoops/

Color_Correlated_ME2.C

Color_Correlated_ME2.H

OpenLoops_Interface.C

OpenLoops_Interface.H

Python/

EXTAMP/

EXTRA_XS/

Main/

ME2_Base.C

ME2_Base.H

NLO/

DIS1jet_QCD_Virtual.C

DY_QCD_Virtual.C

Dummy_QCD_Virtual.C

Higgs_Jet_QCD_Virtual.C

Higgs_QCD_Virtual.C

ee3jet_CSS_approx.C

epe2jet_CSS_approx.C

ppll1jet_CSS_approx.C

Two2Two/

HADRONS++/

Main/

Hadron_Decay_Channel.C

Hadron_Decay_Channel.H

PS_Library/

MODEL/

HEFT/

SMEHC/

Manual/

PDF/

Main/

PDF_Base.C

PHASIC++/

Process/

CS_Dipole.H

Color_Correlated_ME2.C

Color_Correlated_ME2.H

Scales/

Selectors/

SHERPA/

Initialization/

Initialization_Handler.C

Main/

Makefile.am

PerturbativePhysics/

Matrix_Element_Handler.C

Matrix_Element_Handler.H

SoftPhysics/

Beam_Remnant_Handler.C

Tools/

Makefile.am

configure.ac

m4/

acinclude.m4

	branches/	yamlread2/
	trunk/	SHERPA/

AddOns/

HepMC/

Output_HepMC3_Genevent.C

Output_HepMC3_Genevent.H

OpenLoops/

Spin_Color_Correlated_ME2.C

Spin_Color_Correlated_ME2.H

EXTAMP/

Dipole_Wrapper_Process.C

Dipole_Wrapper_Process.H

External_ME_Interface.C

External_ME_Interface.H

PHASIC++/

Process/

External_ME_Args.H

Spin_Color_Correlated_ME2.C

Spin_Color_Correlated_ME2.H

SHERPA/

Tools/

HepMC3_Interface.C

HepMC3_Interface.H

rSHERPASVN31837

View Options

branches/yamlread2/

View Options

branches/yamlread2/ATOOLS/Org/CXXFLAGS_PACKAGES.H.in

View Options

branches/yamlread2/ATOOLS/Org/Library_Loader.C

View Options

branches/yamlread2/ATOOLS/Org/Library_Loader.H

View Options

branches/yamlread2/ATOOLS/Org/MyStrStream.C

View Options

branches/yamlread2/ATOOLS/Org/MyStrStream.H

View Options

branches/yamlread2/ATOOLS/Phys/Flavour.C

View Options

branches/yamlread2/ATOOLS/Phys/Flavour.H

View Options

branches/yamlread2/AddOns/BlackHat/BlackHat_Tree.C

View Options

branches/yamlread2/AddOns/BlackHat/BlackHat_Tree.H

View Options

branches/yamlread2/AddOns/BlackHat/BlackHat_Virtual.C

View Options

branches/yamlread2/AddOns/DiHiggsNLO/DiHiggs_Virtual.C

View Options

branches/yamlread2/AddOns/HepMC/Makefile.am

View Options

branches/yamlread2/AddOns/HepMC/Output_HepMC3_Genevent.C

View Options

branches/yamlread2/AddOns/HepMC/Output_HepMC3_Genevent.H

View Options

branches/yamlread2/AddOns/Higgs/Ahiggs.C

View Options

branches/yamlread2/AddOns/Higgs/Higgs_Tree.C

View Options

branches/yamlread2/AddOns/Higgs/Higgs_Tree.H

View Options

branches/yamlread2/AddOns/Higgs/Higgs_Virtual.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_0.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_10.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_11.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_12.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_13.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_14.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_2.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_3.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_4.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_5.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_6.C

View Options

branches/yamlread2/AddOns/Higgs/PS3/C3_8.C

View Options

branches/yamlread2/AddOns/OpenLoops/Color_Correlated_ME2.C

View Options

branches/yamlread2/AddOns/OpenLoops/Color_Correlated_ME2.H

View Options

branches/yamlread2/AddOns/OpenLoops/Makefile.am

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Born.C

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Born.H

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Dipoles.C

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Dipoles.H

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Interface.C

View Options

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Interface.H

View Options

branches/yamlread2/AddOns/OpenLoops/Spin_Color_Correlated_ME2.C

View Options

branches/yamlread2/AddOns/OpenLoops/Spin_Color_Correlated_ME2.H

View Options

branches/yamlread2/AddOns/Python/MEProcess.C

View Options

branches/yamlread2/AddOns/Python/MEProcess.H

View Options

branches/yamlread2/EXTAMP/BVI_Process.C

View Options

branches/yamlread2/EXTAMP/BVI_Process.H

View Options

branches/yamlread2/EXTAMP/Born_Process.C

View Options

branches/yamlread2/EXTAMP/Born_Process.H

View Options

branches/yamlread2/EXTAMP/CS_Dipole.C

View Options

branches/yamlread2/EXTAMP/CS_Dipole.H

View Options

branches/yamlread2/EXTAMP/CS_Dipoles.C

View Options

branches/yamlread2/EXTAMP/CS_Dipoles.H

View Options

branches/yamlread2/EXTAMP/Dipole_Wrapper_Process.C

View Options

branches/yamlread2/EXTAMP/Dipole_Wrapper_Process.H

View Options

branches/yamlread2/EXTAMP/External_ME_Interface.C

View Options

branches/yamlread2/EXTAMP/External_ME_Interface.H

View Options

branches/yamlread2/EXTAMP/Makefile.am

View Options

branches/yamlread2/EXTAMP/Process.C

View Options

branches/yamlread2/EXTAMP/Process.H

View Options

branches/yamlread2/EXTAMP/Process_Group.H

View Options

branches/yamlread2/EXTAMP/RS_Process.C

View Options

branches/yamlread2/EXTAMP/RS_Process.H

View Options

branches/yamlread2/EXTAMP/Tests/

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/dis_rs/test.py

View Options

branches/yamlread2/EXTAMP/Tests/ee_3jxs/

View Options

branches/yamlread2/EXTAMP/Tests/ee_3jxs/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_3jxs/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_3jxs/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/ee_bvi/test.py

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/ee_rs/test.py

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/hh_bvi/test.py

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs/test.py

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/Run_amegic.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/Run_ol.dat

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/momenta_0

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/momenta_1

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/momenta_2

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/momenta_3

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/run.sh

View Options

branches/yamlread2/EXTAMP/Tests/hh_rs_running/test.py

View Options

branches/yamlread2/EXTRA_XS/Main/ME2_Base.C

View Options

branches/yamlread2/EXTRA_XS/Main/ME2_Base.H

View Options

branches/yamlread2/EXTRA_XS/NLO/DIS1jet_QCD_Virtual.C

View Options

branches/yamlread2/EXTRA_XS/NLO/DY_QCD_Virtual.C

View Options

branches/yamlread2/EXTRA_XS/NLO/Dummy_QCD_Virtual.C

View Options

branches/yamlread2/EXTRA_XS/NLO/Higgs_Jet_QCD_Virtual.C

View Options

branches/yamlread2/EXTRA_XS/NLO/Higgs_QCD_Virtual.C

View Options

branches/yamlread2/EXTRA_XS/NLO/ee3jet_CSS_approx.C

View Options

branches/yamlread2/EXTRA_XS/NLO/epe2jet_CSS_approx.C

View Options

branches/yamlread2/EXTRA_XS/NLO/ppll1jet_CSS_approx.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/XS_DiPhoton.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/XS_Drell_Yan.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/XS_QCD.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/ee_Y4S_BB.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/gg_yy.C

View Options

branches/yamlread2/EXTRA_XS/Two2Two/yy_bobo.C

View Options

branches/yamlread2/HADRONS++/Decaydata.zip

View Options

branches/yamlread2/HADRONS++/Main/Hadron_Decay_Channel.C

View Options

branches/yamlread2/HADRONS++/Main/Hadron_Decay_Channel.H

View Options

branches/yamlread2/HADRONS++/Main/Tools.C

View Options

branches/yamlread2/HADRONS++/Main/Tools.H

View Options

branches/yamlread2/HADRONS++/PS_Library/Four_Body_PSs.H

View Options

branches/yamlread2/HADRONS++/PS_Library/Three_Body_PSs.H

View Options

branches/yamlread2/HADRONS++/PS_Library/Two_Body_PSs.H

View Options

branches/yamlread2/MODEL/HEFT/Model.C

View Options

branches/yamlread2/MODEL/SMEHC/Model.C

View Options

branches/yamlread2/Makefile.am

View Options

branches/yamlread2/Manual/Run.texi

View Options

branches/yamlread2/PDF/Main/PDF_Base.C

View Options

branches/yamlread2/PHASIC++/Process/CS_Dipole.H

View Options

branches/yamlread2/PHASIC++/Process/Color_Correlated_ME2.C

View Options

branches/yamlread2/PHASIC++/Process/Color_Correlated_ME2.H

View Options

branches/yamlread2/PHASIC++/Process/External_ME_Args.H

View Options

branches/yamlread2/PHASIC++/Process/KP_Terms.C

View Options

branches/yamlread2/PHASIC++/Process/KP_Terms.H

View Options

branches/yamlread2/PHASIC++/Process/Makefile.am

View Options

branches/yamlread2/PHASIC++/Process/Process_Base.H

View Options

branches/yamlread2/PHASIC++/Process/Process_Info.C

View Options

branches/yamlread2/PHASIC++/Process/Process_Info.H

View Options

branches/yamlread2/PHASIC++/Process/Spin_Color_Correlated_ME2.C

View Options

branches/yamlread2/PHASIC++/Process/Spin_Color_Correlated_ME2.H

View Options

branches/yamlread2/PHASIC++/Process/Tree_ME2_Base.C

View Options

branches/yamlread2/PHASIC++/Process/Tree_ME2_Base.H

View Options

branches/yamlread2/PHASIC++/Process/Virtual_ME2_Base.H

View Options

branches/yamlread2/PHASIC++/Scales/Color_Setter.C

View Options

branches/yamlread2/PHASIC++/Selectors/Cut_Data.C

View Options

branches/yamlread2/SHERPA/Initialization/Initialization_Handler.C

View Options

branches/yamlread2/SHERPA/Main/Makefile.am

View Options

branches/yamlread2/SHERPA/PerturbativePhysics/Matrix_Element_Handler.C

View Options

branches/yamlread2/SHERPA/PerturbativePhysics/Matrix_Element_Handler.H

View Options

branches/yamlread2/SHERPA/SoftPhysics/Beam_Remnant_Handler.C

View Options

branches/yamlread2/SHERPA/Tools/HepMC3_Interface.C

View Options

branches/yamlread2/SHERPA/Tools/HepMC3_Interface.H

View Options

branches/yamlread2/SHERPA/Tools/Makefile.am

View Options

branches/yamlread2/configure.ac

View Options

branches/yamlread2/m4/acinclude.m4

Merge -r31771:31832 ^/trunk/SHERPA .rSHERPASVN31837Actions

Description

Details

Event Timeline

Changes (177)

rSHERPASVN31837

branches/yamlread2/

branches/yamlread2/ATOOLS/Org/CXXFLAGS_PACKAGES.H.in

branches/yamlread2/ATOOLS/Org/Library_Loader.C

branches/yamlread2/ATOOLS/Org/Library_Loader.H

branches/yamlread2/ATOOLS/Org/MyStrStream.C

branches/yamlread2/ATOOLS/Org/MyStrStream.H

branches/yamlread2/ATOOLS/Phys/Flavour.C

branches/yamlread2/ATOOLS/Phys/Flavour.H

branches/yamlread2/AddOns/BlackHat/BlackHat_Tree.C

branches/yamlread2/AddOns/BlackHat/BlackHat_Tree.H

branches/yamlread2/AddOns/BlackHat/BlackHat_Virtual.C

branches/yamlread2/AddOns/DiHiggsNLO/DiHiggs_Virtual.C

branches/yamlread2/AddOns/HepMC/Makefile.am

branches/yamlread2/AddOns/HepMC/Output_HepMC3_Genevent.C

branches/yamlread2/AddOns/HepMC/Output_HepMC3_Genevent.H

branches/yamlread2/AddOns/Higgs/Ahiggs.C

branches/yamlread2/AddOns/Higgs/Higgs_Tree.C

branches/yamlread2/AddOns/Higgs/Higgs_Tree.H

branches/yamlread2/AddOns/Higgs/Higgs_Virtual.C

branches/yamlread2/AddOns/Higgs/PS3/C3_0.C

branches/yamlread2/AddOns/Higgs/PS3/C3_10.C

branches/yamlread2/AddOns/Higgs/PS3/C3_11.C

branches/yamlread2/AddOns/Higgs/PS3/C3_12.C

branches/yamlread2/AddOns/Higgs/PS3/C3_13.C

branches/yamlread2/AddOns/Higgs/PS3/C3_14.C

branches/yamlread2/AddOns/Higgs/PS3/C3_2.C

branches/yamlread2/AddOns/Higgs/PS3/C3_3.C

branches/yamlread2/AddOns/Higgs/PS3/C3_4.C

branches/yamlread2/AddOns/Higgs/PS3/C3_5.C

branches/yamlread2/AddOns/Higgs/PS3/C3_6.C

branches/yamlread2/AddOns/Higgs/PS3/C3_8.C

branches/yamlread2/AddOns/OpenLoops/Color_Correlated_ME2.C

branches/yamlread2/AddOns/OpenLoops/Color_Correlated_ME2.H

branches/yamlread2/AddOns/OpenLoops/Makefile.am

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Born.C

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Born.H

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Dipoles.C

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Dipoles.H

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Interface.C

branches/yamlread2/AddOns/OpenLoops/OpenLoops_Interface.H

branches/yamlread2/AddOns/OpenLoops/Spin_Color_Correlated_ME2.C

branches/yamlread2/AddOns/OpenLoops/Spin_Color_Correlated_ME2.H

branches/yamlread2/AddOns/Python/MEProcess.C

branches/yamlread2/AddOns/Python/MEProcess.H

branches/yamlread2/EXTAMP/BVI_Process.C

branches/yamlread2/EXTAMP/BVI_Process.H

branches/yamlread2/EXTAMP/Born_Process.C

branches/yamlread2/EXTAMP/Born_Process.H

branches/yamlread2/EXTAMP/CS_Dipole.C

branches/yamlread2/EXTAMP/CS_Dipole.H

branches/yamlread2/EXTAMP/CS_Dipoles.C

branches/yamlread2/EXTAMP/CS_Dipoles.H

branches/yamlread2/EXTAMP/Dipole_Wrapper_Process.C

branches/yamlread2/EXTAMP/Dipole_Wrapper_Process.H

branches/yamlread2/EXTAMP/External_ME_Interface.C

branches/yamlread2/EXTAMP/External_ME_Interface.H

branches/yamlread2/EXTAMP/Makefile.am

branches/yamlread2/EXTAMP/Process.C

branches/yamlread2/EXTAMP/Process.H

branches/yamlread2/EXTAMP/Process_Group.H

branches/yamlread2/EXTAMP/RS_Process.C

branches/yamlread2/EXTAMP/RS_Process.H

branches/yamlread2/EXTAMP/Tests/

branches/yamlread2/EXTAMP/Tests/dis_rs/

branches/yamlread2/EXTAMP/Tests/dis_rs/Run_amegic.dat

branches/yamlread2/EXTAMP/Tests/dis_rs/Run_ol.dat

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_0

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_1

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_2

branches/yamlread2/EXTAMP/Tests/dis_rs/momenta_3

branches/yamlread2/EXTAMP/Tests/dis_rs/run.sh

branches/yamlread2/EXTAMP/Tests/dis_rs/test.py

branches/yamlread2/EXTAMP/Tests/ee_3jxs/

branches/yamlread2/EXTAMP/Tests/ee_3jxs/Run_amegic.dat

Merge -r31771:31832 ^/trunk/SHERPA .
rSHERPASVN31837
Actions