diff --git a/FixedOrderGen/include/ParticleProperties.hh b/FixedOrderGen/include/ParticleProperties.hh index 70f5e48..70c74b8 100644 --- a/FixedOrderGen/include/ParticleProperties.hh +++ b/FixedOrderGen/include/ParticleProperties.hh @@ -1,31 +1,32 @@ /** * \authors The HEJ collaboration (see AUTHORS for details) * \date 2019 * \copyright GPLv2 or later */ #pragma once #include <vector> #include <unordered_map> #include "HEJ/EWConstants.hh" #include "Decay.hh" namespace HEJFOG{ + //! @TODO this is redundant we should be able to just call EWConstants struct ParticleProperties: public HEJ::ParticleProperties{ std::vector<Decay> decays; ParticleProperties() = default; ParticleProperties(double mass_, double width_, std::vector<Decay> decays_): HEJ::ParticleProperties{mass_, width_}, decays{decays_}{} }; #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ < 6) // gcc version < 6 explicitly needs hash function for enum // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60970 using ParticlesPropMap = std::unordered_map<HEJ::ParticleID, ParticleProperties, std::hash<int>>; #else using ParticlesPropMap = std::unordered_map<HEJ::ParticleID, ParticleProperties>; #endif } diff --git a/FixedOrderGen/include/config.hh b/FixedOrderGen/include/config.hh index 71c748b..c104f5e 100644 --- a/FixedOrderGen/include/config.hh +++ b/FixedOrderGen/include/config.hh @@ -1,43 +1,44 @@ /** * \authors The HEJ collaboration (see AUTHORS for details) * \date 2019 * \copyright GPLv2 or later */ #pragma once #include "yaml-cpp/yaml.h" #include "HEJ/HiggsCouplingSettings.hh" #include "HEJ/optional.hh" #include "HEJ/config.hh" #include "HEJ/output_formats.hh" #include "HEJ/exceptions.hh" #include "Process.hh" #include "JetParameters.hh" #include "Beam.hh" #include "ParticleProperties.hh" #include "UnweightSettings.hh" namespace HEJFOG{ struct Config{ + //! @FIXME add EWConstants Process process; int events; JetParameters jets; Beam beam; int pdf_id; double subleading_fraction; unsigned int subleading_channels; //! < see HEJFOG::Subleading ParticlesPropMap particles_properties; YAML::Node analysis_parameters; HEJ::ScaleConfig scales; std::vector<HEJ::OutputFile> output; HEJ::RNGConfig rng; HEJ::HiggsCouplingSettings Higgs_coupling; HEJ::optional<UnweightSettings> unweight; }; Config load_config(std::string const & config_file); }