Diffusion sherpasvn rSHERPASVN31740

merged with trunk's head
rSHERPASVN31740
Actions

Description

merged with trunk's head

Details

Provenance

dnapoletano

Authored on

Parents

rSHERPASVN31739: merge ^/branches/rel-2-2-5 -r31345:HEAD .

Branches

Unknown

Tags

Unknown

Event Timeline

dnapoletano committed rSHERPASVN31740: merged with trunk's head.Feb 21 2018, 2:45 PM

Changes (156)

Path

Size

branches/

msub_kfac/

AHADIC++/

Decays/

Formation/

Main/

Tools/

Hadronisation_Parameters.C

Proto_Particle.C

SVN_Info.C

Soft_Cluster_Handler.C

Soft_Cluster_Handler.H

AMEGIC++/

Amplitude/

DipoleSubtraction/

Single_Real_Correction.C

Single_Virtual_Correction.C

Main/

Topology.C

String/

String_Handler.C

ATOOLS/

Phys/

AddOns/

Main/

Observables/

Sphericity_Observables.C

Scripts/

Tools/

Triggers/

Primitive_Calorimeter.C

protocones.cpp

Delphes/

Output_Delphes.C

HepMC/

Output_HepMC2_Genevent.C

Output_HepMC2_Genevent.H

Output_HepMC2_Short.C

Output_HepMC2_Short.H

NNLO/

Scale_Setter.C

Pythia/

Pythia_Jet_Criterion.C

Python/

Rivet/

Root/

Weights/

COMIX/

Amplitude/

Main/

CSSHOWER++/

Main/

CS_Shower.C

Showers/

Shower.C

Sudakov.C

DIM/

Lorentz/

Shower/

DIRE/

Lorentz/

Main/

Shower/

EXTAMP/

Main/

BVI_Process.C

Dipole_Wrapper_Process.C

Examples/

tmp/

Process/

Sherpa_References.tex

check.yoda

HADRONS++/

Current_Library/

MCATNLO/

Showers/

SpinCorrelations/

Manual/

PDF/

CT10/

CT10_Fortran_Interface.C

CT12/

CT12_Fortran_Interface.C

CT14/

CT14_Fortran_Interface.C

Electron/

PDF_Electron.C

PHASIC++/

MSub/

Main/

Phase_Space_Integrator.C

Process/

Scales/

Variable_KFactor_Setter.C

Selectors/

Combined_Selector.C

Combined_Selector.H

DressedParticleSelector.C

SHERPA/

Main/

Sherpa.C

Sherpa.H

PerturbativePhysics/

Matrix_Element_Handler.C

Perturbative_Interface.C

Single_Events/

SoftPhysics/

Soft_Photon_Handler.C

Tools/

SHRiMPS/

Beam_Remnants/

Colour_Generator.C

Hadron_Dissociation.C

Cross_Sections/

Sigma_Elastic.C

Eikonals

Single_Channel_Eikonal.C

Event_Generation/

Main/

rSHERPASVN31740

View Options

branches/msub_kfac/

View Options

branches/msub_kfac/AHADIC++/Decays/SVN_Info.C

View Options

branches/msub_kfac/AHADIC++/Formation/Gluon_Splitter.H

View Options

branches/msub_kfac/AHADIC++/Formation/SVN_Info.C

View Options

branches/msub_kfac/AHADIC++/Formation/Singlet_Checker.C

View Options

branches/msub_kfac/AHADIC++/Main/Ahadic.C

View Options

branches/msub_kfac/AHADIC++/Main/SVN_Info.C

View Options

branches/msub_kfac/AHADIC++/Tools/Double_Transitions.C

View Options

branches/msub_kfac/AHADIC++/Tools/Hadron_Init.C

View Options

branches/msub_kfac/AHADIC++/Tools/Hadronisation_Parameters.C

View Options

branches/msub_kfac/AHADIC++/Tools/Proto_Particle.C

View Options

branches/msub_kfac/AHADIC++/Tools/SVN_Info.C

View Options

branches/msub_kfac/AHADIC++/Tools/Soft_Cluster_Handler.C

View Options

branches/msub_kfac/AHADIC++/Tools/Soft_Cluster_Handler.H

View Options

branches/msub_kfac/AMEGIC++/Amplitude/Amplitude_Handler.C

View Options

branches/msub_kfac/AMEGIC++/Amplitude/Amplitude_Output.C

View Options

branches/msub_kfac/AMEGIC++/DipoleSubtraction/IF_DipoleSplitting.C

View Options

branches/msub_kfac/AMEGIC++/DipoleSubtraction/II_DipoleSplitting.C

View Options

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_LOProcess.C

View Options

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_Real_Correction.C

View Options

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_Virtual_Correction.C

View Options

branches/msub_kfac/AMEGIC++/Main/Topology.C

View Options

branches/msub_kfac/AMEGIC++/String/String_Handler.C

View Options

branches/msub_kfac/ATOOLS/Phys/Variations.C

View Options

branches/msub_kfac/ATOOLS/Phys/Variations.H

View Options

branches/msub_kfac/AddOns/Analysis/

View Options

branches/msub_kfac/AddOns/Analysis/Main/Analysis_Handler.C

View Options

branches/msub_kfac/AddOns/Analysis/Main/Primitive_Analysis.C

View Options

branches/msub_kfac/AddOns/Analysis/Observables/Event_Output.C

View Options

branches/msub_kfac/AddOns/Analysis/Observables/Sphericity_Observables.C

View Options

branches/msub_kfac/AddOns/Analysis/Scripts/Combine_Analysis.C

View Options

branches/msub_kfac/AddOns/Analysis/Tools/Breit_Frame.C

View Options

branches/msub_kfac/AddOns/Analysis/Triggers/Fastjet_Interface.C

View Options

branches/msub_kfac/AddOns/Analysis/Triggers/Final_Selector.C

View Options

branches/msub_kfac/AddOns/Analysis/Triggers/Primitive_Calorimeter.C

View Options

branches/msub_kfac/AddOns/Analysis/Triggers/protocones.cpp

View Options

branches/msub_kfac/AddOns/Delphes/Output_Delphes.C

View Options

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Genevent.C

View Options

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Genevent.H

View Options

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Short.C

View Options

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Short.H

View Options

branches/msub_kfac/AddOns/NNLO/Scale_Setter.C

View Options

branches/msub_kfac/AddOns/Pythia/Pythia_Jet_Criterion.C

View Options

branches/msub_kfac/AddOns/Python/MEProcess.C

View Options

branches/msub_kfac/AddOns/Python/MEProcess.H

View Options

branches/msub_kfac/AddOns/Rivet/Rivet_Interface.C

View Options

branches/msub_kfac/AddOns/Root/Output_RootNtuple.C

View Options

branches/msub_kfac/AddOns/Root/Output_RootNtuple.H

View Options

branches/msub_kfac/AddOns/Weights/Output_Weights.C

View Options

branches/msub_kfac/COMIX/Amplitude/Amplitude.C

View Options

branches/msub_kfac/COMIX/Main/Process_Group.C

View Options

branches/msub_kfac/COMIX/Main/Single_Dipole_Term.C

View Options

branches/msub_kfac/COMIX/Main/Single_Process.C

View Options

branches/msub_kfac/CSSHOWER++/Main/CS_Shower.C

View Options

branches/msub_kfac/CSSHOWER++/Showers/Shower.C

View Options

branches/msub_kfac/CSSHOWER++/Showers/Sudakov.C

View Options

branches/msub_kfac/DIM/Lorentz/FFV_FF.C

View Options

branches/msub_kfac/DIM/Lorentz/FFV_IF.C

View Options

branches/msub_kfac/DIM/Lorentz/FFV_II.C

View Options

branches/msub_kfac/DIM/Lorentz/VVV_FF.C

View Options

branches/msub_kfac/DIM/Lorentz/VVV_IF.C

View Options

branches/msub_kfac/DIM/Lorentz/VVV_II.C

View Options

branches/msub_kfac/DIM/Shower/Shower.C

View Options

branches/msub_kfac/DIM/Shower/Shower.H

View Options

branches/msub_kfac/DIRE/Lorentz/FFV_FF.C

View Options

branches/msub_kfac/DIRE/Lorentz/FFV_IF.C

View Options

branches/msub_kfac/DIRE/Lorentz/FFV_II.C

View Options

branches/msub_kfac/DIRE/Lorentz/VVV_IF.C

View Options

branches/msub_kfac/DIRE/Lorentz/VVV_II.C

View Options

branches/msub_kfac/DIRE/Main/Jet_Criterion.C

View Options

branches/msub_kfac/DIRE/Shower/Shower.C

View Options

branches/msub_kfac/DIRE/Shower/Shower.H

View Options

branches/msub_kfac/EXTAMP/Main/BVI_Process.C

View Options

branches/msub_kfac/EXTAMP/Main/Dipole_Wrapper_Process.C

View Options

branches/msub_kfac/Examples/tmp/Process/Comix.db

View Options

branches/msub_kfac/Examples/tmp/Process/Sherpa.db

View Options

branches/msub_kfac/Examples/tmp/Results.db

View Options

branches/msub_kfac/Examples/tmp/Run.LEP.dat

View Options

branches/msub_kfac/Examples/tmp/Sherpa_References.tex

View Options

branches/msub_kfac/Examples/tmp/check.yoda

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_0_PPP.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P_BallZwicky.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P_HQET2.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P_ISGW.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P_PoleFit.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_P_Polynomial.C

View Options

branches/msub_kfac/HADRONS++/Current_Library/VA_P_V_PoleFit.C

View Options

branches/msub_kfac/MCATNLO/Showers/Sudakov.C

View Options

branches/msub_kfac/METOOLS/

View Options

branches/msub_kfac/METOOLS/Explicit/

View Options

branches/msub_kfac/METOOLS/Explicit/Vertex.C

View Options

branches/msub_kfac/METOOLS/SpinCorrelations/Amplitude2_Tensor.H

View Options

branches/msub_kfac/METOOLS/SpinCorrelations/Decay_Matrix.H

View Options

branches/msub_kfac/METOOLS/SpinCorrelations/Spin_Density.H

View Options

branches/msub_kfac/METOOLS/Vertices/

View Options

branches/msub_kfac/METOOLS/Vertices/FFV_DLC.C

View Options

branches/msub_kfac/METOOLS/Vertices/VVV_DLC.C

View Options

branches/msub_kfac/Manual/Bibliography.texi

View Options

branches/msub_kfac/Manual/Examples.texi

View Options

branches/msub_kfac/PDF/CT10/CT10_Fortran_Interface.C

View Options

branches/msub_kfac/PDF/CT12/CT12_Fortran_Interface.C

View Options

branches/msub_kfac/PDF/CT14/CT14_Fortran_Interface.C

View Options

branches/msub_kfac/PDF/Electron/PDF_Electron.C

View Options

branches/msub_kfac/PHASIC++/MSub/KFactor.C

View Options

branches/msub_kfac/PHASIC++/MSub/Makefile.am

View Options

branches/msub_kfac/PHASIC++/MSub/SVN_Info.C

View Options

branches/msub_kfac/PHASIC++/MSub/Subtraction.C

View Options

branches/msub_kfac/PHASIC++/Main/Phase_Space_Integrator.C

View Options

branches/msub_kfac/PHASIC++/Process/Flavour_Kernels.C

View Options

branches/msub_kfac/PHASIC++/Process/Flavour_Kernels.H

View Options

branches/msub_kfac/PHASIC++/Process/MCatNLO_Process.C

View Options

branches/msub_kfac/PHASIC++/Process/ME_Generator_Base.C

View Options

branches/msub_kfac/PHASIC++/Process/Massive_Kernels.C

View Options

branches/msub_kfac/PHASIC++/Process/Single_Process.C

View Options

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

View Options

branches/msub_kfac/PHASIC++/Scales/MEPS_Scale_Setter.C

View Options

branches/msub_kfac/PHASIC++/Scales/Variable_KFactor_Setter.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Combined_Selector.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Combined_Selector.H

View Options

branches/msub_kfac/PHASIC++/Selectors/DressedParticleSelector.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Jet_Finder.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Jet_Finder.H

View Options

branches/msub_kfac/PHASIC++/Selectors/Jet_Selector.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Selector.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Selector.H

View Options

branches/msub_kfac/PHASIC++/Selectors/Standard_Selector.C

View Options

branches/msub_kfac/PHASIC++/Selectors/Variable_Selector.C

View Options

branches/msub_kfac/SHERPA/Main/Sherpa.C

View Options

branches/msub_kfac/SHERPA/Main/Sherpa.H

View Options

branches/msub_kfac/SHERPA/PerturbativePhysics/Matrix_Element_Handler.C

View Options

branches/msub_kfac/SHERPA/PerturbativePhysics/Perturbative_Interface.C

View Options

branches/msub_kfac/SHERPA/PerturbativePhysics/Shower_Handler.C

View Options

branches/msub_kfac/SHERPA/Single_Events/Analysis_Phase.C

View Options

branches/msub_kfac/SHERPA/Single_Events/Event_Handler.C

View Options

branches/msub_kfac/SHERPA/Single_Events/Output_Phase.C

View Options

branches/msub_kfac/SHERPA/Single_Events/Output_Phase.H

View Options

branches/msub_kfac/SHERPA/SoftPhysics/Soft_Photon_Handler.C

View Options

branches/msub_kfac/SHERPA/Tools/HepMC2_Interface.C

View Options

branches/msub_kfac/SHERPA/Tools/HepMC2_Interface.H

View Options

branches/msub_kfac/SHERPA/Tools/Output_Base.H

View Options

branches/msub_kfac/SHERPA/Tools/Output_HepEvt.C

View Options

branches/msub_kfac/SHERPA/Tools/Output_HepEvt.H

View Options

branches/msub_kfac/SHERPA/Tools/Output_LHEF.C

View Options

branches/msub_kfac/SHERPA/Tools/Output_LHEF.H

View Options

branches/msub_kfac/SHERPA/Tools/Scale_Variations.C

View Options

branches/msub_kfac/SHERPA/Tools/Scale_Variations.H

View Options

branches/msub_kfac/SHRiMPS/Beam_Remnants/Colour_Generator.C

View Options

branches/msub_kfac/SHRiMPS/Beam_Remnants/Hadron_Dissociation.C

View Options

branches/msub_kfac/SHRiMPS/Cross_Sections/Sigma_Elastic.C

View Options

branches/msub_kfac/SHRiMPS/Eikonals/

View Options

branches/msub_kfac/SHRiMPS/Eikonals/Single_Channel_Eikonal.C

View Options

branches/msub_kfac/SHRiMPS/Event_Generation/Final_State.C

View Options

branches/msub_kfac/SHRiMPS/Event_Generation/Parton_Luminosity.C

View Options

branches/msub_kfac/SHRiMPS/Event_Generation/Quark_Replace.C

View Options

branches/msub_kfac/SHRiMPS/Main/Cluster_Algorithm.C

merged with trunk's headrSHERPASVN31740Actions

Description

Details

Event Timeline

Changes (156)

rSHERPASVN31740

branches/msub_kfac/

branches/msub_kfac/AHADIC++/Decays/SVN_Info.C

branches/msub_kfac/AHADIC++/Formation/Gluon_Splitter.H

branches/msub_kfac/AHADIC++/Formation/SVN_Info.C

branches/msub_kfac/AHADIC++/Formation/Singlet_Checker.C

branches/msub_kfac/AHADIC++/Main/Ahadic.C

branches/msub_kfac/AHADIC++/Main/SVN_Info.C

branches/msub_kfac/AHADIC++/Tools/Double_Transitions.C

branches/msub_kfac/AHADIC++/Tools/Hadron_Init.C

branches/msub_kfac/AHADIC++/Tools/Hadronisation_Parameters.C

branches/msub_kfac/AHADIC++/Tools/Proto_Particle.C

branches/msub_kfac/AHADIC++/Tools/SVN_Info.C

branches/msub_kfac/AHADIC++/Tools/Soft_Cluster_Handler.C

branches/msub_kfac/AHADIC++/Tools/Soft_Cluster_Handler.H

branches/msub_kfac/AMEGIC++/Amplitude/Amplitude_Handler.C

branches/msub_kfac/AMEGIC++/Amplitude/Amplitude_Output.C

branches/msub_kfac/AMEGIC++/DipoleSubtraction/IF_DipoleSplitting.C

branches/msub_kfac/AMEGIC++/DipoleSubtraction/II_DipoleSplitting.C

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_LOProcess.C

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_Real_Correction.C

branches/msub_kfac/AMEGIC++/DipoleSubtraction/Single_Virtual_Correction.C

branches/msub_kfac/AMEGIC++/Main/Topology.C

branches/msub_kfac/AMEGIC++/String/String_Handler.C

branches/msub_kfac/ATOOLS/Phys/Variations.C

branches/msub_kfac/ATOOLS/Phys/Variations.H

branches/msub_kfac/AddOns/Analysis/

branches/msub_kfac/AddOns/Analysis/Main/Analysis_Handler.C

branches/msub_kfac/AddOns/Analysis/Main/Primitive_Analysis.C

branches/msub_kfac/AddOns/Analysis/Observables/Event_Output.C

branches/msub_kfac/AddOns/Analysis/Observables/Sphericity_Observables.C

branches/msub_kfac/AddOns/Analysis/Scripts/Combine_Analysis.C

branches/msub_kfac/AddOns/Analysis/Tools/Breit_Frame.C

branches/msub_kfac/AddOns/Analysis/Triggers/Fastjet_Interface.C

branches/msub_kfac/AddOns/Analysis/Triggers/Final_Selector.C

branches/msub_kfac/AddOns/Analysis/Triggers/Primitive_Calorimeter.C

branches/msub_kfac/AddOns/Analysis/Triggers/protocones.cpp

branches/msub_kfac/AddOns/Delphes/Output_Delphes.C

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Genevent.C

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Genevent.H

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Short.C

branches/msub_kfac/AddOns/HepMC/Output_HepMC2_Short.H

branches/msub_kfac/AddOns/NNLO/Scale_Setter.C

branches/msub_kfac/AddOns/Pythia/Pythia_Jet_Criterion.C

branches/msub_kfac/AddOns/Python/MEProcess.C

branches/msub_kfac/AddOns/Python/MEProcess.H

branches/msub_kfac/AddOns/Rivet/Rivet_Interface.C

branches/msub_kfac/AddOns/Root/Output_RootNtuple.C

branches/msub_kfac/AddOns/Root/Output_RootNtuple.H

branches/msub_kfac/AddOns/Weights/Output_Weights.C

branches/msub_kfac/COMIX/Amplitude/Amplitude.C

branches/msub_kfac/COMIX/Main/Process_Group.C

branches/msub_kfac/COMIX/Main/Single_Dipole_Term.C

branches/msub_kfac/COMIX/Main/Single_Process.C

branches/msub_kfac/CSSHOWER++/Main/CS_Shower.C

branches/msub_kfac/CSSHOWER++/Showers/Shower.C

branches/msub_kfac/CSSHOWER++/Showers/Sudakov.C

branches/msub_kfac/DIM/Lorentz/FFV_FF.C

branches/msub_kfac/DIM/Lorentz/FFV_IF.C

branches/msub_kfac/DIM/Lorentz/FFV_II.C

branches/msub_kfac/DIM/Lorentz/VVV_FF.C

branches/msub_kfac/DIM/Lorentz/VVV_IF.C

branches/msub_kfac/DIM/Lorentz/VVV_II.C

branches/msub_kfac/DIM/Shower/Shower.C

branches/msub_kfac/DIM/Shower/Shower.H

branches/msub_kfac/DIRE/Lorentz/FFV_FF.C

branches/msub_kfac/DIRE/Lorentz/FFV_IF.C

branches/msub_kfac/DIRE/Lorentz/FFV_II.C

branches/msub_kfac/DIRE/Lorentz/VVV_IF.C

branches/msub_kfac/DIRE/Lorentz/VVV_II.C

branches/msub_kfac/DIRE/Main/Jet_Criterion.C

branches/msub_kfac/DIRE/Shower/Shower.C

branches/msub_kfac/DIRE/Shower/Shower.H

branches/msub_kfac/EXTAMP/Main/BVI_Process.C

branches/msub_kfac/EXTAMP/Main/Dipole_Wrapper_Process.C

merged with trunk's head
rSHERPASVN31740
Actions