Allow extra parameters to be used in SLHA output blocks

FlexibleSUSY · Dec 12, 2016 · 5e68759 · 5e68759
1 parent 9987466
commit 5e68759
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/meta/WriteOut.m b/meta/WriteOut.m
@@ -373,6 +373,7 @@
           IsOutputParameter[par], Global`MODELPARAMETER,
           IsPhase[par]          , Global`MODELPARAMETER,
           IsInputParameter[par] , Global`INPUTPARAMETER,
+          IsExtraParameter[par] , Global`EXTRAPARAMETER,
           True                  , Identity
          ];
 
@@ -382,7 +383,7 @@
     Module[{allPars, replacements, protectionRules, exprWithoutProtectedSymbols},
            allPars = Flatten[{FSModelParameters, FSInputParameters,
                               FSOutputParameters, FSPhysicalOutputParameters,
-                              FSPhases, FSDerivedParameters} /. FindAllParametersClassified[expr]];
+                              FSPhases, FSDerivedParameters, FSExtraParameters} /. FindAllParametersClassified[expr]];
            replacements = Join[
                RuleDelayed[#     , FindMacro[#][#]   ]& /@ allPars,
                RuleDelayed[#[i__], FindMacro[#][#][i]]& /@ allPars,

diff --git a/templates/slha_io.cpp.in b/templates/slha_io.cpp.in
@@ -37,6 +37,7 @@
 #define LOCALPHYSICAL(p) physical.p
 #define MODELPARAMETER(p) model.get_##p()
 #define INPUTPARAMETER(p) input.p
+#define EXTRAPARAMETER(p) model.get_##p()
 #define DEFINE_PHYSICAL_PARAMETER(p) decltype(LOCALPHYSICAL(p)) p;
 #define LowEnergyConstant(p) Electroweak_constants::p
 

diff --git a/templates/slha_io.hpp.in b/templates/slha_io.hpp.in
@@ -46,6 +46,7 @@
 #define LOCALPHYSICAL(p) physical.p
 #define MODEL model
 #define MODELPARAMETER(p) model.get_##p()
+#define EXTRAPARAMETER(p) model.get_##p()
 #define OBSERVABLES observables
 #define LowEnergyConstant(p) Electroweak_constants::p
 #define SCALES(p) scales.p
@@ -255,6 +256,7 @@ void @ModelName@_slha_io::set_spectrum(const @ModelName@_slha<Model>& model)
 #undef LOCALPHYSICAL
 #undef MODEL
 #undef MODELPARAMETER
+#undef EXTRAPARAMETER
 #undef OBSERVABLES
 #undef LowEnergyConstant
 #undef SCALES