Write out EWSB equations after making any user defined substitutions

FlexibleSUSY · Dec 27, 2016 · 87860ba · 87860ba
1 parent 3aedb75
commit 87860ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/meta/EWSB.m b/meta/EWSB.m
@@ -1,7 +1,10 @@
 
 BeginPackage["EWSB`", {"SARAH`", "TextFormatting`", "CConversion`", "Parameters`", "TreeMasses`", "WriteOut`", "Utils`"}];
 
-GetLinearlyIndependentEqs::"Removes linearly dependent EWSB equations
+ApplySubstitutionsToEqs::usage="Makes the given substitutions in the EWSB
+equations, taking into account SARAH heads";
+
+GetLinearlyIndependentEqs::usage="Removes linearly dependent EWSB equations
 from a list of equations";
 
 FindSolutionAndFreePhases::usage="Finds solution to the EWSB and free

diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -2527,19 +2527,21 @@ corresponding tadpole is real or imaginary (only in models with CP
            If[haveEWSB,
               ewsbEquations = Parameters`ExpandExpressions[ewsbEquations];
               FlexibleSUSY`EWSBOutputParameters = Parameters`DecreaseIndexLiterals[FlexibleSUSY`EWSBOutputParameters];
-
+              If[Head[FlexibleSUSY`EWSBSubstitutions] === List && FlexibleSUSY`EWSBSubstitutions =!= {},
+                 FlexibleSUSY`EWSBSubstitutions = FlexibleSUSY`EWSBSubstitutions /. allIndexReplacementRules;
+                ];
               (* adding tadpoles to the EWSB eqs. *)
               ewsbEquations = MapIndexed[#1 - tadpole[First[#2]]&, ewsbEquations];
               treeLevelEwsbSolutionOutputFile = FileNameJoin[{FSOutputDir,
                                                               FlexibleSUSY`FSModelName <> "_EWSB_solution.m"}];
               treeLevelEwsbEqsOutputFile      = FileNameJoin[{FSOutputDir,
                                                               FlexibleSUSY`FSModelName <> "_EWSB_equations.m"}];
               Print["Writing EWSB equations to ", treeLevelEwsbEqsOutputFile];
-              Put[ewsbEquations, treeLevelEwsbEqsOutputFile];
-              Print["Searching for independent EWSB equations ..."];
               If[Head[FlexibleSUSY`EWSBSubstitutions] === List && FlexibleSUSY`EWSBSubstitutions =!= {},
-                 FlexibleSUSY`EWSBSubstitutions = FlexibleSUSY`EWSBSubstitutions /. allIndexReplacementRules;
+                 Put[EWSB`ApplySubstitutionsToEqs[ewsbEquations, FlexibleSUSY`EWSBSubstitutions], treeLevelEwsbEqsOutputFile],
+                 Put[ewsbEquations, treeLevelEwsbEqsOutputFile]
                 ];
+              Print["Searching for independent EWSB equations ..."];
               independentEwsbEquations = EWSB`GetLinearlyIndependentEqs[ewsbEquations, FlexibleSUSY`EWSBOutputParameters,
                                                                         FlexibleSUSY`EWSBSubstitutions];