reuse replacement function to shorten code

FlexibleSUSY · Jul 8, 2015 · 1aec5fb · 1aec5fb
1 parent f0f74d7
commit 1aec5fb
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -362,7 +362,7 @@
              ];
           ];
 
-ReplaceIndicesInSolverSpecificUserInput[rules_, solver_] :=
+ReplaceInSolverSpecificUserInput[rules_, solver_] :=
     Block[{},
           (FlexibleSUSY`BVPSolverOptions[solver] =
                Utils`FSOptionValueReplace[FlexibleSUSY`BVPSolverOptions[solver], #,
@@ -374,15 +374,15 @@
              FlexibleSUSY`HighScaleFirstGuess };
          ];
 
-ReplaceIndicesInUserInput[rules_] :=
+ReplaceInUserInput[rules_] :=
     Block[{},
           FlexibleSUSY`HighScale               = FlexibleSUSY`HighScale               /. rules;
           FlexibleSUSY`HighScaleInput          = FlexibleSUSY`HighScaleInput          /. rules;
           FlexibleSUSY`LowScale                = FlexibleSUSY`LowScale                /. rules;
           FlexibleSUSY`LowScaleInput           = FlexibleSUSY`LowScaleInput           /. rules;
           FlexibleSUSY`SUSYScale               = FlexibleSUSY`SUSYScale               /. rules;
           FlexibleSUSY`SUSYScaleInput          = FlexibleSUSY`SUSYScaleInput          /. rules;
-          ReplaceIndicesInSolverSpecificUserInput[rules, #]& /@ FlexibleSUSY`BVPSolvers;
+          ReplaceInSolverSpecificUserInput[rules, #]& /@ FlexibleSUSY`BVPSolvers;
          ];
 
 GUTNormalization[coupling_] :=
@@ -1741,30 +1741,15 @@ corresponding tadpole is real or imaginary (only in models with CP
            FlexibleSUSY`FSLesHouchesList = Join[FlexibleSUSY`FSLesHouchesList, {#[[1]], #[[2]]}& /@ FlexibleSUSY`FSExtraInputParameters];
 
            (* replace all indices in the user-defined model file variables *)
-           ReplaceIndicesInUserInput[allIndexReplacementRules];
-
-           (* replace LHInput[p] by pInput in the constraints *)
+           ReplaceInUserInput[allIndexReplacementRules];
 
+           (* replace LHInput[p] by pInput in the user-defined model file variables *)
            lesHouchesInputParameterReplacementRules = Flatten[{
                Rule[SARAH`LHInput[#[[1]]], #[[2]]],
                Rule[SARAH`LHInput[#[[1]][p__]], #[[2]][p]]
            }& /@ lesHouchesInputParameters];
 
-           FlexibleSUSY`LowScaleInput = FlexibleSUSY`LowScaleInput /.
-               lesHouchesInputParameterReplacementRules;
-           FlexibleSUSY`SUSYScaleInput = FlexibleSUSY`SUSYScaleInput /.
-               lesHouchesInputParameterReplacementRules;
-           FlexibleSUSY`HighScaleInput = FlexibleSUSY`HighScaleInput /.
-               lesHouchesInputParameterReplacementRules;
-
-           (FlexibleSUSY`BVPSolverOptions[TwoScaleSolver] =
-               Utils`FSOptionValueReplace[FlexibleSUSY`BVPSolverOptions[TwoScaleSolver], #,
-                                          lesHouchesInputParameterReplacementRules])& /@
-           { FlexibleSUSY`InitialGuessAtLowScale,
-             FlexibleSUSY`InitialGuessAtHighScale,
-             FlexibleSUSY`LowScaleFirstGuess,
-             FlexibleSUSY`SUSYScaleFirstGuess,
-             FlexibleSUSY`HighScaleFirstGuess };
+           ReplaceInUserInput[lesHouchesInputParameterReplacementRules];
 
            If[FlexibleSUSY`OnlyLowEnergyFlexibleSUSY === True,
               lesHouchesInputParameters = Join[FlexibleSUSY`FSUnfixedParameters,