No OneTemporary
Actions

Size

64 KB

Subscribers

None

View Options

	diff --git a/FixedOrderGen/configFO.yml b/FixedOrderGen/configFO.yml
	index 2e9f6c1..b24082c 100644
	--- a/FixedOrderGen/configFO.yml
	+++ b/FixedOrderGen/configFO.yml
	@@ -1,53 +1,56 @@
	events: 200

	jets:
	min pt: 30
	R: 0.4
	algorithm: antikt
	max rapidity: 5

	beam:
	energy: 6500
	particles: [p, p]

	pdf: 230000

	process: p p => h 4j

	# fraction of events with two extremal emissions in one direction
	# that contain an unordered emission
	unordered fraction: 0.05

	scales: max jet pperp

	event output:
	- HEJFO.lhe
	# - RHEJ.lhe
	# - RHEJ_events.hepmc

	Higgs properties:
	mass: 125
	width: 0.004165
	decays: {into: [photon, photon], branching ratio: 0.0023568762400521404}

	+random generator:
	+ name: ranlux64
	+
	unweight:
	sample size: 200
	max deviation: 0

	# analysis:
	# # to use a custom analysis
	# plugin: /home/andersen/HEJ/PURE/GitReverse/build/analysis-plugins/src/libVBF.so
	# min dy12: 2.8
	# min m12: 400
	# output: HEJFO.root
	# # wtwt cut: # optional cut on (event weight)^2

	#RanLux init: ranlux.0 # file for initialisation of random number engine

	# parameters for Higgs-gluon couplings
	# this requires compilation with looptools
	# Higgs coupling:
	# use impact factors: false
	# mt: 174
	# include bottom: true
	# mb: 4.7
	diff --git a/FixedOrderGen/include/config.hh b/FixedOrderGen/include/config.hh
	index 8fc1e7c..105a967 100644
	--- a/FixedOrderGen/include/config.hh
	+++ b/FixedOrderGen/include/config.hh
	@@ -1,38 +1,38 @@
	#pragma once

	#include "yaml-cpp/yaml.h"

	#include "fastjet/JetDefinition.hh"
	#include "RHEJ/HiggsCouplingSettings.hh"
	#include "RHEJ/optional.hh"
	#include "RHEJ/config.hh"
	#include "RHEJ/output_formats.hh"
	#include "RHEJ/exceptions.hh"

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

	namespace HEJFOG{

	struct Config{
	Process process;
	int events;
	JetParameters jets;
	Beam beam;
	int pdf_id;
	double unordered_fraction;
	HiggsProperties Higgs_properties;
	YAML::Node analysis_parameters;
	RHEJ::ScaleConfig scales;
	std::vector<RHEJ::OutputFile> output;
	- RHEJ::optional<std::string> RanLux_init;
	+ RHEJ::RNGConfig rng;
	RHEJ::HiggsCouplingSettings Higgs_coupling;
	RHEJ::optional<UnweightSettings> unweight;
	};

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

	}
	diff --git a/FixedOrderGen/src/config.cc b/FixedOrderGen/src/config.cc
	index 38e3f8a..f081147 100644
	--- a/FixedOrderGen/src/config.cc
	+++ b/FixedOrderGen/src/config.cc
	@@ -1,283 +1,286 @@
	#include "config.hh"

	#include <cctype>

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

	namespace HEJFOG{
	using RHEJ::set_from_yaml;
	using RHEJ::set_from_yaml_if_defined;

	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", "unordered fraction", "scales", "scale factors",
	- "max scale ratio", "pdf", "event output", "analysis", "RanLux init",
	+ "max scale ratio", "pdf", "event output", "analysis"
	};
	// add subnodes to "supported" - the assigned value is irrelevant
	for(auto && opt: opts) supported[opt] = "";
	for(auto && jet_opt: {"min pt", "algorithm", "R", "max rapidity"}){
	supported["jets"][jet_opt] = "";
	}
	for(auto && Higgs_opt: {"mass", "width"}){
	supported["Higgs properties"][Higgs_opt] = "";
	}
	supported["Higgs properties"]["decays"]["into"] = "";
	supported["Higgs properties"]["decays"]["branching ratio"] = "";
	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 = RHEJ::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");
	return result;
	}

	Beam get_Beam(
	YAML::Node const & node, std::string const & entry
	){
	Beam beam;
	std::vector<RHEJ::ParticleID> particles;
	set_from_yaml(beam.energy, node, entry, "energy");
	set_from_yaml_if_defined(particles, node, entry, "particles");
	if(! particles.empty()){
	for(RHEJ::ParticleID particle: particles){
	if(particle != RHEJ::pid::p && particle != RHEJ::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', 'W+', 'W-', 'Z', 'H'"
	};
	}

	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() = RHEJ::to_ParticleID(particles[0]);
	result.incoming.back() = RHEJ::to_ParticleID(particles[1]);

	for(size_t i = 0; i < result.incoming.size(); ++i){
	const RHEJ::ParticleID in = result.incoming[i];
	if(
	in != RHEJ::pid::proton && in != RHEJ::pid::p_bar
	&& !RHEJ::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())){
	if(particles[i].back() != 'j'){
	throw invalid_outgoing(particles[i]);
	}
	result.njets += std::stoi(particles[i]);
	}
	else{
	const auto pid = RHEJ::to_ParticleID(particles[i]);
	if(!RHEJ::is_AWZH_boson(pid)){
	throw invalid_outgoing(particles[i]);
	}
	if(result.boson){
	throw std::invalid_argument{
	"More than one outgoing boson is not supported"
	};
	}
	result.boson = pid;
	}
	}
	if(result.njets < 2){
	throw std::invalid_argument{
	"Process has to include at least two jets ('j')"
	};
	}
	return result;
	}

	Decay get_decay(YAML::Node const & node){
	Decay decay;
	set_from_yaml(decay.products, node, "into");
	set_from_yaml(decay.branching_ratio, node, "branching ratio");
	return decay;
	}

	std::vector<Decay> get_decays(YAML::Node const & node){
	using YAML::NodeType;
	if(!node) return {};
	switch(node.Type()){
	case NodeType::Null:
	case NodeType::Undefined:
	return {};
	case NodeType::Scalar:
	throw RHEJ::invalid_type{"value is not a list of decays"};
	case NodeType::Map:
	return {get_decay(node)};
	case NodeType::Sequence:
	std::vector<Decay> result;
	for(auto && decay_str: node){
	result.emplace_back();
	set_from_yaml(result.back().products, decay_str, "into");
	set_from_yaml(result.back().branching_ratio, decay_str, "branching ratio");
	}
	return result;
	}
	throw std::logic_error{"unreachable"};
	}

	HiggsProperties get_higgs_properties(
	YAML::Node const & node, std::string const & entry
	){
	HiggsProperties result;
	set_from_yaml(result.mass, node, entry, "mass");
	set_from_yaml(result.width, node, entry, "width");
	try{
	result.decays = get_decays(node[entry]["decays"]);
	}
	catch(RHEJ::missing_option const & ex){
	throw RHEJ::missing_option{entry + ": decays: " + ex.what()};
	}
	catch(RHEJ::invalid_type const & ex){
	throw RHEJ::invalid_type{entry + ": decays: " + ex.what()};
	}
	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{
	RHEJ::assert_all_options_known(yaml, get_supported_options());
	}
	catch(RHEJ::unknown_option const & ex){
	throw RHEJ::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 RHEJ::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.unordered_fraction, yaml, "unordered fraction");
	if(config.unordered_fraction < 0 \|\| config.unordered_fraction > 1){
	throw std::invalid_argument{
	"unordered fraction has to be between 0 and 1"
	};
	}
	config.Higgs_properties = get_higgs_properties(yaml, "Higgs properties");
	set_from_yaml_if_defined(config.analysis_parameters, yaml, "analysis");
	config.scales = RHEJ::to_ScaleConfig(yaml);
	set_from_yaml_if_defined(config.output, yaml, "event output");
	- set_from_yaml_if_defined(config.RanLux_init, yaml, "RanLux init");
	+ config.rng = RHEJ::to_RNGConfig(yaml, "random generator");
	config.Higgs_coupling = RHEJ::get_Higgs_coupling(yaml, "Higgs coupling");
	if(yaml["unweight"]) config.unweight = get_unweight(yaml, "unweight");
	return config;
	}

	}

	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/FixedOrderGen/src/main.cc b/FixedOrderGen/src/main.cc
	index 70a7fa8..189f220 100644
	--- a/FixedOrderGen/src/main.cc
	+++ b/FixedOrderGen/src/main.cc
	@@ -1,241 +1,240 @@
	/**
	* Name: main.cc
	* Authors: Jeppe R. Andersen
	*/

	#include <fstream>
	#include <algorithm>
	#include <memory>
	#include <chrono>
	#include <iostream>
	#include <map>

	#include "yaml-cpp/yaml.h"

	#include "config.hh"

	#include "LHEF/LHEF.h"
	#include "RHEJ/CombinedEventWriter.hh"
	#include "RHEJ/get_analysis.hh"
	#include "RHEJ/utility.hh"
	//#include "RHEJ/EventReweighter.hh"
	#include "RHEJ/stream.hh"
	#include "RHEJ/LesHouchesWriter.hh"
	#include "RHEJ/ProgressBar.hh"
	-#include "RHEJ/Ranlux64.hh"
	+#include "RHEJ/make_RNG.hh"

	#include "EventGenerator.hh"
	#include "PhaseSpacePoint.hh"
	#include "Unweighter.hh"
	#include "CrossSectionAccumulator.hh"

	namespace{
	constexpr auto banner =
	" __ ___ __ ______ __ __ \n"
	" / / / (_)___ _/ /_ / ____/___ ___ _________ ___ __ / /__ / /______ \n"
	" / /_/ / / __ `/ __ \\ / __/ / __ \\/ _ \\/ ___/ __ `/ / / / __ / / _ \\/ __/ ___/ \n"
	" / __ / / /_/ / / / / / /___/ / / / __/ / / /_/ / /_/ / / /_/ / __/ /_(__ ) \n"
	" /_/ /_/_/\\__, /_/ /_/ /_____/_/ /_/\\___/_/ \\__, /\\__, / \\____/\\___/\\__/____/ \n"
	" ____///__/ __ ____ ///__//____/ ______ __ \n"
	" / ____(_) _____ ____/ / / __ \\_________/ /__ _____ / ____/__ ____ ___ _________ _/ /_____ _____\n"
	" / /_ / / \|/_/ _ \\/ __ / / / / / ___/ __ / _ \\/ ___/ / / __/ _ \\/ __ \\/ _ \\/ ___/ __ `/ __/ __ \\/ ___/\n"
	" / __/ / /> </ __/ /_/ / / /_/ / / / /_/ / __/ / / /_/ / __/ / / / __/ / / /_/ / /_/ /_/ / / \n"
	" /_/ /_/_/\|_\|\\___/\\__,_/ \\____/_/ \\__,_/\\___/_/ \\____/\\___/_/ /_/\\___/_/ \\__,_/\\__/\\____/_/ \n"
	;

	constexpr double invGeV2_to_pb = 389379292.;
	constexpr long long max_warmup_events = 10000;
	}

	HEJFOG::Config load_config(char const * filename){
	try{
	return HEJFOG::load_config(filename);
	}
	catch(std::exception const & exc){
	std::cerr << "Error: " << exc.what() << '\n';
	std::exit(EXIT_FAILURE);
	}
	}

	std::unique_ptr<RHEJ::Analysis> get_analysis(
	YAML::Node const & parameters
	){
	try{
	return RHEJ::get_analysis(parameters);
	}
	catch(std::exception const & exc){
	std::cerr << "Failed to load analysis: " << exc.what() << '\n';
	std::exit(EXIT_FAILURE);
	}
	}

	void rescale_weights(RHEJ::Event & ev, double factor) {
	ev.central().weight *= factor;
	for(auto & var: ev.variations()){
	var.weight *= factor;
	}
	}

	int main(int argn, char** argv) {
	using namespace std::string_literals;
	if (argn < 2) {
	std::cerr << "\n# Usage:\n.FOgen config_file\n";
	return EXIT_FAILURE;
	}
	std::cout << banner;
	fastjet::ClusterSequence::print_banner();
	using clock = std::chrono::system_clock;

	const auto start_time = clock::now();

	// read configuration
	auto config = load_config(argv[1]);

	std::unique_ptr<RHEJ::Analysis> analysis = get_analysis(
	config.analysis_parameters
	);
	assert(analysis != nullptr);

	- auto ran = config.RanLux_init?
	- RHEJ::Ranlux64{*config.RanLux_init}:
	- RHEJ::Ranlux64{};
	+ auto ran = RHEJ::make_RNG(config.rng.name, config.rng.seed);
	+ assert(ran != nullptr);

	RHEJ::ScaleGenerator scale_gen{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	};

	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	std::move(scale_gen),
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	- ran
	+ *ran
	};

	//TODO: fix Les Houches init block (HEPRUP)
	LHEF::HEPRUP lhefheprup;
	lhefheprup.IDBMUP=std::pair<long,long>(config.beam.particles[0], config.beam.particles[1]);
	lhefheprup.EBMUP=std::make_pair(config.beam.energy, config.beam.energy);
	lhefheprup.PDFGUP=std::make_pair(0,0);
	lhefheprup.PDFSUP=std::make_pair(config.pdf_id,config.pdf_id);
	lhefheprup.NPRUP=1;
	lhefheprup.XSECUP=std::vector<double>(1.);
	lhefheprup.XERRUP=std::vector<double>(1.);
	lhefheprup.LPRUP=std::vector<int>{1};

	RHEJ::CombinedEventWriter writer{config.output, lhefheprup};

	RHEJ::optional<HEJFOG::Unweighter> unweighter{};
	std::map<HEJFOG::Status, int> status_counter;

	std::vector<RHEJ::Event> events;
	int trials = 0;
	// warm-up phase to train unweighter
	if(config.unweight) {
	std::cout << "Calibrating unweighting ...\n";
	const auto warmup_start = clock::now();
	const size_t warmup_events = config.unweight->sample_size;
	RHEJ::ProgressBar<size_t> warmup_progress{std::cout, warmup_events};
	for(; events.size() < warmup_events; ++trials){
	auto ev = generator.gen_event();
	++status_counter[generator.status()];
	if(generator.status() == HEJFOG::good && analysis->pass_cuts(ev, ev)) {
	events.emplace_back(std::move(ev));
	++warmup_progress;
	}
	}
	std::cout << std::endl;
	unweighter = HEJFOG::Unweighter{
	- begin(events), end(events), config.unweight->max_dev, ran
	+ begin(events), end(events), config.unweight->max_dev, *ran
	};
	std::vector<RHEJ::Event> unweighted_events;
	for(auto && ev: events) {
	auto unweighted = unweighter->unweight(std::move(ev));
	if(unweighted) {
	unweighted_events.emplace_back(std::move(*unweighted));
	}
	}
	events = std::move(unweighted_events);
	if(events.empty()) {
	std::cerr <<
	"Failed to generate events. Please increase \"unweight: sample size\""
	" or reduce \"unweight: max deviation\"\n";
	return EXIT_FAILURE;
	}
	const auto warmup_end = clock::now();
	const double completion = static_cast<double>(events.size())/config.events;
	const std::chrono::duration<double> remaining_time =
	(warmup_end- warmup_start)*(1./completion - 1);
	const auto finish = clock::to_time_t(
	std::chrono::time_point_cast<std::chrono::seconds>(warmup_end + remaining_time)
	);
	std::cout
	<< "Generated " << events.size() << "/" << config.events << " events ("
	<< static_cast<int>(std::round(100*completion)) << "%)\n"
	<< "Estimated remaining generation time: "
	<< remaining_time.count() << " seconds ("
	<< std::put_time(std::localtime(&finish), "%c") << ")\n\n";
	}

	RHEJ::ProgressBar<long long> progress{std::cout, config.events};
	progress.increment(events.size());
	events.reserve(config.events);
	for(; events.size() < static_cast<size_t>(config.events); ++trials){
	auto ev = generator.gen_event();
	++status_counter[generator.status()];
	if(generator.status() == HEJFOG::good && analysis->pass_cuts(ev, ev)) {
	if(unweighter) {
	auto unweighted = unweighter->unweight(std::move(ev));
	if(! unweighted) continue;
	ev = std::move(*unweighted);
	}
	events.emplace_back(std::move(ev));
	++progress;
	}
	}
	std::cout << std::endl;

	HEJFOG::CrossSectionAccumulator xs;
	for(auto & ev: events){
	rescale_weights(ev, invGeV2_to_pb/trials);
	analysis->fill(ev, ev);
	writer.write(ev);
	xs.fill(ev);
	}

	const std::chrono::duration<double> run_time = (clock::now() - start_time);
	std::cout << "\nTask Runtime: " << run_time.count() << " seconds.\n\n";

	std::cout.precision(10);
	std::cout.setf(std::ios::fixed);
	std::cout
	<< " " << std::left << std::setw(20)
	<< "Cross section: " << xs.total().value
	<< " +- " << std::sqrt(xs.total().error) << " (pb)\n";
	for(auto const & xs_type: xs) {
	std::cout
	<< " " << std::left << std::setw(20)
	<< (RHEJ::event_type::names[xs_type.first] + ": "s)
	<< xs_type.second.value << " +- "
	<< std::sqrt(xs_type.second.error) << " (pb)\n";
	}

	std::cout << '\n';
	for(auto && entry: status_counter){
	const double fraction = static_cast<double>(entry.second)/trials;
	const int percent = std::round(100*fraction);
	std::cout << "status "
	<< std::left << std::setw(16) << (to_string(entry.first) + ":")
	<< " [";
	for(int i = 0; i < percent/2; ++i) std::cout << '#';
	for(int i = percent/2; i < 50; ++i) std::cout << ' ';
	std::cout << "] " << percent << "%\n";
	}

	}
	diff --git a/FixedOrderGen/t/config_h_2j.yml b/FixedOrderGen/t/config_h_2j.yml
	index 8a104af..3fa29a2 100644
	--- a/FixedOrderGen/t/config_h_2j.yml
	+++ b/FixedOrderGen/t/config_h_2j.yml
	@@ -1,23 +1,26 @@
	events: 100000

	jets:
	min pt: 30
	R: 0.4
	algorithm: antikt
	max rapidity: 5

	beam:
	energy: 6500
	particles: [p, p]

	pdf: 11000

	process: p p => h 2j

	unordered fraction: 0

	scales: 125

	Higgs properties:
	mass: 125
	width: 0
	+
	+random generator:
	+ name: ranlux64
	diff --git a/FixedOrderGen/t/config_h_2j_decay.yml b/FixedOrderGen/t/config_h_2j_decay.yml
	index e509690..f3f3b7c 100644
	--- a/FixedOrderGen/t/config_h_2j_decay.yml
	+++ b/FixedOrderGen/t/config_h_2j_decay.yml
	@@ -1,24 +1,27 @@
	events: 100000

	jets:
	min pt: 30
	R: 0.4
	algorithm: antikt
	max rapidity: 5

	beam:
	energy: 6500
	particles: [p, p]

	pdf: 11000

	process: p p => h 2j

	unordered fraction: 0

	scales: 125

	Higgs properties:
	mass: 125
	width: 0.00407
	decays: {into: [photon, photon], branching ratio: 0.00228}
	+
	+random generator:
	+ name: ranlux64
	diff --git a/config.yml b/config.yml
	index 95e7482..7950f4b 100644
	--- a/config.yml
	+++ b/config.yml
	@@ -1,85 +1,91 @@
	# number of attempted resummation phase space points for each input event
	trials: 10

	min extparton pt: 30 # minimum transverse momentum of extremal partons

	resummation jets: # resummation jet properties
	min pt: 35 # minimum jet transverse momentum
	algorithm: antikt # jet algorithm
	R: 0.4 # jet R parameter

	fixed order jets: # properties of input jets
	min pt: 30
	# by default, algorithm and R are like for resummation jets

	# treatment of he various event classes
	# the supported settings are: reweight, keep, discard
	# non-FKL events cannot be reweighted
	FKL: reweight
	unordered: keep
	non-FKL: keep

	# scale settings similar to original HEJ
	#
	# Use combinations of max jet pperp, input scales, ht/2,
	# and the jet invariant mass and vary all scales by factors
	# of 1, sqrt(2), and 2. Discard combinations where mur and muf
	# differ by a factor of more than two.
	#
	# The weight entries in the final events are ordered as follows:
	# 0-18: max jet pperp
	# 19-37: input scales
	# 38-56: ht/2
	# 57-75: jet invariant mass
	# In each of these groups, the first entry corresponds to the basic
	# scale choice. In the following entries, mur and muf are varied with
	# the above factors. The entries are ordered lexicographically so that
	# mur1 < mur2 or (mur1 == mur2 and muf1 < muf2).
	#
	# Note that in contrast to HEJ, the central choice for the event is always
	# max jet pperp and cannot be configured (yet).
	#
	# scales: [max jet pperp, input, Ht/2, jet invariant mass]
	# scale factors: [0.5, 0.7071, 1, 1.41421, 2]
	# max scale ratio: 2.0001

	scales: 91.188

	# import scale setting functions
	#
	# import scales:
	# lib_my_scales.so: [scale0,scale1]

	log correction: false # whether or not to include higher order logs
	unweight: false # TODO: whether or not to unweight events

	# event output files
	#
	# the supported formats are
	# - Les Houches (suffix .lhe)
	# - HepMC (suffix .hepmc3)
	# TODO: - ROOT ntuples (suffix .root)
	#
	# An output file's format is deduced either automatically from the suffix
	# or from an explicit specification, e.g.
	# - Les Houches: outfile

	event output:
	- RHEJ.lhe
	# - RHEJ_events.hepmc

	analysis:
	# to use a custom analysis
	# plugin: ./src/analysis-plugins/libVBF.so
	# output: RHEJ.root
	# wtwt cut: # optional cut on (event weight)^2

	-#RanLux init: ranlux.0 # file for initialisation of random number engine
	+# selection of random number generator and seed
	+# the choices are
	+# - mixmax (seed is an integer)
	+# - ranlux64 (seed is a filename containing parameters)
	+random generator:
	+ name: mixmax
	+ # seed: 1

	# parameters for Higgs-gluon couplings
	# this requires compilation with looptools
	# Higgs coupling:
	# use impact factors: false
	# mt: 174
	# include bottom: true
	# mb: 4.7
	diff --git a/include/RHEJ/YAMLreader.hh b/include/RHEJ/YAMLreader.hh
	index f4507d1..f7a97d2 100644
	--- a/include/RHEJ/YAMLreader.hh
	+++ b/include/RHEJ/YAMLreader.hh
	@@ -1,237 +1,239 @@
	/** \file YAMLread.hh
	* \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
	);

	JetParameters get_jet_parameters(
	YAML::Node const & node, std::string const & entry
	);

	HiggsCouplingSettings get_Higgs_coupling(
	YAML::Node const & node, std::string const & entry
	);

	ScaleConfig to_ScaleConfig(YAML::Node const & yaml);

	+ RNGConfig to_RNGConfig(YAML::Node const & node, std::string const & entry);
	+
	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 7714127..5d002d7 100644
	--- a/include/RHEJ/config.hh
	+++ b/include/RHEJ/config.hh
	@@ -1,161 +1,167 @@
	/** \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.
	*/

	#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
	*/
	struct JetParameters{
	fastjet::JetDefinition def; /*< Jet Definition /
	double min_pt; /*< Minimum Jet Pt /
	};

	//! 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 {
	+ std::string name;
	+ optional<std::string> seed;
	+ };
	+
	/**! \enum EventTreatment config.hh "include/RHEJ/config.hh"
	* \brief Enumeration which deals with how to treat 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 /
	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.
	*/
	using EventTreatMap = std::map<event_type::EventType, EventTreatment>;

	/**! \struct Config config.hh "include/RHEJ/config.hh"
	* \brief Config Struct for user input parameters.
	*
	* The struct which handles the input card given by the user.
	*
	* \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
	*/
	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
	bool log_correction;
	bool unweight; /*< Unweight On or Off /
	std::vector<OutputFile> output; /*< Output Files Type /
	- optional<std::string> RanLux_init; /*< Ranlux File Choice/
	+ RNGConfig rng; /*< Random Number Generator /
	//! Map to decide what to do for differnt EventTypes
	EventTreatMap treat;
	YAML::Node analysis_parameters; /*< Analysis Parameters /
	//! Settings for Effective Higgs-Gluon Coupling
	HiggsCouplingSettings Higgs_coupling;
	};

	//! Configuration options for the PhaseSpacePoint class
	struct PhaseSpacePointConfig {
	JetParameters jet_param;
	double min_extparton_pt;
	double max_ext_soft_pt_fraction;
	};

	//! Configuration options for the MatrixElement class
	struct MatrixElementConfig {
	JetParameters jet_param;
	bool log_correction;
	HiggsCouplingSettings Higgs_coupling;
	};

	//! Configuration options for the EventReweighter class
	struct EventReweighterConfig {
	PhaseSpacePointConfig psp_config;
	MatrixElementConfig ME_config;
	JetParameters jet_param;
	EventTreatMap treat;
	};

	/**! Extract PhaseSpacePointConfig from Config
	*
	* 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/make_RNG.hh b/include/RHEJ/make_RNG.hh
	new file mode 100644
	index 0000000..6e3f05a
	--- /dev/null
	+++ b/include/RHEJ/make_RNG.hh
	@@ -0,0 +1,14 @@
	+#pragma once
	+
	+#include <memory>
	+#include <string>
	+
	+#include "RHEJ/RNG.hh"
	+#include "RHEJ/optional.hh"
	+
	+namespace RHEJ {
	+ std::unique_ptr<RHEJ::RNG> make_RNG(
	+ std::string const & name,
	+ optional<std::string> const & seed
	+ );
	+}
	diff --git a/src/YAMLreader.cc b/src/YAMLreader.cc
	index ebf9581..2ed2833 100644
	--- a/src/YAMLreader.cc
	+++ b/src/YAMLreader.cc
	@@ -1,478 +1,491 @@
	#include "RHEJ/YAMLreader.hh"

	#include <set>
	#include <string>
	#include <vector>
	#include <iostream>
	#include <stdexcept>

	#include <dlfcn.h>

	namespace RHEJ{

	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 = {
	"trials", "min extparton pt", "max ext soft pt fraction",
	"FKL", "unordered", "non-FKL",
	"scales", "scale factors", "max scale ratio", "import scales",
	- "log correction", "unweight", "event output", "analysis",
	- "RanLux init"
	+ "log correction", "unweight", "event output", "analysis"
	};
	// add subnodes to "supported" - the assigned value is irrelevant
	for(auto && opt: opts) supported[opt] = "";
	for(auto && jet_opt: {"min pt", "algorithm", "R"}){
	supported["resummation jets"][jet_opt] = "";
	supported["fixed order jets"][jet_opt] = "";
	}
	for(auto && opt: {"mt", "use impact factors", "include bottom", "mb"}){
	supported["Higgs coupling"][opt] = "";
	}
	+ for(auto && opt: {"name", "seed"}){
	+ supported["random generator"][opt] = "";
	+ }
	return supported;
	}();
	return supported;
	}

	fastjet::JetAlgorithm to_JetAlgorithm(std::string const & algo){
	using namespace fastjet;
	static const std::map<std::string, fastjet::JetAlgorithm> known = {
	{"kt", kt_algorithm},
	{"cambridge", cambridge_algorithm},
	{"antikt", antikt_algorithm},
	{"genkt", genkt_algorithm},
	{"cambridge for passive", cambridge_for_passive_algorithm},
	{"genkt for passive", genkt_for_passive_algorithm},
	{"ee kt", ee_kt_algorithm},
	{"ee genkt", ee_genkt_algorithm},
	{"plugin", plugin_algorithm}
	};
	const auto res = known.find(algo);
	if(res == known.end()){
	throw std::invalid_argument("Unknown jet algorithm " + algo);
	}
	return res->second;
	}

	EventTreatment to_EventTreatment(std::string const & name){
	static const std::map<std::string, EventTreatment> known = {
	{"reweight", EventTreatment::reweight},
	{"keep", EventTreatment::keep},
	{"discard", EventTreatment::discard}
	};
	const auto res = known.find(name);
	if(res == known.end()){
	throw std::invalid_argument("Unknown event treatment " + name);
	}
	return res->second;
	}

	} // namespace anonymous

	ParticleID to_ParticleID(std::string const & name){
	using namespace RHEJ::pid;
	static const std::map<std::string, ParticleID> known = {
	{"d", d}, {"down", down}, {"u", u}, {"up", up}, {"s", s}, {"strange", strange},
	{"c", c}, {"charm", charm}, {"b", b}, {"bottom", bottom}, {"t", t}, {"top", top},
	{"e", e}, {"electron", electron}, {"nu_e", nu_e}, {"electron_neutrino", electron_neutrino},
	{"mu", mu}, {"muon", muon}, {"nu_mu", nu_mu}, {"muon_neutrino", muon_neutrino},
	{"tau", tau}, {"nu_tau", nu_tau}, {"tau_neutrino", tau_neutrino},
	{"d_bar", d_bar}, {"u_bar", u_bar}, {"s_bar", s_bar}, {"c_bar", c_bar},
	{"b_bar", b_bar}, {"t_bar", t_bar}, {"e_bar", e_bar},
	{"nu_e_bar", nu_e_bar}, {"mu_bar", mu_bar}, {"nu_mu_bar", nu_mu_bar},
	{"tau_bar", tau_bar}, {"nu_tau_bar", nu_tau_bar},
	{"gluon", gluon}, {"g", g}, {"photon", photon}, {"gamma", gamma},
	{"Z", Z}, {"Wp", Wp}, {"Wm", Wm}, {"W+", Wp}, {"W-", Wm},
	{"h", h}, {"H", h}, {"Higgs", Higgs}, {"higgs", higgs},
	{"p", p}, {"proton", proton}, {"p_bar", p_bar}
	};
	const auto res = known.find(name);
	if(res == known.end()){
	throw std::invalid_argument("Unknown particle " + name);
	}
	return res->second;
	}

	namespace detail{
	void set_from_yaml(fastjet::JetAlgorithm & setting, YAML::Node const & yaml){
	setting = to_JetAlgorithm(yaml.as<std::string>());
	}

	void set_from_yaml(EventTreatment & setting, YAML::Node const & yaml){
	setting = to_EventTreatment(yaml.as<std::string>());
	}

	void set_from_yaml(ParticleID & setting, YAML::Node const & yaml){
	setting = to_ParticleID(yaml.as<std::string>());
	}
	} // namespace detail

	JetParameters get_jet_parameters(
	YAML::Node const & node,
	std::string const & entry
	){
	assert(node);
	JetParameters result;
	fastjet::JetAlgorithm jet_algo = fastjet::antikt_algorithm;
	double R;
	set_from_yaml_if_defined(jet_algo, node, entry, "algorithm");
	set_from_yaml(R, node, entry, "R");
	result.def = fastjet::JetDefinition{jet_algo, R};
	set_from_yaml(result.min_pt, node, entry, "min pt");
	return result;
	}

	+ RNGConfig to_RNGConfig(
	+ YAML::Node const & node,
	+ std::string const & entry
	+ ){
	+ assert(node);
	+ RNGConfig result;
	+ set_from_yaml(result.name, node, entry, "name");
	+ set_from_yaml_if_defined(result.seed, node, entry, "seed");
	+ return result;
	+ }
	+
	HiggsCouplingSettings get_Higgs_coupling(
	YAML::Node const & node,
	std::string const & entry
	){
	assert(node);
	static constexpr double mt_max = 2e4;
	#ifndef RHEJ_BUILD_WITH_QCDLOOP
	if(node[entry]){
	throw std::invalid_argument{
	"Higgs coupling settings require building Reversed HEJ "
	"with QCDloop support"
	};
	}
	#endif
	HiggsCouplingSettings settings;
	set_from_yaml_if_defined(settings.mt, node, entry, "mt");
	set_from_yaml_if_defined(settings.mb, node, entry, "mb");
	set_from_yaml_if_defined(settings.include_bottom, node, entry, "include bottom");
	set_from_yaml_if_defined(settings.use_impact_factors, node, entry, "use impact factors");
	if(settings.use_impact_factors){
	if(settings.mt != std::numeric_limits<double>::infinity()){
	throw std::invalid_argument{
	"Conflicting settings: "
	"impact factors may only be used in the infinite top mass limit"
	};
	}
	}
	else{
	// huge values of the top mass are numerically unstable
	settings.mt = std::min(settings.mt, mt_max);
	}
	return settings;
	}

	FileFormat to_FileFormat(std::string const & name){
	static const std::map<std::string, FileFormat> known = {
	{"Les Houches", FileFormat::Les_Houches},
	{"HepMC", FileFormat::HepMC}
	};
	const auto res = known.find(name);
	if(res == known.end()){
	throw std::invalid_argument("Unknown file format " + name);
	}
	return res->second;
	}

	std::string extract_suffix(std::string const & filename){
	size_t separator = filename.rfind('.');
	if(separator == filename.npos) return {};
	return filename.substr(separator + 1);
	}

	FileFormat format_from_suffix(std::string const & filename){
	const std::string suffix = extract_suffix(filename);
	if(suffix == "lhe") return FileFormat::Les_Houches;
	if(suffix == "hepmc") return FileFormat::HepMC;
	throw std::invalid_argument{
	"Can't determine format for output file " + filename
	};
	}

	void assert_all_options_known(
	YAML::Node const & conf, YAML::Node const & supported
	){
	if(!conf.IsMap()) return;
	if(!supported.IsMap()) throw invalid_type{"must not have sub-entries"};
	for(auto const & entry: conf){
	const auto name = entry.first.as<std::string>();
	if(! supported[name]) throw unknown_option{name};
	/* check sub-options, e.g. 'resummation jets: min pt'
	* we don't check analysis sub-options
	* those depend on the analysis being used and should be checked there
	* similar for "import scales"
	*/
	if(name != "analysis" && name != "import scales"){
	try{
	assert_all_options_known(conf[name], supported[name]);
	}
	catch(unknown_option const & ex){
	throw unknown_option{name + ": " + ex.what()};
	}
	catch(invalid_type const & ex){
	throw invalid_type{name + ": " + ex.what()};
	}
	}
	}
	}

	} // namespace RHEJ

	namespace YAML {

	Node convert<RHEJ::OutputFile>::encode(RHEJ::OutputFile const & outfile) {
	Node node;
	node[to_string(outfile.format)] = outfile.name;
	return node;
	};

	bool convert<RHEJ::OutputFile>::decode(Node const & node, RHEJ::OutputFile & out) {
	switch(node.Type()){
	case NodeType::Map: {
	YAML::const_iterator it = node.begin();
	out.format = RHEJ::to_FileFormat(it->first.as<std::string>());
	out.name = it->second.as<std::string>();
	return true;
	}
	case NodeType::Scalar:
	out.name = node.as<std::string>();
	out.format = RHEJ::format_from_suffix(out.name);
	return true;
	default:
	return false;
	}
	}
	} // namespace YAML

	namespace RHEJ{

	namespace detail{
	void set_from_yaml(OutputFile & setting, YAML::Node const & yaml){
	setting = yaml.as<OutputFile>();
	}
	}

	namespace{
	void update_fixed_order_jet_parameters(
	JetParameters & fixed_order_jets, YAML::Node const & yaml
	){
	if(!yaml["fixed order jets"]) return;
	set_from_yaml_if_defined(
	fixed_order_jets.min_pt, yaml, "fixed order jets", "min pt"
	);
	fastjet::JetAlgorithm algo = fixed_order_jets.def.jet_algorithm();
	set_from_yaml_if_defined(algo, yaml, "fixed order jets", "algorithm");
	double R = fixed_order_jets.def.R();
	set_from_yaml_if_defined(R, yaml, "fixed order jets", "R");
	fixed_order_jets.def = fastjet::JetDefinition{algo, R};
	}

	// like std::stod, but throw if not the whole string can be converted
	double to_double(std::string const & str){
	std::size_t pos;
	const double result = std::stod(str, &pos);
	if(pos < str.size()){
	throw std::invalid_argument(str + " is not a valid double value");
	}
	return result;
	}

	void import_scale_functions(
	std::string const & file,
	std::vector<std::string> const & scale_names,
	std::unordered_map<std::string, ScaleFunction> & known
	) {
	using ScaleFunction = double (*)(Event const &);

	auto handle = dlopen(file.c_str(), RTLD_NOW);
	char * error = dlerror();
	if(error != nullptr) throw std::runtime_error{error};

	for(auto const & scale: scale_names) {
	void * sym = dlsym(handle, scale.c_str());
	error = dlerror();
	if(error != nullptr) throw std::runtime_error{error};
	known.emplace(scale, reinterpret_cast<ScaleFunction>(sym));
	}
	}

	auto get_scale_map(
	YAML::Node const & yaml
	) {
	std::unordered_map<std::string, ScaleFunction> scale_map;
	scale_map.emplace("H_T", H_T);
	scale_map.emplace("max jet pperp", max_jet_pt);
	scale_map.emplace("jet invariant mass", jet_invariant_mass);
	scale_map.emplace("m_j1j2", m_j1j2);
	if(yaml["import scales"]) {
	if(! yaml["import scales"].IsMap()) {
	throw invalid_type{"Entry 'import scales' is not a map"};
	}
	for(auto const & import: yaml["import scales"]) {
	const auto file = import.first.as<std::string>();
	const auto scale_names =
	import.second.IsSequence()
	?import.second.as<std::vector<std::string>>()
	:std::vector<std::string>{import.second.as<std::string>()};
	import_scale_functions(file, scale_names, scale_map);
	}
	}
	return scale_map;
	}

	// simple (as in non-composite) scale functions
	/**
	* An example for a simple scale function would be H_T,
	* H_T/2 is then composite (take H_T and then divide by 2)
	*/
	ScaleFunction parse_simple_ScaleFunction(
	std::string const & scale_fun,
	std::unordered_map<std::string, ScaleFunction> const & known
	) {
	assert(
	scale_fun.empty() \|\|
	(!std::isspace(scale_fun.front()) && !std::isspace(scale_fun.back()))
	);
	const auto it = known.find(scale_fun);
	if(it != end(known)) return it->second;
	try{
	const double scale = to_double(scale_fun);
	return FixedScale{scale};
	} catch(std::invalid_argument const &){}
	throw std::invalid_argument{"Unknown scale choice: " + scale_fun};
	}

	std::string trim_front(std::string const & str){
	const auto new_begin = std::find_if(
	begin(str), end(str), [](char c){ return ! std::isspace(c); }
	);
	return std::string(new_begin, end(str));
	}

	std::string trim_back(std::string str){
	size_t pos = str.size() - 1;
	// use guaranteed wrap-around behaviour to check whether we have
	// traversed the whole string
	for(; pos < str.size() && std::isspace(str[pos]); --pos) {}
	str.resize(pos + 1); // note that pos + 1 can be 0
	return str;
	}

	ScaleFunction parse_ScaleFunction(
	std::string const & scale_fun,
	std::unordered_map<std::string, ScaleFunction> const & known
	){
	assert(
	scale_fun.empty() \|\|
	(!std::isspace(scale_fun.front()) && !std::isspace(scale_fun.back()))
	);
	const size_t delim = scale_fun.find_first_of("*/");
	if(delim == scale_fun.npos){
	return parse_simple_ScaleFunction(scale_fun, known);
	}
	const std::string first = trim_back(std::string{scale_fun, 0, delim});
	const std::string second = trim_front(std::string{scale_fun, delim+1});
	double factor;
	ScaleFunction fun;
	if(scale_fun[delim] == '/'){
	factor = 1/to_double(second);
	fun = parse_simple_ScaleFunction(first, known);
	}
	else{
	assert(scale_fun[delim] == '*');
	try{
	factor = to_double(second);
	fun = parse_simple_ScaleFunction(first, known);
	}
	catch(std::invalid_argument const &){
	factor = to_double(first);
	fun = parse_simple_ScaleFunction(second, known);
	}
	}
	assert(fun != nullptr);
	return Product{factor, std::move(fun)};
	}

	EventTreatMap get_event_treatment(
	YAML::Node const & yaml
	){
	using namespace event_type;
	EventTreatMap treat {
	{no_2_jets, EventTreatment::discard},
	{bad_final_state, EventTreatment::discard},
	{FKL, EventTreatment::reweight},
	{unob, EventTreatment::keep},
	{unof, EventTreatment::keep},
	{nonFKL, EventTreatment::keep}
	};
	set_from_yaml(treat.at(FKL), yaml, "FKL");
	set_from_yaml(treat.at(unob), yaml, "unordered");
	treat.at(unof) = treat.at(unob);
	set_from_yaml(treat.at(nonFKL), yaml, "non-FKL");
	if(treat[nonFKL] == EventTreatment::reweight){
	throw std::invalid_argument{"Cannot reweight non-FKL events"};
	}
	return treat;
	}


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

	Config config;
	config.resummation_jets = get_jet_parameters(yaml, "resummation jets");
	config.fixed_order_jets = config.resummation_jets;
	update_fixed_order_jet_parameters(config.fixed_order_jets, yaml);
	set_from_yaml(config.min_extparton_pt, yaml, "min extparton pt");
	config.max_ext_soft_pt_fraction = std::numeric_limits<double>::infinity();
	set_from_yaml_if_defined(
	config.max_ext_soft_pt_fraction, yaml, "max ext soft pt fraction"
	);
	set_from_yaml(config.trials, yaml, "trials");
	set_from_yaml(config.log_correction, yaml, "log correction");
	set_from_yaml(config.unweight, yaml, "unweight");
	config.treat = get_event_treatment(yaml);
	set_from_yaml_if_defined(config.output, yaml, "event output");
	- set_from_yaml_if_defined(config.RanLux_init, yaml, "RanLux init");
	+ config.rng = to_RNGConfig(yaml, "random generator");
	set_from_yaml_if_defined(config.analysis_parameters, yaml, "analysis");
	config.scales = to_ScaleConfig(yaml);
	config.Higgs_coupling = get_Higgs_coupling(yaml, "Higgs coupling");
	return config;
	}

	} // namespace anonymous

	ScaleConfig to_ScaleConfig(YAML::Node const & yaml){
	ScaleConfig config;
	auto scale_funs = get_scale_map(yaml);
	std::vector<std::string> scales;
	set_from_yaml(scales, yaml, "scales");
	config.base.reserve(scales.size());
	std::transform(
	begin(scales), end(scales), std::back_inserter(config.base),
	[scale_funs](auto const & entry){
	return parse_ScaleFunction(entry, scale_funs);
	}
	);
	set_from_yaml_if_defined(config.factors, yaml, "scale factors");
	config.max_ratio = std::numeric_limits<double>::infinity();
	set_from_yaml_if_defined(config.max_ratio, yaml, "max scale ratio");
	return config;
	}

	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;
	}
	}

	} // namespace RHEJ
	diff --git a/src/main.cc b/src/main.cc
	index 7a0b2cd..d6b7f0d 100644
	--- a/src/main.cc
	+++ b/src/main.cc
	@@ -1,179 +1,178 @@
	/**
	* Name: main.cc
	* Authors: Tuomas Hapola, Andreas Maier <andreas.maier@durham.ac.uk>
	*
	*/
	#include <fstream>
	#include <algorithm>
	#include <memory>
	#include <chrono>
	#include <iostream>

	#include "yaml-cpp/yaml.h"

	#include "RHEJ/CombinedEventWriter.hh"
	#include "RHEJ/config.hh"
	#include "RHEJ/EventReweighter.hh"
	#include "RHEJ/get_analysis.hh"
	#include "LHEF/LHEF.h"
	#include "RHEJ/utility.hh"
	#include "RHEJ/Version.hh"
	#include "RHEJ/stream.hh"
	#include "RHEJ/YAMLreader.hh"
	#include "RHEJ/ProgressBar.hh"
	-#include "RHEJ/Ranlux64.hh"
	+#include "RHEJ/make_RNG.hh"

	int event_number(std::string const & record){
	size_t start = record.rfind("Number of Events");
	start = record.find_first_of("123456789", start);
	if(start == std::string::npos) {
	throw std::invalid_argument("no event number record found");
	}
	const size_t end = record.find_first_not_of("0123456789", start);
	return std::stoi(record.substr(start, end - start));
	}

	RHEJ::Config load_config(char const * filename){
	try{
	return RHEJ::load_config(filename);
	}
	catch(std::exception const & exc){
	std::cerr << "Error: " << exc.what() << '\n';
	std::exit(EXIT_FAILURE);
	}
	}

	std::unique_ptr<RHEJ::Analysis> get_analysis(
	YAML::Node const & parameters
	){
	try{
	return RHEJ::get_analysis(parameters);
	}
	catch(std::exception const & exc){
	std::cerr << "Failed to load analysis: " << exc.what() << '\n';
	std::exit(EXIT_FAILURE);
	}
	}

	// unique_ptr is a workaround:
	// RHEJ::optional is a better fit, but gives spurious errors with g++ 7.3.0
	std::unique_ptr<RHEJ::ProgressBar<double>> make_progress_bar(
	std::vector<double> const & xs
	) {
	if(xs.empty()) return {};
	const double Born_xs = std::accumulate(begin(xs), end(xs), 0.);
	return std::make_unique<RHEJ::ProgressBar<double>>(std::cout, Born_xs);
	}

	std::string time_to_string(const time_t time){
	char s[30];
	struct tm * p = localtime(&time);
	strftime(s, 30, "%a %b %d %Y %H:%M:%S", p);
	return s;
	}

	int main(int argn, char** argv) {
	using clock = std::chrono::system_clock;

	if (argn < 3) {
	std::cerr << "\n# Usage:\n."<< argv[0] <<" config_file input_file\n\n";
	return EXIT_FAILURE;
	}

	const auto start_time = clock::now();
	{
	std::cout << "Starting " << RHEJ::Version::package_name_full()
	<< ", revision " << RHEJ::Version::revision() << " ("
	<< time_to_string(clock::to_time_t(start_time)) << ")" << std::endl;
	}
	fastjet::ClusterSequence::print_banner();

	// read configuration
	const RHEJ::Config config = load_config(argv[1]);

	RHEJ::istream in{argv[2]};

	std::unique_ptr<RHEJ::Analysis> analysis = get_analysis(
	config.analysis_parameters
	);
	assert(analysis != nullptr);

	LHEF::Reader reader{in};
	RHEJ::CombinedEventWriter writer{config.output, reader.heprup};

	double global_reweight = 1.;
	int max_events = std::numeric_limits<int>::max();
	if(argn > 3){
	max_events = std::stoi(argv[3]);
	const int input_events = event_number(reader.headerBlock);
	global_reweight = input_events/static_cast<double>(max_events);
	std::cout << "Processing " << max_events
	<< " out of " << input_events << " events\n";
	}
	RHEJ::ScaleGenerator scale_gen{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	};
	- auto ran = config.RanLux_init?
	- RHEJ::Ranlux64{*config.RanLux_init}:
	- RHEJ::Ranlux64{};
	+ auto ran = RHEJ::make_RNG(config.rng.name, config.rng.seed);
	+ assert(ran != nullptr);
	RHEJ::EventReweighter rhej{
	reader.heprup,
	std::move(scale_gen),
	to_EventReweighterConfig(config),
	- ran
	+ *ran
	};

	int nevent = 0;
	std::array<int, RHEJ::event_type::last_type + 1>
	nevent_type{0}, nfailed_type{0};
	auto progress = make_progress_bar(reader.heprup.XSECUP);
	// Loop over the events in the inputfile
	while(reader.readEvent()){
	// reweight events so that the total cross section is conserved
	reader.hepeup.setWeight(0, global_reweight * reader.hepeup.weight());

	if(nevent == max_events) break;
	++nevent;

	if (nevent % 10000 == 0){
	std::cout << "Passed " << nevent << " events ("
	<< time_to_string(clock::to_time_t(clock::now())) << ")"<< std::endl;
	}

	// calculate rHEJ weight
	RHEJ::Event FO_event{
	RHEJ::UnclusteredEvent{reader.hepeup},
	config.fixed_order_jets.def, config.fixed_order_jets.min_pt,
	};
	auto resummed_events = rhej.reweight(FO_event, config.trials);
	++nevent_type[FO_event.type()];

	if(resummed_events.empty()) ++nfailed_type[FO_event.type()];

	for(auto const & ev: resummed_events){
	//TODO: move pass_cuts to after phase space point generation
	if(analysis->pass_cuts(ev, FO_event)){
	analysis->fill(ev, FO_event);
	writer.write(ev);
	}
	}
	if(progress) progress->increment(FO_event.central().weight);
	} // main event loop
	std::cout << '\n';

	using namespace RHEJ::event_type;
	std::cout<< "Events processed: " << nevent << '\n';
	for(size_t ev_type = first_type; ev_type <= last_type; ++ev_type){
	std::cout << '\t' << names[ev_type] << ": " << nevent_type[ev_type]
	<< ", failed to reconstruct " << nfailed_type[ev_type]
	<< '\n';
	}
	std::chrono::duration<double> run_time = (clock::now() - start_time);
	std::cout << "Finished " << RHEJ::Version::package_name() << " at "
	<< time_to_string(clock::to_time_t(clock::now()))
	<< "\n=> Runtime: " << run_time.count() << " sec ("
	<< nevent/run_time.count() << " Events/sec).\n";

	}
	diff --git a/src/make_RNG.cc b/src/make_RNG.cc
	new file mode 100644
	index 0000000..b4c3e56
	--- /dev/null
	+++ b/src/make_RNG.cc
	@@ -0,0 +1,28 @@
	+#include "RHEJ/make_RNG.hh"
	+
	+#include <locale>
	+
	+#include "RHEJ/Ranlux64.hh"
	+#include "RHEJ/Mixmax.hh"
	+
	+namespace RHEJ {
	+ std::unique_ptr<RHEJ::RNG> make_RNG(
	+ std::string const & name,
	+ optional<std::string> const & seed
	+ ) {
	+ std::string lname;
	+ std::transform(
	+ begin(name), end(name), std::back_inserter(lname),
	+ [](char c) { return std::tolower(c, std::locale()); }
	+ );
	+ if(lname == "mixmax") {
	+ if(seed) return std::make_unique<Mixmax>(std::stol(*seed));
	+ return std::make_unique<Mixmax>();
	+ }
	+ if(lname == "ranlux64") {
	+ if(seed) return std::make_unique<Ranlux64>(*seed);
	+ return std::make_unique<Ranlux64>();
	+ }
	+ throw std::invalid_argument{"Unknown random number generator: " + name};
	+ }
	+}
	diff --git a/t/jet_config.yml b/t/jet_config.yml
	index b0e96e6..3d19554 100644
	--- a/t/jet_config.yml
	+++ b/t/jet_config.yml
	@@ -1,23 +1,26 @@
	trials: 10

	min extparton pt: 30

	resummation jets:
	min pt: 35
	algorithm: antikt
	R: 0.4

	fixed order jets:
	min pt: 30

	FKL: reweight
	unordered: discard
	non-FKL: discard

	log correction: false
	unweight: false

	scales: 91.188

	+random generator:
	+ name: ranlux64
	+
	event output:
	- tst.lhe
	diff --git a/t/jet_config_with_import.yml b/t/jet_config_with_import.yml
	index 66a84c0..93e0ffa 100644
	--- a/t/jet_config_with_import.yml
	+++ b/t/jet_config_with_import.yml
	@@ -1,26 +1,29 @@
	trials: 10

	min extparton pt: 30

	resummation jets:
	min pt: 35
	algorithm: antikt
	R: 0.4

	fixed order jets:
	min pt: 30

	FKL: reweight
	unordered: discard
	non-FKL: discard

	log correction: false
	unweight: false

	scales: softest_jet_pt

	event output:
	- tst.lhe

	+random generator:
	+ name: ranlux64
	+
	import scales:
	./libscales.so: softest_jet_pt

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions