No OneTemporary
Actions

Size

75 KB

Subscribers

None

View Options

	diff --git a/FixedOrderGen/include/Ranlux64Engine.hh b/FixedOrderGen/include/Ranlux64Engine.hh
	deleted file mode 100644
	index 0f5e0f1..0000000
	--- a/FixedOrderGen/include/Ranlux64Engine.hh
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-#pragma once
	-
	-#include <string>
	-
	-#include <CLHEP/Random/Randomize.h>
	-#include <CLHEP/Random/RanluxEngine.h>
	-
	-namespace HEJFOG {
	- CLHEP::Ranlux64Engine make_Ranlux64Engine();
	-}
	diff --git a/FixedOrderGen/src/Ranlux64Engine.cc b/FixedOrderGen/src/Ranlux64Engine.cc
	deleted file mode 100644
	index 0b1d5e6..0000000
	--- a/FixedOrderGen/src/Ranlux64Engine.cc
	+++ /dev/null
	@@ -1,36 +0,0 @@
	-#include "Ranlux64Engine.hh"
	-
	-namespace HEJFOG {
	- //generate Ranlux64Engine with fixed, predefined state
	- /*
	- * some (all?) of the Ranlux64Engine constructors leave fields
	- * uninitialised, invoking undefined behaviour. This can be
	- * circumvented by restoring the state from a file
	- */
	- CLHEP::Ranlux64Engine make_Ranlux64Engine(){
	- static const std::string state =
	- "9876\n"
	- "0.91280703978419097666\n"
	- "0.41606065829518357191\n"
	- "0.99156342622341142601\n"
	- "0.030922955274050423213\n"
	- "0.16206278421638486975\n"
	- "0.76151768001958330956\n"
	- "0.43765760066092695979\n"
	- "0.42904698253748563275\n"
	- "0.11476317525663759511\n"
	- "0.026620053590963976831\n"
	- "0.65953715764414511114\n"
	- "0.30136722624439826745\n"
	- "3.5527136788005009294e-15 4\n"
	- "1 202\n";
	- const std::string file = std::tmpnam(nullptr);
	- {
	- std::ofstream out{file};
	- out << state;
	- }
	- CLHEP::Ranlux64Engine result;
	- result.restoreStatus(file.c_str());
	- return result;
	- }
	-}
	diff --git a/FixedOrderGen/src/main.cc b/FixedOrderGen/src/main.cc
	index 828a4c6..70514a8 100644
	--- a/FixedOrderGen/src/main.cc
	+++ b/FixedOrderGen/src/main.cc
	@@ -1,240 +1,241 @@
	/**
	* 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/make_Ranlux64Engine.hh"

	#include "EventGenerator.hh"
	#include "PhaseSpacePoint.hh"
	-#include "Ranlux64Engine.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 = HEJFOG::make_Ranlux64Engine();
	- if(config.RanLux_init) ran.restoreStatus(config.RanLux_init->c_str());
	+ auto ran = config.RanLux_init?
	+ RHEJ::make_Ranlux64Engine(*config.RanLux_init):
	+ RHEJ::make_Ranlux64Engine();

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

	//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
	};
	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/h_2j.cc b/FixedOrderGen/t/h_2j.cc
	index bb5d52f..f14a942 100644
	--- a/FixedOrderGen/t/h_2j.cc
	+++ b/FixedOrderGen/t/h_2j.cc
	@@ -1,64 +1,64 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"

	using namespace HEJFOG;

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 2.0304; //calculated with "old" HEJ svn r3364

	auto config = load_config("config_h_2j.yml");

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(generator.status() != good) continue;
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	const auto the_Higgs = std::find_if(
	begin(ev.outgoing()), end(ev.outgoing()),
	[](RHEJ::Sparticle const & p){ return p.type == RHEJ::ParticleID::h; }
	);
	assert(the_Higgs != end(ev.outgoing()));
	if(std::abs(the_Higgs->rapidity()) > 5.) continue;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';

	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.01*xs);
	}
	diff --git a/FixedOrderGen/t/h_2j_decay.cc b/FixedOrderGen/t/h_2j_decay.cc
	index 81625f8..cf357e8 100644
	--- a/FixedOrderGen/t/h_2j_decay.cc
	+++ b/FixedOrderGen/t/h_2j_decay.cc
	@@ -1,82 +1,82 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"
	#include "RHEJ/debug.hh"

	using namespace HEJFOG;

	bool pass_dR_cut(
	std::vector<fastjet::PseudoJet> const & jets,
	std::vector<RHEJ::Sparticle> const & photons
	){
	constexpr double delta_R_min = 0.7;
	for(auto const & jet: jets){
	for(auto const & photon: photons){
	if(jet.delta_R(photon.p) < delta_R_min) return false;
	}
	}
	return true;
	}

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 0.00425287; //calculated with "old" HEJ svn r3364

	auto config = load_config("config_h_2j_decay.yml");

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(generator.status() != good) continue;
	assert(ev.decays().size() == 1);
	const auto decay = begin(ev.decays());
	assert(ev.outgoing().size() > static_cast<size_t>(decay->first));
	const auto & the_Higgs = ev.outgoing()[decay->first];
	assert(the_Higgs.type == RHEJ::pid::Higgs);
	assert(decay->second.size() == 2);
	auto const & gamma = decay->second;
	assert(gamma[0].type == RHEJ::pid::photon);
	assert(gamma[1].type == RHEJ::pid::photon);
	assert(nearby_ep(gamma[0].p + gamma[1].p, the_Higgs.p, 1e-6));
	if(!pass_dR_cut(ev.jets(), gamma)) continue;
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';

	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.012*xs);
	}
	diff --git a/FixedOrderGen/t/h_3j.cc b/FixedOrderGen/t/h_3j.cc
	index 0f3d014..644f165 100644
	--- a/FixedOrderGen/t/h_3j.cc
	+++ b/FixedOrderGen/t/h_3j.cc
	@@ -1,65 +1,65 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"

	using namespace HEJFOG;

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 1.0888; //calculated with "old" HEJ svn r3364

	auto config = load_config("config_h_2j.yml");
	config.process.njets = 3;

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(generator.status() != good) continue;
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	const auto the_Higgs = std::find_if(
	begin(ev.outgoing()), end(ev.outgoing()),
	[](RHEJ::Sparticle const & p){ return p.type == RHEJ::ParticleID::h; }
	);
	assert(the_Higgs != end(ev.outgoing()));
	if(std::abs(the_Higgs->rapidity()) > 5.) continue;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';

	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.02*xs);
	}
	diff --git a/FixedOrderGen/t/h_3j_uno1.cc b/FixedOrderGen/t/h_3j_uno1.cc
	index 4669fc5..45da61c 100644
	--- a/FixedOrderGen/t/h_3j_uno1.cc
	+++ b/FixedOrderGen/t/h_3j_uno1.cc
	@@ -1,68 +1,68 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif

	// check that adding uno emissions doesn't change the FKL cross section

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"

	using namespace HEJFOG;

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 0.02603824; //calculated with "old" HEJ svn r3364

	auto config = load_config("config_h_2j.yml");
	config.process.njets = 3;
	config.process.incoming = {RHEJ::pid::u, RHEJ::pid::u};
	config.unordered_fraction = 0.37;

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	int uno_found = 0;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(generator.status() != good) continue;
	if(ev.type() != RHEJ::event_type::FKL){
	++uno_found;
	continue;
	}
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';
	std::cout << uno_found << " events with unordered emission\n";
	assert(uno_found > 0);
	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.05*xs);
	}
	diff --git a/FixedOrderGen/t/h_3j_uno2.cc b/FixedOrderGen/t/h_3j_uno2.cc
	index 6d53aba..d11005f 100644
	--- a/FixedOrderGen/t/h_3j_uno2.cc
	+++ b/FixedOrderGen/t/h_3j_uno2.cc
	@@ -1,62 +1,62 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif

	// check uno cross section

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"

	using namespace HEJFOG;

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 0.00336012;

	auto config = load_config("config_h_2j.yml");
	config.process.njets = 3;
	config.process.incoming = {RHEJ::pid::u, RHEJ::pid::u};
	config.unordered_fraction = 1.;

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(ev.type() == RHEJ::event_type::FKL) continue;
	if(generator.status() != good) continue;
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';
	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.05*xs);
	}
	diff --git a/FixedOrderGen/t/h_5j.cc b/FixedOrderGen/t/h_5j.cc
	index bedb49c..2d0185c 100644
	--- a/FixedOrderGen/t/h_5j.cc
	+++ b/FixedOrderGen/t/h_5j.cc
	@@ -1,60 +1,60 @@
	#ifdef NDEBUG
	#undef NDEBUG
	#endif
	// This is a regression test
	// the reference cross section has not been checked against any other program

	#include <algorithm>
	#include <cmath>
	#include <cassert>
	#include <iostream>

	#include "config.hh"
	#include "EventGenerator.hh"
	-#include "Ranlux64Engine.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	#include "RHEJ/PDF.hh"
	#include "RHEJ/MatrixElement.hh"

	using namespace HEJFOG;

	int main(){
	constexpr double invGeV2_to_pb = 389379292.;
	constexpr double xs_ref = 0.235969;

	auto config = load_config("config_h_2j.yml");
	config.process.njets = 5;

	- auto ran = make_Ranlux64Engine();
	+ auto ran = RHEJ::make_Ranlux64Engine();
	HEJFOG::EventGenerator generator{
	config.process,
	config.beam,
	RHEJ::ScaleGenerator{
	config.scales.base,
	config.scales.factors,
	config.scales.max_ratio
	},
	config.jets,
	config.pdf_id,
	config.unordered_fraction,
	config.Higgs_properties,
	config.Higgs_coupling,
	ran
	};

	double xs = 0., xs_err = 0.;
	for (int trials = 0; trials < config.events; ++trials){
	auto ev = generator.gen_event();
	if(generator.status() != good) continue;
	ev.central().weight *= invGeV2_to_pb;
	ev.central().weight /= config.events;

	xs += ev.central().weight;
	xs_err += ev.central().weight*ev.central().weight;
	}
	xs_err = std::sqrt(xs_err);
	std::cout << xs_ref << " ~ " << xs << " +- " << xs_err << '\n';

	assert(std::abs(xs - xs_ref) < 3*xs_err);
	assert(xs_err < 0.06*xs);
	}
	diff --git a/include/RHEJ/EventReweighter.hh b/include/RHEJ/EventReweighter.hh
	index 276fdf7..033505a 100644
	--- a/include/RHEJ/EventReweighter.hh
	+++ b/include/RHEJ/EventReweighter.hh
	@@ -1,160 +1,167 @@
	/** \file EventReweighter.hh
	* \brief Main class for reweighting events according to the reversed HEJ method
	*
	* EventReweighter Class is the main class used within RHEJ. 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"

	+namespace CLHEP {
	+ class Ranlux64Engine;
	+}
	+
	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
	*/
	struct Beam{
	double E;
	std::array<ParticleID, 2> type;
	};

	/** \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.
	*/
	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 /
	+ EventReweighterConfig conf, /*< Configuration parameters /
	+ CLHEP::Ranlux64Engine & ran /*< Random number generator /
	);

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

	PDF const & pdf() const; /*< PDF Used /


	std::vector<Event> reweight(
	Event const & ev, /*< Event For Reweighing /
	int num_events /*< Number of 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 /
	};

	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;


	EventReweighterConfig param_;

	double E_beam_; /*< Energy of Beam /

	PDF pdf_; /*< Relevant PDF /

	MatrixElement MEt2_; /*< Matrix Element Object /
	ScaleGenerator scale_gen_;
	+ std::reference_wrapper<CLHEP::Ranlux64Engine> ran_;
	};

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

	}
	diff --git a/include/RHEJ/PhaseSpacePoint.hh b/include/RHEJ/PhaseSpacePoint.hh
	index b050bdb..7e55d2e 100644
	--- a/include/RHEJ/PhaseSpacePoint.hh
	+++ b/include/RHEJ/PhaseSpacePoint.hh
	@@ -1,157 +1,159 @@
	/** \file PhaseSpacePoint.hh
	* \brief Contains the PhaseSpacePoint Class
	*/

	#pragma once

	#include <vector>

	-#include <CLHEP/Random/Randomize.h>
	-#include <CLHEP/Random/RanluxEngine.h>
	-
	#include "RHEJ/utility.hh"
	#include "RHEJ/config.hh"
	#include "RHEJ/Event.hh"
	#include "RHEJ/Splitter.hh"

	+namespace CLHEP {
	+ class Ranlux64Engine;
	+}
	+
	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
	*/
	PhaseSpacePoint(
	Event const & ev,
	- PhaseSpacePointConfig conf
	+ PhaseSpacePointConfig conf,
	+ CLHEP::Ranlux64Engine & ran
	);

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


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

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

	std::unordered_map<int, std::vector<Sparticle>> 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<Sparticle, 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<Sparticle, 2> incoming_;
	std::vector<Sparticle> outgoing_;
	//! Particle decays in the format {outgoing index, decay products}
	std::unordered_map<int, std::vector<Sparticle>> decays_;

	- static CLHEP::Ranlux64Engine ran_;
	+ std::reference_wrapper<CLHEP::Ranlux64Engine> ran_;
	HejSplit splitter_;
	};

	}
	diff --git a/include/RHEJ/make_Ranlux64Engine.hh b/include/RHEJ/make_Ranlux64Engine.hh
	new file mode 100644
	index 0000000..9d2dad2
	--- /dev/null
	+++ b/include/RHEJ/make_Ranlux64Engine.hh
	@@ -0,0 +1,11 @@
	+#pragma once
	+
	+#include <CLHEP/Random/Randomize.h>
	+#include <CLHEP/Random/RanluxEngine.h>
	+
	+namespace RHEJ {
	+ //! create Ranlux64Engine with fixed, predefined state
	+ CLHEP::Ranlux64Engine make_Ranlux64Engine();
	+ //! create Ranlux64Engine with state read from the given file
	+ CLHEP::Ranlux64Engine make_Ranlux64Engine(std::string const & seed_file);
	+}
	diff --git a/src/EventReweighter.cc b/src/EventReweighter.cc
	index d8e3454..dd5d5e4 100644
	--- a/src/EventReweighter.cc
	+++ b/src/EventReweighter.cc
	@@ -1,280 +1,281 @@
	#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),
	[](Sparticle o1, Sparticle 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
	+ EventReweighterConfig conf,
	+ CLHEP::Ranlux64Engine & 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)
	+ 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
	+ EventReweighterConfig conf,
	+ CLHEP::Ranlux64Engine & 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))
	+ 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
	- };
	+ 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;
	};

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



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




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

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

	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()),
	[](Sparticle 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;
	}

	}
	diff --git a/src/PhaseSpacePoint.cc b/src/PhaseSpacePoint.cc
	index 46bd4bc..28cf6d2 100644
	--- a/src/PhaseSpacePoint.cc
	+++ b/src/PhaseSpacePoint.cc
	@@ -1,579 +1,539 @@
	#include "RHEJ/PhaseSpacePoint.hh"

	#include <random>

	+#include <CLHEP/Random/Randomize.h>
	+#include <CLHEP/Random/RanluxEngine.h>
	+
	#include "RHEJ/Constants.hh"
	#include "RHEJ/resummation_jet_momenta.hh"
	#include "RHEJ/Jacobian.hh"
	#include "RHEJ/RNGWrapper.hh"
	#include "RHEJ/uno.hh"
	#include "RHEJ/debug.hh"
	#include "RHEJ/kinematics.hh"

	namespace RHEJ{
	-
	- namespace {
	- //generate Ranlux64Engine with fixed, predefined state
	- /*
	- * some (all?) of the Ranlux64Engine constructors leave fields
	- * uninitialised, invoking undefined behaviour. This can be
	- * circumvented by restoring the state from a file
	- */
	- CLHEP::Ranlux64Engine gen_Ranlux64Engine(){
	- static const std::string state =
	- "9876\n"
	- "0.91280703978419097666\n"
	- "0.41606065829518357191\n"
	- "0.99156342622341142601\n"
	- "0.030922955274050423213\n"
	- "0.16206278421638486975\n"
	- "0.76151768001958330956\n"
	- "0.43765760066092695979\n"
	- "0.42904698253748563275\n"
	- "0.11476317525663759511\n"
	- "0.026620053590963976831\n"
	- "0.65953715764414511114\n"
	- "0.30136722624439826745\n"
	- "3.5527136788005009294e-15 4\n"
	- "1 202\n";
	- const std::string file = std::tmpnam(nullptr);
	- {
	- std::ofstream out{file};
	- out << state;
	- }
	- CLHEP::Ranlux64Engine result;
	- result.restoreStatus(file.c_str());
	- return result;
	- }
	- }
	-
	- CLHEP::Ranlux64Engine PhaseSpacePoint::ran_{gen_Ranlux64Engine()};
	-
	-
	- void PhaseSpacePoint::reset_ranlux(std::string const & init_file){
	- reset_ranlux(init_file.c_str());
	- }
	-
	- void PhaseSpacePoint::reset_ranlux(char const * init_file){
	- ran_.restoreStatus(init_file);
	- }
	-
	namespace {
	constexpr int max_jet_user_idx = PhaseSpacePoint::ng_max;

	bool is_nonjet_parton(fastjet::PseudoJet const & parton){
	assert(parton.user_index() != -1);
	return parton.user_index() > max_jet_user_idx;
	}

	bool is_jet_parton(fastjet::PseudoJet const & parton){
	assert(parton.user_index() != -1);
	return parton.user_index() <= max_jet_user_idx;
	}

	// user indices for partons with extremal rapidity
	constexpr int unob_idx = -5;
	constexpr int unof_idx = -4;
	constexpr int backward_FKL_idx = -3;
	constexpr int forward_FKL_idx = -2;
	}

	namespace {
	double estimate_ng_mean(std::vector<fastjet::PseudoJet> const & Born_jets){
	const double delta_y =
	Born_jets.back().rapidity() - Born_jets.front().rapidity();
	assert(delta_y > 0);
	// Formula derived from fit in reversed HEJ intro paper
	return 0.975052*delta_y;
	}
	}

	std::vector<fastjet::PseudoJet> PhaseSpacePoint::cluster_jets(
	std::vector<fastjet::PseudoJet> const & partons
	) const{
	fastjet::ClusterSequence cs(partons, param_.jet_param.def);
	return cs.inclusive_jets(param_.jet_param.min_pt);
	}

	bool PhaseSpacePoint::pass_resummation_cuts(
	std::vector<fastjet::PseudoJet> const & jets
	) const{
	return cluster_jets(jets).size() == jets.size();
	}

	int PhaseSpacePoint::sample_ng(std::vector<fastjet::PseudoJet> const & Born_jets){
	const double ng_mean = estimate_ng_mean(Born_jets);
	std::poisson_distribution<int> dist(ng_mean);
	RNGWrapper<CLHEP::Ranlux64Engine> rng{ran_};
	const int ng = dist(rng);
	assert(ng >= 0);
	assert(ng < ng_max);
	weight_ = std::tgamma(ng + 1)std::exp(ng_mean)*std::pow(ng_mean, -ng);
	return ng;
	}

	void PhaseSpacePoint::copy_AWZH_boson_from(Event const & event){
	auto const & from = event.outgoing();

	const auto AWZH_boson = std::find_if(
	begin(from), end(from),
	[](Sparticle const & p){ return is_AWZH_boson(p); }
	);
	if(AWZH_boson == end(from)) return;
	auto insertion_point = std::lower_bound(
	begin(outgoing_), end(outgoing_), *AWZH_boson, rapidity_less{}
	);
	outgoing_.insert(insertion_point, *AWZH_boson);

	// copy decay products
	const int idx = std::distance(begin(from), AWZH_boson);
	const auto decay_it = event.decays().find(idx);
	if(decay_it != end(event.decays())){
	const int new_idx = std::distance(begin(outgoing_), insertion_point);
	assert(outgoing_[new_idx].type == AWZH_boson->type);
	decays_.emplace(new_idx, decay_it->second);
	}

	assert(std::is_sorted(begin(outgoing_), end(outgoing_), rapidity_less{}));
	}

	- PhaseSpacePoint::PhaseSpacePoint(Event const & ev, PhaseSpacePointConfig conf):
	+ PhaseSpacePoint::PhaseSpacePoint(
	+ Event const & ev, PhaseSpacePointConfig conf,
	+ CLHEP::Ranlux64Engine & ran
	+ ):
	unob_{has_unob_gluon(ev.incoming(), ev.outgoing())},
	unof_{!unob_ && has_unof_gluon(ev.incoming(), ev.outgoing())},
	param_{std::move(conf)},
	- splitter_{param_.jet_param.def.R(), param_.jet_param.def, param_.jet_param.min_pt, ran_}
	+ ran_{ran},
	+ splitter_{param_.jet_param.def.R(), param_.jet_param.def, param_.jet_param.min_pt, ran}
	{
	weight_ = 1;
	const auto Born_jets = sorted_by_rapidity(ev.jets());
	const int ng = sample_ng(Born_jets);
	weight_ /= std::tgamma(ng + 1);
	const int ng_jets = sample_ng_jets(ng, Born_jets);
	std::vector<fastjet::PseudoJet> out_partons = gen_non_jet(
	ng - ng_jets, CMINPT, param_.jet_param.min_pt
	);
	{
	const auto qperp = std::accumulate(
	begin(out_partons), end(out_partons),
	fastjet::PseudoJet{}
	);
	const auto jets = reshuffle(Born_jets, qperp);
	if(weight_ == 0.) return;
	if(! pass_resummation_cuts(jets)){
	weight_ = 0.;
	return;
	}
	std::vector<fastjet::PseudoJet> jet_partons = split(jets, ng_jets);
	if(weight_ == 0.) return;
	rescale_rapidities(
	out_partons,
	most_backward_FKL(jet_partons).rapidity(),
	most_forward_FKL(jet_partons).rapidity()
	);
	if(! cluster_jets(out_partons).empty()){
	weight_ = 0.;
	return;
	}
	std::sort(begin(out_partons), end(out_partons), rapidity_less{});
	assert(
	std::is_sorted(begin(jet_partons), end(jet_partons), rapidity_less{})
	);
	const auto first_jet_parton = out_partons.insert(
	end(out_partons), begin(jet_partons), end(jet_partons)
	);
	std::inplace_merge(
	begin(out_partons), first_jet_parton, end(out_partons), rapidity_less{}
	);
	}
	if(! jets_ok(Born_jets, out_partons)){
	weight_ = 0.;
	return;
	}
	weight_ *= phase_space_normalisation(Born_jets.size(), out_partons.size());

	outgoing_.reserve(out_partons.size() + 1); // one slot for possible A, W, Z, H
	for(auto & p: out_partons){
	outgoing_.emplace_back(Sparticle{pid::gluon, std::move(p)});
	}
	most_backward_FKL(outgoing_).type = ev.incoming().front().type;
	most_forward_FKL(outgoing_).type = ev.incoming().back().type;
	copy_AWZH_boson_from(ev);

	assert(!outgoing_.empty());
	reconstruct_incoming(ev.incoming());
	}

	std::vector<fastjet::PseudoJet> PhaseSpacePoint::gen_non_jet(
	int count, double ptmin, double ptmax
	){
	// heuristic parameters for pt sampling
	const double ptpar = 1.3 + count/5.;
	const double temp1 = atan((ptmax - ptmin)/ptpar);

	std::vector<fastjet::PseudoJet> partons(count);
	for(size_t i = 0; i < (size_t) count; ++i){
	- const double r1 = ran_.flat();
	+ const double r1 = ran_.get().flat();
	const double pt = ptmin + ptpartan(r1temp1);
	const double temp2 = cos(r1*temp1);
	- const double phi = 2M_PIran_.flat();
	+ const double phi = 2M_PIran_.get().flat();
	weight_ = 2.0M_PIptptpartemp1/(temp2temp2);
	// we don't know the allowed rapidity span yet,
	// set a random value to be rescaled later on
	- const double y = ran_.flat();
	+ const double y = ran_.get().flat();
	partons[i].reset_PtYPhiM(pt, y, phi);
	// Set user index higher than any jet-parton index
	// in order to assert that these are not inside jets
	partons[i].set_user_index(i + 1 + RHEJ::PhaseSpacePoint::ng_max);

	assert(ptmin-1e-5 <= partons[i].pt() && partons[i].pt() <= ptmax+1e-5);
	}
	assert(std::all_of(partons.cbegin(), partons.cend(), is_nonjet_parton));
	return partons;
	}

	void PhaseSpacePoint::rescale_rapidities(
	std::vector<fastjet::PseudoJet> & partons,
	double ymin, double ymax
	){
	constexpr double ep = 1e-7;
	for(auto & parton: partons){
	assert(0 <= parton.rapidity() && parton.rapidity() <= 1);
	const double dy = ymax - ymin - 2*ep;
	const double y = ymin + ep + dy*parton.rapidity();
	parton.reset_momentum_PtYPhiM(parton.pt(), y, parton.phi());
	weight_ *= dy;
	assert(ymin <= parton.rapidity() && parton.rapidity() <= ymax);
	}
	}

	namespace {
	template<typename T, typename... Rest>
	auto min(T const & a, T const & b, Rest&&... r) {
	using std::min;
	return min(a, min(b, std::forward<Rest>(r)...));
	}
	}

	double PhaseSpacePoint::probability_in_jet(
	std::vector<fastjet::PseudoJet> const & Born_jets
	) const{
	assert(std::is_sorted(begin(Born_jets), end(Born_jets), rapidity_less{}));
	assert(Born_jets.size() >= 2);

	const double dy =
	Born_jets.back().rapidity() - Born_jets.front().rapidity();
	const double R = param_.jet_param.def.R();
	const int njets = Born_jets.size();
	const double p_J_y_large = (njets-1)RR/(2.*dy);
	const double p_J_y0 = njets*R/M_PI;
	return min(p_J_y_large, p_J_y0, 1.);
	}

	int PhaseSpacePoint::sample_ng_jets(
	int ng, std::vector<fastjet::PseudoJet> const & Born_jets
	){
	RNGWrapper<CLHEP::Ranlux64Engine> rng{ran_};
	const double p_J = probability_in_jet(Born_jets);
	std::binomial_distribution<> bin_dist(ng, p_J);
	const int ng_J = bin_dist(rng);
	weight_ = std::pow(p_J, -ng_J)std::pow(1 - p_J, ng_J - ng);
	return ng_J;
	}

	std::vector<fastjet::PseudoJet>
	PhaseSpacePoint::reshuffle(
	std::vector<fastjet::PseudoJet> const & Born_jets,
	fastjet::PseudoJet const & q
	){
	if(q == fastjet::PseudoJet{0, 0, 0, 0}) return Born_jets;
	std::vector<fastjet::PseudoJet> jets = resummation_jet_momenta(Born_jets, q);
	if(jets.empty()){
	weight_ = 0;
	return {};
	}
	// transform delta functions to integration over resummation momenta
	weight_ /= Jacobian(jets, q);
	return jets;
	}

	std::vector<int> PhaseSpacePoint::distribute_jet_partons(
	int ng_jets, std::vector<fastjet::PseudoJet> const & jets
	){
	size_t first_valid_jet = 0;
	size_t num_valid_jets = jets.size();
	const double R_eff = 5./3.*param_.jet_param.def.R();
	// if there is an unordered jet too far away from the FKL jets
	// then extra gluon constituents of the unordered jet would
	// violate the FKL rapidity ordering
	if(unob_ && jets[0].delta_R(jets[1]) > R_eff){
	++first_valid_jet;
	--num_valid_jets;
	}
	else if(unof_ && jets[jets.size()-1].delta_R(jets[jets.size()-2]) > R_eff){
	--num_valid_jets;
	}
	std::vector<int> np(jets.size(), 1);
	for(int i = 0; i < ng_jets; ++i){
	- ++np[first_valid_jet + ran_.flat() * num_valid_jets];
	+ ++np[first_valid_jet + ran_.get().flat() * num_valid_jets];
	}
	weight_ *= std::pow(num_valid_jets, ng_jets);
	return np;
	}

	#ifndef NDEBUG
	namespace{
	bool tagged_FKL_backward(
	std::vector<fastjet::PseudoJet> const & jet_partons
	){
	return std::find_if(
	begin(jet_partons), end(jet_partons),
	[](fastjet::PseudoJet const & p){
	return p.user_index() == backward_FKL_idx;
	}
	) != end(jet_partons);
	}

	bool tagged_FKL_forward(
	std::vector<fastjet::PseudoJet> const & jet_partons
	){
	// the most forward FKL parton is most likely near the end of jet_partons;
	// start search from there
	return std::find_if(
	jet_partons.rbegin(), jet_partons.rend(),
	[](fastjet::PseudoJet const & p){
	return p.user_index() == forward_FKL_idx;
	}
	) != jet_partons.rend();
	}

	bool tagged_FKL_extremal(
	std::vector<fastjet::PseudoJet> const & jet_partons
	){
	return tagged_FKL_backward(jet_partons) && tagged_FKL_forward(jet_partons);
	}

	} // namespace anonymous
	#endif

	std::vector<fastjet::PseudoJet> PhaseSpacePoint::split(
	std::vector<fastjet::PseudoJet> const & jets,
	int ng_jets
	){
	return split(jets, distribute_jet_partons(ng_jets, jets));
	}

	bool PhaseSpacePoint::pass_extremal_cuts(
	fastjet::PseudoJet const & ext_parton,
	fastjet::PseudoJet const & jet
	) const{
	if(ext_parton.pt() < param_.min_extparton_pt) return false;
	return (ext_parton - jet).pt()/jet.pt() < param_.max_ext_soft_pt_fraction;
	}

	std::vector<fastjet::PseudoJet> PhaseSpacePoint::split(
	std::vector<fastjet::PseudoJet> const & jets,
	std::vector<int> const & np
	){
	assert(! jets.empty());
	assert(jets.size() == np.size());
	assert(pass_resummation_cuts(jets));

	const size_t most_backward_FKL_idx = 0 + unob_;
	const size_t most_forward_FKL_idx = jets.size() - 1 - unof_;

	std::vector<fastjet::PseudoJet> jet_partons;
	// randomly distribute jet gluons among jets
	for(size_t i = 0; i < jets.size(); ++i){
	weight_ *= splitter_.Split(jets[i], np[i]);
	if(weight_ == 0) return {};
	assert(
	std::all_of(
	begin(splitter_.get_jcons()), end(splitter_.get_jcons()),
	is_jet_parton
	)
	);
	const auto first_new_parton = jet_partons.insert(
	end(jet_partons),
	begin(splitter_.get_jcons()), end(splitter_.get_jcons())
	);
	// mark uno and extremal FKL emissions here so we can check
	// their position once all emissions are generated
	auto extremal = end(jet_partons);
	if((unob_ && i == 0) \|\| i == most_backward_FKL_idx){
	// unordered or FKL backward emission
	extremal = std::min_element(
	first_new_parton, end(jet_partons), rapidity_less{}
	);
	extremal->set_user_index(
	(i == most_backward_FKL_idx)?backward_FKL_idx:unob_idx
	);
	}
	else if((unof_ && i == jets.size() - 1) \|\| i == most_forward_FKL_idx){
	// unordered or FKL forward emission
	extremal = std::max_element(
	first_new_parton, end(jet_partons), rapidity_less{}
	);
	extremal->set_user_index(
	(i == most_forward_FKL_idx)?forward_FKL_idx:unof_idx
	);
	}
	if(
	extremal != end(jet_partons)
	&& !pass_extremal_cuts(*extremal, jets[i])
	){
	weight_ = 0;
	return {};
	}
	}
	assert(tagged_FKL_extremal(jet_partons));
	std::sort(begin(jet_partons), end(jet_partons), rapidity_less{});
	if(
	!extremal_ok(jet_partons)
	\|\| !split_preserved_jets(jets, jet_partons)
	){
	weight_ = 0.;
	return {};
	}
	return jet_partons;
	}

	bool PhaseSpacePoint::extremal_ok(
	std::vector<fastjet::PseudoJet> const & partons
	) const{
	assert(std::is_sorted(begin(partons), end(partons), rapidity_less{}));
	if(unob_ && partons.front().user_index() != unob_idx) return false;
	if(unof_ && partons.back().user_index() != unof_idx) return false;
	return
	most_backward_FKL(partons).user_index() == backward_FKL_idx
	&& most_forward_FKL(partons).user_index() == forward_FKL_idx;
	}

	bool PhaseSpacePoint::split_preserved_jets(
	std::vector<fastjet::PseudoJet> const & jets,
	std::vector<fastjet::PseudoJet> const & jet_partons
	) const{
	assert(std::is_sorted(begin(jets), end(jets), rapidity_less{}));

	const auto split_jets = sorted_by_rapidity(cluster_jets(jet_partons));
	// this can happen if two overlapping jets
	// are both split into more than one parton
	if(split_jets.size() != jets.size()) return false;
	for(size_t i = 0; i < split_jets.size(); ++i){
	// this can happen if there are two overlapping jets
	// and a parton is assigned to the "wrong" jet
	if(!nearby_ep(jets[i].rapidity(), split_jets[i].rapidity(), 1e-2)){
	return false;
	}
	}
	return true;
	}

	template<class Particle>
	Particle const & PhaseSpacePoint::most_backward_FKL(
	std::vector<Particle> const & partons
	) const{
	return partons[0 + unob_];
	}

	template<class Particle>
	Particle const & PhaseSpacePoint::most_forward_FKL(
	std::vector<Particle> const & partons
	) const{
	const size_t idx = partons.size() - 1 - unof_;
	assert(idx < partons.size());
	return partons[idx];
	}

	template<class Particle>
	Particle & PhaseSpacePoint::most_backward_FKL(
	std::vector<Particle> & partons
	) const{
	return partons[0 + unob_];
	}

	template<class Particle>
	Particle & PhaseSpacePoint::most_forward_FKL(
	std::vector<Particle> & partons
	) const{
	const size_t idx = partons.size() - 1 - unof_;
	assert(idx < partons.size());
	return partons[idx];
	}

	namespace {
	bool contains_idx(
	fastjet::PseudoJet const & jet, fastjet::PseudoJet const & parton
	){
	auto const & constituents = jet.constituents();
	const int idx = parton.user_index();
	return std::find_if(
	begin(constituents), end(constituents),
	[idx](fastjet::PseudoJet const & con){return con.user_index() == idx;}
	) != end(constituents);
	}
	}

	/**
	* final jet test:
	* - number of jets must match Born kinematics
	* - no partons designated as nonjet may end up inside jets
	* - all other outgoing partons must end up inside jets
	* - the extremal (in rapidity) partons must be inside the extremal jets
	* - rapidities must be the same (by construction)
	*/
	bool PhaseSpacePoint::jets_ok(
	std::vector<fastjet::PseudoJet> const & Born_jets,
	std::vector<fastjet::PseudoJet> const & partons
	) const{
	fastjet::ClusterSequence cs(partons, param_.jet_param.def);
	const auto jets = sorted_by_rapidity(cs.inclusive_jets(param_.jet_param.min_pt));
	if(jets.size() != Born_jets.size()) return false;
	int in_jet = 0;
	for(size_t i = 0; i < jets.size(); ++i){
	assert(jets[i].has_constituents());
	for(auto && parton: jets[i].constituents()){
	if(is_nonjet_parton(parton)) return false;
	}
	in_jet += jets[i].constituents().size();
	}
	const int expect_in_jet = std::count_if(
	partons.cbegin(), partons.cend(), is_jet_parton
	);
	if(in_jet != expect_in_jet) return false;
	// note that PseudoJet::contains does not work here
	if(! (
	contains_idx(most_backward_FKL(jets), most_backward_FKL(partons))
	&& contains_idx(most_forward_FKL(jets), most_forward_FKL(partons))
	)) return false;
	if(unob_ && !contains_idx(jets.front(), partons.front())) return false;
	if(unof_ && !contains_idx(jets.back(), partons.back())) return false;
	for(size_t i = 0; i < jets.size(); ++i){
	assert(nearby_ep(jets[i].rapidity(), Born_jets[i].rapidity(), 1e-2));
	}
	return true;
	}

	void PhaseSpacePoint::reconstruct_incoming(
	std::array<Sparticle, 2> const & Born_incoming
	){
	std::tie(incoming_[0].p, incoming_[1].p) = incoming_momenta(outgoing_);
	for(size_t i = 0; i < incoming_.size(); ++i){
	incoming_[i].type = Born_incoming[i].type;
	}
	assert(momentum_conserved());
	}

	double PhaseSpacePoint::phase_space_normalisation(
	int num_Born_jets, int num_out_partons
	) const{
	return pow(16*pow(M_PI,3), num_Born_jets - num_out_partons);
	}

	bool PhaseSpacePoint::momentum_conserved() const{
	fastjet::PseudoJet diff;
	for(auto const & in: incoming()) diff += in.p;
	const double norm = diff.E();
	for(auto const & out: outgoing()) diff -= out.p;
	return nearby(diff, fastjet::PseudoJet{}, norm);
	}

	} //namespace RHEJ
	diff --git a/src/main.cc b/src/main.cc
	index 188c2ae..2e77482 100644
	--- a/src/main.cc
	+++ b/src/main.cc
	@@ -1,177 +1,179 @@
	/**
	* 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/make_Ranlux64Engine.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::make_Ranlux64Engine(*config.RanLux_init):
	+ RHEJ::make_Ranlux64Engine();
	RHEJ::EventReweighter rhej{
	reader.heprup,
	std::move(scale_gen),
	- to_EventReweighterConfig(config)
	+ to_EventReweighterConfig(config),
	+ ran
	};
	- if(config.RanLux_init){
	- RHEJ::PhaseSpacePoint::reset_ranlux(*config.RanLux_init);
	- }

	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_Ranlux64Engine.cc b/src/make_Ranlux64Engine.cc
	new file mode 100644
	index 0000000..29e88a6
	--- /dev/null
	+++ b/src/make_Ranlux64Engine.cc
	@@ -0,0 +1,42 @@
	+#include "RHEJ/make_Ranlux64Engine.hh"
	+
	+namespace RHEJ {
	+ CLHEP::Ranlux64Engine make_Ranlux64Engine() {
	+ /*
	+ * some (all?) of the Ranlux64Engine constructors leave fields
	+ * uninitialised, invoking undefined behaviour. This can be
	+ * circumvented by restoring the state from a file
	+ */
	+ static const std::string state =
	+ "9876\n"
	+ "0.91280703978419097666\n"
	+ "0.41606065829518357191\n"
	+ "0.99156342622341142601\n"
	+ "0.030922955274050423213\n"
	+ "0.16206278421638486975\n"
	+ "0.76151768001958330956\n"
	+ "0.43765760066092695979\n"
	+ "0.42904698253748563275\n"
	+ "0.11476317525663759511\n"
	+ "0.026620053590963976831\n"
	+ "0.65953715764414511114\n"
	+ "0.30136722624439826745\n"
	+ "3.5527136788005009294e-15 4\n"
	+ "1 202\n";
	+ const std::string file = std::tmpnam(nullptr);
	+ {
	+ std::ofstream out{file};
	+ out << state;
	+ }
	+ auto result = make_Ranlux64Engine(file);
	+ std::remove(file.c_str());
	+ return result;
	+ }
	+
	+ //! create Ranlux64Engine with state read from the given file
	+ CLHEP::Ranlux64Engine make_Ranlux64Engine(std::string const & seed_file) {
	+ CLHEP::Ranlux64Engine result;
	+ result.restoreStatus(seed_file.c_str());
	+ return result;
	+ }
	+}
	diff --git a/t/check_res.cc b/t/check_res.cc
	index c01cbb3..9829c82 100644
	--- a/t/check_res.cc
	+++ b/t/check_res.cc
	@@ -1,86 +1,88 @@
	#include <iostream>

	#include "LHEF/LHEF.h"
	#include "RHEJ/stream.hh"
	#include "RHEJ/EventReweighter.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	namespace{
	const fastjet::JetDefinition jet_def{fastjet::kt_algorithm, 0.4};
	const fastjet::JetDefinition Born_jet_def{jet_def};
	constexpr double Born_jetptmin = 30;
	constexpr double extpartonptmin = 30;
	constexpr double max_ext_soft_pt_fraction =
	std::numeric_limits<double>::infinity();
	constexpr double jetptmin = 35;
	constexpr bool log_corr = false;
	using EventTreatment = RHEJ::EventTreatment;
	using namespace RHEJ::event_type;
	RHEJ::EventTreatMap treat{
	{no_2_jets, EventTreatment::discard},
	{bad_final_state, EventTreatment::discard},
	{nonFKL, EventTreatment::discard},
	{unof, EventTreatment::discard},
	{unob, EventTreatment::discard},
	{FKL, EventTreatment::reweight}
	};
	};

	int main(int argn, char** argv) {
	if(argn == 5 && std::string(argv[4]) == "uno"){
	--argn;
	treat[unof] = EventTreatment::reweight;
	treat[unob] = EventTreatment::reweight;
	treat[FKL] = EventTreatment::discard;
	}
	if(argn != 4){
	std::cerr << "Usage: check_res eventfile xsection tolerance [uno]";
	return EXIT_FAILURE;
	}

	const double xsec_ref = std::stod(argv[2]);
	const double tolerance = std::stod(argv[3]);

	RHEJ::istream in{argv[1]};
	LHEF::Reader reader{in};

	RHEJ::PhaseSpacePointConfig psp_conf;
	psp_conf.jet_param = RHEJ::JetParameters{jet_def, jetptmin};
	psp_conf.min_extparton_pt = extpartonptmin;
	psp_conf.max_ext_soft_pt_fraction = max_ext_soft_pt_fraction;
	RHEJ::MatrixElementConfig ME_conf;
	ME_conf.jet_param = psp_conf.jet_param;
	ME_conf.log_correction = log_corr;
	ME_conf.Higgs_coupling = RHEJ::HiggsCouplingSettings{};
	RHEJ::EventReweighterConfig conf;
	conf.psp_config = std::move(psp_conf);
	conf.ME_config = std::move(ME_conf);
	conf.jet_param = psp_conf.jet_param;
	conf.treat = treat;

	reader.readEvent();
	const bool has_Higgs = std::find(
	begin(reader.hepeup.IDUP),
	end(reader.hepeup.IDUP),
	25
	) != end(reader.hepeup.IDUP);
	const double mu = has_Higgs?125.:91.188;
	RHEJ::ScaleGenerator scale_gen{{RHEJ::FixedScale{mu}}, {}, 1.};
	- RHEJ::EventReweighter rhej{reader.heprup, std::move(scale_gen), conf};
	+ auto ran = RHEJ::make_Ranlux64Engine();
	+ RHEJ::EventReweighter rhej{reader.heprup, std::move(scale_gen), conf, ran};

	double xsec = 0.;
	do{
	RHEJ::Event ev{
	RHEJ::UnclusteredEvent{reader.hepeup},
	Born_jet_def, Born_jetptmin
	};
	auto resummed_events = rhej.reweight(ev, 10);
	for(auto const & ev: resummed_events) xsec += ev.central().weight;
	} while(reader.readEvent());

	if(std::abs(xsec - xsec_ref) > tolerance){
	std::cerr << "cross section is off: "
	<< xsec << " != " << xsec_ref
	<< " +- " << tolerance << '\n';
	return EXIT_FAILURE;
	}
	}
	diff --git a/t/test_psp.cc b/t/test_psp.cc
	index fe3660e..9d00cc8 100644
	--- a/t/test_psp.cc
	+++ b/t/test_psp.cc
	@@ -1,66 +1,69 @@
	#include "LHEF/LHEF.h"
	#include "RHEJ/stream.hh"
	#include "RHEJ/config.hh"
	#include "RHEJ/event_types.hh"
	#include "RHEJ/Event.hh"
	#include "RHEJ/PhaseSpacePoint.hh"
	+#include "RHEJ/make_Ranlux64Engine.hh"

	namespace{
	constexpr int max_trials = 100;
	constexpr double extpartonptmin = 45.;
	constexpr double max_ext_soft_pt_fraction =
	std::numeric_limits<double>::infinity();
	const fastjet::JetDefinition jet_def{fastjet::kt_algorithm, 0.4};
	constexpr double min_jet_pt = 50;

	};

	int main(int argn, char** argv) {
	if(argn != 2){
	std::cerr << "Usage: test_psp eventfile";
	return EXIT_FAILURE;
	}

	RHEJ::istream in{argv[1]};
	LHEF::Reader reader{in};
	LHEF::Writer writer{std::cerr};
	writer.heprup = reader.heprup;


	RHEJ::PhaseSpacePointConfig conf;
	conf.jet_param = RHEJ::JetParameters{jet_def, min_jet_pt};
	conf.min_extparton_pt = extpartonptmin;
	conf.max_ext_soft_pt_fraction = max_ext_soft_pt_fraction;

	+ auto ran = RHEJ::make_Ranlux64Engine();
	+
	while(reader.readEvent()){
	const RHEJ::Event ev{
	RHEJ::UnclusteredEvent{reader.hepeup},
	jet_def, min_jet_pt
	};
	for(int trial = 0; trial < max_trials; ++trial){
	- RHEJ::PhaseSpacePoint psp(ev, conf);
	+ RHEJ::PhaseSpacePoint psp{ev, conf, ran};
	if(psp.weight() != 0){
	RHEJ::UnclusteredEvent tmp_ev;
	tmp_ev.incoming = psp.incoming();
	tmp_ev.outgoing = psp.outgoing();
	tmp_ev.central = {0,0,0};
	RHEJ::Event out_ev{
	std::move(tmp_ev),
	jet_def, min_jet_pt
	};
	if(out_ev.type() != ev.type()){
	using RHEJ::event_type::names;
	std::cerr << "Wrong class of phase space point:\n"
	"original event of class " << names[ev.type()] << ":\n";
	writer.hepeup = reader.hepeup;
	writer.writeEvent();
	std::cerr << "Phase space point of class " << names[out_ev.type()] << ":\n";
	writer.hepeup = to_HEPEUP(out_ev, &writer.heprup);
	writer.writeEvent();
	return EXIT_FAILURE;
	}
	}
	}
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Jan 20, 9:12 PM (1 d, 1 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4240002
Default Alt Text: (75 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions