No OneTemporary
Actions

Size

34 KB

Subscribers

None

View Options

	diff --git a/FixedOrderGen/include/config.hh b/FixedOrderGen/include/config.hh
	index 461fcee..7a55cb7 100644
	--- a/FixedOrderGen/include/config.hh
	+++ b/FixedOrderGen/include/config.hh
	@@ -1,45 +1,46 @@
	/**
	* \authors The HEJ collaboration (see AUTHORS for details)
	* \date 2019
	* \copyright GPLv2 or later
	*/
	#pragma once

	#include "yaml-cpp/yaml.h"

	#include "HEJ/HiggsCouplingSettings.hh"
	#include "HEJ/optional.hh"
	#include "HEJ/Config.hh"
	#include "HEJ/output_formats.hh"
	#include "HEJ/exceptions.hh"
	#include "HEJ/EWConstants.hh"
	+#include "HEJ/Fraction.hh"

	#include "Beam.hh"
	#include "Decay.hh"
	#include "JetParameters.hh"
	#include "Process.hh"
	#include "UnweightSettings.hh"

	namespace HEJFOG{

	struct Config{
	Process process;
	size_t events;
	JetParameters jets;
	Beam beam;
	int pdf_id;
	- double subleading_fraction;
	+ HEJ::Fraction<double> subleading_fraction;
	unsigned int subleading_channels; //! < see HEJFOG::Subleading
	ParticlesDecayMap particle_decays;
	std::vector<YAML::Node> analyses_parameters;
	HEJ::ScaleConfig scales;
	std::vector<HEJ::OutputFile> output;
	HEJ::RNGConfig rng;
	HEJ::HiggsCouplingSettings Higgs_coupling;
	HEJ::EWConstants ew_parameters;
	HEJ::optional<UnweightSettings> unweight;
	};

	Config load_config(std::string const & config_file);

	}
	diff --git a/FixedOrderGen/src/config.cc b/FixedOrderGen/src/config.cc
	index 675e1c1..326bb73 100644
	--- a/FixedOrderGen/src/config.cc
	+++ b/FixedOrderGen/src/config.cc
	@@ -1,437 +1,432 @@
	/**
	* \authors The HEJ collaboration (see AUTHORS for details)
	* \date 2019
	* \copyright GPLv2 or later
	*/
	#include "config.hh"

	#include <cctype>

	#include "Subleading.hh"

	#include "HEJ/Config.hh"
	#include "HEJ/YAMLreader.hh"

	namespace HEJFOG{
	using HEJ::set_from_yaml;
	using HEJ::set_from_yaml_if_defined;
	using HEJ::pid::ParticleID;

	namespace{
	//! Get YAML tree of supported options
	/**
	* The configuration file is checked against this tree of options
	* in assert_all_options_known.
	*/
	YAML::Node const & get_supported_options(){
	const static YAML::Node supported = [](){
	YAML::Node supported;
	static const auto opts = {
	"process", "events", "subleading fraction","subleading channels",
	"scales", "scale factors", "max scale ratio", "pdf", "vev",
	"event output", "analyses", "analysis", "import scales"
	};
	// add subnodes to "supported" - the assigned value is irrelevant
	for(auto && opt: opts) supported[opt] = "";
	for(auto && jet_opt: {"min pt", "peak pt", "algorithm", "R", "max rapidity"}){
	supported["jets"][jet_opt] = "";
	}
	for(auto && particle_type: {"Higgs", "W", "Z"}){
	for(auto && particle_opt: {"mass", "width"}){
	supported["particle properties"][particle_type][particle_opt] = "";
	}
	}
	for(auto && particle_type: {"Higgs", "Wp", "W+", "Wm", "W-", "Z"}){
	for(auto && particle_opt: {"into", "branching ratio"}){
	supported["decays"][particle_type][particle_opt] = "";
	}
	}
	for(auto && opt: {"mt", "use impact factors", "include bottom", "mb"}){
	supported["Higgs coupling"][opt] = "";
	}
	for(auto && beam_opt: {"energy", "particles"}){
	supported["beam"][beam_opt] = "";
	}
	for(auto && unweight_opt: {"sample size", "max deviation"}){
	supported["unweight"][unweight_opt] = "";
	}
	for(auto && opt: {"name", "seed"}){
	supported["random generator"][opt] = "";
	}
	return supported;
	}();
	return supported;
	}

	JetParameters get_jet_parameters(
	YAML::Node const & node, std::string const & entry
	){
	const auto p = HEJ::get_jet_parameters(node, entry);
	JetParameters result;
	result.def = p.def;
	result.min_pt = p.min_pt;
	set_from_yaml(result.max_y, node, entry, "max rapidity");
	set_from_yaml_if_defined(result.peak_pt, node, entry, "peak pt");
	if(result.peak_pt && *result.peak_pt <= result.min_pt)
	throw std::invalid_argument{
	"Value of option 'peak pt' has to be larger than 'min pt'."
	};
	return result;
	}

	Beam get_Beam(
	YAML::Node const & node, std::string const & entry
	){
	Beam beam;
	std::vector<HEJ::ParticleID> particles;
	set_from_yaml(beam.energy, node, entry, "energy");
	set_from_yaml_if_defined(particles, node, entry, "particles");
	if(! particles.empty()){
	for(HEJ::ParticleID particle: particles){
	if(particle != HEJ::pid::p && particle != HEJ::pid::p_bar){
	throw std::invalid_argument{
	"Unsupported value in option " + entry + ": particles:"
	" only proton ('p') and antiproton ('p_bar') beams are supported"
	};
	}
	}
	if(particles.size() != 2){
	throw std::invalid_argument{"Not exactly two beam particles"};
	}
	beam.particles.front() = particles.front();
	beam.particles.back() = particles.back();
	}
	return beam;
	}

	std::vector<std::string> split(
	std::string const & str, std::string const & delims
	){
	std::vector<std::string> result;
	for(size_t begin, end = 0; end != str.npos;){
	begin = str.find_first_not_of(delims, end);
	if(begin == str.npos) break;
	end = str.find_first_of(delims, begin + 1);
	result.emplace_back(str.substr(begin, end - begin));
	}
	return result;
	}

	std::invalid_argument invalid_incoming(std::string const & what){
	return std::invalid_argument{
	"Incoming particle type " + what + " not supported,"
	" incoming particles have to be 'p', 'p_bar' or partons"
	};
	}

	std::invalid_argument invalid_outgoing(std::string const & what){
	return std::invalid_argument{
	"Outgoing particle type " + what + " not supported,"
	" outgoing particles have to be 'j', 'photon', 'H', 'Wm', 'Wp', 'e-', 'e+', 'nu_e', 'nu_e_bar'"
	};
	}

	HEJ::ParticleID reconstruct_boson_id(
	std::vector<HEJ::ParticleID> const & ids
	){
	assert(ids.size()==2);
	const int pidsum = ids[0] + ids[1];
	if(pidsum == +1) {
	assert(HEJ::is_antilepton(ids[0]));
	if(HEJ::is_antineutrino(ids[0])) {
	throw HEJ::not_implemented{"lepton-flavour violating final state"};
	}
	assert(HEJ::is_neutrino(ids[1]));
	// charged antilepton + neutrino means we had a W+
	return HEJ::pid::Wp;
	}
	if(pidsum == -1) {
	assert(HEJ::is_antilepton(ids[0]));
	if(HEJ::is_neutrino(ids[1])) {
	throw HEJ::not_implemented{"lepton-flavour violating final state"};
	}
	assert(HEJ::is_antineutrino(ids[0]));
	// charged lepton + antineutrino means we had a W-
	return HEJ::pid::Wm;
	}
	throw HEJ::not_implemented{
	"final state with leptons "+HEJ::name(ids[0])+" and "+HEJ::name(ids[1])
	+" not supported"
	};
	}

	Process get_process(
	YAML::Node const & node, std::string const & entry
	){
	Process result;

	std::string process_string;
	set_from_yaml(process_string, node, entry);
	assert(! process_string.empty());
	const auto particles = split(process_string, " \n\t\v=>");
	if(particles.size() < 3){
	throw std::invalid_argument{
	"Bad format in option process: '" + process_string
	+ "', expected format is 'in1 in2 => out1 ...'"
	};
	}
	result.incoming.front() = HEJ::to_ParticleID(particles[0]);
	result.incoming.back() = HEJ::to_ParticleID(particles[1]);

	for(size_t i = 0; i < result.incoming.size(); ++i){
	const HEJ::ParticleID in = result.incoming[i];
	if(
	in != HEJ::pid::proton && in != HEJ::pid::p_bar
	&& !HEJ::is_parton(in)
	){
	throw invalid_incoming(particles[i]);
	}
	}
	result.njets = 0;
	for(size_t i = result.incoming.size(); i < particles.size(); ++i){
	assert(! particles[i].empty());
	if(particles[i] == "j") ++result.njets;
	else if(std::isdigit(particles[i].front())
	&& particles[i].back() == 'j')
	result.njets += std::stoi(particles[i]);
	else{
	const auto pid = HEJ::to_ParticleID(particles[i]);
	if(pid==HEJ::pid::Higgs \|\| pid==HEJ::pid::Wp \|\| pid==HEJ::pid::Wm){
	if(result.boson)
	throw std::invalid_argument{
	"More than one outgoing boson is not supported"
	};
	if(!result.boson_decay.empty())
	throw std::invalid_argument{
	"Production of a boson together with a lepton is not supported"
	};
	result.boson = pid;
	} else if (HEJ::is_anylepton(pid)){
	// Do not accept more leptons, if two leptons are already mentioned
	if( result.boson_decay.size()>=2 )
	throw std::invalid_argument{"Too many leptons provided"};
	if(result.boson)
	throw std::invalid_argument{
	"Production of a lepton together with a boson is not supported"
	};
	result.boson_decay.emplace_back(pid);
	} else {
	throw invalid_outgoing(particles[i]);
	}
	}
	}
	if(result.njets < 2){
	throw std::invalid_argument{
	"Process has to include at least two jets ('j')"
	};
	}
	if(!result.boson_decay.empty()){
	std::sort(begin(result.boson_decay),end(result.boson_decay));
	assert(!result.boson);
	result.boson = reconstruct_boson_id(result.boson_decay);
	}
	return result;
	}

	HEJFOG::Subleading to_subleading_channel(YAML::Node const & yaml){
	std::string name;
	using namespace HEJFOG::channels;
	set_from_yaml(name, yaml);
	if(name == "none")
	return none;
	if(name == "all")
	return all;
	if(name == "unordered" \|\| name == "uno")
	return uno;
	if(name == "qqx")
	return qqx;
	throw HEJ::unknown_option("Unknown subleading channel '"+name+"'");
	}

	unsigned int get_subleading_channels(YAML::Node const & node){
	using YAML::NodeType;
	using namespace HEJFOG::channels;
	// all channels allowed by default
	if(!node) return all;
	switch(node.Type()){
	case NodeType::Undefined:
	return all;
	case NodeType::Null:
	return none;
	case NodeType::Scalar:
	return to_subleading_channel(node);
	case NodeType::Map:
	throw HEJ::invalid_type{"map is not a valid option for subleading channels"};
	case NodeType::Sequence:
	unsigned int channels = HEJFOG::Subleading::none;
	for(auto && channel_node: node){
	channels \|= get_subleading_channels(channel_node);
	}
	return channels;
	}
	throw std::logic_error{"unreachable"};
	}

	Decay get_decay(YAML::Node const & node,
	std::string const & entry, std::string const & boson
	){
	Decay decay;
	set_from_yaml(decay.products, node, entry, boson, "into");
	decay.branching_ratio=1;
	set_from_yaml_if_defined(decay.branching_ratio, node, entry, boson,
	"branching ratio");
	return decay;
	}

	std::vector<Decay> get_decays(YAML::Node const & node,
	std::string const & entry, std::string const & boson
	){
	using YAML::NodeType;
	if(!node[entry][boson]) return {};
	switch(node[entry][boson].Type()){
	case NodeType::Null:
	case NodeType::Undefined:
	return {};
	case NodeType::Scalar:
	throw HEJ::invalid_type{"value is not a list of decays"};
	case NodeType::Map:
	return {get_decay(node, entry, boson)};
	case NodeType::Sequence:
	std::vector<Decay> result;
	for(auto && decay_str: node[entry][boson]){
	result.emplace_back(get_decay(decay_str, entry, boson));
	}
	return result;
	}
	throw std::logic_error{"unreachable"};
	}

	ParticlesDecayMap get_all_decays(YAML::Node const & node,
	std::string const & entry
	){
	if(!node[entry]) return {};
	if(!node[entry].IsMap())
	throw HEJ::invalid_type{entry + " have to be a map"};
	ParticlesDecayMap result;
	for(auto const & sub_node: node[entry]) {
	const auto boson = sub_node.first.as<std::string>();
	const auto id = HEJ::to_ParticleID(boson);
	result.emplace(id, get_decays(node, entry, boson));
	}
	return result;
	}

	HEJ::ParticleProperties get_particle_properties(
	YAML::Node const & node, std::string const & entry,
	std::string const & boson
	){
	HEJ::ParticleProperties result;
	set_from_yaml(result.mass, node, entry, boson, "mass");
	set_from_yaml(result.width, node, entry, boson, "width");
	return result;
	}

	HEJ::EWConstants get_ew_parameters(YAML::Node const & node){
	HEJ::EWConstants result;
	double vev;
	set_from_yaml(vev, node, "vev");
	result.set_vevWZH(vev,
	get_particle_properties(node, "particle properties", "W"),
	get_particle_properties(node, "particle properties", "Z"),
	get_particle_properties(node, "particle properties", "Higgs")
	);
	return result;
	}

	UnweightSettings get_unweight(
	YAML::Node const & node, std::string const & entry
	){
	UnweightSettings result;
	set_from_yaml(result.sample_size, node, entry, "sample size");
	if(result.sample_size <= 0){
	throw std::invalid_argument{
	"negative sample size " + std::to_string(result.sample_size)
	};
	}
	set_from_yaml(result.max_dev, node, entry, "max deviation");
	return result;
	}

	Config to_Config(YAML::Node const & yaml){
	try{
	HEJ::assert_all_options_known(yaml, get_supported_options());
	}
	catch(HEJ::unknown_option const & ex){
	throw HEJ::unknown_option{std::string{"Unknown option '"} + ex.what() + "'"};
	}

	Config config;
	config.process = get_process(yaml, "process");
	set_from_yaml(config.events, yaml, "events");
	config.jets = get_jet_parameters(yaml, "jets");
	config.beam = get_Beam(yaml, "beam");
	for(size_t i = 0; i < config.process.incoming.size(); ++i){
	const auto & in = config.process.incoming[i];
	using namespace HEJ::pid;
	if( (in == p \|\| in == p_bar) && in != config.beam.particles[i]){
	throw std::invalid_argument{
	"Particle type of beam " + std::to_string(i+1) + " incompatible"
	+ " with type of incoming particle " + std::to_string(i+1)
	};
	}
	}
	set_from_yaml(config.pdf_id, yaml, "pdf");

	set_from_yaml(config.subleading_fraction, yaml, "subleading fraction");
	- if(config.subleading_fraction < 0 \|\| config.subleading_fraction > 1){
	- throw std::invalid_argument{
	- "subleading fraction has to be between 0 and 1"
	- };
	- }
	if(config.subleading_fraction == 0)
	config.subleading_channels = Subleading::none;
	else
	config.subleading_channels = get_subleading_channels(yaml["subleading channels"]);

	config.ew_parameters = get_ew_parameters(yaml);
	config.particle_decays = get_all_decays(yaml, "decays");
	if(config.process.boson // check that Ws always decay
	&& std::abs(*config.process.boson) == HEJ::ParticleID::Wp
	&& config.process.boson_decay.empty()
	){
	auto const & decay = config.particle_decays.find(*config.process.boson);
	if(decay == config.particle_decays.end() \|\| decay->second.empty())
	throw std::invalid_argument{
	"Decay for "+HEJ::name(*config.process.boson)+" is required"};
	}
	set_from_yaml_if_defined(config.analyses_parameters, yaml, "analyses");
	if(yaml["analysis"]){
	std::cerr <<
	"WARNING: Configuration entry 'analysis' is deprecated. "
	" Use 'analyses' instead.\n";
	YAML::Node ana;
	set_from_yaml(ana, yaml, "analysis");
	if(!ana.IsNull()){
	config.analyses_parameters.push_back(ana);
	}
	}
	config.scales = HEJ::to_ScaleConfig(yaml);
	set_from_yaml_if_defined(config.output, yaml, "event output");
	config.rng = HEJ::to_RNGConfig(yaml, "random generator");
	config.Higgs_coupling = HEJ::get_Higgs_coupling(yaml, "Higgs coupling");
	if(yaml["unweight"]) config.unweight = get_unweight(yaml, "unweight");
	return config;
	}

	} // namespace anonymous

	Config load_config(std::string const & config_file){
	try{
	return to_Config(YAML::LoadFile(config_file));
	}
	catch(...){
	std::cerr << "Error reading " << config_file << ":\n ";
	throw;
	}
	}
	}
	diff --git a/include/HEJ/Config.hh b/include/HEJ/Config.hh
	index 31070cd..f9d1a7c 100644
	--- a/include/HEJ/Config.hh
	+++ b/include/HEJ/Config.hh
	@@ -1,232 +1,233 @@
	/** \file
	* \brief HEJ 2 configuration parameters
	*
	* \authors The HEJ collaboration (see AUTHORS for details)
	* \date 2019
	* \copyright GPLv2 or later
	*/
	#pragma once

	#include <map>
	#include <string>
	#include <vector>

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

	#include "HEJ/Constants.hh"
	#include "HEJ/event_types.hh"
	#include "HEJ/EWConstants.hh"
	+#include "HEJ/Fraction.hh"
	#include "HEJ/HiggsCouplingSettings.hh"
	#include "HEJ/optional.hh"
	#include "HEJ/output_formats.hh"
	#include "HEJ/ScaleFunction.hh"

	namespace HEJ{

	//! Jet parameters
	struct JetParameters{
	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
	struct RNGConfig {
	//! Random number generator name
	std::string name;
	//! Optional initial seed
	optional<std::string> seed;
	};

	//! Settings for partial unweighting
	struct PartialUnweightConfig {
	//! Number of trials for training
	size_t trials;
	//! Maximum distance in standard deviations from mean logarithmic weight
	double max_dev;
	};

	/**! 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, /*< Perform resummation /
	keep, /*< Keep the event /
	discard, /*< Discard the event /
	};

	//! Container to store the treatments for various event types
	using EventTreatMap = std::map<event_type::EventType, EventTreatment>;

	//! Possible setting for the event weight
	enum class WeightType{
	weighted, //!< weighted events
	unweighted_resum, //!< unweighted only resummation part
	partially_unweighted //!< mixed weighted and unweighted
	};

	/**! Input parameters.
	*
	* This struct handles stores all configuration parameters
	* needed in a HEJ 2 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 {
	//! %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
	//! \deprecated This will be removed in future versions.
	//! Use \ref max_ext_soft_pt_fraction instead.
	double min_extparton_pt = 0;
	//! Maximum transverse momentum fraction from soft radiation in extremal jets
	- double max_ext_soft_pt_fraction;
	+ Fraction<double> max_ext_soft_pt_fraction;
	//! The regulator lambda for the subtraction terms
	double regulator_lambda = CLAMBDA;
	//! Number of resummation configurations to generate per fixed-order event
	size_t trials;
	//! Maximal number of events
	optional<size_t> max_events;
	//! Whether to include the logarithmic correction from \f$\alpha_s\f$ running
	bool log_correction;
	//! 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;
	//! %Parameters for custom analysis
	//! @deprecated use analyses_parameters instead
	YAML::Node analysis_parameters;
	//! %Parameters for custom analyses
	std::vector<YAML::Node> analyses_parameters;
	//! Settings for effective Higgs-gluon coupling
	HiggsCouplingSettings Higgs_coupling;
	//! elector weak parameters
	EWConstants ew_parameters;
	//! Type of event weight e.g. (un)weighted
	WeightType weight_type;
	//! Settings for partial unweighting
	HEJ::optional<PartialUnweightConfig> unweight_config;
	};

	//! Configuration options for the PhaseSpacePoint class
	struct PhaseSpacePointConfig {
	//! Properties of resummation jets
	JetParameters jet_param;
	//! Minimum transverse momentum for extremal partons
	//! \deprecated This will be removed in future versions.
	//! Use \ref max_ext_soft_pt_fraction instead.
	double min_extparton_pt = 0;
	//! Maximum transverse momentum fraction from soft radiation in extremal jets
	- double max_ext_soft_pt_fraction;
	+ Fraction<double> max_ext_soft_pt_fraction;
	};

	//! Configuration options for the MatrixElement class
	struct MatrixElementConfig {
	MatrixElementConfig() = default;
	MatrixElementConfig(
	bool log_correction,
	HiggsCouplingSettings Higgs_coupling,
	EWConstants ew_parameters,
	double regulator_lambda = CLAMBDA
	):
	log_correction{log_correction},
	Higgs_coupling{Higgs_coupling},
	ew_parameters{ew_parameters},
	regulator_lambda{regulator_lambda}
	{}

	//! Whether to include the logarithmic correction from \f$\alpha_s\f$ running
	bool log_correction;
	//! Settings for effective Higgs-gluon coupling
	HiggsCouplingSettings Higgs_coupling;
	//! elector weak parameters
	EWConstants ew_parameters;
	//! The regulator lambda for the subtraction terms
	double regulator_lambda = CLAMBDA;
	};

	//! 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;
	//! Access properties of resummation jets
	JetParameters & jet_param() {
	return psp_config.jet_param;}
	//! Access properties of resummation jets (const version)
	JetParameters const & jet_param() const {
	return psp_config.jet_param;}
	//! Treatment of the various event types
	EventTreatMap treat;
	};

	/**! Extract PhaseSpacePointConfig 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.log_correction, conf.Higgs_coupling,
	conf.ew_parameters, conf.regulator_lambda};
	}

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

	} // namespace HEJ
	diff --git a/include/HEJ/Fraction.hh b/include/HEJ/Fraction.hh
	new file mode 100644
	index 0000000..358420d
	--- /dev/null
	+++ b/include/HEJ/Fraction.hh
	@@ -0,0 +1,45 @@
	+/** \file
	+ * \brief Header file for fractions, i.e. floating point numbers between 0 and 1.
	+ *
	+ * \authors The HEJ collaboration (see AUTHORS for details)
	+ * \date 2020
	+ * \copyright GPLv2 or later
	+ */
	+#pragma once
	+
	+#include <stdexcept>
	+#include <string>
	+#include <type_traits>
	+
	+namespace HEJ {
	+
	+ //! Class for floating point numbers between 0 and 1
	+ template<
	+ class Real,
	+ typename = std::enable_if_t<std::is_floating_point<Real>::value>
	+ >
	+ class Fraction {
	+ public:
	+ Fraction() = default;
	+
	+ explicit Fraction(Real r): f_{r} {
	+ if(f_ < 0 \|\| f_ > 1) {
	+ throw std::invalid_argument{
	+ std::to_string(f_) + " is not between 0 and 1"
	+ };
	+ }
	+ }
	+
	+ Fraction & operator=(Real r) {
	+ f_ = Fraction{r};
	+ return *this;
	+ }
	+
	+ operator Real() const {
	+ return f_;
	+ }
	+
	+ private:
	+ Real f_;
	+ };
	+}
	diff --git a/include/HEJ/YAMLreader.hh b/include/HEJ/YAMLreader.hh
	index 993fbc7..c4b5641 100644
	--- a/include/HEJ/YAMLreader.hh
	+++ b/include/HEJ/YAMLreader.hh
	@@ -1,253 +1,267 @@
	/** \file
	* \brief The file which handles the configuration file parameters
	*
	* The configuration files parameters are read and then stored
	* within this objects.
	*
	* \authors The HEJ collaboration (see AUTHORS for details)
	* \date 2019
	* \copyright GPLv2 or later
	*/
	#pragma once

	#include <string>
	#include <utility>
	#include <vector>

	#include "yaml-cpp/yaml.h"

	#include "fastjet/JetDefinition.hh"

	#include "HEJ/Config.hh"
	#include "HEJ/exceptions.hh"
	+#include "HEJ/Fraction.hh"
	#include "HEJ/optional.hh"
	#include "HEJ/PDG_codes.hh"
	#include "HEJ/utility.hh"

	namespace HEJ{
	class OutputFile;
	//! Load configuration from file
	/**
	* @param config_file Name of the YAML configuration file
	* @returns The HEJ 2 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);

	//! 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);
	void set_from_yaml(WeightType & 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)...
	);
	}
	} // namespace detail

	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 HEJ

	namespace YAML {

	template<>
	struct convert<HEJ::OutputFile> {
	static Node encode(HEJ::OutputFile const & outfile);
	static bool decode(Node const & node, HEJ::OutputFile & out);
	};
	+
	+ template<class Real>
	+ struct convert<HEJ::Fraction<Real>> {
	+ static Node encode(HEJ::Fraction<Real> const & f) {
	+ return encode(Real{f});
	+ }
	+ static bool decode(Node const & node, HEJ::Fraction<Real> & f) {
	+ Real r;
	+ if(!convert<Real>::decode(node, r)) return false;
	+ f = r;
	+ return true;
	+ }
	+ };
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Feb 23, 3:01 PM (5 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4486802
Default Alt Text: (34 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions