No OneTemporary
Actions

Size

273 KB

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
	index 712fb4d..40f75f8 100644
	--- a/doc/doxygen/Doxyfile
	+++ b/doc/doxygen/Doxyfile
	@@ -1,2427 +1,2427 @@
	# Doxyfile 1.8.11

	# This file describes the settings to be used by the documentation system
	# doxygen (www.doxygen.org) for a project.
	#
	# All text after a double hash (##) is considered a comment and is placed in
	# front of the TAG it is preceding.
	#
	# All text after a single hash (#) is considered a comment and will be ignored.
	# The format is:
	# TAG = value [value, ...]
	# For lists, items can also be appended using:
	# TAG += value [value, ...]
	# Values that contain spaces should be placed between quotes (\" \").

	#---------------------------------------------------------------------------
	# Project related configuration options
	#---------------------------------------------------------------------------

	# This tag specifies the encoding used for all characters in the config file
	# that follow. The default is UTF-8 which is also the encoding used for all text
	# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
	# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
	# for the list of possible encodings.
	# The default value is: UTF-8.

	DOXYFILE_ENCODING = UTF-8

	# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
	# double-quotes, unless you are using Doxywizard) that should identify the
	# project for which the documentation is generated. This name is used in the
	# title of most generated pages and in a few other places.
	# The default value is: My Project.

	PROJECT_NAME = "Reversed HEJ"

	# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
	# could be handy for archiving the generated documentation or if some version
	# control system is used.

	PROJECT_NUMBER = "0.1"

	# Using the PROJECT_BRIEF tag one can provide an optional one line description
	# for a project that appears at the top of each page and should give viewer a
	# quick idea about the purpose of the project. Keep the description short.

	PROJECT_BRIEF = "Reversing HEJ one event at a time"

	# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
	# in the documentation. The maximum height of the logo should not exceed 55
	# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
	# the logo to the output directory.

	PROJECT_LOGO =

	# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
	# into which the generated documentation will be written. If a relative path is
	# entered, it will be relative to the location where doxygen was started. If
	# left blank the current directory will be used.

	OUTPUT_DIRECTORY =

	# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
	# directories (in 2 levels) under the output directory of each output format and
	# will distribute the generated files over these directories. Enabling this
	# option can be useful when feeding doxygen a huge amount of source files, where
	# putting all generated files in the same directory would otherwise causes
	# performance problems for the file system.
	# The default value is: NO.

	CREATE_SUBDIRS = NO

	# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
	# characters to appear in the names of generated files. If set to NO, non-ASCII
	# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
	# U+3044.
	# The default value is: NO.

	ALLOW_UNICODE_NAMES = NO

	# The OUTPUT_LANGUAGE tag is used to specify the language in which all
	# documentation generated by doxygen is written. Doxygen will use this
	# information to generate all constant output in the proper language.
	# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
	# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
	# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
	# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
	# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
	# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
	# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
	# Ukrainian and Vietnamese.
	# The default value is: English.

	OUTPUT_LANGUAGE = English

	# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
	# descriptions after the members that are listed in the file and class
	# documentation (similar to Javadoc). Set to NO to disable this.
	# The default value is: YES.

	BRIEF_MEMBER_DESC = YES

	# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
	# description of a member or function before the detailed description
	#
	# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
	# brief descriptions will be completely suppressed.
	# The default value is: YES.

	REPEAT_BRIEF = YES

	# This tag implements a quasi-intelligent brief description abbreviator that is
	# used to form the text in various listings. Each string in this list, if found
	# as the leading text of the brief description, will be stripped from the text
	# and the result, after processing the whole list, is used as the annotated
	# text. Otherwise, the brief description is used as-is. If left blank, the
	# following values are used ($name is automatically replaced with the name of
	# the entity):The $name class, The $name widget, The $name file, is, provides,
	# specifies, contains, represents, a, an and the.

	ABBREVIATE_BRIEF =

	# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
	# doxygen will generate a detailed section even if there is only a brief
	# description.
	# The default value is: NO.

	ALWAYS_DETAILED_SEC = NO

	# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
	# inherited members of a class in the documentation of that class as if those
	# members were ordinary class members. Constructors, destructors and assignment
	# operators of the base classes will not be shown.
	# The default value is: NO.

	INLINE_INHERITED_MEMB = NO

	# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
	# before files name in the file list and in the header files. If set to NO the
	# shortest path that makes the file name unique will be used
	# The default value is: YES.

	FULL_PATH_NAMES = YES

	# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
	# Stripping is only done if one of the specified strings matches the left-hand
	# part of the path. The tag can be used to show relative paths in the file list.
	# If left blank the directory from which doxygen is run is used as the path to
	# strip.
	#
	# Note that you can specify absolute paths here, but also relative paths, which
	# will be relative from the directory where doxygen is started.
	# This tag requires that the tag FULL_PATH_NAMES is set to YES.

	STRIP_FROM_PATH =

	# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
	# path mentioned in the documentation of a class, which tells the reader which
	# header file to include in order to use a class. If left blank only the name of
	# the header file containing the class definition is used. Otherwise one should
	# specify the list of include paths that are normally passed to the compiler
	# using the -I flag.

	STRIP_FROM_INC_PATH =

	# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
	# less readable) file names. This can be useful is your file systems doesn't
	# support long names like on DOS, Mac, or CD-ROM.
	# The default value is: NO.

	SHORT_NAMES = NO

	# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
	# first line (until the first dot) of a Javadoc-style comment as the brief
	# description. If set to NO, the Javadoc-style will behave just like regular Qt-
	# style comments (thus requiring an explicit @brief command for a brief
	# description.)
	# The default value is: NO.

	JAVADOC_AUTOBRIEF = NO

	# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
	# line (until the first dot) of a Qt-style comment as the brief description. If
	# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
	# requiring an explicit \brief command for a brief description.)
	# The default value is: NO.

	QT_AUTOBRIEF = NO

	# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
	# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
	# a brief description. This used to be the default behavior. The new default is
	# to treat a multi-line C++ comment block as a detailed description. Set this
	# tag to YES if you prefer the old behavior instead.
	#
	# Note that setting this tag to YES also means that rational rose comments are
	# not recognized any more.
	# The default value is: NO.

	MULTILINE_CPP_IS_BRIEF = NO

	# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
	# documentation from any documented member that it re-implements.
	# The default value is: YES.

	INHERIT_DOCS = YES

	# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
	# page for each member. If set to NO, the documentation of a member will be part
	# of the file/class/namespace that contains it.
	# The default value is: NO.

	SEPARATE_MEMBER_PAGES = NO

	# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
	# uses this value to replace tabs by spaces in code fragments.
	# Minimum value: 1, maximum value: 16, default value: 4.

	TAB_SIZE = 4

	# This tag can be used to specify a number of aliases that act as commands in
	# the documentation. An alias has the form:
	# name=value
	# For example adding
	# "sideeffect=@par Side Effects:\n"
	# will allow you to put the command \sideeffect (or @sideeffect) in the
	# documentation, which will result in a user-defined paragraph with heading
	# "Side Effects:". You can put \n's in the value part of an alias to insert
	# newlines.

	ALIASES =

	# This tag can be used to specify a number of word-keyword mappings (TCL only).
	# A mapping has the form "name=value". For example adding "class=itcl::class"
	# will allow you to use the command class in the itcl::class meaning.

	TCL_SUBST =

	# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
	# only. Doxygen will then generate output that is more tailored for C. For
	# instance, some of the names that are used will be different. The list of all
	# members will be omitted, etc.
	# The default value is: NO.

	OPTIMIZE_OUTPUT_FOR_C = NO

	# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
	# Python sources only. Doxygen will then generate output that is more tailored
	# for that language. For instance, namespaces will be presented as packages,
	# qualified scopes will look different, etc.
	# The default value is: NO.

	OPTIMIZE_OUTPUT_JAVA = NO

	# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
	# sources. Doxygen will then generate output that is tailored for Fortran.
	# The default value is: NO.

	OPTIMIZE_FOR_FORTRAN = NO

	# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
	# sources. Doxygen will then generate output that is tailored for VHDL.
	# The default value is: NO.

	OPTIMIZE_OUTPUT_VHDL = NO

	# Doxygen selects the parser to use depending on the extension of the files it
	# parses. With this tag you can assign which parser to use for a given
	# extension. Doxygen has a built-in mapping, but you can override or extend it
	# using this tag. The format is ext=language, where ext is a file extension, and
	# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
	# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
	# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
	# Fortran. In the later case the parser tries to guess whether the code is fixed
	# or free formatted code, this is the default for Fortran type files), VHDL. For
	# instance to make doxygen treat .inc files as Fortran files (default is PHP),
	# and .f files as C (default is Fortran), use: inc=Fortran f=C.
	#
	# Note: For files without extension you can use no_extension as a placeholder.
	#
	# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
	# the files are not read by doxygen.

	EXTENSION_MAPPING =

	# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
	# according to the Markdown format, which allows for more readable
	# documentation. See http://daringfireball.net/projects/markdown/ for details.
	# The output of markdown processing is further processed by doxygen, so you can
	# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
	# case of backward compatibilities issues.
	# The default value is: YES.

	MARKDOWN_SUPPORT = YES

	# When enabled doxygen tries to link words that correspond to documented
	# classes, or namespaces to their corresponding documentation. Such a link can
	# be prevented in individual cases by putting a % sign in front of the word or
	# globally by setting AUTOLINK_SUPPORT to NO.
	# The default value is: YES.

	AUTOLINK_SUPPORT = YES

	# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
	# to include (a tag file for) the STL sources as input, then you should set this
	# tag to YES in order to let doxygen match functions declarations and
	# definitions whose arguments contain STL classes (e.g. func(std::string);
	# versus func(std::string) {}). This also make the inheritance and collaboration
	# diagrams that involve STL classes more complete and accurate.
	# The default value is: NO.

	BUILTIN_STL_SUPPORT = NO

	# If you use Microsoft's C++/CLI language, you should set this option to YES to
	# enable parsing support.
	# The default value is: NO.

	CPP_CLI_SUPPORT = NO

	# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
	# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
	# will parse them like normal C++ but will assume all classes use public instead
	# of private inheritance when no explicit protection keyword is present.
	# The default value is: NO.

	SIP_SUPPORT = NO

	# For Microsoft's IDL there are propget and propput attributes to indicate
	# getter and setter methods for a property. Setting this option to YES will make
	# doxygen to replace the get and set methods by a property in the documentation.
	# This will only work if the methods are indeed getting or setting a simple
	# type. If this is not the case, or you want to show the methods anyway, you
	# should set this option to NO.
	# The default value is: YES.

	IDL_PROPERTY_SUPPORT = YES

	# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
	# tag is set to YES then doxygen will reuse the documentation of the first
	# member in the group (if any) for the other members of the group. By default
	# all members of a group must be documented explicitly.
	# The default value is: NO.

	DISTRIBUTE_GROUP_DOC = NO

	# If one adds a struct or class to a group and this option is enabled, then also
	# any nested class or struct is added to the same group. By default this option
	# is disabled and one has to add nested compounds explicitly via \ingroup.
	# The default value is: NO.

	GROUP_NESTED_COMPOUNDS = NO

	# Set the SUBGROUPING tag to YES to allow class member groups of the same type
	# (for instance a group of public functions) to be put as a subgroup of that
	# type (e.g. under the Public Functions section). Set it to NO to prevent
	# subgrouping. Alternatively, this can be done per class using the
	# \nosubgrouping command.
	# The default value is: YES.

	SUBGROUPING = YES

	# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
	# are shown inside the group in which they are included (e.g. using \ingroup)
	# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
	# and RTF).
	#
	# Note that this feature does not work in combination with
	# SEPARATE_MEMBER_PAGES.
	# The default value is: NO.

	INLINE_GROUPED_CLASSES = NO

	# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
	# with only public data fields or simple typedef fields will be shown inline in
	# the documentation of the scope in which they are defined (i.e. file,
	# namespace, or group documentation), provided this scope is documented. If set
	# to NO, structs, classes, and unions are shown on a separate page (for HTML and
	# Man pages) or section (for LaTeX and RTF).
	# The default value is: NO.

	INLINE_SIMPLE_STRUCTS = NO

	# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
	# enum is documented as struct, union, or enum with the name of the typedef. So
	# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
	# with name TypeT. When disabled the typedef will appear as a member of a file,
	# namespace, or class. And the struct will be named TypeS. This can typically be
	# useful for C code in case the coding convention dictates that all compound
	# types are typedef'ed and only the typedef is referenced, never the tag name.
	# The default value is: NO.

	TYPEDEF_HIDES_STRUCT = NO

	# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
	# cache is used to resolve symbols given their name and scope. Since this can be
	# an expensive process and often the same symbol appears multiple times in the
	# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
	# doxygen will become slower. If the cache is too large, memory is wasted. The
	# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
	# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
	# symbols. At the end of a run doxygen will report the cache usage and suggest
	# the optimal cache size from a speed point of view.
	# Minimum value: 0, maximum value: 9, default value: 0.

	LOOKUP_CACHE_SIZE = 0

	#---------------------------------------------------------------------------
	# Build related configuration options
	#---------------------------------------------------------------------------

	# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
	# documentation are documented, even if no documentation was available. Private
	# class members and static file members will be hidden unless the
	# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
	# Note: This will also disable the warnings about undocumented members that are
	# normally produced when WARNINGS is set to YES.
	# The default value is: NO.

	EXTRACT_ALL = YES

	# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
	# be included in the documentation.
	# The default value is: NO.

	EXTRACT_PRIVATE = NO

	# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
	# scope will be included in the documentation.
	# The default value is: NO.

	EXTRACT_PACKAGE = NO

	# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
	# included in the documentation.
	# The default value is: NO.

	EXTRACT_STATIC = NO

	# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
	# locally in source files will be included in the documentation. If set to NO,
	# only classes defined in header files are included. Does not have any effect
	# for Java sources.
	# The default value is: YES.

	EXTRACT_LOCAL_CLASSES = YES

	# This flag is only useful for Objective-C code. If set to YES, local methods,
	# which are defined in the implementation section but not in the interface are
	# included in the documentation. If set to NO, only methods in the interface are
	# included.
	# The default value is: NO.

	EXTRACT_LOCAL_METHODS = NO

	# If this flag is set to YES, the members of anonymous namespaces will be
	# extracted and appear in the documentation as a namespace called
	# 'anonymous_namespace{file}', where file will be replaced with the base name of
	# the file that contains the anonymous namespace. By default anonymous namespace
	# are hidden.
	# The default value is: NO.

	EXTRACT_ANON_NSPACES = NO

	# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
	# undocumented members inside documented classes or files. If set to NO these
	# members will be included in the various overviews, but no documentation
	# section is generated. This option has no effect if EXTRACT_ALL is enabled.
	# The default value is: NO.

	HIDE_UNDOC_MEMBERS = NO

	# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
	# undocumented classes that are normally visible in the class hierarchy. If set
	# to NO, these classes will be included in the various overviews. This option
	# has no effect if EXTRACT_ALL is enabled.
	# The default value is: NO.

	HIDE_UNDOC_CLASSES = NO

	# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
	# (class\|struct\|union) declarations. If set to NO, these declarations will be
	# included in the documentation.
	# The default value is: NO.

	HIDE_FRIEND_COMPOUNDS = NO

	# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
	# documentation blocks found inside the body of a function. If set to NO, these
	# blocks will be appended to the function's detailed documentation block.
	# The default value is: NO.

	HIDE_IN_BODY_DOCS = NO

	# The INTERNAL_DOCS tag determines if documentation that is typed after a
	# \internal command is included. If the tag is set to NO then the documentation
	# will be excluded. Set it to YES to include the internal documentation.
	# The default value is: NO.

	INTERNAL_DOCS = NO

	# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
	# names in lower-case letters. If set to YES, upper-case letters are also
	# allowed. This is useful if you have classes or files whose names only differ
	# in case and if your file system supports case sensitive file names. Windows
	# and Mac users are advised to set this option to NO.
	# The default value is: system dependent.

	CASE_SENSE_NAMES = YES

	# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
	# their full class and namespace scopes in the documentation. If set to YES, the
	# scope will be hidden.
	# The default value is: NO.

	HIDE_SCOPE_NAMES = NO

	# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
	# append additional text to a page's title, such as Class Reference. If set to
	# YES the compound reference will be hidden.
	# The default value is: NO.

	HIDE_COMPOUND_REFERENCE= NO

	# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
	# the files that are included by a file in the documentation of that file.
	# The default value is: YES.

	SHOW_INCLUDE_FILES = YES

	# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
	# grouped member an include statement to the documentation, telling the reader
	# which file to include in order to use the member.
	# The default value is: NO.

	SHOW_GROUPED_MEMB_INC = NO

	# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
	# files with double quotes in the documentation rather than with sharp brackets.
	# The default value is: NO.

	FORCE_LOCAL_INCLUDES = NO

	# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
	# documentation for inline members.
	# The default value is: YES.

	INLINE_INFO = YES

	# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
	# (detailed) documentation of file and class members alphabetically by member
	# name. If set to NO, the members will appear in declaration order.
	# The default value is: YES.

	SORT_MEMBER_DOCS = YES

	# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
	# descriptions of file, namespace and class members alphabetically by member
	# name. If set to NO, the members will appear in declaration order. Note that
	# this will also influence the order of the classes in the class list.
	# The default value is: NO.

	SORT_BRIEF_DOCS = NO

	# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
	# (brief and detailed) documentation of class members so that constructors and
	# destructors are listed first. If set to NO the constructors will appear in the
	# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
	# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
	# member documentation.
	# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
	# detailed member documentation.
	# The default value is: NO.

	SORT_MEMBERS_CTORS_1ST = NO

	# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
	# of group names into alphabetical order. If set to NO the group names will
	# appear in their defined order.
	# The default value is: NO.

	SORT_GROUP_NAMES = NO

	# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
	# fully-qualified names, including namespaces. If set to NO, the class list will
	# be sorted only by class name, not including the namespace part.
	# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
	# Note: This option applies only to the class list, not to the alphabetical
	# list.
	# The default value is: NO.

	SORT_BY_SCOPE_NAME = NO

	# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
	# type resolution of all parameters of a function it will reject a match between
	# the prototype and the implementation of a member function even if there is
	# only one candidate or it is obvious which candidate to choose by doing a
	# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
	# accept a match between prototype and implementation in such cases.
	# The default value is: NO.

	STRICT_PROTO_MATCHING = NO

	# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
	# list. This list is created by putting \todo commands in the documentation.
	# The default value is: YES.

	GENERATE_TODOLIST = YES

	# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
	# list. This list is created by putting \test commands in the documentation.
	# The default value is: YES.

	GENERATE_TESTLIST = YES

	# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
	# list. This list is created by putting \bug commands in the documentation.
	# The default value is: YES.

	GENERATE_BUGLIST = YES

	# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
	# the deprecated list. This list is created by putting \deprecated commands in
	# the documentation.
	# The default value is: YES.

	GENERATE_DEPRECATEDLIST= YES

	# The ENABLED_SECTIONS tag can be used to enable conditional documentation
	# sections, marked by \if <section_label> ... \endif and \cond <section_label>
	# ... \endcond blocks.

	ENABLED_SECTIONS =

	# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
	# initial value of a variable or macro / define can have for it to appear in the
	# documentation. If the initializer consists of more lines than specified here
	# it will be hidden. Use a value of 0 to hide initializers completely. The
	# appearance of the value of individual variables and macros / defines can be
	# controlled using \showinitializer or \hideinitializer command in the
	# documentation regardless of this setting.
	# Minimum value: 0, maximum value: 10000, default value: 30.

	MAX_INITIALIZER_LINES = 30

	# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
	# the bottom of the documentation of classes and structs. If set to YES, the
	# list will mention the files that were used to generate the documentation.
	# The default value is: YES.

	SHOW_USED_FILES = YES

	# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
	# will remove the Files entry from the Quick Index and from the Folder Tree View
	# (if specified).
	# The default value is: YES.

	SHOW_FILES = YES

	# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
	# page. This will remove the Namespaces entry from the Quick Index and from the
	# Folder Tree View (if specified).
	# The default value is: YES.

	SHOW_NAMESPACES = YES

	# The FILE_VERSION_FILTER tag can be used to specify a program or script that
	# doxygen should invoke to get the current version for each file (typically from
	# the version control system). Doxygen will invoke the program by executing (via
	# popen()) the command command input-file, where command is the value of the
	# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
	# by doxygen. Whatever the program writes to standard output is used as the file
	# version. For an example see the documentation.

	FILE_VERSION_FILTER =

	# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
	# by doxygen. The layout file controls the global structure of the generated
	# output files in an output format independent way. To create the layout file
	# that represents doxygen's defaults, run doxygen with the -l option. You can
	# optionally specify a file name after the option, if omitted DoxygenLayout.xml
	# will be used as the name of the layout file.
	#
	# Note that if you run doxygen from a directory containing a file called
	# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
	# tag is left empty.

	LAYOUT_FILE =

	# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
	# the reference definitions. This must be a list of .bib files. The .bib
	# extension is automatically appended if omitted. This requires the bibtex tool
	# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
	# For LaTeX the style of the bibliography can be controlled using
	# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
	# search path. See also \cite for info how to create references.

	-CITE_BIB_FILES =
	+CITE_BIB_FILES = biblio.bib

	#---------------------------------------------------------------------------
	# Configuration options related to warning and progress messages
	#---------------------------------------------------------------------------

	# The QUIET tag can be used to turn on/off the messages that are generated to
	# standard output by doxygen. If QUIET is set to YES this implies that the
	# messages are off.
	# The default value is: NO.

	QUIET = NO

	# The WARNINGS tag can be used to turn on/off the warning messages that are
	# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
	# this implies that the warnings are on.
	#
	# Tip: Turn warnings on while writing the documentation.
	# The default value is: YES.

	WARNINGS = YES

	# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
	# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
	# will automatically be disabled.
	# The default value is: YES.

	WARN_IF_UNDOCUMENTED = YES

	# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
	# potential errors in the documentation, such as not documenting some parameters
	# in a documented function, or documenting parameters that don't exist or using
	# markup commands wrongly.
	# The default value is: YES.

	WARN_IF_DOC_ERROR = YES

	# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
	# are documented, but have no documentation for their parameters or return
	# value. If set to NO, doxygen will only warn about wrong or incomplete
	# parameter documentation, but not about the absence of documentation.
	# The default value is: NO.

	WARN_NO_PARAMDOC = NO

	# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
	# a warning is encountered.
	# The default value is: NO.

	WARN_AS_ERROR = NO

	# The WARN_FORMAT tag determines the format of the warning messages that doxygen
	# can produce. The string should contain the $file, $line, and $text tags, which
	# will be replaced by the file and line number from which the warning originated
	# and the warning text. Optionally the format may contain $version, which will
	# be replaced by the version of the file (if it could be obtained via
	# FILE_VERSION_FILTER)
	# The default value is: $file:$line: $text.

	WARN_FORMAT = "$file:$line: $text"

	# The WARN_LOGFILE tag can be used to specify a file to which warning and error
	# messages should be written. If left blank the output is written to standard
	# error (stderr).

	WARN_LOGFILE =

	#---------------------------------------------------------------------------
	# Configuration options related to the input files
	#---------------------------------------------------------------------------

	# The INPUT tag is used to specify the files and/or directories that contain
	# documented source files. You may enter file names like myfile.cpp or
	# directories like /usr/src/myproject. Separate the files or directories with
	# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
	# Note: If this tag is empty the current directory is searched.

	INPUT = "../../include"

	# This tag can be used to specify the character encoding of the source files
	# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
	# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
	# documentation (see: http://www.gnu.org/software/libiconv) for the list of
	# possible encodings.
	# The default value is: UTF-8.

	INPUT_ENCODING = UTF-8

	# If the value of the INPUT tag contains directories, you can use the
	# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
	# *.h) to filter out the source-files in the directories.
	#
	# Note that for custom extensions or not directly supported extensions you also
	# need to set EXTENSION_MAPPING for the extension otherwise the files are not
	# read by doxygen.
	#
	# If left blank the following patterns are tested:.c, .cc, .cxx, .cpp,
	# .c++, .java, .ii, .ixx, .ipp, .i++, .inl, .idl, .ddl, .odl, *.h,
	# .hh, .hxx, .hpp, .h++, .cs, .d, .php, .php4, .php5, .phtml, *.inc,
	# .m, .markdown, .md, .mm, .dox, .py, .pyw, .f90, .f, .for, *.tcl,
	# .vhd, .vhdl, .ucf, .qsf, .as and .js.

	FILE_PATTERNS =

	# The RECURSIVE tag can be used to specify whether or not subdirectories should
	# be searched for input files as well.
	# The default value is: NO.

	RECURSIVE = YES

	# The EXCLUDE tag can be used to specify files and/or directories that should be
	# excluded from the INPUT source files. This way you can easily exclude a
	# subdirectory from a directory tree whose root is specified with the INPUT tag.
	#
	# Note that relative paths are relative to the directory from which doxygen is
	# run.

	EXCLUDE =

	# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
	# directories that are symbolic links (a Unix file system feature) are excluded
	# from the input.
	# The default value is: NO.

	EXCLUDE_SYMLINKS = NO

	# If the value of the INPUT tag contains directories, you can use the
	# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
	# certain files from those directories.
	#
	# Note that the wildcards are matched against the file with absolute path, so to
	# exclude all test directories for example use the pattern /test/

	EXCLUDE_PATTERNS =

	# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
	# (namespaces, classes, functions, etc.) that should be excluded from the
	# output. The symbol name can be a fully qualified name, a word, or if the
	# wildcard * is used, a substring. Examples: ANamespace, AClass,
	# AClass::ANamespace, ANamespace::*Test
	#
	# Note that the wildcards are matched against the file with absolute path, so to
	# exclude all test directories use the pattern /test/

	EXCLUDE_SYMBOLS =

	# The EXAMPLE_PATH tag can be used to specify one or more files or directories
	# that contain example code fragments that are included (see the \include
	# command).

	EXAMPLE_PATH =

	# If the value of the EXAMPLE_PATH tag contains directories, you can use the
	# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
	# *.h) to filter out the source-files in the directories. If left blank all
	# files are included.

	EXAMPLE_PATTERNS =

	# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
	# searched for input files to be used with the \include or \dontinclude commands
	# irrespective of the value of the RECURSIVE tag.
	# The default value is: NO.

	EXAMPLE_RECURSIVE = NO

	# The IMAGE_PATH tag can be used to specify one or more files or directories
	# that contain images that are to be included in the documentation (see the
	# \image command).

	IMAGE_PATH =

	# The INPUT_FILTER tag can be used to specify a program that doxygen should
	# invoke to filter for each input file. Doxygen will invoke the filter program
	# by executing (via popen()) the command:
	#
	# <filter> <input-file>
	#
	# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
	# name of an input file. Doxygen will then use the output that the filter
	# program writes to standard output. If FILTER_PATTERNS is specified, this tag
	# will be ignored.
	#
	# Note that the filter must not add or remove lines; it is applied before the
	# code is scanned, but not when the output code is generated. If lines are added
	# or removed, the anchors will not be placed correctly.
	#
	# Note that for custom extensions or not directly supported extensions you also
	# need to set EXTENSION_MAPPING for the extension otherwise the files are not
	# properly processed by doxygen.

	INPUT_FILTER =

	# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
	# basis. Doxygen will compare the file name with each pattern and apply the
	# filter if there is a match. The filters are a list of the form: pattern=filter
	# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
	# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
	# patterns match the file name, INPUT_FILTER is applied.
	#
	# Note that for custom extensions or not directly supported extensions you also
	# need to set EXTENSION_MAPPING for the extension otherwise the files are not
	# properly processed by doxygen.

	FILTER_PATTERNS =

	# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
	# INPUT_FILTER) will also be used to filter the input files that are used for
	# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
	# The default value is: NO.

	FILTER_SOURCE_FILES = NO

	# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
	# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
	# it is also possible to disable source filtering for a specific pattern using
	# *.ext= (so without naming a filter).
	# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.

	FILTER_SOURCE_PATTERNS =

	# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
	# is part of the input, its contents will be placed on the main page
	# (index.html). This can be useful if you have a project on for instance GitHub
	# and want to reuse the introduction page also for the doxygen output.

	USE_MDFILE_AS_MAINPAGE =

	#---------------------------------------------------------------------------
	# Configuration options related to source browsing
	#---------------------------------------------------------------------------

	# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
	# generated. Documented entities will be cross-referenced with these sources.
	#
	# Note: To get rid of all source code in the generated output, make sure that
	# also VERBATIM_HEADERS is set to NO.
	# The default value is: NO.

	SOURCE_BROWSER = NO

	# Setting the INLINE_SOURCES tag to YES will include the body of functions,
	# classes and enums directly into the documentation.
	# The default value is: NO.

	INLINE_SOURCES = NO

	# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
	# special comment blocks from generated source code fragments. Normal C, C++ and
	# Fortran comments will always remain visible.
	# The default value is: YES.

	STRIP_CODE_COMMENTS = YES

	# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
	# function all documented functions referencing it will be listed.
	# The default value is: NO.

	REFERENCED_BY_RELATION = NO

	# If the REFERENCES_RELATION tag is set to YES then for each documented function
	# all documented entities called/used by that function will be listed.
	# The default value is: NO.

	REFERENCES_RELATION = NO

	# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
	# to YES then the hyperlinks from functions in REFERENCES_RELATION and
	# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
	# link to the documentation.
	# The default value is: YES.

	REFERENCES_LINK_SOURCE = YES

	# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
	# source code will show a tooltip with additional information such as prototype,
	# brief description and links to the definition and documentation. Since this
	# will make the HTML file larger and loading of large files a bit slower, you
	# can opt to disable this feature.
	# The default value is: YES.
	# This tag requires that the tag SOURCE_BROWSER is set to YES.

	SOURCE_TOOLTIPS = YES

	# If the USE_HTAGS tag is set to YES then the references to source code will
	# point to the HTML generated by the htags(1) tool instead of doxygen built-in
	# source browser. The htags tool is part of GNU's global source tagging system
	# (see http://www.gnu.org/software/global/global.html). You will need version
	# 4.8.6 or higher.
	#
	# To use it do the following:
	# - Install the latest version of global
	# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
	# - Make sure the INPUT points to the root of the source tree
	# - Run doxygen as normal
	#
	# Doxygen will invoke htags (and that will in turn invoke gtags), so these
	# tools must be available from the command line (i.e. in the search path).
	#
	# The result: instead of the source browser generated by doxygen, the links to
	# source code will now point to the output of htags.
	# The default value is: NO.
	# This tag requires that the tag SOURCE_BROWSER is set to YES.

	USE_HTAGS = NO

	# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
	# verbatim copy of the header file for each class for which an include is
	# specified. Set to NO to disable this.
	# See also: Section \class.
	# The default value is: YES.

	VERBATIM_HEADERS = YES

	# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
	# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
	# cost of reduced performance. This can be particularly helpful with template
	# rich C++ code for which doxygen's built-in parser lacks the necessary type
	# information.
	# Note: The availability of this option depends on whether or not doxygen was
	# generated with the -Duse-libclang=ON option for CMake.
	# The default value is: NO.

	CLANG_ASSISTED_PARSING = NO

	# If clang assisted parsing is enabled you can provide the compiler with command
	# line options that you would normally use when invoking the compiler. Note that
	# the include paths will already be set by doxygen for the files and directories
	# specified with INPUT and INCLUDE_PATH.
	# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.

	CLANG_OPTIONS =

	#---------------------------------------------------------------------------
	# Configuration options related to the alphabetical class index
	#---------------------------------------------------------------------------

	# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
	# compounds will be generated. Enable this if the project contains a lot of
	# classes, structs, unions or interfaces.
	# The default value is: YES.

	ALPHABETICAL_INDEX = YES

	# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
	# which the alphabetical index list will be split.
	# Minimum value: 1, maximum value: 20, default value: 5.
	# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.

	COLS_IN_ALPHA_INDEX = 5

	# In case all classes in a project start with a common prefix, all classes will
	# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
	# can be used to specify a prefix (or a list of prefixes) that should be ignored
	# while generating the index headers.
	# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.

	IGNORE_PREFIX =

	#---------------------------------------------------------------------------
	# Configuration options related to the HTML output
	#---------------------------------------------------------------------------

	# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
	# The default value is: YES.

	GENERATE_HTML = YES

	# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
	# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
	# it.
	# The default directory is: html.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_OUTPUT = html

	# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
	# generated HTML page (for example: .htm, .php, .asp).
	# The default value is: .html.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_FILE_EXTENSION = .html

	# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
	# each generated HTML page. If the tag is left blank doxygen will generate a
	# standard header.
	#
	# To get valid HTML the header file that includes any scripts and style sheets
	# that doxygen needs, which is dependent on the configuration options used (e.g.
	# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
	# default header using
	# doxygen -w html new_header.html new_footer.html new_stylesheet.css
	# YourConfigFile
	# and then modify the file new_header.html. See also section "Doxygen usage"
	# for information on how to generate the default header that doxygen normally
	# uses.
	# Note: The header is subject to change so you typically have to regenerate the
	# default header when upgrading to a newer version of doxygen. For a description
	# of the possible markers and block names see the documentation.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_HEADER =

	# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
	# generated HTML page. If the tag is left blank doxygen will generate a standard
	# footer. See HTML_HEADER for more information on how to generate a default
	# footer and what special commands can be used inside the footer. See also
	# section "Doxygen usage" for information on how to generate the default footer
	# that doxygen normally uses.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_FOOTER =

	# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
	# sheet that is used by each HTML page. It can be used to fine-tune the look of
	# the HTML output. If left blank doxygen will generate a default style sheet.
	# See also section "Doxygen usage" for information on how to generate the style
	# sheet that doxygen normally uses.
	# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
	# it is more robust and this tag (HTML_STYLESHEET) will in the future become
	# obsolete.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_STYLESHEET =

	# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
	# cascading style sheets that are included after the standard style sheets
	# created by doxygen. Using this option one can overrule certain style aspects.
	# This is preferred over using HTML_STYLESHEET since it does not replace the
	# standard style sheet and is therefore more robust against future updates.
	# Doxygen will copy the style sheet files to the output directory.
	# Note: The order of the extra style sheet files is of importance (e.g. the last
	# style sheet in the list overrules the setting of the previous ones in the
	# list). For an example see the documentation.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_EXTRA_STYLESHEET =

	# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
	# other source files which should be copied to the HTML output directory. Note
	# that these files will be copied to the base HTML output directory. Use the
	# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
	# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
	# files will be copied as-is; there are no commands or markers available.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_EXTRA_FILES =

	# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
	# will adjust the colors in the style sheet and background images according to
	# this color. Hue is specified as an angle on a colorwheel, see
	# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
	# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
	# purple, and 360 is red again.
	# Minimum value: 0, maximum value: 359, default value: 220.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_COLORSTYLE_HUE = 220

	# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
	# in the HTML output. For a value of 0 the output will use grayscales only. A
	# value of 255 will produce the most vivid colors.
	# Minimum value: 0, maximum value: 255, default value: 100.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_COLORSTYLE_SAT = 100

	# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
	# luminance component of the colors in the HTML output. Values below 100
	# gradually make the output lighter, whereas values above 100 make the output
	# darker. The value divided by 100 is the actual gamma applied, so 80 represents
	# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
	# change the gamma.
	# Minimum value: 40, maximum value: 240, default value: 80.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_COLORSTYLE_GAMMA = 80

	# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
	# page will contain the date and time when the page was generated. Setting this
	# to YES can help to show when doxygen was last run and thus if the
	# documentation is up to date.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_TIMESTAMP = NO

	# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
	# documentation will contain sections that can be hidden and shown after the
	# page has loaded.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_DYNAMIC_SECTIONS = NO

	# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
	# shown in the various tree structured indices initially; the user can expand
	# and collapse entries dynamically later on. Doxygen will expand the tree to
	# such a level that at most the specified number of entries are visible (unless
	# a fully collapsed tree already exceeds this amount). So setting the number of
	# entries 1 will produce a full collapsed tree by default. 0 is a special value
	# representing an infinite number of entries and will result in a full expanded
	# tree by default.
	# Minimum value: 0, maximum value: 9999, default value: 100.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	HTML_INDEX_NUM_ENTRIES = 100

	# If the GENERATE_DOCSET tag is set to YES, additional index files will be
	# generated that can be used as input for Apple's Xcode 3 integrated development
	# environment (see: http://developer.apple.com/tools/xcode/), introduced with
	# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
	# Makefile in the HTML output directory. Running make will produce the docset in
	# that directory and running make install will install the docset in
	# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
	# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
	# for more information.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	GENERATE_DOCSET = NO

	# This tag determines the name of the docset feed. A documentation feed provides
	# an umbrella under which multiple documentation sets from a single provider
	# (such as a company or product suite) can be grouped.
	# The default value is: Doxygen generated docs.
	# This tag requires that the tag GENERATE_DOCSET is set to YES.

	DOCSET_FEEDNAME = "Doxygen generated docs"

	# This tag specifies a string that should uniquely identify the documentation
	# set bundle. This should be a reverse domain-name style string, e.g.
	# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
	# The default value is: org.doxygen.Project.
	# This tag requires that the tag GENERATE_DOCSET is set to YES.

	DOCSET_BUNDLE_ID = org.doxygen.Project

	# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
	# the documentation publisher. This should be a reverse domain-name style
	# string, e.g. com.mycompany.MyDocSet.documentation.
	# The default value is: org.doxygen.Publisher.
	# This tag requires that the tag GENERATE_DOCSET is set to YES.

	DOCSET_PUBLISHER_ID = org.doxygen.Publisher

	# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
	# The default value is: Publisher.
	# This tag requires that the tag GENERATE_DOCSET is set to YES.

	DOCSET_PUBLISHER_NAME = Publisher

	# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
	# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
	# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
	# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
	# Windows.
	#
	# The HTML Help Workshop contains a compiler that can convert all HTML output
	# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
	# files are now used as the Windows 98 help format, and will replace the old
	# Windows help format (.hlp) on all Windows platforms in the future. Compressed
	# HTML files also contain an index, a table of contents, and you can search for
	# words in the documentation. The HTML workshop also contains a viewer for
	# compressed HTML files.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	GENERATE_HTMLHELP = NO

	# The CHM_FILE tag can be used to specify the file name of the resulting .chm
	# file. You can add a path in front of the file if the result should not be
	# written to the html output directory.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	CHM_FILE =

	# The HHC_LOCATION tag can be used to specify the location (absolute path
	# including file name) of the HTML help compiler (hhc.exe). If non-empty,
	# doxygen will try to run the HTML help compiler on the generated index.hhp.
	# The file has to be specified with full path.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	HHC_LOCATION =

	# The GENERATE_CHI flag controls if a separate .chi index file is generated
	# (YES) or that it should be included in the master .chm file (NO).
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	GENERATE_CHI = NO

	# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
	# and project file content.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	CHM_INDEX_ENCODING =

	# The BINARY_TOC flag controls whether a binary table of contents is generated
	# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
	# enables the Previous and Next buttons.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	BINARY_TOC = NO

	# The TOC_EXPAND flag can be set to YES to add extra items for group members to
	# the table of contents of the HTML help documentation and to the tree view.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTMLHELP is set to YES.

	TOC_EXPAND = NO

	# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
	# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
	# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
	# (.qch) of the generated HTML documentation.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	GENERATE_QHP = NO

	# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
	# the file name of the resulting .qch file. The path specified is relative to
	# the HTML output folder.
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QCH_FILE =

	# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
	# Project output. For more information please see Qt Help Project / Namespace
	# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
	# The default value is: org.doxygen.Project.
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHP_NAMESPACE = org.doxygen.Project

	# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
	# Help Project output. For more information please see Qt Help Project / Virtual
	# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
	# folders).
	# The default value is: doc.
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHP_VIRTUAL_FOLDER = doc

	# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
	# filter to add. For more information please see Qt Help Project / Custom
	# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
	# filters).
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHP_CUST_FILTER_NAME =

	# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
	# custom filter to add. For more information please see Qt Help Project / Custom
	# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
	# filters).
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHP_CUST_FILTER_ATTRS =

	# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
	# project's filter section matches. Qt Help Project / Filter Attributes (see:
	# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHP_SECT_FILTER_ATTRS =

	# The QHG_LOCATION tag can be used to specify the location of Qt's
	# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
	# generated .qhp file.
	# This tag requires that the tag GENERATE_QHP is set to YES.

	QHG_LOCATION =

	# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
	# generated, together with the HTML files, they form an Eclipse help plugin. To
	# install this plugin and make it available under the help contents menu in
	# Eclipse, the contents of the directory containing the HTML and XML files needs
	# to be copied into the plugins directory of eclipse. The name of the directory
	# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
	# After copying Eclipse needs to be restarted before the help appears.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	GENERATE_ECLIPSEHELP = NO

	# A unique identifier for the Eclipse help plugin. When installing the plugin
	# the directory name containing the HTML and XML files should also have this
	# name. Each documentation set should have its own identifier.
	# The default value is: org.doxygen.Project.
	# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.

	ECLIPSE_DOC_ID = org.doxygen.Project

	# If you want full control over the layout of the generated HTML pages it might
	# be necessary to disable the index and replace it with your own. The
	# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
	# of each HTML page. A value of NO enables the index and the value YES disables
	# it. Since the tabs in the index contain the same information as the navigation
	# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	DISABLE_INDEX = NO

	# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
	# structure should be generated to display hierarchical information. If the tag
	# value is set to YES, a side panel will be generated containing a tree-like
	# index structure (just like the one that is generated for HTML Help). For this
	# to work a browser that supports JavaScript, DHTML, CSS and frames is required
	# (i.e. any modern browser). Windows users are probably better off using the
	# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
	# further fine-tune the look of the index. As an example, the default style
	# sheet generated by doxygen has an example that shows how to put an image at
	# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
	# the same information as the tab index, you could consider setting
	# DISABLE_INDEX to YES when enabling this option.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	GENERATE_TREEVIEW = NO

	# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
	# doxygen will group on one line in the generated HTML documentation.
	#
	# Note that a value of 0 will completely suppress the enum values from appearing
	# in the overview section.
	# Minimum value: 0, maximum value: 20, default value: 4.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	ENUM_VALUES_PER_LINE = 4

	# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
	# to set the initial width (in pixels) of the frame in which the tree is shown.
	# Minimum value: 0, maximum value: 1500, default value: 250.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	TREEVIEW_WIDTH = 250

	# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
	# external symbols imported via tag files in a separate window.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	EXT_LINKS_IN_WINDOW = NO

	# Use this tag to change the font size of LaTeX formulas included as images in
	# the HTML documentation. When you change the font size after a successful
	# doxygen run you need to manually remove any form_*.png images from the HTML
	# output directory to force them to be regenerated.
	# Minimum value: 8, maximum value: 50, default value: 10.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	FORMULA_FONTSIZE = 10

	# Use the FORMULA_TRANPARENT tag to determine whether or not the images
	# generated for formulas are transparent PNGs. Transparent PNGs are not
	# supported properly for IE 6.0, but are supported on all modern browsers.
	#
	# Note that when changing this option you need to delete any form_*.png files in
	# the HTML output directory before the changes have effect.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	FORMULA_TRANSPARENT = YES

	# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
	# http://www.mathjax.org) which uses client side Javascript for the rendering
	# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
	# installed or if you want to formulas look prettier in the HTML output. When
	# enabled you may also need to install MathJax separately and configure the path
	# to it using the MATHJAX_RELPATH option.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	USE_MATHJAX = NO

	# When MathJax is enabled you can set the default output format to be used for
	# the MathJax output. See the MathJax site (see:
	# http://docs.mathjax.org/en/latest/output.html) for more details.
	# Possible values are: HTML-CSS (which is slower, but has the best
	# compatibility), NativeMML (i.e. MathML) and SVG.
	# The default value is: HTML-CSS.
	# This tag requires that the tag USE_MATHJAX is set to YES.

	MATHJAX_FORMAT = HTML-CSS

	# When MathJax is enabled you need to specify the location relative to the HTML
	# output directory using the MATHJAX_RELPATH option. The destination directory
	# should contain the MathJax.js script. For instance, if the mathjax directory
	# is located at the same level as the HTML output directory, then
	# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
	# Content Delivery Network so you can quickly see the result without installing
	# MathJax. However, it is strongly recommended to install a local copy of
	# MathJax from http://www.mathjax.org before deployment.
	# The default value is: http://cdn.mathjax.org/mathjax/latest.
	# This tag requires that the tag USE_MATHJAX is set to YES.

	MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest

	# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
	# extension names that should be enabled during MathJax rendering. For example
	# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
	# This tag requires that the tag USE_MATHJAX is set to YES.

	MATHJAX_EXTENSIONS =

	# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
	# of code that will be used on startup of the MathJax code. See the MathJax site
	# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
	# example see the documentation.
	# This tag requires that the tag USE_MATHJAX is set to YES.

	MATHJAX_CODEFILE =

	# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
	# the HTML output. The underlying search engine uses javascript and DHTML and
	# should work on any modern browser. Note that when using HTML help
	# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
	# there is already a search function so this one should typically be disabled.
	# For large projects the javascript based search engine can be slow, then
	# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
	# search using the keyboard; to jump to the search box use <access key> + S
	# (what the <access key> is depends on the OS and browser, but it is typically
	# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
	# key> to jump into the search results window, the results can be navigated
	# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
	# the search. The filter options can be selected when the cursor is inside the
	# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
	# to select a filter and <Enter> or <escape> to activate or cancel the filter
	# option.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_HTML is set to YES.

	SEARCHENGINE = YES

	# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
	# implemented using a web server instead of a web client using Javascript. There
	# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
	# setting. When disabled, doxygen will generate a PHP script for searching and
	# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
	# and searching needs to be provided by external tools. See the section
	# "External Indexing and Searching" for details.
	# The default value is: NO.
	# This tag requires that the tag SEARCHENGINE is set to YES.

	SERVER_BASED_SEARCH = NO

	# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
	# script for searching. Instead the search results are written to an XML file
	# which needs to be processed by an external indexer. Doxygen will invoke an
	# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
	# search results.
	#
	# Doxygen ships with an example indexer (doxyindexer) and search engine
	# (doxysearch.cgi) which are based on the open source search engine library
	# Xapian (see: http://xapian.org/).
	#
	# See the section "External Indexing and Searching" for details.
	# The default value is: NO.
	# This tag requires that the tag SEARCHENGINE is set to YES.

	EXTERNAL_SEARCH = NO

	# The SEARCHENGINE_URL should point to a search engine hosted by a web server
	# which will return the search results when EXTERNAL_SEARCH is enabled.
	#
	# Doxygen ships with an example indexer (doxyindexer) and search engine
	# (doxysearch.cgi) which are based on the open source search engine library
	# Xapian (see: http://xapian.org/). See the section "External Indexing and
	# Searching" for details.
	# This tag requires that the tag SEARCHENGINE is set to YES.

	SEARCHENGINE_URL =

	# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
	# search data is written to a file for indexing by an external tool. With the
	# SEARCHDATA_FILE tag the name of this file can be specified.
	# The default file is: searchdata.xml.
	# This tag requires that the tag SEARCHENGINE is set to YES.

	SEARCHDATA_FILE = searchdata.xml

	# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
	# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
	# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
	# projects and redirect the results back to the right project.
	# This tag requires that the tag SEARCHENGINE is set to YES.

	EXTERNAL_SEARCH_ID =

	# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
	# projects other than the one defined by this configuration file, but that are
	# all added to the same external search index. Each project needs to have a
	# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
	# to a relative location where the documentation can be found. The format is:
	# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
	# This tag requires that the tag SEARCHENGINE is set to YES.

	EXTRA_SEARCH_MAPPINGS =

	#---------------------------------------------------------------------------
	# Configuration options related to the LaTeX output
	#---------------------------------------------------------------------------

	# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
	# The default value is: YES.

	GENERATE_LATEX = YES

	# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
	# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
	# it.
	# The default directory is: latex.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_OUTPUT = latex

	# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
	# invoked.
	#
	# Note that when enabling USE_PDFLATEX this option is only used for generating
	# bitmaps for formulas in the HTML output, but not in the Makefile that is
	# written to the output directory.
	# The default file is: latex.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_CMD_NAME = latex

	# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
	# index for LaTeX.
	# The default file is: makeindex.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	MAKEINDEX_CMD_NAME = makeindex

	# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
	# documents. This may be useful for small projects and may help to save some
	# trees in general.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	COMPACT_LATEX = NO

	# The PAPER_TYPE tag can be used to set the paper type that is used by the
	# printer.
	# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
	# 14 inches) and executive (7.25 x 10.5 inches).
	# The default value is: a4.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	PAPER_TYPE = a4

	# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
	# that should be included in the LaTeX output. The package can be specified just
	# by its name or with the correct syntax as to be used with the LaTeX
	# \usepackage command. To get the times font for instance you can specify :
	# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
	# To use the option intlimits with the amsmath package you can specify:
	# EXTRA_PACKAGES=[intlimits]{amsmath}
	# If left blank no extra packages will be included.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	EXTRA_PACKAGES =

	# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
	# generated LaTeX document. The header should contain everything until the first
	# chapter. If it is left blank doxygen will generate a standard header. See
	# section "Doxygen usage" for information on how to let doxygen write the
	# default header to a separate file.
	#
	# Note: Only use a user-defined header if you know what you are doing! The
	# following commands have a special meaning inside the header: $title,
	# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
	# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
	# string, for the replacement values of the other commands the user is referred
	# to HTML_HEADER.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_HEADER =

	# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
	# generated LaTeX document. The footer should contain everything after the last
	# chapter. If it is left blank doxygen will generate a standard footer. See
	# LATEX_HEADER for more information on how to generate a default footer and what
	# special commands can be used inside the footer.
	#
	# Note: Only use a user-defined footer if you know what you are doing!
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_FOOTER =

	# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
	# LaTeX style sheets that are included after the standard style sheets created
	# by doxygen. Using this option one can overrule certain style aspects. Doxygen
	# will copy the style sheet files to the output directory.
	# Note: The order of the extra style sheet files is of importance (e.g. the last
	# style sheet in the list overrules the setting of the previous ones in the
	# list).
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_EXTRA_STYLESHEET =

	# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
	# other source files which should be copied to the LATEX_OUTPUT output
	# directory. Note that the files will be copied as-is; there are no commands or
	# markers available.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_EXTRA_FILES =

	# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
	# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
	# contain links (just like the HTML output) instead of page references. This
	# makes the output suitable for online browsing using a PDF viewer.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	PDF_HYPERLINKS = YES

	# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
	# the PDF file directly from the LaTeX files. Set this option to YES, to get a
	# higher quality PDF documentation.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	USE_PDFLATEX = YES

	# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
	# command to the generated LaTeX files. This will instruct LaTeX to keep running
	# if errors occur, instead of asking the user for help. This option is also used
	# when generating formulas in HTML.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_BATCHMODE = NO

	# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
	# index chapters (such as File Index, Compound Index, etc.) in the output.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_HIDE_INDICES = NO

	# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
	# code with syntax highlighting in the LaTeX output.
	#
	# Note that which sources are shown also depends on other settings such as
	# SOURCE_BROWSER.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_SOURCE_CODE = NO

	# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
	# bibliography, e.g. plainnat, or ieeetr. See
	# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
	# The default value is: plain.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_BIB_STYLE = plain

	# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
	# page will contain the date and time when the page was generated. Setting this
	# to NO can help when comparing the output of multiple runs.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_LATEX is set to YES.

	LATEX_TIMESTAMP = NO

	#---------------------------------------------------------------------------
	# Configuration options related to the RTF output
	#---------------------------------------------------------------------------

	# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
	# RTF output is optimized for Word 97 and may not look too pretty with other RTF
	# readers/editors.
	# The default value is: NO.

	GENERATE_RTF = NO

	# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
	# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
	# it.
	# The default directory is: rtf.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	RTF_OUTPUT = rtf

	# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
	# documents. This may be useful for small projects and may help to save some
	# trees in general.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	COMPACT_RTF = NO

	# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
	# contain hyperlink fields. The RTF file will contain links (just like the HTML
	# output) instead of page references. This makes the output suitable for online
	# browsing using Word or some other Word compatible readers that support those
	# fields.
	#
	# Note: WordPad (write) and others do not support links.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	RTF_HYPERLINKS = NO

	# Load stylesheet definitions from file. Syntax is similar to doxygen's config
	# file, i.e. a series of assignments. You only have to provide replacements,
	# missing definitions are set to their default value.
	#
	# See also section "Doxygen usage" for information on how to generate the
	# default style sheet that doxygen normally uses.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	RTF_STYLESHEET_FILE =

	# Set optional variables used in the generation of an RTF document. Syntax is
	# similar to doxygen's config file. A template extensions file can be generated
	# using doxygen -e rtf extensionFile.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	RTF_EXTENSIONS_FILE =

	# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
	# with syntax highlighting in the RTF output.
	#
	# Note that which sources are shown also depends on other settings such as
	# SOURCE_BROWSER.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_RTF is set to YES.

	RTF_SOURCE_CODE = NO

	#---------------------------------------------------------------------------
	# Configuration options related to the man page output
	#---------------------------------------------------------------------------

	# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
	# classes and files.
	# The default value is: NO.

	GENERATE_MAN = NO

	# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
	# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
	# it. A directory man3 will be created inside the directory specified by
	# MAN_OUTPUT.
	# The default directory is: man.
	# This tag requires that the tag GENERATE_MAN is set to YES.

	MAN_OUTPUT = man

	# The MAN_EXTENSION tag determines the extension that is added to the generated
	# man pages. In case the manual section does not start with a number, the number
	# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
	# optional.
	# The default value is: .3.
	# This tag requires that the tag GENERATE_MAN is set to YES.

	MAN_EXTENSION = .3

	# The MAN_SUBDIR tag determines the name of the directory created within
	# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
	# MAN_EXTENSION with the initial . removed.
	# This tag requires that the tag GENERATE_MAN is set to YES.

	MAN_SUBDIR =

	# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
	# will generate one additional man file for each entity documented in the real
	# man page(s). These additional files only source the real man page, but without
	# them the man command would be unable to find the correct page.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_MAN is set to YES.

	MAN_LINKS = NO

	#---------------------------------------------------------------------------
	# Configuration options related to the XML output
	#---------------------------------------------------------------------------

	# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
	# captures the structure of the code including all documentation.
	# The default value is: NO.

	GENERATE_XML = NO

	# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
	# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
	# it.
	# The default directory is: xml.
	# This tag requires that the tag GENERATE_XML is set to YES.

	XML_OUTPUT = xml

	# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
	# listings (including syntax highlighting and cross-referencing information) to
	# the XML output. Note that enabling this will significantly increase the size
	# of the XML output.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_XML is set to YES.

	XML_PROGRAMLISTING = YES

	#---------------------------------------------------------------------------
	# Configuration options related to the DOCBOOK output
	#---------------------------------------------------------------------------

	# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
	# that can be used to generate PDF.
	# The default value is: NO.

	GENERATE_DOCBOOK = NO

	# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
	# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
	# front of it.
	# The default directory is: docbook.
	# This tag requires that the tag GENERATE_DOCBOOK is set to YES.

	DOCBOOK_OUTPUT = docbook

	# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
	# program listings (including syntax highlighting and cross-referencing
	# information) to the DOCBOOK output. Note that enabling this will significantly
	# increase the size of the DOCBOOK output.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_DOCBOOK is set to YES.

	DOCBOOK_PROGRAMLISTING = NO

	#---------------------------------------------------------------------------
	# Configuration options for the AutoGen Definitions output
	#---------------------------------------------------------------------------

	# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
	# AutoGen Definitions (see http://autogen.sf.net) file that captures the
	# structure of the code including all documentation. Note that this feature is
	# still experimental and incomplete at the moment.
	# The default value is: NO.

	GENERATE_AUTOGEN_DEF = NO

	#---------------------------------------------------------------------------
	# Configuration options related to the Perl module output
	#---------------------------------------------------------------------------

	# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
	# file that captures the structure of the code including all documentation.
	#
	# Note that this feature is still experimental and incomplete at the moment.
	# The default value is: NO.

	GENERATE_PERLMOD = NO

	# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
	# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
	# output from the Perl module output.
	# The default value is: NO.
	# This tag requires that the tag GENERATE_PERLMOD is set to YES.

	PERLMOD_LATEX = NO

	# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
	# formatted so it can be parsed by a human reader. This is useful if you want to
	# understand what is going on. On the other hand, if this tag is set to NO, the
	# size of the Perl module output will be much smaller and Perl will parse it
	# just the same.
	# The default value is: YES.
	# This tag requires that the tag GENERATE_PERLMOD is set to YES.

	PERLMOD_PRETTY = YES

	# The names of the make variables in the generated doxyrules.make file are
	# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
	# so different doxyrules.make files included by the same Makefile don't
	# overwrite each other's variables.
	# This tag requires that the tag GENERATE_PERLMOD is set to YES.

	PERLMOD_MAKEVAR_PREFIX =

	#---------------------------------------------------------------------------
	# Configuration options related to the preprocessor
	#---------------------------------------------------------------------------

	# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
	# C-preprocessor directives found in the sources and include files.
	# The default value is: YES.

	ENABLE_PREPROCESSING = YES

	# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
	# in the source code. If set to NO, only conditional compilation will be
	# performed. Macro expansion can be done in a controlled way by setting
	# EXPAND_ONLY_PREDEF to YES.
	# The default value is: NO.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	MACRO_EXPANSION = NO

	# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
	# the macro expansion is limited to the macros specified with the PREDEFINED and
	# EXPAND_AS_DEFINED tags.
	# The default value is: NO.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	EXPAND_ONLY_PREDEF = NO

	# If the SEARCH_INCLUDES tag is set to YES, the include files in the
	# INCLUDE_PATH will be searched if a #include is found.
	# The default value is: YES.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	SEARCH_INCLUDES = YES

	# The INCLUDE_PATH tag can be used to specify one or more directories that
	# contain include files that are not input files but should be processed by the
	# preprocessor.
	# This tag requires that the tag SEARCH_INCLUDES is set to YES.

	INCLUDE_PATH =

	# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
	# patterns (like .h and .hpp) to filter out the header-files in the
	# directories. If left blank, the patterns specified with FILE_PATTERNS will be
	# used.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	INCLUDE_FILE_PATTERNS =

	# The PREDEFINED tag can be used to specify one or more macro names that are
	# defined before the preprocessor is started (similar to the -D option of e.g.
	# gcc). The argument of the tag is a list of macros of the form: name or
	# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
	# is assumed. To prevent a macro definition from being undefined via #undef or
	# recursively expanded use the := operator instead of the = operator.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	PREDEFINED =

	# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
	# tag can be used to specify a list of macro names that should be expanded. The
	# macro definition that is found in the sources will be used. Use the PREDEFINED
	# tag if you want to use a different macro definition that overrules the
	# definition found in the source code.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	EXPAND_AS_DEFINED =

	# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
	# remove all references to function-like macros that are alone on a line, have
	# an all uppercase name, and do not end with a semicolon. Such function macros
	# are typically used for boiler-plate code, and will confuse the parser if not
	# removed.
	# The default value is: YES.
	# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.

	SKIP_FUNCTION_MACROS = YES

	#---------------------------------------------------------------------------
	# Configuration options related to external references
	#---------------------------------------------------------------------------

	# The TAGFILES tag can be used to specify one or more tag files. For each tag
	# file the location of the external documentation should be added. The format of
	# a tag file without this location is as follows:
	# TAGFILES = file1 file2 ...
	# Adding location for the tag files is done as follows:
	# TAGFILES = file1=loc1 "file2 = loc2" ...
	# where loc1 and loc2 can be relative or absolute paths or URLs. See the
	# section "Linking to external documentation" for more information about the use
	# of tag files.
	# Note: Each tag file must have a unique name (where the name does NOT include
	# the path). If a tag file is not located in the directory in which doxygen is
	# run, you must also specify the path to the tagfile here.

	TAGFILES =

	# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
	# tag file that is based on the input files it reads. See section "Linking to
	# external documentation" for more information about the usage of tag files.

	GENERATE_TAGFILE =

	# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
	# the class index. If set to NO, only the inherited external classes will be
	# listed.
	# The default value is: NO.

	ALLEXTERNALS = NO

	# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
	# in the modules index. If set to NO, only the current project's groups will be
	# listed.
	# The default value is: YES.

	EXTERNAL_GROUPS = YES

	# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
	# the related pages index. If set to NO, only the current project's pages will
	# be listed.
	# The default value is: YES.

	EXTERNAL_PAGES = YES

	# The PERL_PATH should be the absolute path and name of the perl script
	# interpreter (i.e. the result of 'which perl').
	# The default file (with absolute path) is: /usr/bin/perl.

	PERL_PATH = /usr/bin/perl

	#---------------------------------------------------------------------------
	# Configuration options related to the dot tool
	#---------------------------------------------------------------------------

	# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
	# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
	# NO turns the diagrams off. Note that this option also works with HAVE_DOT
	# disabled, but it is recommended to install and use dot, since it yields more
	# powerful graphs.
	# The default value is: YES.

	CLASS_DIAGRAMS = YES

	# You can define message sequence charts within doxygen comments using the \msc
	# command. Doxygen will then run the mscgen tool (see:
	# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
	# documentation. The MSCGEN_PATH tag allows you to specify the directory where
	# the mscgen tool resides. If left empty the tool is assumed to be found in the
	# default search path.

	MSCGEN_PATH =

	# You can include diagrams made with dia in doxygen documentation. Doxygen will
	# then run dia to produce the diagram and insert it in the documentation. The
	# DIA_PATH tag allows you to specify the directory where the dia binary resides.
	# If left empty dia is assumed to be found in the default search path.

	DIA_PATH =

	# If set to YES the inheritance and collaboration graphs will hide inheritance
	# and usage relations if the target is undocumented or is not a class.
	# The default value is: YES.

	HIDE_UNDOC_RELATIONS = YES

	# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
	# available from the path. This tool is part of Graphviz (see:
	# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
	# Bell Labs. The other options in this section have no effect if this option is
	# set to NO
	# The default value is: YES.

	HAVE_DOT = YES

	# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
	# to run in parallel. When set to 0 doxygen will base this on the number of
	# processors available in the system. You can set it explicitly to a value
	# larger than 0 to get control over the balance between CPU load and processing
	# speed.
	# Minimum value: 0, maximum value: 32, default value: 0.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_NUM_THREADS = 0

	# When you want a differently looking font in the dot files that doxygen
	# generates you can specify the font name using DOT_FONTNAME. You need to make
	# sure dot is able to find the font, which can be done by putting it in a
	# standard location or by setting the DOTFONTPATH environment variable or by
	# setting DOT_FONTPATH to the directory containing the font.
	# The default value is: Helvetica.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_FONTNAME = Helvetica

	# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
	# dot graphs.
	# Minimum value: 4, maximum value: 24, default value: 10.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_FONTSIZE = 10

	# By default doxygen will tell dot to use the default font as specified with
	# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
	# the path where dot can find it using this tag.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_FONTPATH =

	# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
	# each documented class showing the direct and indirect inheritance relations.
	# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	CLASS_GRAPH = YES

	# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
	# graph for each documented class showing the direct and indirect implementation
	# dependencies (inheritance, containment, and class references variables) of the
	# class with other documented classes.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	COLLABORATION_GRAPH = YES

	# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
	# groups, showing the direct groups dependencies.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	GROUP_GRAPHS = YES

	# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
	# collaboration diagrams in a style similar to the OMG's Unified Modeling
	# Language.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	UML_LOOK = NO

	# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
	# class node. If there are many fields or methods and many nodes the graph may
	# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
	# number of items for each type to make the size more manageable. Set this to 0
	# for no limit. Note that the threshold may be exceeded by 50% before the limit
	# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
	# but if the number exceeds 15, the total amount of fields shown is limited to
	# 10.
	# Minimum value: 0, maximum value: 100, default value: 10.
	# This tag requires that the tag HAVE_DOT is set to YES.

	UML_LIMIT_NUM_FIELDS = 10

	# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
	# collaboration graphs will show the relations between templates and their
	# instances.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	TEMPLATE_RELATIONS = NO

	# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
	# YES then doxygen will generate a graph for each documented file showing the
	# direct and indirect include dependencies of the file with other documented
	# files.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	INCLUDE_GRAPH = YES

	# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
	# set to YES then doxygen will generate a graph for each documented file showing
	# the direct and indirect include dependencies of the file with other documented
	# files.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	INCLUDED_BY_GRAPH = YES

	# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
	# dependency graph for every global function or class method.
	#
	# Note that enabling this option will significantly increase the time of a run.
	# So in most cases it will be better to enable call graphs for selected
	# functions only using the \callgraph command. Disabling a call graph can be
	# accomplished by means of the command \hidecallgraph.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	CALL_GRAPH = NO

	# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
	# dependency graph for every global function or class method.
	#
	# Note that enabling this option will significantly increase the time of a run.
	# So in most cases it will be better to enable caller graphs for selected
	# functions only using the \callergraph command. Disabling a caller graph can be
	# accomplished by means of the command \hidecallergraph.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	CALLER_GRAPH = NO

	# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
	# hierarchy of all classes instead of a textual one.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	GRAPHICAL_HIERARCHY = YES

	# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
	# dependencies a directory has on other directories in a graphical way. The
	# dependency relations are determined by the #include relations between the
	# files in the directories.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DIRECTORY_GRAPH = YES

	# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
	# generated by dot. For an explanation of the image formats see the section
	# output formats in the documentation of the dot tool (Graphviz (see:
	# http://www.graphviz.org/)).
	# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
	# to make the SVG files visible in IE 9+ (other browsers do not have this
	# requirement).
	# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
	# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
	# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
	# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
	# png:gdiplus:gdiplus.
	# The default value is: png.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_IMAGE_FORMAT = png

	# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
	# enable generation of interactive SVG images that allow zooming and panning.
	#
	# Note that this requires a modern browser other than Internet Explorer. Tested
	# and working are Firefox, Chrome, Safari, and Opera.
	# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
	# the SVG files visible. Older versions of IE do not have SVG support.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	INTERACTIVE_SVG = NO

	# The DOT_PATH tag can be used to specify the path where the dot tool can be
	# found. If left blank, it is assumed the dot tool can be found in the path.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_PATH =

	# The DOTFILE_DIRS tag can be used to specify one or more directories that
	# contain dot files that are included in the documentation (see the \dotfile
	# command).
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOTFILE_DIRS =

	# The MSCFILE_DIRS tag can be used to specify one or more directories that
	# contain msc files that are included in the documentation (see the \mscfile
	# command).

	MSCFILE_DIRS =

	# The DIAFILE_DIRS tag can be used to specify one or more directories that
	# contain dia files that are included in the documentation (see the \diafile
	# command).

	DIAFILE_DIRS =

	# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
	# path where java can find the plantuml.jar file. If left blank, it is assumed
	# PlantUML is not used or called during a preprocessing step. Doxygen will
	# generate a warning when it encounters a \startuml command in this case and
	# will not generate output for the diagram.

	PLANTUML_JAR_PATH =

	# When using plantuml, the specified paths are searched for files specified by
	# the !include statement in a plantuml block.

	PLANTUML_INCLUDE_PATH =

	# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
	# that will be shown in the graph. If the number of nodes in a graph becomes
	# larger than this value, doxygen will truncate the graph, which is visualized
	# by representing a node as a red box. Note that doxygen if the number of direct
	# children of the root node in a graph is already larger than
	# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
	# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
	# Minimum value: 0, maximum value: 10000, default value: 50.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_GRAPH_MAX_NODES = 50

	# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
	# generated by dot. A depth value of 3 means that only nodes reachable from the
	# root by following a path via at most 3 edges will be shown. Nodes that lay
	# further from the root node will be omitted. Note that setting this option to 1
	# or 2 may greatly reduce the computation time needed for large code bases. Also
	# note that the size of a graph can be further restricted by
	# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
	# Minimum value: 0, maximum value: 1000, default value: 0.
	# This tag requires that the tag HAVE_DOT is set to YES.

	MAX_DOT_GRAPH_DEPTH = 0

	# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
	# background. This is disabled by default, because dot on Windows does not seem
	# to support this out of the box.
	#
	# Warning: Depending on the platform used, enabling this option may lead to
	# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
	# read).
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_TRANSPARENT = NO

	# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
	# files in one run (i.e. multiple -o and -T options on the command line). This
	# makes dot run faster, but since only newer versions of dot (>1.8.10) support
	# this, this feature is disabled by default.
	# The default value is: NO.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_MULTI_TARGETS = NO

	# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
	# explaining the meaning of the various boxes and arrows in the dot generated
	# graphs.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	GENERATE_LEGEND = YES

	# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
	# files that are used to generate the various graphs.
	# The default value is: YES.
	# This tag requires that the tag HAVE_DOT is set to YES.

	DOT_CLEANUP = YES
	diff --git a/doc/doxygen/biblio.bib b/doc/doxygen/biblio.bib
	new file mode 100644
	index 0000000..5fce287
	--- /dev/null
	+++ b/doc/doxygen/biblio.bib
	@@ -0,0 +1,56 @@
	+@article{Andersen:2011hs,
	+ author = "Andersen, Jeppe R. and Smillie, Jennifer M.",
	+ title = "{Multiple Jets at the LHC with High Energy Jets}",
	+ journal = "JHEP",
	+ volume = "06",
	+ year = "2011",
	+ pages = "010",
	+ doi = "10.1007/JHEP06(2011)010",
	+ eprint = "1101.5394",
	+ archivePrefix = "arXiv",
	+ primaryClass = "hep-ph",
	+ reportNumber = "CP3-ORIGINS-2011-02, EDINBURGH-2011-03",
	+ SLACcitation = "%%CITATION = ARXIV:1101.5394;%%"
	+}
	+@article{James:1993np,
	+ author = "James, F.",
	+ title = "{RANLUX: A FORTRAN implementation of the high quality
	+ pseudorandom number generator of Luscher}",
	+ journal = "Comput. Phys. Commun.",
	+ volume = "79",
	+ year = "1994",
	+ pages = "111-114",
	+ doi = "10.1016/0010-4655(94)90233-X",
	+ note = "[Erratum: Comput. Phys. Commun.97,357(1996)]",
	+ reportNumber = "CERN-CN-93-13",
	+ SLACcitation = "%%CITATION = CPHCB,79,111;%%"
	+}
	+@article{Luscher:1993dy,
	+ author = "Luscher, Martin",
	+ title = "{A Portable high quality random number generator for
	+ lattice field theory simulations}",
	+ journal = "Comput. Phys. Commun.",
	+ volume = "79",
	+ year = "1994",
	+ pages = "100-110",
	+ doi = "10.1016/0010-4655(94)90232-1",
	+ eprint = "hep-lat/9309020",
	+ archivePrefix = "arXiv",
	+ primaryClass = "hep-lat",
	+ reportNumber = "DESY-93-133",
	+ SLACcitation = "%%CITATION = HEP-LAT/9309020;%%"
	+}
	+@article{Savvidy:2014ana,
	+ author = "Savvidy, Konstantin G.",
	+ title = "{The MIXMAX random number generator}",
	+ journal = "Comput. Phys. Commun.",
	+ volume = "196",
	+ year = "2015",
	+ pages = "161-165",
	+ doi = "10.1016/j.cpc.2015.06.003",
	+ eprint = "1403.5355",
	+ archivePrefix = "arXiv",
	+ primaryClass = "hep-lat",
	+ reportNumber = "NITS-PHY-2014, NITS-PHY-2014003",
	+ SLACcitation = "%%CITATION = ARXIV:1403.5355;%%"
	+}
	diff --git a/include/RHEJ/Analysis.hh b/include/RHEJ/Analysis.hh
	index ea7a722..9dd9cab 100644
	--- a/include/RHEJ/Analysis.hh
	+++ b/include/RHEJ/Analysis.hh
	@@ -1,51 +1,50 @@
	-/** \file Analysis.hh
	- * \brief Header file for the Analysis Interface (ABC)
	+/** \file
	+ * \brief Header file for the Analysis interface
	*
	- * Contains the Analysis struct and the Dynamic Analysis
	- * struct. Also contains some histogram centric functions
	- * such as histogram_names(), parameters(), draw_histogram()
	- * update_parameter()
	+ * This header contains declarations that faciliate creating custom analyses
	+ * to be used with reversed HEJ.
	+ * \todo{link to user documentation}
	*/
	#pragma once

	#include <vector>
	#include <string>

	namespace YAML{
	class Node;
	}

	-//! Reversed HEJ Namespace
	+//! Main Reversed HEJ Namespace
	namespace RHEJ{
	class Event;

	- /** \struct Analysis Analysis.hh "include/RHEJ/Analysis.hh"
	- * \brief Analysis Struct
	- *
	+ //! Analysis base class
	+ /**
	* This is the interface that all analyses should implement,
	- * i.e. all custom analyses have to derived from this struct.
	+ * i.e. all custom analyses have to be derived from this struct.
	*/
	struct Analysis{
	//! Fill event into analysis (e.g. to histograms)
	/**
	* @param res_event The event in resummation phase space
	* @param FO_event The original fixed-order event
	*/
	virtual void fill(Event const & res_event, Event const & FO_event) = 0;
	//! Decide whether an event passes the cuts
	/**
	* @param res_event The event in resummation phase space
	* @param FO_event The original fixed-order event
	+ * @returns Whether the event passes all cuts
	*/
	virtual bool pass_cuts(Event const & res_event, Event const & FO_event) = 0;
	//! Finalise analysis
	/**
	* This function is called after all events have been processed and
	* can be used for example to print out or save the results.
	*/
	virtual void finalise() = 0;

	virtual ~Analysis() = default;
	};

	}
	diff --git a/include/RHEJ/CombinedEventWriter.hh b/include/RHEJ/CombinedEventWriter.hh
	index a1f1646..5527fac 100644
	--- a/include/RHEJ/CombinedEventWriter.hh
	+++ b/include/RHEJ/CombinedEventWriter.hh
	@@ -1,52 +1,41 @@
	-/** \file CombinedEventWriter.hh
	- * \brief Details the CombinedEventWriter class
	- *
	- * CombinedEventWriter Class which handles all of the EventWriters being used by a single use
	- * of RHEJ. It calls all other EventWriters in its list to use their write function and output.
	+/** \file
	+ * \brief Declares the CombinedEventWriter class
	*/

	#pragma once

	#include <memory>
	#include <vector>

	#include "RHEJ/EventWriter.hh"
	#include "RHEJ/make_writer.hh"

	namespace LHEF{
	- /** \struct HEPRUP CombinedEventWriter.hh "include/RHEJ/CombinedEventWriter.hh"
	- * \brief HEPRUP struct which contains input event information.
	- *
	- * This struct contains important information from the LHEF header such as the beam energy.
	- */
	struct HEPRUP;
	}

	namespace RHEJ{

	- /** \class CombinedEventWriter CombinedEventWriter.hh "include/RHEJ/CombinedEventWriter.hh"
	- * \brief Intended as an EventWriter to Multiple Output types.
	- *
	- * Inherits from EventWriter, and then uses its write function which calls all of the event
	- * writers write function to output to their specific output files in their specific format.
	- * This handles this complexity of having multiple EventWriters.
	- */
	+ //! Write event output to zero or more output files.
	class CombinedEventWriter: public EventWriter{
	-
	public:
	- //! CombinedEventWriter Constructor
	+ //!Constructor
	+ /**
	+ * @param outfiles Specifies files output should be written to.
	+ * Each entry in the vector contains a file name
	+ * and output format.
	+ * @param heprup General process information
	+ */
	CombinedEventWriter(
	- /** Files to which event output should be written */
	std::vector<OutputFile> const & outfiles,
	- /** Contains important information from the Input */
	LHEF::HEPRUP const & heprup
	);

	+ //! Write one event to all output files
	void write(Event const &) override;

	private:
	- //! A vector of the EventWriters
	std::vector<std::unique_ptr<EventWriter>> writers_;
	};

	}
	diff --git a/include/RHEJ/Constants.hh b/include/RHEJ/Constants.hh
	index 5960484..db1f296 100644
	--- a/include/RHEJ/Constants.hh
	+++ b/include/RHEJ/Constants.hh
	@@ -1,21 +1,21 @@
	-/** \file Constants.hh
	+/** \file
	* \brief Header file defining all global constants used for HEJ
	*/
	#pragma once

	namespace RHEJ{
	/// @name QCD parameters
	//@{
	constexpr int N_C = 3; //!< number of Colors
	constexpr int C_A = N_C; //!< \f$C_A\f$
	constexpr double C_F = (N_CN_C - 1.)/(2.N_C); //!< \f$C_F\f$
	constexpr double t_f = 0.5; //!< \f$t_f\f$
	constexpr int n_f = 5; //!< number light flavors
	constexpr double beta0 = 11./3.C_A - 4./3.t_f*n_f; //!< \f$\beta_0\f$
	//@}
	/// @name Generation Parameters
	//@{
	constexpr double CLAMBDA = 0.2; //!< Scale for virtual correction, \f$\lambda\f$ cf. eq. (20) in \cite Andersen:2011hs
	constexpr double CMINPT = CLAMBDA; //!< minimal \f$p_t\f$ of all partons
	//@}
	}
	diff --git a/include/RHEJ/EmptyAnalysis.hh b/include/RHEJ/EmptyAnalysis.hh
	index f022f12..5ece2a1 100644
	--- a/include/RHEJ/EmptyAnalysis.hh
	+++ b/include/RHEJ/EmptyAnalysis.hh
	@@ -1,33 +1,44 @@
	-/** \file EmptyAnalysis.hh
	- * \brief Details the EmptyAnalysis Class. (The trivial Analysis case.)
	+/** \file
	+ * \brief Declaration of the trivial (empty) analysis
	*/

	#pragma once

	#include <memory>

	#include "RHEJ/Analysis.hh"

	//! YAML Namespace
	namespace YAML{
	class Node;
	}

	-
	namespace RHEJ{
	- /** \struct EmptyAnalysis EmptyAnalysis.hh "include/RHEJ/EmptyAnalysis.hh"
	- * \brief EmptyAnalysis struct. Trivial Analysis case.
	+ /** An analysis that does nothing
	*
	- * Inherits from the Analysis Struct and defines its own fill function (as necessary)
	- * This function does nothing (which is the trivial case.
	+ * This analysis is used by default if no user analysis is specified.
	+ * The member functions don't do anything and events passed to the
	+ * analysis are simply ignored.
	*/
	struct EmptyAnalysis: Analysis{
	static std::unique_ptr<Analysis> create(YAML::Node const & parameters);

	+ //! Fill event into analysis (e.g. to histograms)
	+ /**
	+ * This function does nothing
	+ */
	virtual void fill(Event const &, Event const &) override;
	+ //! Whether a resummation event passes all cuts
	+ /**
	+ * There are no cuts, so all events pass
	+ */
	virtual bool pass_cuts(Event const &, Event const &) override;
	+ //! Finalise analysis
	+ /**
	+ * This function does nothing
	+ */
	virtual void finalise() override;

	virtual ~EmptyAnalysis() override = default;
	};
	}
	diff --git a/include/RHEJ/Event.hh b/include/RHEJ/Event.hh
	index b79ab89..0a5eb17 100644
	--- a/include/RHEJ/Event.hh
	+++ b/include/RHEJ/Event.hh
	@@ -1,136 +1,163 @@
	-/** \file Event.hh
	- * \brief Details the parameters of an Event.
	+/** \file
	+ * \brief Declares the Event class and helpers
	*
	- * Contains the EventParameters struct and the Event struct. Also
	- * contains the ClusteredEvent class.
	*/

	#pragma once

	#include <string>
	#include <unordered_map>

	#include "RHEJ/utility.hh"
	#include "RHEJ/event_types.hh"
	#include "LHEF/LHEF.h"
	#include "fastjet/JetDefinition.hh"
	#include "fastjet/ClusterSequence.hh"

	namespace RHEJ{

	- /** \struct EventParameters Event.hh "include/RHEJ/Event.hh"
	- * \brief A struct containing the parameters of an event
	- */
	+ //! Event parameters
	struct EventParameters{
	double mur; /*< Value of the Renormalisation Scale /
	double muf; /*< Value of the Factorisation Scale /
	double weight; /*< Event Weight /
	};

	- /** \struct UnclusteredEvent Event.hh "include/RHEJ/Event.hh"
	- * \brief Event Struct which contains Particle Content.
	- */
	+ //! An event before jet clustering
	struct UnclusteredEvent{
	//! Default Constructor
	UnclusteredEvent() = default;
	//! Constructor from LesHouches event information
	UnclusteredEvent(LHEF::HEPEUP const & hepeup);

	std::array<Particle, 2> incoming; /*< Incoming Particles /
	std::vector<Particle> outgoing; /*< Outgoing Particles /
	//! Particle decays in the format {outgoing index, decay products}
	std::unordered_map<int, std::vector<Particle>> decays;
	//! Central parameter (e.g. scale) choice
	EventParameters central;
	std::vector<EventParameters> variations; /*< For parameter variation /
	};

	- /** \class Event Event.hh "include/RHEJ/Event.hh"
	- * \brief Class for Events
	+ /** An event with clustered jets
	*
	- * This is the default reversed HEJ event class.
	+ * This is the main reversed HEJ event class.
	* It contains kinematic information including jet clustering,
	* parameter (e.g. scale) settings and the event weight.
	*/
	class Event{
	public:
	//! Default Event Constructor
	Event() = default;
	//! Event Constructor adding jet clustering to an unclustered event
	Event(
	UnclusteredEvent ev,
	fastjet::JetDefinition const & jet_def, double min_jet_pt
	);

	+ //! The jets formed by the outgoing partons
	std::vector<fastjet::PseudoJet> jets() const;

	+ //! The corresponding event before jet clustering
	UnclusteredEvent const & unclustered() const {
	return ev_;
	}

	+ //! Central parameter choice
	EventParameters const & central() const{
	return ev_.central;
	}

	+ //! Central parameter choice
	EventParameters & central(){
	return ev_.central;
	}

	+ //! Incoming particles
	std::array<Particle, 2> const & incoming() const{
	return ev_.incoming;
	}

	+ //! Outgoing particles
	std::vector<Particle> const & outgoing() const{
	return ev_.outgoing;
	}

	+ //! Particle decays
	+ /**
	+ * The key in the returned map corresponds to the index in the
	+ * vector returned by outgoing()
	+ */
	std::unordered_map<int, std::vector<Particle>> const & decays() const{
	return ev_.decays;
	}

	+ //! Parameter (scale) variations
	std::vector<EventParameters> const & variations() const{
	return ev_.variations;
	}

	+ //! Parameter (scale) variations
	std::vector<EventParameters> & variations(){
	return ev_.variations;
	}

	+ //! Parameter (scale) variation
	+ /**
	+ * @param i Index of the requested variation
	+ */
	EventParameters const & variations(size_t i) const{
	return ev_.variations[i];
	}

	+ //! Parameter (scale) variation
	+ /**
	+ * @param i Index of the requested variation
	+ */
	EventParameters & variations(size_t i){
	return ev_.variations[i];
	}

	+ //! Indices of the jets the outgoing partons belong to
	+ /**
	+ * @param jets Jets to be tested
	+ * @returns A vector containing, for each outgoing parton,
	+ * the index in the vector of jets the considered parton
	+ * belongs to. If the parton is not inside any of the
	+ * passed jets, the corresponding index is set to -1.
	+ */
	std::vector<int> particle_jet_indices(
	std::vector<fastjet::PseudoJet> const & jets
	) const{
	return cs_.particle_jet_indices(jets);
	}

	+ //! Jet definition used for clustering
	fastjet::JetDefinition const & jet_def() const{
	return cs_.jet_def();
	}

	+ //! Minimum jet transverse momentum
	double min_jet_pt() const{
	return min_jet_pt_;
	}

	+ //! Event type
	event_type::EventType type() const{
	return type_;
	}

	private:
	UnclusteredEvent ev_;
	fastjet::ClusterSequence cs_;
	double min_jet_pt_;
	event_type::EventType type_;
	};

	+ //! Square of the partonic centre-of-mass energy
	double shat(Event const & ev);

	+ //! Convert an event to a LHEF::HEPEUP
	LHEF::HEPEUP to_HEPEUP(Event const & event, LHEF::HEPRUP *);

	}
	diff --git a/include/RHEJ/EventReweighter.hh b/include/RHEJ/EventReweighter.hh
	index f80a713..48f55d1 100644
	--- a/include/RHEJ/EventReweighter.hh
	+++ b/include/RHEJ/EventReweighter.hh
	@@ -1,164 +1,136 @@
	-/** \file EventReweighter.hh
	- * \brief Main class for reweighting events according to the reversed HEJ method
	+/** \file
	+ * \brief Declares the EventReweighter class
	*
	- * EventReweighter Class is the main class used within RHEJ. It reweights the
	+ * EventReweighter is the main class used within reversed HEJ. It reweights the
	* resummation events.
	*/
	#pragma once

	#include "fastjet/PseudoJet.hh"
	#include "fastjet/ClusterSequence.hh"

	#include "LHEF/LHEF.h"

	#include "RHEJ/config.hh"
	#include "RHEJ/PDF.hh"
	#include "RHEJ/utility.hh"
	#include "RHEJ/Event.hh"
	#include "RHEJ/event_types.hh"
	#include "RHEJ/PhaseSpacePoint.hh"
	#include "RHEJ/MatrixElement.hh"
	#include "RHEJ/RNG.hh"

	namespace RHEJ{

	- /** \struct Beam EventReweighter.hh "include/RHEJ/EventReweighter.hh"
	- * \brief Beam Struct. Contains beam energy and incoming particle content.
	- *
	- * Contains the value of the energy of the beam and the identity of the two incoming Particles
	+ //! Beam parameters
	+ /**
	+ * Currently, only symmetric beams are supported,
	+ * so there is a single beam energy.
	*/
	struct Beam{
	- double E;
	- std::array<ParticleID, 2> type;
	+ double E; /*< Beam energy /
	+ std::array<ParticleID, 2> type; /*< Beam particles /
	};

	- /** \class EventReweighter EventReweighter.hh "include/RHEJ/EventReweighter.hh"
	- * \brief EventReweighter Main class for reweighting events in RHEJ.
	- *
	- * This is the class which reweights the resummation phase space points once they have been
	- * generated by PhaseSpacePoint. This class also handles how many phase space points are generated
	- * for every fixed order event which is processed.
	- */
	+ //! Main class for reweighting events in reveresed HEJ.
	class EventReweighter{
	using EventType = event_type::EventType;
	public:

	EventReweighter(
	Beam beam, /*< Beam Energy /
	int pdf_id, /*< PDF ID /
	ScaleGenerator scale_gen, /*< Scale settings /
	EventReweighterConfig conf, /*< Configuration parameters /
	RHEJ::RNG & ran /*< Random number generator /
	);

	EventReweighter(
	LHEF::HEPRUP const & heprup, /*< LHEF event header /
	ScaleGenerator scale_gen, /*< Scale settings /
	EventReweighterConfig conf, /*< Configuration parameters /
	RHEJ::RNG & ran /*< Random number generator /
	);

	- PDF const & pdf() const; /*< PDF Used /
	+ //! Get the used pdf
	+ PDF const & pdf() const;


	+ //! Generate resummation events for a given fixed-order event
	+ /**
	+ * @param ev Fixed-order event corresponding
	+ * to the resummation events
	+ * @param num_events Number of trial resummation configurations.
	+ * @returns A vector of resummation events.
	+ *
	+ * The result vector depends on the type of the input event and the
	+ * treatment of different types as specified in the constructor:
	+ *
	+ * \ref reweight The result vector contains between
	+ * 0 and num_events resummation events.
	+ *
	+ * \ref keep If the input event passes the resummation jet cuts
	+ * the result vector contains one event. Otherwise it is empty.
	+ *
	+ * \ref discard The result vector is empty
	+ */
	std::vector<Event> reweight(
	- Event const & ev, /*< Event For Reweighing /
	- int num_events /*< Number of Events /
	+ Event const & ev,
	+ int num_events
	);

	private:

	- /** \struct EventFactors EventReweighter.hh "include/RHEJ/EventReweighter.hh"
	- * \brief EventFactors Struct containing central value and variations
	- *
	- * Contains the Central Value and Variation around
	- */
	struct EventFactors{
	- double central; /*< Central Value for the Factor /
	- std::vector<double> variations; /*< Vector of Variations from central value /
	+ double central;
	+ std::vector<double> variations;
	};

	template<typename... T>
	PDF const & pdf(T&& ...);

	std::vector<Event> gen_res_events(
	Event const & ev, int num_events
	);
	std::vector<Event> rescale(
	Event const & Born_ev, std::vector<Event> events
	) const;

	- /**
	- * \brief Do the Jets pass the resummation Cuts?
	- *
	- * @param ev Event in Question
	- * @returns 0 or 1 depending on if ev passes Jet Cuts
	- */
	bool jets_pass_resummation_cuts(Event const & ev) const;

	- /**
	- * \brief pdf_factors Function
	- *
	- * @param ev Event in Question
	- * @returns EventFactor due to PDFs
	- *
	- * Calculates the Central value and the variation due
	- * to the PDF choice made.
	- */
	EventFactors pdf_factors(Event const & ev) const;

	- /**
	- * \brief matrix_elements Function
	- *
	- * @param ev Event in question
	- * @returns EventFactor due to MatrixElements
	- *
	- * Calculates the Central value and the variation due
	- * to the Matrix Element.
	- */
	EventFactors matrix_elements(Event const & ev) const;

	- /**
	- * \brief Scale-dependent part of fixed-order matrix element
	- *
	- * @param ev Event in question
	- * @returns EventFactor scale variation due to FO-ME.
	- *
	- * This is only called to compute the scale variation for events where
	- * we don't do resummation (e.g. non-FKL).
	- * Since at tree level the scale dependence is just due to alpha_s,
	- * it is enough to return the alpha_s(mur) factors in the matrix element.
	- * The rest drops out in the ratio of (output event ME)/(input event ME),
	- * so we never have to compute it.
	- */
	EventFactors fixed_order_scale_ME(Event const & ev) const;

	- /**
	- * \brief Computes the tree level matrix element
	- *
	- * @param ev Event in Question
	- * @returns HEJ approximation to Tree level Matrix Element
	- *
	- * This computes the HEJ approximation to the tree level FO
	- * Matrix element which is used within the LO weighting process.
	- */
	double tree_matrix_element(Event const & ev) const;


	+ //! \internal General parameters
	EventReweighterConfig param_;

	- double E_beam_; /*< Energy of Beam /
	+ //! \internal Beam energy
	+ double E_beam_;

	- PDF pdf_; /*< Relevant PDF /
	+ //! \internal PDF
	+ PDF pdf_;

	- MatrixElement MEt2_; /*< Matrix Element Object /
	+ //! \internal Object to calculate the square of the matrix element
	+ MatrixElement MEt2_;
	+ //! \internal Object to calculate event renormalisation and factorisation scales
	ScaleGenerator scale_gen_;
	+ //! \internal random number generator
	+ /**
	+ * \internal We use a reference_wrapper so that EventReweighter objects can
	+ * still be copied (which would be impossible with a reference).
	+ */
	std::reference_wrapper<RHEJ::RNG> ran_;
	};

	template<typename... T>
	PDF const & EventReweighter::pdf(T&&... t){
	return pdf_ = PDF{std::forward<T>(t)...};
	}

	}
	diff --git a/include/RHEJ/EventWriter.hh b/include/RHEJ/EventWriter.hh
	index c121049..4d9b89f 100644
	--- a/include/RHEJ/EventWriter.hh
	+++ b/include/RHEJ/EventWriter.hh
	@@ -1,24 +1,20 @@
	-/** \file EventWriter.hh
	- * \brief Contains the EventWriter Class which is inherited by all writers.
	+/** \file
	+ * \brief Header file for the EventWriter interface.
	*/
	#pragma once

	#include <string>
	#include <exception>

	namespace RHEJ{
	class Event;

	- /** \struct EventWriter EventWriter.hh "include/RHEJ/EventWriter.hh"
	- * \brief The basis of every other writer in RHEJ
	- *
	- * All other writers inherit from this, regardless of final
	- * output. Includes the virtual function write and a destructor
	- */
	+ //! Pure abstract base class for event writers
	struct EventWriter{
	+ //! Write an event
	virtual void write(Event const &) = 0;

	virtual ~EventWriter() = default;
	};

	}
	diff --git a/include/RHEJ/HepMCInterface.hh b/include/RHEJ/HepMCInterface.hh
	index 978a770..6b49471 100644
	--- a/include/RHEJ/HepMCInterface.hh
	+++ b/include/RHEJ/HepMCInterface.hh
	@@ -1,48 +1,47 @@
	-/** \file HepMCInterface.hh
	+/** \file
	* \brief Header file for the HepMCInterface
	*/

	#pragma once

	#include <cstddef>

	#include "LHEF/LHEF.h"

	namespace HepMC{
	class GenEvent;
	class GenCrossSection;
	class GenRunInfo;
	}

	namespace RHEJ{
	class Event;
	- /** \class HepMCInterface HepMCInterface.hh "include/RHEJ/HepMCInterface.hh
	- * \brief This class converts the Events into HepMC::GenEvents
	- *
	+ //! This class converts the Events into HepMC::GenEvents
	+ /**
	* \details The output is depended on the HepMC version rHEJ is compiled with,
	- * both HepMC 2 and HepMC 3 are supported. If rHEJ is compiled without HepMC
	- * calling this interface will through an error.
	+ * both HepMC 2 and HepMC 3 are supported. If reversed HEJ is compiled
	+ * without HepMC calling this interface will throw an error.
	*
	* This interface will also keep track of the cross section of all the events that
	* being fed into it.
	*/

	class HepMCInterface{
	public:
	HepMCInterface();
	/**
	- * \brief main function to convert a event into HepMC::GenEvent
	+ * \brief main function to convert an event into HepMC::GenEvent
	*
	- * \param event Event to convert
	- * \param weight_index optional input to choose a specific weight
	+ * \param event Event to convert
	+ * \param weight_index optional input to choose a specific weight
	*/
	HepMC::GenEvent operator()(Event const & event, size_t weight_index = 0);
	private:
	size_t event_count_;
	double tot_weight_;
	double tot_weight2_;
	void add_weight(double wt);
	HepMC::GenCrossSection cross_section() const;

	};
	}
	diff --git a/include/RHEJ/HepMCWriter.hh b/include/RHEJ/HepMCWriter.hh
	index ce61c00..e175e1c 100644
	--- a/include/RHEJ/HepMCWriter.hh
	+++ b/include/RHEJ/HepMCWriter.hh
	@@ -1,46 +1,48 @@
	-/** \file HepMCWriter.hh
	- * \brief Contains the EventWriter which is necessary for HepMC Output.
	+/** \file
	+ * \brief Contains the EventWriter for HepMC Output.
	*/

	#pragma once

	#include <string>

	#include "RHEJ/EventWriter.hh"

	#include "LHEF/LHEF.h"

	namespace RHEJ{
	class Event;

	- /** \class HepMCWriter HepMCWriter.hh "include/RHEJ/HepMCWriter.hh"
	- * \brief This is an event writer specifically for HepMC output.
	- * as such it inherits everything from the EventWriter class
	- * and also includes HepMCWriter constructors
	- *
	- * Implementation note:
	+ //! This is an event writer specifically for HepMC output.
	+ /**
	+ * \internal Implementation note:
	* This uses the pimpl ("pointer to implementation") idiom.
	* HepMC support is optional and the implementation depends on the
	* HepMC version. Without pimpl, we would have to specify the HepMC version
	* via the preprocessor whenever this header is included. We don't want to
	* burden users of the rHEJ library (for example the HEJ fixed-order generator)
	* with those details
	- *
	*/
	class HepMCWriter: public EventWriter{
	public:
	+ //! Constructor
	+ /**
	+ * @param file name of the output file
	+ * @param heprup general process information
	+ */
	HepMCWriter(std::string const & file, LHEF::HEPRUP heprup);
	~HepMCWriter() override = default;

	+ //! Write an event to the output file
	void write(Event const & ev) override;

	private:
	struct HepMCWriterImpl;
	struct HepMCWriterImplDeleter {
	void operator()(HepMCWriterImpl* p);
	};

	std::unique_ptr<HepMCWriterImpl, HepMCWriterImplDeleter> impl_;
	};

	}
	diff --git a/include/RHEJ/HiggsCouplingSettings.hh b/include/RHEJ/HiggsCouplingSettings.hh
	index db9ee3a..d31d915 100644
	--- a/include/RHEJ/HiggsCouplingSettings.hh
	+++ b/include/RHEJ/HiggsCouplingSettings.hh
	@@ -1,12 +1,20 @@
	+/** \file
	+ * \brief Defines the settings for Higgs boson coupling to gluons
	+ */
	#pragma once

	#include <limits>

	namespace RHEJ{
	+ //! Settings for Higgs boson coupling to gluons
	struct HiggsCouplingSettings{
	+ //! Top quark mass
	double mt = std::numeric_limits<double>::infinity();
	+ //! Bottom quark mass
	double mb = 4.7;
	+ //! Whether to use impact factors
	bool use_impact_factors = true;
	+ //! Whether to include bottom quark effects
	bool include_bottom = false;
	};
	}
	diff --git a/include/RHEJ/Jacobian.hh b/include/RHEJ/Jacobian.hh
	index df310a1..ed20294 100644
	--- a/include/RHEJ/Jacobian.hh
	+++ b/include/RHEJ/Jacobian.hh
	@@ -1,26 +1,26 @@
	-/** \file Jacobian.hh
	- * \brief Contains the Jacobian Function
	+/** \file
	+ * \brief Contains the Jacobian from changing arguments of a delta function
	*
	- * The function contained computes the jacobian which is gained from
	- * changing the delta function expressed in Jet momenta to Parton
	- * momenta. See Eq. 7 in NewMerging Notes.
	+ * The function contained computes the Jacobian which is gained from
	+ * changing the delta function expressed in Jet momenta to Parton
	+ * momenta. See Eqs. 10 and 11 in the developer manual.
	*/

	#pragma once

	#include <vector>

	#include "fastjet/PseudoJet.hh"

	namespace RHEJ{
	/** \brief Computes Jacobian from changing delta functions
	*
	* Computes the Jacobian for changing the original delta functions
	* expressed in terms of jet momenta to delta functions of the
	* parton momenta in the resummation phase space
	*/
	double Jacobian(
	std::vector<fastjet::PseudoJet> const & jets,
	fastjet::PseudoJet const & q
	);
	}
	diff --git a/include/RHEJ/LesHouchesWriter.hh b/include/RHEJ/LesHouchesWriter.hh
	index a312644..06d3b30 100644
	--- a/include/RHEJ/LesHouchesWriter.hh
	+++ b/include/RHEJ/LesHouchesWriter.hh
	@@ -1,55 +1,54 @@
	-/** \file LesHouchesWriter.hh
	- * \brief Contains the writer for LesHouches Output
	+/** \file
	+ * \brief Contains the writer for LesHouches output
	*/

	#pragma once

	#include <fstream>

	#include "RHEJ/EventWriter.hh"

	#include "LHEF/LHEF.h"

	namespace RHEJ{
	class Event;

	- /** \class LesHouchesWriter LesHouchesWriter.hh "include/RHEJ/LesHouchesWriter.hh"
	- * \brief EventWriter Class specifically for LesHouches Output
	- *
	- * This is an event writer specifically for Les Houches Output. This
	- * inherits from the EventWriter Class and contains its own
	- * contructors. TODO: in principle, this class should be movable but that
	- * somehow(?) breaks the write member function.
	- **/
	+ //! Class for writing events to a file in the Les Houches Event File format
	class LesHouchesWriter : public EventWriter{
	public:
	+ //! Constructor
	+ /**
	+ * @param file Name of output file
	+ * @param heprup General process information
	+ */
	LesHouchesWriter(std::string const & file, LHEF::HEPRUP heprup);
	LesHouchesWriter(LesHouchesWriter const & other) = delete;
	LesHouchesWriter & operator=(LesHouchesWriter const & other) = delete;
	// TODO: in principle, this class should be movable
	// but that somehow(?) breaks the write member function
	LesHouchesWriter(LesHouchesWriter && other) = delete;
	LesHouchesWriter & operator=(LesHouchesWriter && other) = delete;
	~LesHouchesWriter() override;

	+ //! Write an event to the file specified in the constructor
	void write(Event const & ev) override;

	private:
	void write_init(){
	writer_->init();
	}

	void rewrite_init();

	LHEF::HEPRUP & heprup(){
	return writer_->heprup;
	}

	LHEF::HEPEUP & hepeup(){
	return writer_->hepeup;
	}

	std::fstream out_;
	std::unique_ptr<LHEF::Writer> writer_;
	};
	}
	diff --git a/include/RHEJ/Matrix.hh b/include/RHEJ/Matrix.hh
	index ff2a415..96acb8b 100644
	--- a/include/RHEJ/Matrix.hh
	+++ b/include/RHEJ/Matrix.hh
	@@ -1,49 +1,57 @@
	-/** \file Matrix.hh
	- * \brief This Header file contains the Matrix Class
	+/** \file
	+ * \brief This header file contains the Matrix class
	*/

	#pragma once

	#include <cstddef> // needed for size_t
	#include <string>

	#include <gsl/gsl_matrix.h>

	namespace RHEJ{


	- /**
	- * \class Matrix Matrix.hh "include/RHEJ/Matrix.hh"
	- * \brief This is a class for matrices to be stored
	- *
	- * This Matrix class is used */
	+ //! Class for matrices
	class Matrix{
	public:
	Matrix() = default;
	+ //! Constructor
	+ /**
	+ * @param rows Number of rows
	+ * @param columns Number of columns
	+ */
	Matrix(size_t rows, size_t columns);
	+ //! Access element in given row and column
	double & operator()(size_t row, size_t column);
	+ //! Access element in given row and column
	double const & operator()(size_t row, size_t column) const;

	+ //! Get number of rows
	size_t rows() const;
	+ //! Get number of columns
	size_t columns() const;

	Matrix(Matrix const & other);
	Matrix(Matrix && other);

	Matrix & operator=(Matrix const & other);
	Matrix & operator=(Matrix && other);

	~Matrix();
	private:
	gsl_matrix* m;

	friend double det(Matrix m);
	friend void swap(Matrix & a, Matrix & b);
	};

	+ //! Swap two matrices
	void swap(Matrix & a, Matrix & b);

	+ //! Compute the determinant
	double det(Matrix m);

	+ //! Convert a matrix to a string
	std::string to_string(Matrix const & m);
	}
	diff --git a/include/RHEJ/MatrixElement.hh b/include/RHEJ/MatrixElement.hh
	index 41b4f6f..ae519aa 100644
	--- a/include/RHEJ/MatrixElement.hh
	+++ b/include/RHEJ/MatrixElement.hh
	@@ -1,216 +1,208 @@
	-/** \file MatrixElement.hh
	- * \brief The header file which contains the MatrixElement Class
	- *
	- * This contains the MatrixElement Class which contains many functions
	- * used to calculate many different MatrixElements and their components.
	+/** \file
	+ * \brief Contains the MatrixElement Class
	*/
	#pragma once

	#include <functional>

	#include "RHEJ/config.hh"
	#include "RHEJ/utility.hh"
	#include "RHEJ/HiggsCouplingSettings.hh"

	#include "CLHEP/Vector/LorentzVector.h"


	namespace RHEJ{

	- /** \class MatrixElement MatrixElement.hh "include/RHEJ/MatrixElement.hh
	- * \brief MatrixElement class. Functions for obtaining various ME and components.
	- */
	+ //! Class to calculate the squares of matrix elements
	class MatrixElement{
	public:
	/** \brief MatrixElement Constructor
	* @param alpha_s Function taking the renormalisation scale
	* and returning the strong coupling constant
	* @param conf General matrix element settings
	*/
	MatrixElement(
	std::function<double (double)> alpha_s,
	MatrixElementConfig conf
	);

	/**
	* \brief regulated HEJ matrix element
	* @param mur Value of the renormalisation scale
	* @param incoming Incoming particles
	- * @param partons Outgoing particles
	+ * @param outgoing Outgoing particles
	* @param check_momenta Special treatment for partons inside extremal jets
	* @returns The HEJ matrix element including virtual corrections
	*
	- * cf. eq. (22) in \ref Andersen:2011hs
	+ * cf. eq. (22) in \cite Andersen:2011hs
	* Incoming particles should be ordered by ascending z momentum.
	* Outgoing particles should be ordered by ascending rapidity.
	*
	* \internal Relation to standard HEJ Met2: MatrixElement = Met2shat^2/(pdftapdftb)
	*/
	double operator()(
	double mur,
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;

	//! HEJ tree-level matrix element
	/**
	* @param mur Value of the renormalisation scale
	* @param incoming Incoming particles
	* @param outgoing Outgoing particles
	* @param check_momenta Special treatment for partons inside extremal jets
	* @returns The HEJ matrix element without virtual corrections
	*
	- * cf. eq. (22) in \ref Andersen:2011hs
	+ * cf. eq. (22) in \cite Andersen:2011hs
	* Incoming particles should be ordered by ascending z momentum.
	* Outgoing particles should be ordered by ascending rapidity.
	*/
	double tree(
	double mur,
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;

	//! HEJ tree-level matrix element - parametric part
	/**
	- * @param mur Value of the renormalisation scale
	+ * @param mur Value of the renormalisation scale
	+ * @param incoming Incoming particles
	* @param outgoing Outgoing particles
	* @returns The parametric part of the tree matrix element
	*
	- * cf. eq. (22) in \ref Andersen:2011hs
	+ * cf. eq. (22) in \cite Andersen:2011hs
	*
	* The tree level matrix element factorises into a parametric part
	* which depends on the theory parameters (alpha_s and scale)
	* and a kinematic part comprising the dependence on the particle momenta
	* and colour factors. This function returns the former.
	*/
	double tree_param(
	double mur,
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing
	) const;

	//! HEJ tree-level matrix element - kinematic part
	/**
	* @param incoming Incoming particles
	- * @param partons Outgoing particles
	+ * @param outgoing Outgoing particles
	* @param check_momenta Special treatment for partons inside extremal jets
	* @returns The kinematic part of the tree matrix element
	*
	- * cf. eq. (22) in \ref Andersen:2011hs
	+ * cf. eq. (22) in \cite Andersen:2011hs
	* Incoming particles should be ordered by ascending z momentum.
	* Outgoing particles should be ordered by ascending rapidity.
	*
	* The tree level matrix element factorises into a parametric part
	* which depends on the theory parameters (alpha_s and scale)
	* and a kinematic part comprising the dependence on the particle momenta
	* and colour factors. This function returns the latter.
	*/
	double tree_kin(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;

	/**
	* \brief Calculates the Virtual Corrections
	* @param mur Value of the renormalisation scale
	* @param in Incoming particles
	* @param out Outgoing particles
	* @returns The Virtual Corrections of the Matrix Element
	*
	* Incoming particles should be ordered by ascending z momentum.
	* Outgoing particles should be ordered by ascending rapidity.
	*
	* The all order virtual corrections to LL in the MRK limit is
	* given by replacing 1/t in the scattering amplitude according to the
	* lipatov ansatz.
	*
	- * cf. second-to-last line of eq. (22) in \ref Andersen:2011hs
	+ * cf. second-to-last line of eq. (22) in \cite Andersen:2011hs
	* note that indices are off by one, i.e. out[0].p corresponds to p_1
	*/
	double virtual_corrections(
	double mur,
	std::array<Particle, 2> const & in,
	std::vector<Particle> const & out
	) const;

	private:
	- /**
	- * \brief cf. last line of eq. (22) in \ref Andersen:2011hs
	- * @param mur Value of Renormalisation Scale
	- * @param q_j ???
	- * @param lambda ???
	- */
	+ //! \internal cf. last line of eq. (22) in \cite Andersen:2011hs
	double omega0(
	double alpha_s, double mur,
	fastjet::PseudoJet const & q_j, double lambda
	) const;

	double tree_kin_jets(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> partons,
	bool check_momenta
	) const;
	double tree_kin_Higgs(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;
	double tree_kin_Higgs_first(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;
	double tree_kin_Higgs_last(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;

	/**
	+ * \internal
	* \brief Higgs inbetween extremal partons.
	*
	* Note that in the case of unordered emission, the Higgs is always
	* treated as if in between the extremal (FKL) partons, even if its
	* rapidity is outside the extremal parton rapidities
	*/
	double tree_kin_Higgs_between(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing,
	bool check_momenta
	) const;


	double tree_param_partons(
	double alpha_s, double mur,
	std::vector<Particle> const & partons
	) const;


	std::vector<int> in_extremal_jet_indices(
	std::vector<fastjet::PseudoJet> const & partons
	) const;


	std::vector<Particle> tag_extremal_jet_partons(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> out_partons, bool check_momenta
	) const;

	double MH2_forwardH(
	RHEJ::ParticleID id,
	CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector pH,
	double t1, double t2
	) const;

	std::function<double (double)> alpha_s_;

	MatrixElementConfig param_;
	};


	}
	diff --git a/include/RHEJ/Mixmax.hh b/include/RHEJ/Mixmax.hh
	index 2bcbd42..60f2a4d 100644
	--- a/include/RHEJ/Mixmax.hh
	+++ b/include/RHEJ/Mixmax.hh
	@@ -1,26 +1,31 @@
	/** \file
	* \brief The Mixmax random number generator
	*/
	#pragma once

	#include <CLHEP/Random/Randomize.h>
	#include <CLHEP/Random/MixMaxRng.h>

	#include "RHEJ/RNG.hh"

	namespace RHEJ {

	+ //! MIXMAX random number generator
	+ /**
	+ * For details on MIXMAX, see \cite Savvidy:2014ana
	+ */
	class Mixmax : public DefaultRNG {
	public:
	Mixmax() = default;
	Mixmax(long seed): ran_{seed} {};

	+ //! Generate pseudorandom number between 0 and 1
	double flat() override {
	return ran_.flat();
	};

	private:
	CLHEP::MixMaxRng ran_;
	};

	}
	diff --git a/include/RHEJ/PDF.hh b/include/RHEJ/PDF.hh
	index 9b277ae..1dac8a4 100644
	--- a/include/RHEJ/PDF.hh
	+++ b/include/RHEJ/PDF.hh
	@@ -1,80 +1,73 @@
	-/**
	- * \file PDF.hh
	- * Author: Tuomas Hapola
	+/** \file
	*
	* \brief Contains all the necessary classes and functions for interaction with PDFs.
	*/

	#pragma once

	#include <array>

	#include "LHAPDF/LHAPDF.h"
	#include "RHEJ/utility.hh"
	#include "RHEJ/PDG_codes.hh"

	namespace RHEJ{

	- /** \class PDF PDF.hh "include/RHEJ/PDF.hh"
	- * \brief Contains all classes and functions for interaction with PDFs
	- */
	+ //! Class for interaction with a PDF set
	class PDF {
	public:
	- /**
	+ /**
	* \brief PDF Constructor
	* @param id Particle ID according to PDG
	* @param beam1 Particle ID of particle in beam 1
	* @param beam2 Particle ID of particle in beam 2
	*/
	PDF(int id, ParticleID beam1, ParticleID beam2);
	-
	- /**
	+
	+ /**
	* \brief Calculate the pdf value x*f(x, q)
	* @param beam_idx Beam number (0 or 1)
	* @param x Momentum fraction
	* @param q Energy scale
	* @param id PDG particle id
	* @returns x*f(x, q)
	*
	* Returns 0 if x or q are outside the range covered by the PDF set
	*/
	double pdfpt(size_t beam_idx, double x, double q, ParticleID id) const;

	/**
	- * \brief Uses fortran(?) code to determine the runnning of alphaS.
	- * @oaram q Momentum of particle
	+ * \brief Value of the strong coupling \f$\alpha_s(q)\f$ at the given scale
	+ * @param q Renormalisation scale
	* @returns Value of the strong coupling constant
	*/
	double Halphas(double q) const;

	- //! Is the Energy Scale within Range?
	+ //! Check if the energy scale is within the range covered by the PDF set
	/**
	* @param q Energy Scale
	- * @returns Within Scale?
	- *
	- * Returns 0 if q is outside the range covered by the PDF set.
	+ * @returns true if q is within the covered range, false otherwise
	*/
	bool inRangeQ(double q) const;

	- //! Is the Momentum fraction within Range?
	+ //! Check if the momentum fraction is within the range covered by the PDF set
	/**
	* @param x Momentum Fraction
	- * @returns Within range?
	- *
	- * Returns 0 if x is outside the range covered by the PDF set.
	+ * @returns true if x is within the covered range, false otherwise
	*/
	bool inRangeX(double x) const;

	#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
	+ //! PDF id of the current set
	int id() const;
	#endif

	private:

	#if defined LHAPDF_MAJOR_VERSION && LHAPDF_MAJOR_VERSION == 6
	std::unique_ptr<LHAPDF::PDF> pdf;
	#endif

	std::array<int, 2> beamtype;
	};
	}
	diff --git a/include/RHEJ/PDG_codes.hh b/include/RHEJ/PDG_codes.hh
	index 03e7337..2294286 100644
	--- a/include/RHEJ/PDG_codes.hh
	+++ b/include/RHEJ/PDG_codes.hh
	@@ -1,104 +1,92 @@
	/** \file PDG_codes.hh
	- * \brief Contains the Particle IDs of all relevant SM particles.
	+ * \brief Contains the Particle IDs of all relevant SM particles.
	*
	* Large enumeration included which has multiple entries for potential
	- * alternative names of different particles. There are also functions
	+ * alternative names of different particles. There are also functions
	* which can be used to determine if a particle is a parton or if
	* it is a non-gluon boson.
	*/

	#pragma once

	namespace RHEJ {

	//! particle ids according to PDG
	namespace pid {
	- /**
	- * \enum ParticleID
	- * \brief The possible particle identities. We use PDG IDs as standard.
	- */
	+ //! The possible particle identities. We use PDG IDs as standard.
	enum ParticleID{
	d = 1, /!< Down Quark /
	down = d, /!< Down Quark /
	u = 2, /!< Up Quark /
	up = u, /!< Up Quark /
	s = 3, /!< Strange Quark /
	strange = s, /!< Strange Quark /
	c = 4, /!< Charm Quark /
	charm = c, /!< Charm Quark /
	b = 5, /!< Bottom Quark /
	bottom = b, /!< Bottom Quark /
	t = 6, /!< Top Quark /
	top = t, /!< Top Quark /
	e = 11, /!< Electron /
	electron = e, /!< Electron /
	nu_e = 12, /!< Electron Neutrino /
	electron_neutrino = nu_e, /!< Electron neutrino /
	mu = 13, /!< Muon /
	muon = mu, /!< Muon /
	nu_mu = 14, /!< Muon Neutrino /
	muon_neutrino = nu_mu, /!< Muon Neutrino /
	tau = 15, /!< Tau /
	nu_tau = 16, /!< Tau Neutrino /
	tau_neutrino = nu_tau, /!< Tau Neutrino /
	d_bar = -d, /!< Anti-Down Quark /
	u_bar = -u, /!< Anti-Up quark /
	s_bar = -s, /!< Anti-Strange Quark /
	c_bar = -c, /!< Anti-Charm Quark /
	b_bar = -b, /!< Anti-Bottom Quark /
	t_bar = -t, /!< Anti-Top Quark /
	e_bar = -e, /!< Positron /
	nu_e_bar = -nu_e, /!< Anti-Electron Neutrino /
	mu_bar = -mu, /!< Anti-Muon /
	nu_mu_bar = -nu_mu, /!< Anti-Muon Neutrino /
	tau_bar = -tau, /!< Anti-Tau /
	nu_tau_bar = -nu_tau, /!< Anti-Tau Neutrino /
	gluon = 21, /!< Gluon /
	g = gluon, /!< Gluon /
	photon = 22, /!< Photon /
	gamma = photon, /!< Photon /
	Z = 23, /!< Z Boson /
	Wp = 24, /!< W- Boson /
	Wm = -Wp, /!< W+ Boson /
	h = 25, /!< Higgs Boson /
	Higgs = h, /!< Higgs Boson /
	higgs = h, /!< Higgs Boson /
	p = 2212, /!< Proton /
	proton = p, /!< Proton /
	p_bar = -p, /!< Anti-Proton /
	};

	}

	using ParticleID = pid::ParticleID;

	/**
	- * \brief Bool function to determine if particle is a parton
	+ * \brief Function to determine if particle is a parton
	* @param p PDG ID of particle
	- * @returns 0 or 1 is the particle a parton
	- *
	- * Checks to see if the particle is either a gluon or has a PDG ID value
	- * with a smaller magnitude than that of the top. This will conclude
	- * whether the particle is partonic in nature.
	+ * @returns true if the particle is a parton, false otherwise
	*/
	inline
	constexpr bool is_parton(ParticleID p){
	return p == pid::gluon \|\| std::abs(p) <= pid::top;
	}

	- /**
	- * \brief Bool function to determine if the particle is a boson
	+ /**
	+ * \brief function to determine if the particle is a photon, W, Z, or Higgs boson
	* @param id PDG ID of particle
	- * @returns 0 or 1 is particle a boson?
	- *
	- * Checks the PDG ID of the particle and checks whether it has an ID
	- * corresponding to a boson (which is not a gluon). Also checks explicitly for
	- * the Wminus boson ID since it has a minus PDG ID where as the rest are
	- * evaluated as a range.
	+ * @returns true if the partice is a A,W,Z, or H, false otherwise
	*/
	inline
	constexpr bool is_AWZH_boson(ParticleID id){
	return id == pid::Wm \|\| (id >= pid::photon && id <= pid::Higgs);
	}

	}
	diff --git a/include/RHEJ/PhaseSpacePoint.hh b/include/RHEJ/PhaseSpacePoint.hh
	index f317304..fb63b1c 100644
	--- a/include/RHEJ/PhaseSpacePoint.hh
	+++ b/include/RHEJ/PhaseSpacePoint.hh
	@@ -1,156 +1,154 @@
	-/** \file PhaseSpacePoint.hh
	+/** \file
	* \brief Contains the PhaseSpacePoint Class
	*/

	#pragma once

	#include <vector>

	#include "RHEJ/utility.hh"
	#include "RHEJ/config.hh"
	#include "RHEJ/Event.hh"
	#include "RHEJ/Splitter.hh"
	#include "RHEJ/RNG.hh"

	namespace RHEJ{

	//! A point in resummation phase space
	class PhaseSpacePoint{
	public:
	//! Default PhaseSpacePoint Constructor
	PhaseSpacePoint() = default;

	//! PhaseSpacePoint Constructor
	/**
	* @param ev Clustered Jet Event
	* @param conf Configuration parameters
	+ * @param ran Random number generator
	*/
	PhaseSpacePoint(
	Event const & ev,
	PhaseSpacePointConfig conf,
	RHEJ::RNG & ran
	);

	- //! Get Weight Function
	- /**
	- * @returns Weight of Event
	- */
	+ //! Get phase space point weight
	double weight() const{
	return weight_;
	}


	- //! Get Incoming Function
	- /**
	- * @returns Incoming Particles
	- */
	+ //! Access incoming particles
	std::array<Particle, 2> const & incoming() const{
	return incoming_;
	}

	- //! Get Outgoing Function
	- /**
	- * @returns Outgoing Particles
	- */
	+ //! Access outgoing particles
	std::vector<Particle> const & outgoing() const{
	return outgoing_;
	}

	+
	+ //! Particle decays
	+ /**
	+ * The key in the returned map corresponds to the index in the
	+ * vector returned by outgoing()
	+ */
	std::unordered_map<int, std::vector<Particle>> const & decays() const{
	return decays_;
	}

	static constexpr int ng_max = 1000; //< maximum number of extra gluons


	static void reset_ranlux(std::string const & init_file);
	static void reset_ranlux(char const * init_file);

	private:

	std::vector<fastjet::PseudoJet> cluster_jets(
	std::vector<fastjet::PseudoJet> const & partons
	) const;
	bool pass_resummation_cuts(
	std::vector<fastjet::PseudoJet> const & jets
	) const;
	bool pass_extremal_cuts(
	fastjet::PseudoJet const & ext_parton,
	fastjet::PseudoJet const & jet
	) const;
	int sample_ng(std::vector<fastjet::PseudoJet> const & Born_jets);
	int sample_ng_jets(int ng, std::vector<fastjet::PseudoJet> const & Born_jets);
	double probability_in_jet(
	std::vector<fastjet::PseudoJet> const & Born_jets
	) const;
	std::vector<fastjet::PseudoJet> gen_non_jet(
	int ng_non_jet,
	double ptmin, double ptmax
	);
	void rescale_rapidities(
	std::vector<fastjet::PseudoJet> & partons,
	double ymin, double ymax
	);
	std::vector<fastjet::PseudoJet> reshuffle(
	std::vector<fastjet::PseudoJet> const & Born_jets,
	fastjet::PseudoJet const & q
	);
	bool jets_ok(
	std::vector<fastjet::PseudoJet> const & Born_jets,
	std::vector<fastjet::PseudoJet> const & partons
	) const;
	void reconstruct_incoming(std::array<Particle, 2> const & Born_incoming);
	double phase_space_normalisation(
	int num_Born_jets,
	int num_res_partons
	) const;
	std::vector<fastjet::PseudoJet> split(
	std::vector<fastjet::PseudoJet> const & jets, int ng_jets
	);
	std::vector<int> distribute_jet_partons(
	int ng_jets, std::vector<fastjet::PseudoJet> const & jets
	);
	std::vector<fastjet::PseudoJet> split(
	std::vector<fastjet::PseudoJet> const & jets,
	std::vector<int> const & np_in_jet
	);
	bool split_preserved_jets(
	std::vector<fastjet::PseudoJet> const & jets,
	std::vector<fastjet::PseudoJet> const & jet_partons
	) const;
	template<class Particle>
	Particle const & most_backward_FKL(
	std::vector<Particle> const & partons
	) const;
	template<class Particle>
	Particle const & most_forward_FKL(
	std::vector<Particle> const & partons
	) const;
	template<class Particle>
	Particle & most_backward_FKL(std::vector<Particle> & partons) const;
	template<class Particle>
	Particle & most_forward_FKL(std::vector<Particle> & partons) const;
	bool extremal_ok(
	std::vector<fastjet::PseudoJet> const & partons
	) const;
	void copy_AWZH_boson_from(Event const & event);

	bool momentum_conserved() const;

	bool unob_, unof_;

	double weight_;

	PhaseSpacePointConfig param_;


	std::array<Particle, 2> incoming_;
	std::vector<Particle> outgoing_;
	- //! Particle decays in the format {outgoing index, decay products}
	+ //! \internal Particle decays in the format {outgoing index, decay products}
	std::unordered_map<int, std::vector<Particle>> decays_;

	std::reference_wrapper<RHEJ::RNG> ran_;
	HejSplit splitter_;
	};

	}
	diff --git a/include/RHEJ/ProgressBar.hh b/include/RHEJ/ProgressBar.hh
	index 88f07e0..2105032 100644
	--- a/include/RHEJ/ProgressBar.hh
	+++ b/include/RHEJ/ProgressBar.hh
	@@ -1,64 +1,89 @@
	+/** \file
	+ * \brief Contains the ProgressBar class
	+ */
	#pragma once

	#include <ostream>
	#include <functional>
	#include <stdexcept>

	namespace RHEJ {

	+ //! Class representing (and printing) a progress bar
	template<typename T>
	class ProgressBar {
	public:
	+ //! Constructor
	+ /**
	+ * @param out Output stream
	+ * @param max Maximum value of the progress parameter
	+ *
	+ * This will print a fixed-width progress bar, which is initially at 0%.
	+ */
	ProgressBar(std::ostream & out, T max) :
	out_{out}, max_{max}
	{
	if(max <= 0) {
	throw std::invalid_argument{
	"Maximum in progress bar has to be positive"
	};
	}
	print_bar();
	}

	+ //! Increment progress
	+ /**
	+ * @param count Value to add to the current progress parameter
	+ *
	+ * After updating the progess parameter, the progress bar is updated
	+ * to a percentage that corresponds to the ratio of the current and
	+ * maximum progress parameters.
	+ */
	ProgressBar & increment(T count) {
	counter_ += count;
	update_progress();
	return *this;
	}

	+ //! Increase progress by one unit
	+ /**
	+ * After updating the progess parameter, the progress bar is updated
	+ * to a percentage that corresponds to the ratio of the current and
	+ * maximum progress parameters.
	+ */
	ProgressBar & operator++() {
	++counter_;
	update_progress();
	return *this;
	}

	private:
	void update_progress() {
	counter_ = std::min(counter_, max_);
	const int ndots = (100*counter_)/max_;
	const int new_dots = ndots - ndots_;
	if(new_dots > 0) {
	for(int dot = 0; dot < new_dots; ++dot) out_.get() << '.';
	out_.get().flush();
	ndots_ = ndots;
	}
	}

	void print_bar() const {
	out_.get() << "0% ";
	for(int i = 10; i <= 100; i+= 10){
	out_.get() << " " + std::to_string(i) + "%";
	}
	out_.get() << "\n\|";
	for(int i = 10; i <= 100; i+= 10){
	out_.get() << "---------\|";
	}
	out_.get() << '\n';
	}

	std::reference_wrapper<std::ostream> out_;
	T counter_ = 0;
	T ndots_ = 0;
	T max_;
	};
	}
	diff --git a/include/RHEJ/Ranlux64.hh b/include/RHEJ/Ranlux64.hh
	index 6fda1c2..b634f6a 100644
	--- a/include/RHEJ/Ranlux64.hh
	+++ b/include/RHEJ/Ranlux64.hh
	@@ -1,24 +1,29 @@
	/** \file
	- * \brief The ranlux 64 random number generator
	+ * \brief Contains a class for the ranlux64 random number generator
	*/
	#pragma once

	#include <CLHEP/Random/Randomize.h>
	#include <CLHEP/Random/RanluxEngine.h>

	#include "RHEJ/RNG.hh"

	namespace RHEJ {

	+ //! Ranlux64 random number generator
	+ /**
	+ * For details on ranlux64, see \cite Luscher:1993dy, \cite James:1993np
	+ */
	class Ranlux64 : public DefaultRNG {
	public:
	Ranlux64();
	Ranlux64(std::string const & seed_file);

	+ //! Generate pseudorandom number between 0 and 1
	double flat() override;

	private:
	CLHEP::Ranlux64Engine ran_;
	};

	}
	diff --git a/include/RHEJ/Rivet_Analysis.hh b/include/RHEJ/Rivet_Analysis.hh
	index 992c68e..1b79ee3 100644
	--- a/include/RHEJ/Rivet_Analysis.hh
	+++ b/include/RHEJ/Rivet_Analysis.hh
	@@ -1,59 +1,71 @@
	-/** \file Rivet_Analysis.hh
	- * \brief A custom analysis that calles multiple rivet analyses
	+/** \file
	+ * \brief Reversed HEJ interface to rivet analyses
	*/

	#pragma once

	#include <memory>
	#include <string>
	#include <utility>

	#include "RHEJ/Analysis.hh"
	#include "RHEJ/HepMCInterface.hh"

	namespace RHEJ {
	class Event;
	}

	namespace Rivet {
	class AnalysisHandler;
	}
	namespace YAML {
	class Node;
	}

	namespace RHEJ {
	/**
	- * @brief Rivet analysis which can be called as a normal rHEJ analysis
	- * @details In the input file both "analysis" (list of rivet analysis to be called)
	- * and "output" (prefix for the .yoda files)
	+ * @brief Class representing a Rivet analysis
	+ *
	+ * This class inherits from Analysis and can therefore be used
	+ * like any other reversed HEJ analysis.
	*/
	class Rivet_Analysis: public RHEJ::Analysis {
	public:
	static std::unique_ptr<Analysis> create(YAML::Node const & config);

	+ //! Constructor
	+ /**
	+ * @param config Configuration parameters
	+ *
	+ * config["analysis"] should be the name of a single Rivet analysis or
	+ * a list of Rivet analyses. config["output"] is the prefix for
	+ * the .yoda output files.
	+ */
	Rivet_Analysis(YAML::Node const & config);
	+ //! Pass an event to the underlying Rivet analysis
	void fill(RHEJ::Event const & event, RHEJ::Event const &) override;
	bool pass_cuts(RHEJ::Event const &, RHEJ::Event const &) override
	{return true;} //< no additional cuts are applied
	void finalise() override;
	private:
	std::vector<std::string> analyses_names_;
	const std::string output_name_;

	/// struct to organise the infos per rivet run/scale setting
	struct rivet_info {
	std::unique_ptr<Rivet::AnalysisHandler> handler;
	std::string name;
	RHEJ::HepMCInterface hepmc;
	};
	std::vector<rivet_info> rivet_runs_;

	- /** @brief Calculates the scale variation from the first event for the output file
	+ /**
	+ * \internal
	+ * @brief Calculates the scale variation from the first event for the output file
	* @note Name is wrong if multiple scale functions are choosen
	* @TODO is there a better way of finding the scale factor?
	*/
	void init(RHEJ::Event const & event);
	bool first_event_;
	};
	}
	diff --git a/include/RHEJ/ScaleFunction.hh b/include/RHEJ/ScaleFunction.hh
	index fb06478..7f62d7a 100644
	--- a/include/RHEJ/ScaleFunction.hh
	+++ b/include/RHEJ/ScaleFunction.hh
	@@ -1,125 +1,125 @@
	-/** \file ScaleFunction.hh
	+/** \file
	* \brief Functions to calculate the (renormalisation and factorisation) scales for an event
	*/
	#pragma once

	#include <functional>
	#include <vector>

	namespace RHEJ{
	class Event;

	using ScaleFunction = std::function<double(Event const &)>;

	//! Calculate \f$H_T\f$ for the input event
	/**
	* \f$H_T\f$ is the sum of the (scalar) transverse momenta of all
	* final-state particles
	*/
	double H_T(Event const &);
	//! The maximum of all (scalar) jet transverse momentum
	double max_jet_pt(Event const &);
	//! The invariant mass of the sum of all jet momenta
	double jet_invariant_mass(Event const &);
	//! Invariant mass of the two hardest jets
	double m_j1j2(Event const &);

	//! Functor that returns a fixed scale regardless of the input event
	class FixedScale {
	public:
	explicit FixedScale(double mu): mu_{mu} {}
	double operator()(Event const &) const {
	return mu_;
	}
	private:
	double mu_;
	};

	//! Choose scales as a multiple of some base scale.
	/**
	* This ScaleFunction functor returns a renormalisation and
	* factorisation scale choice equal to the given factor times
	* the given base scale choice. For example, passing 0.5 the
	* H_T function to the constructor, the generated scale will be
	* \f$H_T/2\f$.
	*/
	class Product {
	public:
	Product(double factor, ScaleFunction base_scale):
	factor_{factor},
	base_scale_{std::move(base_scale)}
	{}
	double operator()(Event const & ev) const {
	return factor_ * base_scale_(ev);
	}
	private:
	double factor_;
	ScaleFunction base_scale_;
	};


	//! Generate combinations of renormalisation and factorisation scales
	class ScaleGenerator{
	public:
	ScaleGenerator() = default;

	- /** Constructor
	+ /** \brief Constructor
	* @param scale_functions_begin Iterator to first base scale
	* @param scale_functions_end Iterator past last base scale
	* @param scale_factors_begin Iterator to first scale factor
	* @param scale_factors_end Iterator past last scale factor
	* @param max_scale_ratio Maximum ratio between renormalisation
	* and factorisation scale
	*/
	template<class ScaleFunIterator, class FactorIterator>
	ScaleGenerator(
	ScaleFunIterator scale_functions_begin,
	ScaleFunIterator scale_functions_end,
	FactorIterator scale_factors_begin,
	FactorIterator scale_factors_end,
	double max_scale_ratio
	):
	scales_(scale_functions_begin, scale_functions_end),
	scale_factors_(scale_factors_begin, scale_factors_end),
	max_scale_ratio_{max_scale_ratio}
	{}

	- /** Constructor
	+ /** \brief Constructor
	* @param scales Base scales
	* @param scale_factors Factors to multiply the base scales
	* @param max_scale_ratio Maximum ratio between renormalisation
	* and factorisation scale
	*/
	ScaleGenerator(
	std::vector<ScaleFunction> scales,
	std::vector<double> scale_factors,
	double max_scale_ratio
	):
	scales_(std::move(scales)),
	scale_factors_(std::move(scale_factors)),
	max_scale_ratio_{max_scale_ratio}
	{}

	- /** Adjust event parameters, adding scale variation
	+ /** \brief Adjust event parameters, adding scale variation
	*
	* The central renormalisation and factorisation scale of the returned
	* event is given be the first base scale passed to the constructor.
	* The scale variation (stored in event.variation()) is constructed as
	* follows: For each base scale according to the arguments of the
	* constructor we add one variation where both renormalisation and
	* factorisation scale are set according to the current base scale.
	* Then, all combinations where the base renormalisation and factorisation
	* scales are multiplied by one of the scale factors are added.
	* The case were both scales are multiplied by one is skipped.
	* Scale combinations where the ratio is larger than the maximum scale ratio
	* set in the constructor are likewise discarded.
	*/
	Event operator()(Event event) const;

	private:
	std::vector<ScaleFunction> scales_;
	std::vector<double> scale_factors_;
	double max_scale_ratio_;
	};

	}
	diff --git a/include/RHEJ/Splitter.hh b/include/RHEJ/Splitter.hh
	index 8f568fc..8e838b2 100644
	--- a/include/RHEJ/Splitter.hh
	+++ b/include/RHEJ/Splitter.hh
	@@ -1,57 +1,67 @@
	/**
	- * \file Splitter.hh
	- * Author: Tuomas Hapola
	- * \brief Splitter header file for splitting jet into constituents.
	+ * \file
	+ * \brief Declaration of the HejSplit class
	*/

	#pragma once

	#include "RHEJ/utility.hh"
	#include "RHEJ/RNG.hh"

	-/*! \class HejSplit Splitter.hh "include/RHEJ/Splitter.hh
	- *
	- * \brief This contains the functions needed to split a jet into constituents
	- *
	- * Along with splitting the jets it also tracks the weights.
	- */
	+//! Class to split jets into their constituents
	class HejSplit {

	public:
	+ //! Constructor
	+ /**
	+ * @param rpin Jet radius parameter
	+ * @param jetdefin Jet definition
	+ * @param ptmin Minimum jet transverse momentum
	+ * @param ran Random number generator
	+ */
	HejSplit(
	double rpin, fastjet::JetDefinition jetdefin, double ptmin,
	RHEJ::RNG & ran
	):
	- ran_{ran},
	- rp{rpin},
	- jetptmin{ptmin},
	- jet_def{jetdefin}
	+ ran_{ran},
	+ rp{rpin},
	+ jetptmin{ptmin},
	+ jet_def{jetdefin}
	{}

	- double Split(fastjet::PseudoJet const & j2split, int ncons);
	+ //! Split a get into constituents
	+ /**
	+ * @param j2split Jet to be split
	+ * @param ncons Number of constituents
	+ * @returns The weight factor associated with the split
	+ */
	+ double Split(fastjet::PseudoJet const & j2split, int ncons);
	void PrintConstituentInfo(std::vector<fastjet::PseudoJet> jets);

	double getweight();
	int gettrials();

	double get_qwt(){return qwt;}
	double get_swt(){return swt;}
	- std::vector<fastjet::PseudoJet> const & get_jcons() const{return jcons;}
	+
	+ //! Get constituents of the last split jet
	+ std::vector<fastjet::PseudoJet> const & get_jcons() const{return jcons;}

	void clear_jcons(){jcons.clear();}
	void reset_qwt(){qwt=1.;}
	void reset_swt(){qwt=1.;}

	- static constexpr double R_factor = 5./3.;
	+ //! Maximum distance of constituents to jet axis
	+ static constexpr double R_factor = 5./3.;
	private:
	double Split2(fastjet::PseudoJet const & j2split);
	double sample_distance_2p(double & wt);

	std::reference_wrapper<RHEJ::RNG> ran_;
	double rp;
	double jetptmin;
	fastjet::JetDefinition jet_def;
	double qwt,swt;
	std::vector<fastjet::PseudoJet> jcons;

	};
	diff --git a/include/RHEJ/YAMLreader.hh b/include/RHEJ/YAMLreader.hh
	index f7a97d2..8a12eca 100644
	--- a/include/RHEJ/YAMLreader.hh
	+++ b/include/RHEJ/YAMLreader.hh
	@@ -1,239 +1,244 @@
	-/** \file YAMLread.hh
	+/** \file
	* \brief The file which handles the configuration file parameters
	*
	* The configuration files parameters are read and then stored
	* within this objects.
	*/

	#pragma once

	#include "yaml-cpp/yaml.h"

	#include "RHEJ/config.hh"
	#include "RHEJ/exceptions.hh"


	namespace RHEJ{
	//! Load configuration from file
	/**
	* @param config_file Name of the YAML configuration file
	* @returns The reversed HEJ configuration
	*/
	Config load_config(std::string const & config_file);

	//! Set option using the corresponding YAML entry
	/**
	* @param setting Option variable to be set
	* @param yaml Root of the YAML configuration
	* @param names Name of the entry
	*
	* If the entry does not exist or has the wrong type or format
	* an exception is thrown.
	*
	* For example
	* @code
	* set_from_yaml(foobar, yaml, "foo", "bar")
	* @endcode
	* is equivalent to
	* @code
	* foobar = yaml["foo"]["bar"].as<decltype(foobar)>()
	* @endcode
	* with improved diagnostics on errors.
	*
	* @see set_from_yaml_if_defined
	*/
	template<typename T, typename... YamlNames>
	void set_from_yaml(
	T & setting,
	YAML::Node const & yaml, YamlNames const & ... names
	);

	//! Set option using the corresponding YAML entry, if present
	/**
	* @param setting Option variable to be set
	* @param yaml Root of the YAML configuration
	* @param names Name of the entry
	*
	* This function works similar to set_from_yaml, but does not
	* throw any exception if the requested YAML entry does not exist.
	*
	* @see set_from_yaml
	*/
	template<typename T, typename... YamlNames>
	void set_from_yaml_if_defined(
	T & setting,
	YAML::Node const & yaml, YamlNames const & ... names
	);

	+ //! Extract jet parameters from YAML configuration
	JetParameters get_jet_parameters(
	YAML::Node const & node, std::string const & entry
	);

	+ //! Extract Higgs coupling settings from YAML configuration
	HiggsCouplingSettings get_Higgs_coupling(
	YAML::Node const & node, std::string const & entry
	);

	+ //! Extract scale setting parameters from YAML configuration
	ScaleConfig to_ScaleConfig(YAML::Node const & yaml);

	+ //! Extract random number generator settings from YAML configuration
	RNGConfig to_RNGConfig(YAML::Node const & node, std::string const & entry);

	+ //! Convert a particle name to the corresponding PDG particle ID
	ParticleID to_ParticleID(std::string const & particle_name);

	//! Check whether all options in configuration are supported
	/**
	* @param conf Configuration to be checked
	* @param supported Tree of supported options
	*
	* If conf contains an entry that does not appear in supported
	* an unknown_option exception is thrown. Sub-entries of "analysis"
	* (if present) are not checked.
	*
	* @see unknown_option
	*/
	void assert_all_options_known(
	YAML::Node const & conf, YAML::Node const & supported
	);

	namespace detail{
	void set_from_yaml(fastjet::JetAlgorithm & setting, YAML::Node const & yaml);
	void set_from_yaml(EventTreatment & setting, YAML::Node const & yaml);
	void set_from_yaml(ParticleID & setting, YAML::Node const & yaml);
	void set_from_yaml(OutputFile & setting, YAML::Node const & yaml);

	inline
	void set_from_yaml(YAML::Node & setting, YAML::Node const & yaml){
	setting = yaml;
	}

	template<typename Scalar>
	void set_from_yaml(Scalar & setting, YAML::Node const & yaml){
	assert(yaml);
	if(!yaml.IsScalar()){
	throw invalid_type{"value is not a scalar"};
	}
	try{
	setting = yaml.as<Scalar>();
	}
	catch(...){
	throw invalid_type{
	"value " + yaml.as<std::string>()
	+ " cannot be converted to a " + type_string(setting)
	};
	}
	}

	template<typename T>
	void set_from_yaml(optional<T> & setting, YAML::Node const & yaml){
	T tmp;
	set_from_yaml(tmp, yaml);
	setting = tmp;
	}

	template<typename T>
	void set_from_yaml(std::vector<T> & setting, YAML::Node const & yaml){
	assert(yaml);
	// special case: treat a single value like a vector with one element
	if(yaml.IsScalar()){
	setting.resize(1);
	return set_from_yaml(setting.front(), yaml);
	}
	if(yaml.IsSequence()){
	setting.resize(yaml.size());
	for(size_t i = 0; i < setting.size(); ++i){
	set_from_yaml(setting[i], yaml[i]);
	}
	return;
	}
	throw invalid_type{""};
	}

	template<typename T, typename FirstName, typename... YamlNames>
	void set_from_yaml(
	T & setting,
	YAML::Node const & yaml, FirstName const & name,
	YamlNames && ... names
	){
	if(!yaml[name]) throw missing_option{""};
	set_from_yaml(
	setting,
	yaml[name], std::forward<YamlNames>(names)...
	);
	}

	template<typename T>
	void set_from_yaml_if_defined(T & setting, YAML::Node const & yaml){
	return set_from_yaml(setting, yaml);
	}

	template<typename T, typename FirstName, typename... YamlNames>
	void set_from_yaml_if_defined(
	T & setting,
	YAML::Node const & yaml, FirstName const & name,
	YamlNames && ... names
	){
	if(!yaml[name]) return;
	set_from_yaml_if_defined(
	setting,
	yaml[name], std::forward<YamlNames>(names)...
	);
	}
	}

	template<typename T, typename... YamlNames>
	void set_from_yaml(
	T & setting,
	YAML::Node const & yaml, YamlNames const & ... names
	){
	try{
	detail::set_from_yaml(setting, yaml, names...);
	}
	catch(invalid_type const & ex){
	throw invalid_type{
	"In option " + join(": ", names...) + ": " + ex.what()
	};
	}
	catch(missing_option const &){
	throw missing_option{
	"No entry for mandatory option " + join(": ", names...)
	};
	}
	catch(std::invalid_argument const & ex){
	throw missing_option{
	"In option " + join(": ", names...) + ":"
	" invalid value " + ex.what()
	};
	}
	}

	template<typename T, typename... YamlNames>
	void set_from_yaml_if_defined(
	T & setting,
	YAML::Node const & yaml, YamlNames const & ... names
	){
	try{
	detail::set_from_yaml_if_defined(setting, yaml, names...);
	}
	catch(invalid_type const & ex){
	throw invalid_type{
	"In option " + join(": ", names...) + ": " + ex.what()
	};
	}
	catch(std::invalid_argument const & ex){
	throw missing_option{
	"In option " + join(": ", names...) + ":"
	" invalid value " + ex.what()
	};
	}
	}

	}


	namespace YAML {

	template<>
	struct convert<RHEJ::OutputFile> {
	static Node encode(RHEJ::OutputFile const & outfile);
	static bool decode(Node const & node, RHEJ::OutputFile & out);
	};
	}
	diff --git a/include/RHEJ/config.hh b/include/RHEJ/config.hh
	index 5d002d7..ef2786e 100644
	--- a/include/RHEJ/config.hh
	+++ b/include/RHEJ/config.hh
	@@ -1,167 +1,175 @@
	-/** \file config.hh
	- * \brief The file which handles the configuration file parameters
	- *
	- * Contains the JetParameters Struct and ScaleConfig Struct. Also
	- * contains the ScaleGenerator Class and the EventTreatment class.
	- * Config struct is also defined here. The configuration files
	- * parameters are read and then stored within this objects.
	+/** \file
	+ * \brief Reversed HEJ configuration parameters
	*/

	#pragma once

	#include <string>
	#include <memory>

	#include "fastjet/JetDefinition.hh"
	#include "yaml-cpp/yaml.h"

	#include "RHEJ/event_types.hh"
	#include "RHEJ/Event.hh"
	#include "RHEJ/HiggsCouplingSettings.hh"
	#include "RHEJ/optional.hh"
	#include "RHEJ/output_formats.hh"
	#include "RHEJ/ScaleFunction.hh"
	#include "RHEJ/utility.hh"


	namespace RHEJ{

	- /**! \struct JetParameters config.hh "include/RHEJ/config.hh"
	- * \brief Contains Jet Definition and Minimum Pt to be a Jet.
	- *
	- * Contains the Fastjet definition of a Jet and a threshold (minimum) value for pt
	- */
	+ //! Jet parameters
	struct JetParameters{
	- fastjet::JetDefinition def; /*< Jet Definition /
	- double min_pt; /*< Minimum Jet Pt /
	+ fastjet::JetDefinition def; /*< Jet Definition /
	+ double min_pt; /*< Minimum Jet Transverse Momentum /
	};

	//! Settings for scale variation
	struct ScaleConfig{
	//! Base scale choices
	std::vector<ScaleFunction> base;
	//! Factors for multiplicative scale variation
	std::vector<double> factors;
	//! Maximum ratio between renormalisation and factorisation scale
	double max_ratio;
	};

	- //! Settings for random number generator
	+ //! Settings for random number generator
	struct RNGConfig {
	+ //! Random number generator name
	std::string name;
	+ //! Optional initial seed
	optional<std::string> seed;
	};

	- /**! \enum EventTreatment config.hh "include/RHEJ/config.hh"
	- * \brief Enumeration which deals with how to treat events.
	+ /**! Possible treatments for fixed-order input events.
	*
	* The program will decide on how to treat an event based on
	* the value of this enumeration.
	*/
	enum class EventTreatment{
	- reweight, /*< Reweigh the event /
	+ reweight, /*< Perform resummation /
	keep, /*< Keep the event /
	discard, /*< Discard the event /
	};

	- /**
	- * \brief An ordered Map with EventType keys and mapped values EventTreatment
	- *
	- * If called upon with EventTreatMap.at(EventType) it will return the treatment which has
	- * been specified for that EventType.
	- */
	+ //! Container to store the treatments for various event types
	using EventTreatMap = std::map<event_type::EventType, EventTreatment>;

	- /**! \struct Config config.hh "include/RHEJ/config.hh"
	- * \brief Config Struct for user input parameters.
	+ /**! Input parameters.
	*
	- * The struct which handles the input card given by the user.
	+ * This struct handles stores all configuration parameters
	+ * needed in a reversed HEJ run.
	*
	* \internal To add a new option:
	* 1. Add a member to the Config struct.
	* 2. Inside "src/YAMLreader.cc":
	* - Add the option name to the "supported" Node in
	* get_supported_options.
	* - Initialise the new Config member in to_Config.
	* The functions set_from_yaml (for mandatory options) and
	* set_from_yaml_if_defined (non-mandatory) may be helpful.
	* 3. Add a new entry (with short description) to config.yaml
	+ * 4. Update the user documentation in "doc/Sphinx/"
	*/
	struct Config {
	- ScaleConfig scales; /*< Scale variation /
	- JetParameters resummation_jets; /*< Resummation Jets /
	- JetParameters fixed_order_jets; /*< Fixed-Order Jets /
	- double min_extparton_pt; /*< Min External Parton Pt/
	- double max_ext_soft_pt_fraction; /*< Min External Parton Pt Fraction /
	- int trials; /*< Number of resummation points to generate per FO /
	- //! Log Correct from running of \f$\alpha_s$\f On or Off
	+ //! Parameters for scale variation
	+ ScaleConfig scales;
	+ //! Resummation jet properties
	+ JetParameters resummation_jets;
	+ //! Fixed-order jet properties
	+ JetParameters fixed_order_jets;
	+ //! Minimum transverse momentum for extremal partons
	+ double min_extparton_pt;
	+ //! Maximum transverse momentum fraction from soft radiation in extremal jets
	+ double max_ext_soft_pt_fraction;
	+ //! Number of resummation configurations to generate per fixed-order event
	+ int trials;
	+ //! Whether to include the logarithmic correction from \f$\alpha_s\f$ running
	bool log_correction;
	- bool unweight; /*< Unweight On or Off /
	- std::vector<OutputFile> output; /*< Output Files Type /
	- RNGConfig rng; /*< Random Number Generator /
	- //! Map to decide what to do for differnt EventTypes
	+ //! Whether to perform unweighting
	+ bool unweight;
	+ //! Event output files names and formats
	+ std::vector<OutputFile> output;
	+ //! Parameters for random number generation
	+ RNGConfig rng;
	+ //! Map to decide what to do for different event types
	EventTreatMap treat;
	- YAML::Node analysis_parameters; /*< Analysis Parameters /
	- //! Settings for Effective Higgs-Gluon Coupling
	+ //! Parameters for custom analyses
	+ YAML::Node analysis_parameters;
	+ //! Settings for effective Higgs-gluon coupling
	HiggsCouplingSettings Higgs_coupling;
	};

	//! Configuration options for the PhaseSpacePoint class
	struct PhaseSpacePointConfig {
	+ //! Properties of resummation jets
	JetParameters jet_param;
	+ //! Minimum transverse momentum for extremal partons
	double min_extparton_pt;
	+ //! Maximum transverse momentum fraction from soft radiation in extremal jets
	double max_ext_soft_pt_fraction;
	};

	//! Configuration options for the MatrixElement class
	struct MatrixElementConfig {
	+ //! Jet properties
	JetParameters jet_param;
	+ //! Whether to include the logarithmic correction from \f$\alpha_s\f$ running
	bool log_correction;
	+ //! Settings for effective Higgs-gluon coupling
	HiggsCouplingSettings Higgs_coupling;
	};

	//! Configuration options for the EventReweighter class
	struct EventReweighterConfig {
	+ //! Settings for phase space point generation
	PhaseSpacePointConfig psp_config;
	+ //! Settings for matrix element calculation
	MatrixElementConfig ME_config;
	+ //! Properties of resummation jets
	JetParameters jet_param;
	+ //! Treatment of the various event types
	EventTreatMap treat;
	};

	/**! Extract PhaseSpacePointConfig from Config
	*
	- * We do not provide a PhaseSpacePointConfig constructor from Config
	+ * \internal We do not provide a PhaseSpacePointConfig constructor from Config
	* so that PhaseSpacePointConfig remains an aggregate.
	* This faciliates writing client code (e.g. the HEJ fixed-order generator)
	* that creates a PhaseSpacePointConfig without a Config object.
	*
	* @see to_MatrixElementConfig, to_EventReweighterConfig
	*/
	inline
	PhaseSpacePointConfig to_PhaseSpacePointConfig(Config const & conf) {
	return {conf.resummation_jets, conf.min_extparton_pt, conf.max_ext_soft_pt_fraction};
	}

	/**! Extract MatrixElementConfig from Config
	*
	* @see to_PhaseSpacePointConfig, to_EventReweighterConfig
	*/
	inline
	MatrixElementConfig to_MatrixElementConfig(Config const & conf) {
	return {conf.resummation_jets, conf.log_correction, conf.Higgs_coupling};
	}

	/**! Extract EventReweighterConfig from Config
	*
	* @see to_PhaseSpacePointConfig, to_MatrixElementConfig
	*/
	inline
	EventReweighterConfig to_EventReweighterConfig(Config const & conf) {
	return {
	to_PhaseSpacePointConfig(conf),
	to_MatrixElementConfig(conf),
	conf.resummation_jets, conf.treat
	};
	}

	} // namespace RHEJ
	diff --git a/include/RHEJ/currents.hh b/include/RHEJ/currents.hh
	index 2e4f58c..5a14eff 100644
	--- a/include/RHEJ/currents.hh
	+++ b/include/RHEJ/currents.hh
	@@ -1,872 +1,872 @@
	//////////////////////////////////////////////////
	//////////////////////////////////////////////////
	// This source code is Copyright (2012) of //
	// Jeppe R. Andersen and Jennifer M. Smillie //
	// and is distributed under the //
	// Gnu Public License version 2 //
	// http://www.gnu.org/licenses/gpl-2.0.html //
	// You are allowed to distribute and alter the //
	// source under the conditions of the GPLv2 //
	// as long as this copyright notice //
	// is unaltered and distributed with the source //
	// Any use should comply with the //
	// MCNET GUIDELINES //
	// for Event Generator Authors and Users //
	// as distributed with this source code //
	//////////////////////////////////////////////////
	//////////////////////////////////////////////////

	-/** \file currents.hh
	- * \brief Contains the functions computing the square of current contractions.
	+/** \file
	+ * \brief Functions computing the square of current contractions.
	*
	* This file contains all the necessary functions to compute the current
	* contractions for all valid HEJ processes. PJETS, H+JETS and W+JETS along with
	- * some unordered counterparts. This also contains the CCurrents Class.
	+ * some unordered counterparts.
	*/


	#pragma once

	#include <CLHEP/Vector/LorentzVector.h>
	#include <complex>
	#include <vector>
	#include <limits>

	typedef std::complex<double> COM;
	typedef COM current[4];
	typedef CLHEP::HepLorentzVector HLV;

	//! The Higgs field vacuum expectation value in GeV
	static constexpr double v = 246.;

	constexpr double infinity = std::numeric_limits<double>::infinity();
	constexpr double mb_default = 4.7;

	void Setup_Currents(void);

	//! Square of qQ->qenuQ W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	* @returns Square of the current contractions for qQ->qenuQ Scattering
	*
	* This returns the square of the current contractions in qQ->qenuQ scattering
	* with an emission of a W Boson.
	*/
	double jMWqQ (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qbarQ->qbarenuQ W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state anti-quark
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	* @returns Square of the current contractions for qbarQ->qbarenuQ Scattering
	*
	* This returns the square of the current contractions in qbarQ->qbarenuQ scattering
	* with an emission of a W Boson.
	*/
	double jMWqbarQ (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qQbar->qenuQbar W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	* @returns Square of the current contractions for qQbar->qenuQbar Scattering
	*
	* This returns the square of the current contractions in qQbar->qenuQbar scattering
	* with an emission of a W Boson.
	*/
	double jMWqQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qbarQbar->qbarenuQbar W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state anti-quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	* @returns Square of the current contractions for qbarQbar->qbarenuQbar Scattering
	*
	* This returns the square of the current contractions in qbarQbar->qbarenuQbar scattering
	* with an emission of a W Boson.
	*/
	double jMWqbarQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);

	//! Square of qg->qenug W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	* @returns Square of the current contractions for qg->qenug Scattering
	*
	* This returns the square of the current contractions in qg->qenug scattering
	* with an emission of a W Boson.
	*/
	double jMWqg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);

	//! Square of qbarg->qbarenug W+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param pe Momentum of final state electron
	* @param pnu Momentum of final state Neutrino
	* @param p1in Momentum of initial state anti-quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	* @returns Square of the current contractions for qbarg->qbarenug Scattering
	*
	* This returns the square of the current contractions in qbarg->qbarenug scattering
	* with an emission of a W Boson.
	*/
	double jMWqbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector pe,
	CLHEP::HepLorentzVector pnu, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qQ->qQ Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	* @returns Square of the current contractions for qQ->qQ Scattering
	*
	* This returns the square of the current contractions in qQ->qQ Pure Jet Scattering.
	*/
	double jM2qQ (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qQbar->qQbar Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	* @returns Square of the current contractions for qQbar->qQbar Scattering
	*
	* This returns the square of the current contractions in qQbar->qQbar Pure Jet Scattering.
	* Note this can be used for qbarQ->qbarQ Scattering by inputting arguments appropriately.
	*/
	double jM2qQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qbarQbar->qbarQbar Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	* @returns Square of the current contractions for qbarQbar->qbarQbar Scattering
	*
	* This returns the square of the current contractions in qbarQbar->qbarQbar Pure Jet Scattering.
	*/
	double jM2qbarQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qg->qg Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	* @returns Square of the current contractions for qg->qg Scattering
	*
	* This returns the square of the current contractions in qg->qg Pure Jet Scattering.
	* Note this can be used for gq->gq Scattering by inputting arguments appropriately.
	*/
	double jM2qg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of qbarg->qbarg Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	* @returns Square of the current contractions for qbarg->qbarg Scattering
	*
	* This returns the square of the current contractions in qbarg->qbarg Pure Jet Scattering.
	* Note this can be used for gqbar->gqbar Scattering by inputting arguments appropriately.
	*/
	double jM2qbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of gg->gg Pure Jets Scattering Current
	/**
	* @param p1out Momentum of final state gluon
	* @param p1in Momentum of initial state gluon
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	* @returns Square of the current contractions for gg->gg Scattering
	*
	* This returns the square of the current contractions in gg->gg Pure Jet Scattering.
	*/
	double jM2gg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in);


	//! Square of gg->gg Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state gluon
	* @param p1in Momentum of initial state gluon
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for gg->gg Scattering
	*
	* This returns the square of the current contractions in gg->gg Higgs+Jet Scattering.
	*
	* g~p1 g~p2
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if g is backward, q1 is forward)
	*/
	double MH2gg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of gq->gq Higgs+Jets Scattering Current with Higgs before Gluon
	/**
	* @param p1out Momentum of final state gluon
	* @param p1in Momentum of initial state gluon
	* @param p2out Momentum of final state gluon
	* @param p2in Momentum of intial state gluon
	* @param pH Momentum of Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contraction
	*
	*/
	double MH2gq_outsideH(CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector pH,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qg->qg Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qg->qg Scattering
	*
	* This returns the square of the current contractions in qg->qg Higgs+Jet Scattering.
	*
	* q~p1 g~p2 (i.e. ALWAYS p1 for quark, p2 for gluon)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if g is backward, q1 is forward)
	*/
	double MH2qg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qbarg->qbarg Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	+ * @param p2in Momentum of intial state gluon
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarg->qbarg Scattering
	*
	* This returns the square of the current contractions in qbarg->qbarg Higgs+Jet Scattering.
	*
	* qbar~p1 g~p2 (i.e. ALWAYS p1 for anti-quark, p2 for gluon)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if g is backward, q1 is forward)
	*/
	double MH2qbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qQ->qQ Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQ->qQ Scattering
	*
	* This returns the square of the current contractions in qQ->qQ Higgs+Jet Scattering.
	*
	- * q~p1 Q~p2 (i.e. ALWAYS p1 for quark, p2 for Quark)
	+ * q~p1 Q~p2 (i.e. ALWAYS p1 for quark, p2 for quark)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if Q is backward, q1 is forward)
	*/
	double MH2qQ (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of qQbar->qQbar Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQ->qQ Scattering
	*
	* This returns the square of the current contractions in qQbar->qQbar Higgs+Jet Scattering.
	*
	- * q~p1 Qbar~p2 (i.e. ALWAYS p1 for quark, p2 for anti-Quark)
	+ * q~p1 Qbar~p2 (i.e. ALWAYS p1 for quark, p2 for anti-quark)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if Qbar is backward, q1 is forward)
	*/
	double MH2qQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of qbarQ->qbarQ Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQ->qbarQ Scattering
	*
	* This returns the square of the current contractions in qbarQ->qbarQ Higgs+Jet Scattering.
	*
	- * qbar~p1 Q~p2 (i.e. ALWAYS p1 for anti-quark, p2 for Quark)
	+ * qbar~p1 Q~p2 (i.e. ALWAYS p1 for anti-quark, p2 for quark)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if Q is backward, q1 is forward)
	*/
	double MH2qbarQ (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qbarQbar->qbarQbar Higgs+Jets Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param q1 Momentum of t-channel propagator p1in-p1out?
	- * @param q2 Momentum of t-channel propagator -(p2in-p2out)?
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param q1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQbar->qbarQbar Scattering
	*
	* This returns the square of the current contractions in qbarQbar->qbarQbar Higgs+Jet Scattering.
	*
	- * qbar~p1 Qbar~p2 (i.e. ALWAYS p1 for anti-quark, p2 for anti-Quark)
	+ * qbar~p1 Qbar~p2 (i.e. ALWAYS p1 for anti-quark, p2 for anti-quark)
	* should be called with q1 meant to be contracted with p2 in first part of vertex
	* (i.e. if Qbar is backward, q1 is forward)
	*/
	double MH2qbarQbar (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector p2out, CLHEP::HepLorentzVector p2in,
	CLHEP::HepLorentzVector q1, CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	// Unordered f

	//! Square of qQ->gqQ Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQ->gqQ Scattering
	*
	* This returns the square of the current contractions in qQ->gqQ Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqHQ (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qQbar->gqQbar Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQbar->gqQbar Scattering
	*
	* This returns the square of the current contractions in qQbar->gqQbar Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqHQbar (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of qbarQ->gqbarQ Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQ->gqbarQ Scattering
	*
	* This returns the square of the current contractions in qbarQ->gqbarQ Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqbarHQ (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of qbarQbar->gqbarQbar Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQbar->gqbarQbar Scattering
	*
	* This returns the square of the current contractions in qbarQbar->gqbarQbar Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqbarHQbar (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qg->gqg Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2in Momentum of intial state gluon
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qg->gqg Scattering
	*
	* This returns the square of the current contractions in qg->gqg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqHg (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qbarg->gqbarg Higgs+Jets Unordered f Scattering Current
	/**
	* @param pg Momentum of unordered gluon
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	* @param p2out Momentum of final state gluon
	- * @oaram p2in Momentum of intial state gluon
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2in Momentum of intial state gluon
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarg->gbarg Scattering
	*
	* This returns the square of the current contractions in qbarg->gqbarg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: pg > p1out >> p2out
	*/
	double jM2unogqbarHg (CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p1out,
	CLHEP::HepLorentzVector p1in, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//Unordered b

	//! Square of qbarQ->qbarQg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQ->qbarQg Scattering
	*
	* This returns the square of the current contractions in qbarQ->qbarQg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobqbarHQg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qQ->qQg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQ->qQg Scattering
	*
	* This returns the square of the current contractions in qQ->qQg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobqHQg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of qQbar->qQbarg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state quark
	* @param p1in Momentum of initial state quark
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qQbar->qQbarg Scattering
	*
	* This returns the square of the current contractions in qQbar->qQbarg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobqHQbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of qbarQbar->qbarQbarg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state anti-quark
	* @param p1in Momentum of initial state anti-quark
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for qbarQbar->qbarQbarg Scattering
	*
	* This returns the square of the current contractions in qbarQbar->qbarQbarg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobqbarHQbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);


	//! Square of gQbar->gQbarg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state gluon
	* @param p1in Momentum of initial state gluon
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state anti-Quark
	- * @oaram p2in Momentum of intial state anti-Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state anti-quark
	+ * @param p2in Momentum of intial state anti-quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for gQbar->gQbarg Scattering
	*
	* This returns the square of the current contractions in gQbar->gQbarg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobgHQbarg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	//! Square of gQ->gQg Higgs+Jets Unordered b Scattering Current
	/**
	* @param p1out Momentum of final state gluon
	* @param p1in Momentum of initial state gluon
	* @param pg Momentum of unordered b gluon
	- * @param p2out Momentum of final state Quark
	- * @oaram p2in Momentum of intial state Quark
	- * @param qH1 Momentum of t-channel propagator p1in-p1out?
	- * @param qH2 Momentum of t-channel propagator -(p2in-p2out)?
	+ * @param p2out Momentum of final state quark
	+ * @param p2in Momentum of intial state quark
	+ * @param qH1 Momentum of t-channel propagator before Higgs
	+ * @param qH2 Momentum of t-channel propagator after Higgs
	* @param mt Top quark mass
	* @param include_bottom Specifies whether bottom corrections are included
	* @param mb Bottom quark mass
	* @returns Square of the current contractions for gQ->gQg Scattering
	*
	* This returns the square of the current contractions in gQ->gQg Higgs+Jet Scattering.
	*
	* This construction is taking rapidity order: p1out >> p2out > pg
	*/
	double jM2unobgHQg (CLHEP::HepLorentzVector p1out, CLHEP::HepLorentzVector p1in,
	CLHEP::HepLorentzVector pg, CLHEP::HepLorentzVector p2out,
	CLHEP::HepLorentzVector p2in, CLHEP::HepLorentzVector qH1,
	CLHEP::HepLorentzVector qH2,
	double mt = infinity,
	bool include_bottom = false, double mb = mb_default);

	// impact factors for Higgs + jet


	//! Implements Eq. (4.22) in hep-ph/0301013 with modifications to incoming plus momenta
	/**
	* @param p2 Momentum of Particle 2
	* @param p1 Momentum of Particle 1
	* @param pH Momentum of Higgs
	* @returns Value of Eq. (4.22) in Hep-ph/0301013 with modifications
	*
	* This gives the impact factor. First it determines first whether this is the case
	* p1p\sim php>>p3p or the opposite
	*/
	double C2gHgm(CLHEP::HepLorentzVector p2, CLHEP::HepLorentzVector p1, CLHEP::HepLorentzVector pH);


	//! Implements Eq. (4.23) in hep-ph/0301013 with modifications to incoming plus momenta
	/**
	* @param p2 Momentum of Particle 2
	* @param p1 Momentum of Particle 1
	* @param pH Momentum of Higgs
	* @returns Value of Eq. (4.23) in Hep-ph/0301013
	*
	* This gives the impact factor. First it determines first whether this is the case
	* p1p\sim php>>p3p or the opposite
	*/
	double C2gHgp(CLHEP::HepLorentzVector p2, CLHEP::HepLorentzVector p1, CLHEP::HepLorentzVector pH);


	//! Implements Eq. (4.22) in hep-ph/0301013
	/**
	* @param p2 Momentum of Particle 2
	* @param p1 Momentum of Particle 1
	* @param pH Momentum of Higgs
	* @returns Value of Eq. (4.22) in Hep-ph/0301013
	*
	* This gives the impact factor. First it determines first whether this is the case
	* p1p\sim php>>p3p or the opposite
	*/
	double C2qHqm(CLHEP::HepLorentzVector p2, CLHEP::HepLorentzVector p1, CLHEP::HepLorentzVector pH);

	/** \class CCurrent currents.hh "include/RHEJ/currents.hh"
	* \brief This is the a new class structure for currents.
	*/
	class CCurrent
	{
	public:
	CCurrent(COM sc0, COM sc1, COM sc2, COM sc3)
	:c0(sc0),c1(sc1),c2(sc2),c3(sc3)
	{};
	CCurrent(const CLHEP::HepLorentzVector p)
	{
	c0=p.e();
	c1=p.px();
	c2=p.py();
	c3=p.pz();
	};
	CCurrent()
	{};
	CCurrent operator+(const CCurrent& other);
	CCurrent operator-(const CCurrent& other);
	CCurrent operator*(const double x);
	CCurrent operator*(const COM x);
	CCurrent operator/(const double x);
	CCurrent operator/(const COM x);

	friend std::ostream& operator<<(std::ostream& os, const CCurrent& cur);
	COM dot(CLHEP::HepLorentzVector p1);
	COM dot(CCurrent p1);
	COM c0,c1,c2,c3;
	private:
	};

	/* std::ostream& operator <<(std::ostream& os, const CCurrent& cur); */
	CCurrent operator * ( double x, CCurrent& m);
	CCurrent operator * ( COM x, CCurrent& m);
	CCurrent operator / ( double x, CCurrent& m);
	CCurrent operator / ( COM x, CCurrent& m);

	//! Current ???
	/**
	* These functions are a mess. There are many more defined in the source file than declared in the
	* header - and the arguments are mislabelled in some cases. Need to investigate.
	*/
	CCurrent j (CLHEP::HepLorentzVector pout, bool helout, CLHEP::HepLorentzVector pin, bool helin);

	//! Current <incoming state \| mu \| outgoing state>
	/**
	* These functions are a mess. There are many more defined in the source file than declared in the
	* header - and the arguments are mislabelled in some cases. Need to investigate.
	*/
	CCurrent jio (CLHEP::HepLorentzVector pout, bool helout, CLHEP::HepLorentzVector pin, bool helin);

	//! Current <outgoing state \| mu \| outgoing state>
	/**
	* These functions are a mess. There are many more defined in the source file than declared in the
	* header - and the arguments are mislabelled in some cases. Need to investigate.
	*/
	CCurrent joo (CLHEP::HepLorentzVector pout, bool helout, CLHEP::HepLorentzVector pin, bool helin);

	/* // Coupling values */
	/* const double stw2 = 0.2222; */
	/* const double ctw = sqrt(1.0 - stw2); */
	/* const double gs = 1.217716; */
	/* const double gw = 0.653232911; */
	/* const double Zem = (-1.0 / 2.0 + stw2) / ctw; */
	/* const double Zep = stw2 / ctw; */
	/* const double Zum = ( 1.0 / 2.0 - 2.0 * stw2 / 3.0) / ctw; */
	/* const double Zup = - 2.0 * stw2 / 3.0 / ctw; */
	/* const double Zdm = (-1.0 / 2.0 + 1.0 / 3.0 * stw2) / ctw; */
	/* const double Zdp = stw2 / 3.0 / ctw; */
	/* const double RWeak = -pow(gw, 2.0); */
	/* const double Strong = pow(gs, 4.0); */
	/* const double ee = pow(gw, 2.0) * stw2; */


	/* std::vector <double> jMZqQ (HLV, HLV, HLV, HLV, HLV, HLV, std::vector <double>, std::vector < std::vector <double> >, int, int, bool, bool); */
	/* std::vector <double> jMZqg (HLV, HLV, HLV, HLV, HLV, HLV, std::vector <double>, std::vector < std::vector <double> >, int, int, bool, bool); */
	/* void jZ (HLV, HLV, HLV, HLV, bool, bool, current); */
	/* void jZbar (HLV, HLV, HLV, HLV, bool, bool, current); */
	/* COM PZ(double); */
	/* double Zq (int, bool); */
	/* double Gq (int); */
	diff --git a/include/RHEJ/debug.hh b/include/RHEJ/debug.hh
	index df0a5ab..7432727 100644
	--- a/include/RHEJ/debug.hh
	+++ b/include/RHEJ/debug.hh
	@@ -1,55 +1,58 @@
	#pragma once

	#include <iostream>
	+#include <cassert>
	+
	+#include "fastjet/PseudoJet.hh"

	inline
	std::ostream & operator<<(std::ostream & o, fastjet::PseudoJet const & p){
	o << '(';
	for(size_t i = 0; i < 3; ++i) o << p[i] << ", ";
	return o << p[3] << ')';
	}

	// to work around compiler warnings for unused variables
	template<typename... T>
	void ignore(T&&...) {}

	inline
	void dprint() {};

	template<typename T, typename... Rest>
	void dprint(T&& t, Rest&&... r){
	ignore(std::forward<T>(t), std::forward<Rest>(r)...);
	#ifndef NDEBUG
	std::cout << std::forward<T>(t);
	dprint(std::forward<Rest>(r)...);
	#endif
	}

	//check whether two doubles are closer than ep > 0 to each other
	inline
	bool nearby_ep(double a, double b, double ep){
	ignore(a, b, ep);
	assert(ep > 0);
	return std::abs(a-b) < ep;
	}

	//check whether two four-vectors are close to each other
	inline
	bool nearby_ep(
	fastjet::PseudoJet const & pa, fastjet::PseudoJet const & pb,
	double ep
	){
	ignore(pa, pb, ep);
	assert(ep > 0);
	for(size_t i = 0; i < 4; ++i){
	if(!nearby_ep(pa[i], pb[i], ep)) return false;
	}
	return true;
	}

	inline
	bool nearby(
	fastjet::PseudoJet const & pa, fastjet::PseudoJet const & pb, double const norm = 1.
	){
	return nearby_ep(pa, pb, 1e-7*norm);
	}
	diff --git a/include/RHEJ/event_types.hh b/include/RHEJ/event_types.hh
	index b7e8a42..23ca618 100644
	--- a/include/RHEJ/event_types.hh
	+++ b/include/RHEJ/event_types.hh
	@@ -1,44 +1,42 @@
	-/** \file event_types.hh
	- * \brief This file details the classification of events.
	+/** \file
	+ * \brief Define different types of events.
	*
	- * This file makes use of a macro in order to avoid repetition of EventType names.
	- * To this end, the Documentation of the EventType enumeration below is incomplete.
	- * The possible event classifications are stored within that enumeration.
	*/

	#pragma once

	#include "RHEJ/utility.hh"

	namespace RHEJ{

	- // macro definition to avoid repetition of EventType names
	-#define RHEJ_EVENT_TYPES(F) F(FKL), F(unordered_backward), F(unordered_forward), F(nonHEJ), F(no_2_jets), F(bad_final_state)
	-#define RHEJ_AS_ENUM(VAR) VAR
	-#define RHEJ_AS_STRING(VAR) #VAR
	-
	- //! Event_Type NameSpace
	+ //! Namespace for event types
	namespace event_type{
	- /** \enum EventType
	- * \brief EventType enumeration gives different possible event types
	- *
	- * This enumeration is used to distinguish between different event types.
	- */
	+ //! Possible event types
	enum EventType: size_t{
	- RHEJ_EVENT_TYPES(RHEJ_AS_ENUM), /*< Macro of Possible States /
	- unob = unordered_backward, /*< Unordered Emission by backwards Jet /
	- unof = unordered_forward, /*< Unordered Emission by forwards Jet /
	- first_type = FKL, /*< FKL Event /
	- last_type = bad_final_state /*< Bad Final State Event /
	+ FKL, /*< FKL-type event /
	+ unordered_backward, /*< event with unordered backward emission /
	+ unordered_forward, /*< event with unordered forward emission /
	+ nonHEJ, /*< event configuration not covered by HEJ /
	+ no_2_jets, /*< event with less than two jets /
	+ bad_final_state, /*< event with an unsupported final state /
	+ unob = unordered_backward,
	+ unof = unordered_forward,
	+ first_type = FKL,
	+ last_type = bad_final_state
	};

	-
	+ //! Event type names
	+ /**
	+ * For example, names[FKL] is the string "FKL"
	+ */
	static constexpr auto names = make_array(
	- RHEJ_EVENT_TYPES(RHEJ_AS_STRING)
	+ "FKL",
	+ "unordered backward",
	+ "unordered forward",
	+ "nonHEJ",
	+ "no 2 jets",
	+ "bad final state"
	);
	}
	-#undef RHEJ_HISTOGRAMS
	-#undef RHEJ_AS_ENUM
	-#undef RHEJ_AS_STRING

	}
	diff --git a/include/RHEJ/exceptions.hh b/include/RHEJ/exceptions.hh
	index f1ab441..74924d6 100644
	--- a/include/RHEJ/exceptions.hh
	+++ b/include/RHEJ/exceptions.hh
	@@ -1,53 +1,53 @@
	-/** \file exceptions.hh
	+/** \file
	* \brief Custom exception classes
	*/
	#pragma once

	#include <stdexcept>

	namespace RHEJ{
	//! Exception indicating wrong option type
	/**
	* This exception is thrown if a configuration option has
	* the wrong type (e.g. 'trials' is not set to a number)
	*/
	struct invalid_type: std::invalid_argument {
	explicit invalid_type(std::string const & what):
	std::invalid_argument{what} {};
	explicit invalid_type(char const * what):
	std::invalid_argument{what} {};
	};

	//! Exception indicating unknown option
	/**
	* This exception is thrown if an unknown configuration option
	* is set (e.g. the 'trials' setting is misspelt as 'trails')
	*/
	struct unknown_option: std::invalid_argument {
	explicit unknown_option(std::string const & what):
	std::invalid_argument{what} {};
	explicit unknown_option(char const * what):
	std::invalid_argument{what} {};
	};

	//! Exception indicating missing option setting
	/**
	* This exception is thrown if a mandatory configuration option
	* (e.g. 'trials') is not set.
	*/
	struct missing_option: std::logic_error {
	explicit missing_option(std::string const & what):
	std::logic_error{what} {};
	explicit missing_option(char const * what):
	std::logic_error{what} {};
	};

	//! Exception indicating functionality that has not been implemented yet
	struct not_implemented: std::logic_error {
	explicit not_implemented(std::string const & what):
	std::logic_error{what} {};
	explicit not_implemented(char const * what):
	std::logic_error{what} {};
	};

	}
	diff --git a/include/RHEJ/get_analysis.hh b/include/RHEJ/get_analysis.hh
	index b922859..12d3301 100644
	--- a/include/RHEJ/get_analysis.hh
	+++ b/include/RHEJ/get_analysis.hh
	@@ -1,22 +1,30 @@
	-/** \file get_analysis.hh
	+/** \file
	* \brief Contains the get_analysis function
	*/

	#pragma once

	#include <memory>
	#include <string>

	#include "RHEJ/optional.hh"
	#include "RHEJ/Analysis.hh"

	namespace YAML{
	class Node;
	}

	namespace RHEJ{
	- /**
	- * \brief get_analysis function Takes parameters to return the analysis being used.
	+ //! Load an analysis
	+ /**
	+ * @param parameters Analysis parameters
	+ * @returns A pointer to an Analysis instance
	+ *
	+ * If parameters["plugin"] exists, an analysis (deriving from the
	+ * \ref Analysis class) will be loaded from the library parameters["plugin"].
	+ * Otherwise, if parameters["rivet"] exists, the corresponding Rivet_Analysis
	+ * will be loaded. If none of these parameters are specified, a pointer to
	+ * the default EmptyAnalysis is returned.
	*/
	std::unique_ptr<Analysis> get_analysis(YAML::Node const & parameters);
	}
	diff --git a/include/RHEJ/gsl_wrapper.hh b/include/RHEJ/gsl_wrapper.hh
	index c9ae7ef..3c4b569 100644
	--- a/include/RHEJ/gsl_wrapper.hh
	+++ b/include/RHEJ/gsl_wrapper.hh
	@@ -1,64 +1,64 @@
	-/** \file gsl_wrapper.hh
	+/** \file
	* \brief C++ wrappers around various gsl functions
	*/

	#pragma once

	#include <memory>

	#include <gsl/gsl_vector.h>
	#include <gsl/gsl_matrix.h>
	#include <gsl/gsl_multiroots.h>

	/** \brief gsl Namespace
	*
	* C++ wrappers around various gsl functions
	*/
	namespace gsl{

	class MultirootFsolver;

	//! Wrapper around gsl_vector
	class Vector{
	public:
	explicit Vector(size_t size);

	double & at(size_t idx);
	double const & at(size_t idx) const;

	double & operator[](size_t idx);
	double const & operator[](size_t idx) const;

	size_t size() const;

	private:
	friend class MultirootFsolver;
	std::unique_ptr<gsl_vector, decltype(&gsl_vector_free)> vec_;
	};

	//! Wrapper around gsl_multiroot_fsolver
	/**
	* This solves multdimensional systems of equations
	*/
	class MultirootFsolver{
	public:
	MultirootFsolver(
	gsl_multiroot_fsolver_type const * T,
	gsl_multiroot_function* f,
	Vector&& x
	);

	int iterate();
	int test_residual(double epsabs) const;

	gsl_vector const * x() const;

	const char * name() const;

	private:
	std::unique_ptr<gsl_multiroot_fsolver, decltype(&gsl_multiroot_fsolver_free)> solver_;
	gsl_multiroot_function* f_;
	Vector x_;
	};

	}
	diff --git a/include/RHEJ/kinematics.hh b/include/RHEJ/kinematics.hh
	index a8e86c0..3debccf 100644
	--- a/include/RHEJ/kinematics.hh
	+++ b/include/RHEJ/kinematics.hh
	@@ -1,21 +1,21 @@
	-/** \file kinematics.hh
	+/** \file
	* \brief Contains function to compute the incoming momentum from outgoing.
	*/
	#pragma once

	#include <tuple>
	#include <vector>

	namespace fastjet{
	class PseudoJet;
	}

	namespace RHEJ{
	class Particle;

	- /** \brief incoming_momenta function to compute the incoming momentum from momentum conservation.
	+ /** \brief Compute the incoming momentum from momentum conservation.
	*/
	std::tuple<fastjet::PseudoJet, fastjet::PseudoJet> incoming_momenta(
	- std::vector<Particle> const & outgoing /*< Outgoing particles /
	+ std::vector<Particle> const & outgoing /*< Outgoing particles /
	);
	}
	diff --git a/include/RHEJ/make_RNG.hh b/include/RHEJ/make_RNG.hh
	index 6e3f05a..f3d94c9 100644
	--- a/include/RHEJ/make_RNG.hh
	+++ b/include/RHEJ/make_RNG.hh
	@@ -1,14 +1,28 @@
	+/** \file
	+ * \brief Declares a factory function for random number generators
	+ */
	#pragma once

	#include <memory>
	#include <string>

	#include "RHEJ/RNG.hh"
	#include "RHEJ/optional.hh"

	namespace RHEJ {
	+ //! Factory function for random number generators
	+ /**
	+ * @param name Name of the random number generator
	+ * @param seed Optional seed
	+ * @returns A pointer to an instance of a random number generator
	+ *
	+ * At present, name should be one of "ranlux64" or "mixmax" (case insensitive).
	+ * The interpretation of the seed depends on the random number generator.
	+ * For ranlux64, it is the name of a seed file. For mixmax it should be a
	+ * string convertible to a long integer.
	+ */
	std::unique_ptr<RHEJ::RNG> make_RNG(
	std::string const & name,
	optional<std::string> const & seed
	);
	}
	diff --git a/include/RHEJ/make_writer.hh b/include/RHEJ/make_writer.hh
	index c27f2a7..2e5d380 100644
	--- a/include/RHEJ/make_writer.hh
	+++ b/include/RHEJ/make_writer.hh
	@@ -1,30 +1,33 @@
	-/** \file make_writer.hh
	- * \brief Contains make_format_writer which returns the EventWriter which is asked for.
	+/** \file
	+ * \brief Declares a factory function for event writers
	*/

	#pragma once

	#include <string>
	#include <memory>

	#include "RHEJ/output_formats.hh"
	#include "RHEJ/EventWriter.hh"

	namespace LHEF{
	struct HEPRUP;
	}

	namespace RHEJ{

	+ //! Factory function for event writers
	/**
	- * \brief returns the EventWriter which is asked for.
	- *
	- * Cases which are possible: Les_Houches and HepMC
	+ * @param format The format of the output file
	+ * @param outfile The name of the output file
	+ * @param heprup General process information
	+ * @returns A pointer to an instance of an EventWriter
	+ * for the desired format
	*/
	std::unique_ptr<EventWriter> make_format_writer(
	- FileFormat format, /*< Output File Type /
	- std::string const & outfile, /*< Output File Name /
	- LHEF::HEPRUP const & heprup /*< Contains important information from the input LHEF /
	+ FileFormat format,
	+ std::string const & outfile,
	+ LHEF::HEPRUP const & heprup
	);

	}
	diff --git a/include/RHEJ/optional.hh b/include/RHEJ/optional.hh
	index 1451f92..5f2d6e6 100644
	--- a/include/RHEJ/optional.hh
	+++ b/include/RHEJ/optional.hh
	@@ -1,18 +1,24 @@
	+/** \file
	+ * \brief Defines the optional type
	+ *
	+ * The C++14 standard introduces the std::optional type.
	+ * If C++14 is not available, we use the optional type from boost instead.
	+ */
	#pragma once

	#if __cplusplus <= 201402L
	#include <boost/optional.hpp>
	#else
	#include <optional>
	#endif

	namespace RHEJ{

	#if __cplusplus <= 201402L
	template<typename T>
	using optional = boost::optional<T>;
	#else
	template<typename T>
	using optional = std::optional<T>;
	#endif
	}
	diff --git a/include/RHEJ/output_formats.hh b/include/RHEJ/output_formats.hh
	index a34394c..e60d65b 100644
	--- a/include/RHEJ/output_formats.hh
	+++ b/include/RHEJ/output_formats.hh
	@@ -1,38 +1,34 @@
	-/** \file output_formats.hh
	- * \brief Contains the enumeration which contains the different available Outputs
	- *
	- * OutputFile Struct contains the name of the output file and the format in an
	- * enumeration.
	+/** \file
	+ * \brief Defines formats for output to event files
	*/

	#pragma once

	+#include <string>
	+#include <stdexcept>
	+
	namespace RHEJ{

	- /**
	- * \enum FileFormat
	- * \brief The enumerater which documents which file format will be outputted.
	- */
	+ //! Supported event file formats
	enum FileFormat{
	Les_Houches, /!< Les Houches Output /
	HepMC /!< HepMC Output /
	};

	+ //! Convert a file format to a string
	inline std::string to_string(FileFormat f){
	switch(f){
	case Les_Houches: return "Les Houches";
	case HepMC: return "HepMC";
	default:
	throw std::logic_error("unhandled file format");
	}
	}
	- /**
	- * \struct OutputFile output_formats.hh "include/RHEJ/output_formats.hh"
	- * \brief Struct which contains the output file type.
	- */
	+
	+ //! Output file specification
	struct OutputFile{
	std::string name; /*< Output File Name /
	FileFormat format; /*< Output File Format /
	};

	}
	diff --git a/include/RHEJ/resummation_jet_momenta.hh b/include/RHEJ/resummation_jet_momenta.hh
	index fc8face..03213f1 100644
	--- a/include/RHEJ/resummation_jet_momenta.hh
	+++ b/include/RHEJ/resummation_jet_momenta.hh
	@@ -1,21 +1,21 @@
	-/** \file resummation_jet_momenta.hh
	- * \brief Contains the functions which can calculate the resummed jet momenta
	+/** \file
	+ * \brief Function to calculate the momenta of resummation jets
	*/
	#pragma once

	#include "RHEJ/utility.hh"

	namespace RHEJ{

	/**
	* \brief Calculate the resummation jet momenta
	* @param p_born Born Jet Momenta
	* @param qperp Sum of non-jet Parton Transverse Momenta
	* @returns Resummation Jet Momenta
	*/
	std::vector<fastjet::PseudoJet> resummation_jet_momenta(
	std::vector<fastjet::PseudoJet> const & p_born,
	fastjet::PseudoJet const & qperp
	);

	}
	diff --git a/include/RHEJ/stream.hh b/include/RHEJ/stream.hh
	index 407e9d3..4a10a14 100644
	--- a/include/RHEJ/stream.hh
	+++ b/include/RHEJ/stream.hh
	@@ -1,31 +1,33 @@
	-/** \file stream.hh
	- * \brief small wrapper around Boost filtering_istream
	+/** \file
	+ * \brief Declares input streams
	*/

	#pragma once

	#include <memory>
	#include <fstream>
	#include <boost/iostreams/filtering_stream.hpp>

	namespace RHEJ{

	-
	- /** \class istream stream.hh "include/RHEJ/stream.hh"
	- * \brief small wrapper around boost's filtering_istream
	- */
	+ //! Small wrapper around boost's filtering_istream
	class istream {
	using boost_istream = boost::iostreams::filtering_istream;
	public:
	+ //! Constructor
	+ /**
	+ * @param filename Name of input file
	+ */
	explicit istream(std::string const & filename);

	+ //! Conversion to boost_istream
	operator boost_istream& () const noexcept {
	return *stream_;
	}

	private:
	std::ifstream file_;
	std::unique_ptr<boost_istream> stream_;
	};

	}
	diff --git a/include/RHEJ/uno.hh b/include/RHEJ/uno.hh
	index f90d23c..b583642 100644
	--- a/include/RHEJ/uno.hh
	+++ b/include/RHEJ/uno.hh
	@@ -1,74 +1,65 @@
	/** \file uno.hh
	- * \brief Some boolean functions for determining if event is unordered.
	+ * \brief Functions for determining if event is unordered.
	*/

	#pragma once

	#include "RHEJ/utility.hh"
	#include "RHEJ/PDG_codes.hh"

	namespace RHEJ{
	- //! Unordered Classification Front Leg
	+ //! Check if an event has an unordered backward gluon emission
	/**
	- * @param incoming Incoming Particles
	- * @param outgoing Outgoing Particles
	- * @returns 0 or 1 depending if classifed as unob_gluon event
	+ * @param incoming Incoming particles in ascending pz
	+ * @param outgoing Outgoing particles in ascending rapidity
	+ * @returns true iff the most backward outgoing particle is a
	+ * gluon and the first incoming particle is not a gluon.
	*
	- * This is a test applied to the most forwards (in terms of rapidity) jet.
	- * If the initial state leg is not a gluon, and the final state leg corresponding
	- * to that is a gluon then the even is deemed to be an unob_gluon event.
	- * This assumes that the event being tested is an FKL event wih at most
	- * one unordered emission.
	+ * If the incoming and outgoing particles are ordered such that HEJ resummation
	+ * is possible, this function can help to distinguish between FKL and unordered
	+ * events.
	*/
	inline
	bool has_unob_gluon(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing
	){
	return incoming.front().type != pid::gluon
	&& outgoing.front().type == pid::gluon;
	}


	- //! Unordered Classification Back Leg
	+ //! Check if an event has an unordered backward gluon emission
	/**
	- * @param incoming Incoming Particles
	- * @param outgoing Outgoing Particles
	- * @returns 0 or 1 depending if classifed as unof_gluon event
	+ * @param incoming Incoming particles in ascending pz
	+ * @param outgoing Outgoing particles in ascending rapidity
	+ * @returns true iff the most forward outgoing particle is a
	+ * gluon and the last incoming particle is not a gluon.
	*
	- * This is a test applied to the most backwards (in terms of rapidity) jet.
	- * If the initial state leg is not a gluon, and the final state leg corresponding
	- * to that is a gluon then the even is deemed to be an unob_gluon event.
	- * This assumes that the event being tested is an FKL event wih at most
	- * one unordered emission.
	+ * If the incoming and outgoing particles are ordered such that HEJ resummation
	+ * is possible, this function can help to distinguish between FKL and unordered
	+ * events.
	*/
	inline
	bool has_unof_gluon(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing
	){
	return incoming.back().type != pid::gluon
	&& outgoing.back().type == pid::gluon;
	}

	- //! Unordered Classification
	+ //! Check if an event has an gluon emission
	/**
	- * @param incoming Incoming Particles
	- * @param outgoing Outgoing Particles
	- * @returns 0 or 1 depending if classifed as unordered event
	- *
	- * This combined the functions has_unob_gluon and has_unof_gluon to see either leg
	- * has an unordered emission.
	- * This assumes that the event being tested is an FKL event wih at most
	- * one unordered emission.
	+ * @see has_unob_gluon, has_unof_gluon
	*/
	inline
	bool has_uno_gluon(
	std::array<Particle, 2> const & incoming,
	std::vector<Particle> const & outgoing
	){
	return
	has_unob_gluon(incoming, outgoing) \|\| has_unof_gluon(incoming, outgoing);
	}

	}
	diff --git a/include/RHEJ/utility.hh b/include/RHEJ/utility.hh
	index 33ae3c1..41e1dc6 100644
	--- a/include/RHEJ/utility.hh
	+++ b/include/RHEJ/utility.hh
	@@ -1,145 +1,166 @@
	/**
	- * \file utility.hh
	- * Author: Tuomas Hapola
	- * \brief Contains the struct Particle which contains particle information and parameters.
	- *
	- * Also contains some functions which are useful for comparison on particles parameters.
	+ * \file
	+ * \brief Contains various utilities
	*/

	#pragma once

	#include <algorithm>

	#include <boost/core/demangle.hpp>

	// FastJet Includes
	#include "fastjet/PseudoJet.hh"
	#include "fastjet/ClusterSequence.hh"

	#include "RHEJ/PDG_codes.hh"

	namespace RHEJ{
	- /** \struct Particle utility.hh "include/RHEJ/utility.hh"
	- * \brief The struct which contains all the parameters of a particle.
	- *
	- * Constituted by PiD and PseudoJet Objects.
	- */
	+ //! Class representing a particle
	struct Particle {
	+ //! particle type
	ParticleID type;
	+ //! particle momentum
	fastjet::PseudoJet p;

	- //! get rapidity function
	+ //! get rapidity
	double rapidity() const{
	return p.rapidity();
	}
	- //! get perp function
	+ //! get transverse momentum
	double perp() const{
	return p.perp();
	}
	- //! get Px function
	+ //! get momentum in x direction
	double px() const{
	return p.px();
	}
	- //! get Py function
	+ //! get momentum in y direction
	double py() const{
	return p.py();
	}
	- //! Get Pz function
	+ //! get momentum in z direction
	double pz() const{
	return p.pz();
	}
	- //! Get P0 function
	+ //! get energy
	double E() const{
	return p.E();
	}
	- //! Get particle mass
	+ //! get mass
	double m() const{
	return p.m();
	}
	};

	- /** \struct rapidity_less utility.hh "include/RHEJ/utility.hh
	- * \brief A struct which allows quick comparison of two different jets rapidities.
	+ //! Functor to compare rapidities
	+ /**
	+ * This can be used whenever a rapidity comparison function is needed,
	+ * for example in many standard library functions.
	+ *
	+ * @see pz_less
	*/
	struct rapidity_less{
	template<class FourVector>
	bool operator()(FourVector const & p1, FourVector const & p2){
	return p1.rapidity() < p2.rapidity();
	}
	};

	- /** \struct pz_less utility.hh "include/RHEJ/utility.hh
	- * \brief A struct which allows quick comparison of Pz between two jets.
	+ //! Functor to compare momenta in z direction
	+ /**
	+ * This can be used whenever a pz comparison function is needed,
	+ * for example in many standard library functions.
	+ *
	+ * @see rapidity_less
	*/
	struct pz_less{
	template<class FourVector>
	bool operator()(FourVector const & p1, FourVector const & p2){
	return p1.pz() < p2.pz();
	}
	};


	+ //! Convert a vector of Particles to a vector of particle momenta
	inline
	std::vector<fastjet::PseudoJet> to_PseudoJet(
	std::vector<Particle> const & v
	){
	std::vector<fastjet::PseudoJet> result;
	for(auto && sp: v) result.emplace_back(sp.p);
	return result;
	}

	+ //! Check if a particle is a parton, i.e. quark, antiquark, or gluon
	inline
	- bool is_parton(Particle const & p){
	+ bool is_parton(Particle const & p){
	return is_parton(p.type);
	}

	+ //! Check if a particle is a photon, W, Z, or Higgs boson
	inline bool is_AWZH_boson(Particle const & particle){
	return is_AWZH_boson(particle.type);
	}

	+ //! Extract all partons from a vector of particles
	inline
	std::vector<Particle> filter_partons(
	std::vector<Particle> const & v
	){
	std::vector<Particle> result;
	result.reserve(v.size());
	std::copy_if(
	begin(v), end(v), std::back_inserter(result),
	[](Particle const & p){ return is_parton(p); }
	);
	return result;
	}

	+ //! Create a std::unique_ptr to a T object
	+ /**
	+ * For non-array types this works like std::make_unique,
	+ * which is not available under C++11
	+ */
	template<class T, class... Args>
	std::unique_ptr<T> make_unique(Args&&... a){
	return std::unique_ptr<T>{new T{std::forward<Args>(a)...}};
	}

	+ //! Create an array containing the passed arguments
	template<typename T, typename... U>
	- constexpr
	- std::array<T, 1 + sizeof...(U)> make_array(T t, U&&... rest){
	+ constexpr
	+ std::array<T, 1 + sizeof...(U)> make_array(T t, U&&... rest){
	return {{t, std::forward<U>(rest)...}};
	}

	inline
	std::string join(
	std::string const & /* delim */, std::string const & str
	){
	return str;
	}

	+ //! Join strings with a delimiter
	+ /**
	+ * @param delim Delimiter to be put between consecutive strings
	+ * @param first First string
	+ * @param second Second string
	+ * @param rest Remaining strings
	+ */
	template<typename... Strings>
	std::string join(
	std::string const & delim,
	std::string const & first, std::string const & second,
	Strings&&... rest
	){
	return join(delim, first + delim + second, std::forward<Strings>(rest)...);
	}

	+ //! Return the name of the argument's type
	template<typename T>
	std::string type_string(T&&){
	return boost::core::demangle(typeid(T).name());
	}

	}
	diff --git a/src/EventReweighter.cc b/src/EventReweighter.cc
	index 34c8d34..f89ac3c 100644
	--- a/src/EventReweighter.cc
	+++ b/src/EventReweighter.cc
	@@ -1,281 +1,326 @@
	#include "RHEJ/EventReweighter.hh"

	#include <string>
	#include <unordered_map>

	#include "RHEJ/PhaseSpacePoint.hh"
	#include "RHEJ/PDG_codes.hh"
	#include "RHEJ/debug.hh"

	namespace RHEJ{
	using EventType = event_type::EventType;

	namespace {

	static_assert(
	std::numeric_limits<double>::has_quiet_NaN,
	"no quiet NaN for double"
	);
	constexpr double NaN = std::numeric_limits<double>::quiet_NaN();

	UnclusteredEvent to_UnclusteredEvent(PhaseSpacePoint const & psp){
	UnclusteredEvent result;
	result.incoming = psp.incoming();
	std::sort(
	begin(result.incoming), end(result.incoming),
	[](Particle o1, Particle o2){return o1.p.pz()<o2.p.pz();}
	);
	assert(result.incoming.size() == 2);
	result.outgoing = psp.outgoing();
	assert(
	std::is_sorted(
	begin(result.outgoing), end(result.outgoing),
	rapidity_less{}
	)
	);
	assert(result.outgoing.size() >= 2);
	result.decays = psp.decays();
	result.central.mur = NaN;
	result.central.muf = NaN;
	result.central.weight = psp.weight();
	return result;
	}

	} // namespace anonymous

	EventReweighter::EventReweighter(
	LHEF::HEPRUP const & heprup,
	ScaleGenerator scale_gen,
	EventReweighterConfig conf,
	RHEJ::RNG & ran
	):
	EventReweighter{
	RHEJ::Beam{
	heprup.EBMUP.first,
	{{
	static_cast<RHEJ::ParticleID>(heprup.IDBMUP.first),
	static_cast<RHEJ::ParticleID>(heprup.IDBMUP.second)
	}}
	},
	heprup.PDFSUP.first,
	std::move(scale_gen),
	std::move(conf),
	ran
	}
	{
	if(heprup.EBMUP.second != E_beam_){
	throw std::invalid_argument(
	"asymmetric beam: " + std::to_string(E_beam_)
	+ " ---> <--- " + std::to_string(heprup.EBMUP.second)
	);
	};
	if(heprup.PDFSUP.second != pdf_.id()){
	throw std::invalid_argument(
	"conflicting PDF ids: " + std::to_string(pdf_.id())
	+ " vs. " + std::to_string(heprup.PDFSUP.second)
	);
	}
	}

	EventReweighter::EventReweighter(
	Beam beam,
	int pdf_id,
	ScaleGenerator scale_gen,
	EventReweighterConfig conf,
	RHEJ::RNG & ran
	):
	param_{std::move(conf)},
	E_beam_{beam.E},
	pdf_{pdf_id, beam.type.front(), beam.type.back()},
	MEt2_{
	[this](double mu){ return pdf_.Halphas(mu); },
	param_.ME_config
	},
	scale_gen_(std::move(scale_gen)),
	ran_{ran}
	{}

	PDF const & EventReweighter::pdf() const{
	return pdf_;
	}

	std::vector<Event> EventReweighter::reweight(
	Event const & input_ev, int num_events
	){
	auto res_events = gen_res_events(input_ev, num_events);
	if(res_events.empty()) return {};
	for(auto & event: res_events) event = scale_gen_(event);
	return rescale(input_ev, std::move(res_events));
	}

	/**
	* \brief main generation/reweighting function:
	* generate phase space points and divide out Born factors
	*/
	std::vector<Event> EventReweighter::gen_res_events(
	Event const & ev,
	int phase_space_points
	){
	assert(ev.variations().empty());

	switch(param_.treat.at(ev.type())){
	case EventTreatment::discard: return {};
	case EventTreatment::keep:
	if(! jets_pass_resummation_cuts(ev)) return {};
	else return {ev};
	default:;
	}
	const double Born_shat = shat(ev);

	std::vector<Event> resummation_events;
	for(int psp_number = 0; psp_number < phase_space_points; ++psp_number){
	PhaseSpacePoint psp{ev, param_.psp_config, ran_};
	if(psp.weight() == 0.) continue;
	if(psp.incoming()[0].E() > E_beam_ \|\| psp.incoming()[1].E() > E_beam_) continue;

	resummation_events.emplace_back(
	to_UnclusteredEvent(std::move(psp)),
	param_.jet_param.def, param_.jet_param.min_pt
	);
	auto & new_event = resummation_events.back();
	assert(new_event.variations().empty());
	new_event.central().mur = ev.central().mur;
	new_event.central().muf = ev.central().muf;
	const double resum_shat = shat(new_event);
	new_event.central().weight = ev.central().weightBorn_shat*Born_shat/
	(phase_space_pointsresum_shatresum_shat);
	}
	return resummation_events;
	}

	std::vector<Event> EventReweighter::rescale(
	Event const & Born_ev,
	std::vector<Event> events
	) const{
	const double Born_pdf = pdf_factors(Born_ev).central;
	const double Born_ME = tree_matrix_element(Born_ev);

	for(auto & cur_event: events){
	const auto pdf = pdf_factors(cur_event);
	assert(pdf.variations.size() == cur_event.variations().size());
	const auto ME = matrix_elements(cur_event);
	assert(ME.variations.size() == cur_event.variations().size());
	cur_event.central().weight = pdf.centralME.central/(Born_pdf*Born_ME);
	for(size_t i = 0; i < cur_event.variations().size(); ++i){
	cur_event.variations(i).weight *=
	pdf.variations[i]ME.variations[i]/(Born_pdfBorn_ME);
	}
	}
	return events;
	};

	+ /**
	+ * \brief Do the Jets pass the resummation Cuts?
	+ *
	+ * @param ev Event in Question
	+ * @returns 0 or 1 depending on if ev passes Jet Cuts
	+ */
	bool EventReweighter::jets_pass_resummation_cuts(
	Event const & ev
	) const{
	const auto out_as_PseudoJet = to_PseudoJet(filter_partons(ev.outgoing()));
	fastjet::ClusterSequence cs{out_as_PseudoJet, param_.jet_param.def};
	return cs.inclusive_jets(param_.jet_param.min_pt).size() == ev.jets().size();
	}



	+ /**
	+ * \brief pdf_factors Function
	+ *
	+ * @param ev Event in Question
	+ * @returns EventFactor due to PDFs
	+ *
	+ * Calculates the Central value and the variation due
	+ * to the PDF choice made.
	+ */
	EventReweighter::EventFactors
	EventReweighter::pdf_factors(Event const & ev) const{
	auto const & a = ev.incoming().front();
	auto const & b = ev.incoming().back();
	const double xa = a.p.e()/E_beam_;
	const double xb = b.p.e()/E_beam_;

	EventFactors result;
	std::unordered_map<double, double> known_pdf;
	result.central =
	pdf_.pdfpt(0,xa,ev.central().muf,a.type)*
	pdf_.pdfpt(1,xb,ev.central().muf,b.type);
	known_pdf.emplace(ev.central().muf, result.central);

	result.variations.reserve(ev.variations().size());
	for(auto const & ev_param: ev.variations()){
	const double muf = ev_param.muf;
	auto cur_pdf = known_pdf.find(muf);
	if(cur_pdf == known_pdf.end()){
	cur_pdf = known_pdf.emplace(
	muf,
	pdf_.pdfpt(0,xa,muf,a.type)*pdf_.pdfpt(1,xb,muf,b.type)
	).first;
	}
	result.variations.emplace_back(cur_pdf->second);
	}
	assert(result.variations.size() == ev.variations().size());
	return result;
	}



	-
	+ /**
	+ * \brief matrix_elements Function
	+ *
	+ * @param ev Event in question
	+ * @returns EventFactor due to MatrixElements
	+ *
	+ * Calculates the Central value and the variation due
	+ * to the Matrix Element.
	+ */
	EventReweighter::EventFactors
	EventReweighter::matrix_elements(Event const & ev) const{
	assert(param_.treat.count(ev.type()) > 0);
	if(param_.treat.find(ev.type())->second == EventTreatment::keep){
	return fixed_order_scale_ME(ev);
	}

	// precompute overall kinematic factor
	const double ME_kin = MEt2_.tree_kin(ev.incoming(), ev.outgoing(), true);

	EventFactors result;
	std::unordered_map<double, double> known_ME;
	result.central = MEt2_(
	ev.central().mur,
	ev.incoming(), ev.outgoing(),
	true
	);
	known_ME.emplace(ev.central().mur, result.central);

	result.variations.reserve(ev.variations().size());
	for(auto const & param: ev.variations()){
	const double mur = param.mur;
	auto cur_ME = known_ME.find(mur);
	if(cur_ME == known_ME.end()){
	const double ME = MEt2_.tree_param(
	mur, ev.incoming(), ev.outgoing()
	)ME_kinMEt2_.virtual_corrections(
	mur, ev.incoming(), ev.outgoing()
	);
	cur_ME = known_ME.emplace(mur, ME).first;
	}
	result.variations.emplace_back(cur_ME->second);
	}
	assert(result.variations.size() == ev.variations().size());
	return result;
	}

	+ /**
	+ * \brief Computes the tree level matrix element
	+ *
	+ * @param ev Event in Question
	+ * @returns HEJ approximation to Tree level Matrix Element
	+ *
	+ * This computes the HEJ approximation to the tree level FO
	+ * Matrix element which is used within the LO weighting process.
	+ */
	double EventReweighter::tree_matrix_element(Event const & ev) const{
	assert(ev.variations().empty());
	assert(param_.treat.count(ev.type()) > 0);
	if(param_.treat.find(ev.type())->second == EventTreatment::keep){
	return fixed_order_scale_ME(ev).central;
	}
	return MEt2_.tree(
	ev.central().mur,
	ev.incoming(), ev.outgoing(),
	false
	);
	}

	+ /**
	+ * \brief Scale-dependent part of fixed-order matrix element
	+ *
	+ * @param ev Event in question
	+ * @returns EventFactor scale variation due to FO-ME.
	+ *
	+ * This is only called to compute the scale variation for events where
	+ * we don't do resummation (e.g. non-FKL).
	+ * Since at tree level the scale dependence is just due to alpha_s,
	+ * it is enough to return the alpha_s(mur) factors in the matrix element.
	+ * The rest drops out in the ratio of (output event ME)/(input event ME),
	+ * so we never have to compute it.
	+ */
	EventReweighter::EventFactors
	EventReweighter::fixed_order_scale_ME(Event const & ev) const{
	const int alpha_s_power = std::count_if(
	begin(ev.outgoing()), end(ev.outgoing()),
	[](Particle const & p){ return is_parton(p); }
	);
	EventFactors result;
	result.central = pow(pdf_.Halphas(ev.central().mur), alpha_s_power);
	for(auto const & var: ev.variations()){
	result.variations.emplace_back(
	pow(pdf_.Halphas(var.mur), alpha_s_power)
	);
	}
	return result;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jan 20, 9:14 PM (23 h, 10 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4242440
Default Alt Text: (273 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions