Commit 2e961d9a authored by Marek Schoenherr's avatar Marek Schoenherr
Browse files

svn merge -c 26086 trunk/SHERPA .

  -> catch Order input error
svn merge -c 26087 trunk/SHERPA .
  -> description of FastjetFinder in Manual
svn merge -c 26133 trunk/SHERPA .
  -> compilation fix for DIRE on MacOS
parent 3d2941cf
......@@ -7,6 +7,6 @@ include ../../svn.make
libDireGauge_la_SOURCES = \
SVN_Info.C \
GqQ.C \
GqQbar.C \
qqG.C \
......@@ -137,6 +137,7 @@ Their respective syntax is
JetFinder <ycut>[<ycut decay 1>[<ycut decay 11>...]...]... <D parameter>
ConeFinder <min R>
NJetFinder <n> <ptmin> <etmin> <D parameter> [<exponent>] [<eta max>] [<mass max>]
FastjetFinder <algorithm> <n> <ptmin> <etmin> <dr> [<f(siscone)>=0.75] [<eta-max>] [<y-max>] [<bmode>]
@end verbatim
For @option{JetFinder}, it is possible to give different values
......@@ -158,6 +159,17 @@ default, the @option{<mass max>} allows to also include partons with a mass
up to the specified values. This is useful e.g. in calculations with massive
b-quarks which shall nonetheless satisfy jet criteria.
The final option @option{FastjetFinder} allows to use the
@uref{,,FastJet} plugin if enabled during configuration.
It takes the following mandatory arguments:
@code{<algorithm>} can take the values @code{kt,antikt,cambridge,siscone},
@code{<n>} is the minimum number of jets to be found, @code{<ptmin>} and
@code{<etmin>} are the minimum transverse momentum and/or energy,
@code{<dr>} is the radial parameter. Optional arguments are:
@code{<f(siscone)>} (default 0.75), @code{<eta-max>} and @code{<y-max>} as
maximal absolute (pseudo-)rapidity (default infinity), @code{<b-mode>} sets
the B-tagging mode (default 0). For details see
@ref{Scale setters}.
@node Universal selector
@subsection Universal selector
......@@ -404,6 +404,11 @@ void Matrix_Element_Handler::BuildProcesses()
THROW(missing_input,"No data in "+m_path+m_processfile+"'.");
for (size_t nf(0);nf<procdata.size();++nf) {
std::vector<std::string> &cur(procdata[nf]);
if(cur.size()==0) continue;
std::string("Syntax error in coupling order specification: '"+cur[0]+"'\n")
+" Whitespace between 'Order' and brackets is mandatory");
if (cur.size()<2) continue;
if (cur[0]=="Process") {
Process_Info pi;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment