Skip to content

Commit

Permalink
generate only 1 spectrum generator class
Browse files Browse the repository at this point in the history 
in order to avoid chosing the spectrum generator later in different
application files.
  • Loading branch information
Alexander Voigt authored and Alexander Voigt committed Aug 18, 2016
1 parent c432a5a commit aca5c0b
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 25 deletions.
12 changes: 4 additions & 8 deletions meta/FlexibleSUSY.m
View file
Expand Up @@ -1310,20 +1310,15 @@ corresponding tadpole is real or imaginary (only in models with CP
];

WriteUserExample[inputParameters_List, files_List] :=
Module[{parseCmdLineOptions, printCommandLineOptions, inputPars, spectrumGen,
Module[{parseCmdLineOptions, printCommandLineOptions, inputPars,
fillSMFermionPoleMasses = ""},
inputPars = {First[#], #[[3]]}& /@ inputParameters;
parseCmdLineOptions = WriteOut`ParseCmdLineOptions[inputPars];
printCommandLineOptions = WriteOut`PrintCmdLineOptions[inputPars];
spectrumGen = If[FlexibleEFTHiggs === True,
CConversion`ToValidCSymbolString[FlexibleSUSY`FSModelName] <> "_standard_model",
CConversion`ToValidCSymbolString[FlexibleSUSY`FSModelName]
];
fillSMFermionPoleMasses = FlexibleEFTHiggsMatching`FillSMFermionPoleMasses[];
WriteOut`ReplaceInFiles[files,
{ "@parseCmdLineOptions@" -> IndentText[IndentText[parseCmdLineOptions]],
"@printCommandLineOptions@" -> IndentText[IndentText[printCommandLineOptions]],
"@SpectrumGenerator@" -> spectrumGen,
"@fillSMFermionPoleMasses@" -> IndentText[IndentText[IndentText[fillSMFermionPoleMasses]]],
Sequence @@ GeneralReplacementRules[]
} ];
Expand Down Expand Up @@ -2533,11 +2528,12 @@ corresponding tadpole is real or imaginary (only in models with CP
spectrumGeneratorInputFile = "high_scale_spectrum_generator.hpp.in";
If[FlexibleSUSY`OnlyLowEnergyFlexibleSUSY,
spectrumGeneratorInputFile = "low_scale_spectrum_generator.hpp.in";];
If[FlexibleSUSY`FlexibleEFTHiggs === True,
spectrumGeneratorInputFile = "standard_model_" <> spectrumGeneratorInputFile;
];
WriteUserExample[inputParameters,
{{FileNameJoin[{$flexiblesusyTemplateDir, spectrumGeneratorInputFile}],
FileNameJoin[{FSOutputDir, FlexibleSUSY`FSModelName <> "_spectrum_generator.hpp"}]},
{FileNameJoin[{$flexiblesusyTemplateDir, "standard_model_" <> spectrumGeneratorInputFile}],
FileNameJoin[{FSOutputDir, FlexibleSUSY`FSModelName <> "_standard_model_spectrum_generator.hpp"}]},
{FileNameJoin[{$flexiblesusyTemplateDir, "spectrum_generator_interface.hpp.in"}],
FileNameJoin[{FSOutputDir, FlexibleSUSY`FSModelName <> "_spectrum_generator_interface.hpp"}]},
{FileNameJoin[{$flexiblesusyTemplateDir, "run.cpp.in"}],
Expand Down
1 change: 0 additions & 1 deletion templates/module.mk.in
View file
Expand Up @@ -76,7 +76,6 @@ LIB@CLASSNAME@_HDR += \
$(DIR)/@CLASSNAME@_standard_model_matching.hpp \
$(DIR)/@CLASSNAME@_standard_model_two_scale_initial_guesser.hpp \
$(DIR)/@CLASSNAME@_spectrum_generator_interface.hpp \
$(DIR)/@CLASSNAME@_standard_model_spectrum_generator.hpp \
$(DIR)/@CLASSNAME@_standard_model_two_scale_matching.hpp \
$(DIR)/@CLASSNAME@_spectrum_generator.hpp \
$(DIR)/@CLASSNAME@_susy_scale_constraint.hpp \
Expand Down
4 changes: 2 additions & 2 deletions templates/run.cpp.in
View file
Expand Up @@ -21,7 +21,7 @@
#include "@ModelName@_input_parameters.hpp"
#include "@ModelName@_observables.hpp"
#include "@ModelName@_slha_io.hpp"
#include "@SpectrumGenerator@_spectrum_generator.hpp"
#include "@ModelName@_spectrum_generator.hpp"
#include "@ModelName@_utilities.hpp"

#include "physical_input.hpp"
Expand Down Expand Up @@ -78,7 +78,7 @@ int main(int argc, const char* argv[])
return EXIT_FAILURE;
}

@SpectrumGenerator@_spectrum_generator<algorithm_type> spectrum_generator;
@ModelName@_spectrum_generator<algorithm_type> spectrum_generator;
spectrum_generator.set_settings(spectrum_generator_settings);
spectrum_generator.set_parameter_output_scale(
slha_io.get_parameter_output_scale());
Expand Down
4 changes: 2 additions & 2 deletions templates/run_cmd_line.cpp.in
View file
Expand Up @@ -19,7 +19,7 @@
// File generated at @DateAndTime@

#include "@ModelName@_input_parameters.hpp"
#include "@SpectrumGenerator@_spectrum_generator.hpp"
#include "@ModelName@_spectrum_generator.hpp"
#include "@ModelName@_observables.hpp"
#include "@ModelName@_slha_io.hpp"

Expand Down Expand Up @@ -81,7 +81,7 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
}

@SpectrumGenerator@_spectrum_generator<algorithm_type> spectrum_generator;
@ModelName@_spectrum_generator<algorithm_type> spectrum_generator;
spectrum_generator.set_precision_goal(1.0e-4);
spectrum_generator.set_beta_zero_threshold(1e-11);
spectrum_generator.set_max_iterations(0); // 0 == automatic
Expand Down
4 changes: 2 additions & 2 deletions templates/scan.cpp.in
View file
Expand Up @@ -19,7 +19,7 @@
// File generated at @DateAndTime@

#include "@ModelName@_input_parameters.hpp"
#include "@SpectrumGenerator@_spectrum_generator.hpp"
#include "@ModelName@_spectrum_generator.hpp"
#include "@ModelName@_two_scale_model_slha.hpp"

#include "command_line_options.hpp"
Expand Down Expand Up @@ -81,7 +81,7 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
}

@SpectrumGenerator@_spectrum_generator<algorithm_type> spectrum_generator;
@ModelName@_spectrum_generator<algorithm_type> spectrum_generator;
spectrum_generator.set_precision_goal(1.0e-4);
spectrum_generator.set_max_iterations(0); // 0 == automatic
spectrum_generator.set_calculate_sm_masses(0); // 0 == no
Expand Down
10 changes: 5 additions & 5 deletions templates/standard_model_high_scale_spectrum_generator.hpp.in
View file
Expand Up @@ -43,10 +43,10 @@
namespace flexiblesusy {

template <class T>
class @ModelName@_standard_model_spectrum_generator
class @ModelName@_spectrum_generator
: public @ModelName@_spectrum_generator_interface<T> {
public:
@ModelName@_standard_model_spectrum_generator()
@ModelName@_spectrum_generator()
: @ModelName@_spectrum_generator_interface<T>()
, solver()
, high_scale_constraint()
Expand All @@ -58,7 +58,7 @@ public:
, susy_scale(0.)
, low_scale(0.)
{}
virtual ~@ModelName@_standard_model_spectrum_generator() {}
virtual ~@ModelName@_spectrum_generator() {}

const standard_model::StandardModel<T>& get_eft() const { return eft; }
double get_high_scale() const { return high_scale; }
Expand Down Expand Up @@ -90,7 +90,7 @@ private:
* @param input model input parameters
*/
template <class T>
void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQcd& oneset,
void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& oneset,
const @ModelName@_input_parameters& input)
{
@ModelName@<T>& model = this->model;
Expand Down Expand Up @@ -240,7 +240,7 @@ void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQc
* @param filename name of output file
*/
template <class T>
void @ModelName@_standard_model_spectrum_generator<T>::write_running_couplings(
void @ModelName@_spectrum_generator<T>::write_running_couplings(
const std::string& filename) const
{
@ModelName@_spectrum_generator_interface<T>::write_running_couplings(filename, low_scale, high_scale);
Expand Down
10 changes: 5 additions & 5 deletions templates/standard_model_low_scale_spectrum_generator.hpp.in
View file
Expand Up @@ -42,10 +42,10 @@
namespace flexiblesusy {

template <class T>
class @ModelName@_standard_model_spectrum_generator
class @ModelName@_spectrum_generator
: public @ModelName@_spectrum_generator_interface<T> {
public:
@ModelName@_standard_model_spectrum_generator()
@ModelName@_spectrum_generator()
: @ModelName@_spectrum_generator_interface<T>()
, solver()
, susy_scale_constraint()
Expand All @@ -55,7 +55,7 @@ public:
, susy_scale(0.)
, low_scale(0.)
{}
virtual ~@ModelName@_standard_model_spectrum_generator() {}
virtual ~@ModelName@_spectrum_generator() {}

const standard_model::StandardModel<T>& get_eft() const { return eft; }
double get_high_scale() const { return 0.; }
Expand Down Expand Up @@ -86,7 +86,7 @@ private:
* @param input model input parameters
*/
template <class T>
void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQcd& oneset,
void @ModelName@_spectrum_generator<T>::run(const softsusy::QedQcd& oneset,
const @ModelName@_input_parameters& input)
{
@ModelName@<T>& model = this->model;
Expand Down Expand Up @@ -231,7 +231,7 @@ void @ModelName@_standard_model_spectrum_generator<T>::run(const softsusy::QedQc
* @param filename name of output file
*/
template <class T>
void @ModelName@_standard_model_spectrum_generator<T>::write_running_couplings(
void @ModelName@_spectrum_generator<T>::write_running_couplings(
const std::string& filename) const
{
@ModelName@_spectrum_generator_interface<T>::write_running_couplings(filename, low_scale, susy_scale);
Expand Down

0 comments on commit aca5c0b

Please sign in to comment.