Merge branch 'feature-2.0' into feature-2.0-semianalytic-solver

Conflicts: meta/FlexibleSUSY.m
FlexibleSUSY · Mar 10, 2017 · fadef62 · fadef62
2 parents f80fe80 + 819e3bf
commit fadef62
Show file tree

Hide file tree

Showing 34 changed files with 70 additions and 62 deletions.
diff --git a/meta/FlexibleEFTHiggsMatching.m b/meta/FlexibleEFTHiggsMatching.m
@@ -10,7 +10,7 @@
 
 CallSMPoleMassFunctions[states_, enablePoleMassThreads_] :=
     Module[{particles, result, Selector},
-           Selector[p_] := SARAH`SMQ[p] && !IsMassless[p] && (IsVector[p] || IsFermion[p]);
+           Selector[p_] := TreeMasses`IsSMParticle[p] && !IsMassless[p] && (IsVector[p] || IsFermion[p]);
            particles = Select[LoopMasses`GetLoopCorrectedParticles[states], Selector];
            If[enablePoleMassThreads =!= True,
               result = StringJoin[LoopMasses`CallPoleMassFunction[#,"model."]& /@ particles];

diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -106,18 +106,20 @@ FlexibleSUSY model file (FlexibleSUSY.m).
 MT;
 MZDRbar;
 MWDRbar;
+MZMSbar;
+MWMSbar;
 EDRbar;
 ThetaWDRbar;
 SCALE;
 THRESHOLD;
 VEV::usage = "running SM-like VEV in the full model";
-UseHiggs2LoopNMSSM;
+UseHiggs2LoopNMSSM = False;
 EffectiveMu;
 EffectiveMASqr;
 UseSM3LoopRGEs = False;
 UseMSSM3LoopRGEs = False;
-UseHiggs2LoopSM;
-UseHiggs3LoopSplit;
+UseHiggs2LoopSM = False;
+UseHiggs3LoopSplit = False;
 UseYukawa3LoopQCD = Automatic;
 FSRGELoopOrder = 2; (* RGE loop order (0, 1 or 2) *)
 PotentialLSPParticles = {};
@@ -626,9 +628,9 @@ FlexibleSUSY model file (FlexibleSUSY.m).
       "@ModelName@"           -> FlexibleSUSY`FSModelName,
       "@numberOfModelParameters@" -> ToString[numberOfModelParameters],
       "@numberOfParticles@"    -> ToString[Length @ GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates]],
-      "@numberOfSMParticles@"  -> ToString[Length @ Select[GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates], SARAH`SMQ]],
+      "@numberOfSMParticles@"  -> ToString[Length @ Select[GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates], TreeMasses`IsSMParticle]],
       "@numberOfBSMParticles@" -> ToString[Length @ Complement[GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates],
-                                                               Select[GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates], SARAH`SMQ]]],
+                                                               Select[GetLoopCorrectedParticles[FlexibleSUSY`FSEigenstates], TreeMasses`IsSMParticle]]],
       "@InputParameter_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> CConversion`ToValidCSymbolString[
           If[Parameters`GetInputParameters[] === {},
              "",
@@ -1933,7 +1935,7 @@ corresponding tadpole is real or imaginary (only in models with CP
             numberOfDRbarBlocks, drBarBlockNames
            },
            particles = DeleteDuplicates @ Flatten[TreeMasses`GetMassEigenstate /@ massMatrices];
-           susyParticles = Select[particles, (!SARAH`SMQ[#])&];
+           susyParticles = Select[particles, (!TreeMasses`IsSMParticle[#])&];
            smParticles   = Complement[particles, susyParticles];
            minpar = Cases[inputParameters, {p_, {"MINPAR", idx_}, ___} :> {idx, p}];
            extpar = Cases[inputParameters, {p_, {"EXTPAR", idx_}, ___} :> {idx, p}];

diff --git a/meta/GMuonMinus2.m b/meta/GMuonMinus2.m
@@ -27,16 +27,16 @@ If you add new kinds of vertices (e.g for new diagram types):
 
 (************* Begin public interface *******************)
 
-IsSMParticle[particle_] :=
-    SARAH`SMQ[particle] || TreeMasses`IsSMGoldstone[particle];
+GMuonMinus2IsSMParticle[particle_] :=
+    TreeMasses`IsSMParticle[particle] || TreeMasses`IsSMGoldstone[particle];
 
 CreateSMParticleFlags[particle_] :=
     Module[{result = "", i,
             numberOfGenerations = TreeMasses`GetDimension[particle]},
            For[i = 1, i <= numberOfGenerations, i++,
                If[i > 1, result = result <> ", ";];
-               If[IsSMParticle[particle[i]] === True ||
-                  IsSMParticle[particle] === True,
+               If[GMuonMinus2IsSMParticle[particle[i]] === True ||
+                  GMuonMinus2IsSMParticle[particle] === True,
                   result = result <> "true";,
                   result = result <> "false";
                  ];

diff --git a/meta/LoopMasses.m b/meta/LoopMasses.m
@@ -790,7 +790,7 @@ be set to the (positive) tree-level mass.  M_tree
     Module[{particles, susyParticles, smParticles, callSusy,
             callSM, result},
            particles = GetLoopCorrectedParticles[states];
-           smParticles = Select[particles, SARAH`SMQ[#]&];
+           smParticles = Select[particles, TreeMasses`IsSMParticle];
            susyParticles = Complement[particles, smParticles];
            If[enablePoleMassThreads =!= True,
               callSusy = StringJoin[CallPoleMassFunction /@ susyParticles];

diff --git a/meta/TreeMasses.m b/meta/TreeMasses.m
@@ -225,10 +225,10 @@
           ];
 
 GetSusyParticles[states_:FlexibleSUSY`FSEigenstates] :=
-    Select[GetParticles[states], (!SARAH`SMQ[#] && !IsGhost[#])&];
+    Select[GetParticles[states], (!IsSMParticle[#] && !IsGhost[#])&];
 
 GetSMParticles[states_:FlexibleSUSY`FSEigenstates] :=
-    Select[GetParticles[states], (SARAH`SMQ[#])&];
+    Select[GetParticles[states], IsSMParticle];
 
 ParticleQ[p_, states_:FlexibleSUSY`FSEigenstates] :=
     MemberQ[GetParticles[states], p];
@@ -273,7 +273,7 @@
 IsGoldstone[sym_List] := And @@ (IsGoldstone /@ sym);
 
 GetSMGoldstones[] :=
-    Cases[SARAH`GoldstoneGhost /. a_[{idx__}] :> a[idx], {v_?SARAH`SMQ, goldstone_} :> goldstone];
+    Cases[SARAH`GoldstoneGhost /. a_[{idx__}] :> a[idx], {v_?IsSMParticle, goldstone_} :> goldstone];
 
 IsSMGoldstone[Susyno`LieGroups`conj[sym_]] := IsSMGoldstone[sym];
 IsSMGoldstone[SARAH`bar[sym_]] := IsSMGoldstone[sym];
@@ -353,7 +353,7 @@
 IsLepton[SARAH`bar[sym_]] := IsLepton[sym];
 IsLepton[sym_[___]] := IsLepton[sym];
 IsLepton[sym_Symbol] :=
-    MemberQ[Complement[GetParticles[], GetColoredParticles[]], sym] && IsFermion[sym] && SARAH`SMQ[sym];
+    MemberQ[Complement[GetParticles[], GetColoredParticles[]], sym] && IsFermion[sym] && IsSMParticle[sym];
 
 IsSMChargedLepton[Susyno`LieGroups`conj[sym_]] := IsSMChargedLepton[sym];
 IsSMChargedLepton[SARAH`bar[sym_]] := IsSMChargedLepton[sym];
@@ -466,7 +466,7 @@
     Transpose[SARAH`GoldstoneGhost][[2]];
 
 GetSMGoldstoneBosons[] :=
-    Cases[SARAH`GoldstoneGhost, {vector_?SARAH`SMQ, goldstone_} :> goldstone];
+    Cases[SARAH`GoldstoneGhost, {vector_?IsSMParticle, goldstone_} :> goldstone];
 
 GetDimension[sym_List, states_:FlexibleSUSY`FSEigenstates] :=
     Plus @@ (GetDimension[#, states]& /@ sym);
@@ -497,7 +497,7 @@
     GetDimensionStartSkippingGoldstones[sym, SARAH`GoldstoneGhost];
 
 GetDimensionStartSkippingSMGoldstones[sym_] :=
-    GetDimensionStartSkippingGoldstones[sym, Cases[SARAH`GoldstoneGhost, {_?SARAH`SMQ, _}]];
+    GetDimensionStartSkippingGoldstones[sym, Cases[SARAH`GoldstoneGhost, {_?IsSMParticle, _}]];
 
 GetDimensionWithoutGoldstones[sym_[__], states_:FlexibleSUSY`FSEigenstates] :=
     GetDimensionWithoutGoldstones[sym, states];

diff --git a/model_files/BLSM/FlexibleSUSY.m.in b/model_files/BLSM/FlexibleSUSY.m.in
@@ -38,7 +38,7 @@ LowScaleInput = {
     {Yv, LHInput[Yv]},
     {Yx, LHInput[Yx]},
     {vX, vXinput},
-    {vH, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+    {vH, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
     {Ye, Automatic},
     {Yd, Automatic},
     {Yu, Automatic}

diff --git a/model_files/BLSMlightZp/FlexibleSUSY.m.in b/model_files/BLSMlightZp/FlexibleSUSY.m.in
@@ -38,7 +38,7 @@ LowScaleInput = {
     {Yv, LHInput[Yv]},
     {Yx, LHInput[Yx]},
     {vX, vXinput},
-    {vH, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+    {vH, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
     {Ye, Automatic},
     {Yd, Automatic},
     {Yu, Automatic}

diff --git a/model_files/BetaSM/FlexibleSUSY.m.in b/model_files/BetaSM/FlexibleSUSY.m.in
@@ -35,7 +35,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Ye, Automatic}
 };

diff --git a/model_files/CMSSMCPV/FlexibleSUSY.m.in b/model_files/CMSSMCPV/FlexibleSUSY.m.in
@@ -13,6 +13,7 @@ MINPAR = { {1, m0},
            {100, Phase[\[Mu]]} };
 
 IMMINPAR = { {2, Imm12},
+             {4, SinPhiMu},
              {5, ImAzero} };
 
 EXTPAR = {
@@ -29,7 +30,7 @@ SUSYScaleFirstGuess = Sqrt[m0^2 + 4 m12^2];
 
 SUSYScaleInput = {
     {eta, etaInput},
-    {Phase[\[Mu]], Exp[I ArcCos[CosPhiMu]]}
+    {Phase[\[Mu]], CosPhiMu + I SinPhiMu}
 };
 
 HighScale = g1 == g2;

diff --git a/model_files/CMSSMCPV/LesHouches.in.CMSSMCPV b/model_files/CMSSMCPV/LesHouches.in.CMSSMCPV
@@ -51,6 +51,7 @@ Block MINPAR                 # Input parameters
     5   0                    # Azero
 Block IMMINPAR
     2   0                    # Imm12
+    4   0                    # SinPhiMu
     5   0                    # ImAzero
 Block EXTPAR
   100   0.1                  # etaInput
diff --git a/model_files/HGTHDMIIMSSMBC/FlexibleSUSY.m.in b/model_files/HGTHDMIIMSSMBC/FlexibleSUSY.m.in
@@ -80,8 +80,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/HGTHDMIIMSSMBCApprox/FlexibleSUSY.m.in b/model_files/HGTHDMIIMSSMBCApprox/FlexibleSUSY.m.in
@@ -164,8 +164,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/HGTHDMIIMSSMBCFull/FlexibleSUSY.m.in b/model_files/HGTHDMIIMSSMBCFull/FlexibleSUSY.m.in
@@ -154,8 +154,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/HSSUSY/FlexibleSUSY.m.in b/model_files/HSSUSY/FlexibleSUSY.m.in
@@ -89,7 +89,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/HTHDMIIMSSMBC/FlexibleSUSY.m.in b/model_files/HTHDMIIMSSMBC/FlexibleSUSY.m.in
@@ -70,8 +70,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/MDM/FlexibleSUSY.m.in b/model_files/MDM/FlexibleSUSY.m.in
@@ -33,7 +33,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},

diff --git a/model_files/NSM/FlexibleSUSY.m.in b/model_files/NSM/FlexibleSUSY.m.in
@@ -38,7 +38,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {vH, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {vH, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SM/FlexibleSUSY.m.in b/model_files/SM/FlexibleSUSY.m.in
@@ -33,7 +33,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SMEWSBAtMZ/FlexibleSUSY.m.in b/model_files/SMEWSBAtMZ/FlexibleSUSY.m.in
@@ -33,7 +33,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},

diff --git a/model_files/SMHighPrecision/FlexibleSUSY.m.in b/model_files/SMHighPrecision/FlexibleSUSY.m.in
@@ -33,7 +33,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SMHighScale/FlexibleSUSY.m.in b/model_files/SMHighScale/FlexibleSUSY.m.in
@@ -35,7 +35,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[gY]^2 gY^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[gY]^2 gY^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SMNoRGEs/FlexibleSUSY.m.in b/model_files/SMNoRGEs/FlexibleSUSY.m.in
@@ -34,7 +34,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SMnoGUT/FlexibleSUSY.m.in b/model_files/SMnoGUT/FlexibleSUSY.m.in
@@ -22,7 +22,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[gY]^2 gY^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[gY]^2 gY^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SMtower/FlexibleSUSY.m.in b/model_files/SMtower/FlexibleSUSY.m.in
@@ -24,7 +24,7 @@ LowScale = LowEnergyConstant[MT];
 LowScaleFirstGuess = LowEnergyConstant[MT];
 
 LowScaleInput = {
-    {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+    {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
     {Yu, Automatic},
     {Yd, Automatic},
     {Ye, Automatic},

diff --git a/model_files/SSM/FlexibleSUSY.m.in b/model_files/SSM/FlexibleSUSY.m.in
@@ -42,7 +42,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/SplitMSSM/FlexibleSUSY.m.in b/model_files/SplitMSSM/FlexibleSUSY.m.in
@@ -78,7 +78,7 @@ LowScaleInput = {
    {MassB , M1Input},
    {MassWB, M2Input},
    {MassG , M3Input},
-   {v, Sqrt[2] MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, Sqrt[2] MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/THDMII/FlexibleSUSY.m.in b/model_files/THDMII/FlexibleSUSY.m.in
@@ -45,8 +45,8 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]},
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/model_files/THDMIIMSSMBC/FlexibleSUSY.m.in b/model_files/THDMIIMSSMBC/FlexibleSUSY.m.in
@@ -69,8 +69,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/THDMIIMSSMBCApprox/FlexibleSUSY.m.in b/model_files/THDMIIMSSMBCApprox/FlexibleSUSY.m.in
@@ -151,8 +151,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/THDMIIMSSMBCFull/FlexibleSUSY.m.in b/model_files/THDMIIMSSMBCFull/FlexibleSUSY.m.in
@@ -141,8 +141,8 @@ LowScaleInput = {
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic},
-   {v1, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
-   {v2, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
+   {v1, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Cos[ArcTan[TanBeta]]},
+   {v2, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2] Sin[ArcTan[TanBeta]]}
 };
 
 InitialGuessAtLowScale = {

diff --git a/model_files/cSM/FlexibleSUSY.m.in b/model_files/cSM/FlexibleSUSY.m.in
@@ -24,7 +24,7 @@ LowScale = LowEnergyConstant[MZ];
 LowScaleFirstGuess = LowEnergyConstant[MZ];
 
 LowScaleInput = {
-   {v, 2 MZDRbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
+   {v, 2 MZMSbar / Sqrt[GUTNormalization[g1]^2 g1^2 + g2^2]},
    {Yu, Automatic},
    {Yd, Automatic},
    {Ye, Automatic}

diff --git a/templates/a_muon.cpp.in b/templates/a_muon.cpp.in
@@ -410,7 +410,7 @@ double @ModelName@_a_muon::calculate_a_muon(const @ModelName@_mass_eigenstates&
 
 namespace {
 /**
-* @defgroup LoopFunctions
+* @defgroup LoopFunctions LoopFunctions
 * @brief The loop functions necessary for \f$a_\mu\f$ one-loop calculations.
 *
 * These are OneLoopFunctionF1C(), OneLoopFunctionF2C(),