Merge remote-tracking branch 'organization/feature-2.0' into feature-…

…higgs-2l
FlexibleSUSY · Mar 22, 2017 · 0e76fe6 · 0e76fe6
2 parents 0f1e312 + 79db6fc
commit 0e76fe6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -1103,7 +1103,7 @@ corresponding tadpole is real or imaginary (only in models with CP
             printMasses = "", printMixingMatrices = "",
             getPhysical = "", setPhysical = "",
             getMasses = "", setMasses = "",
-            masses, mixingMatrices, oneLoopTadpoles,
+            masses, mixingMatrices,
             dependencePrototypes, dependenceFunctions,
             clearOutputParameters = "", solveEwsbTreeLevel = "",
             clearPhases = "", clearExtraParameters = "",
@@ -1167,7 +1167,6 @@ corresponding tadpole is real or imaginary (only in models with CP
                     " parameters: ", parametersFixedByEWSB];
              ];
            higgsToEWSBEqAssociation     = CreateHiggsToEWSBEqAssociation[];
-           oneLoopTadpoles              = Cases[nPointFunctions, SelfEnergies`Tadpole[___]];
            calculateOneLoopTadpoles     = SelfEnergies`FillArrayWithLoopTadpoles[1, higgsToEWSBEqAssociation, "tadpole", "-"];
            calculateOneLoopTadpolesNoStruct = SelfEnergies`FillArrayWithLoopTadpoles[1, higgsToEWSBEqAssociation, "tadpole", "+"];
            divideTadpoleByVEV           = SelfEnergies`DivideTadpoleByVEV[Parameters`DecreaseIndexLiterals @ CreateVEVToTadpoleAssociation[], "tadpole"];
@@ -1217,7 +1216,7 @@ corresponding tadpole is real or imaginary (only in models with CP
              ];
            loopMassesPrototypes         = LoopMasses`CreateOneLoopPoleMassPrototypes[];
            (* If you want to add tadpoles, call the following routine like this:
-              CreateOneLoopPoleMassFunctions[diagonalizationPrecision, oneLoopTadpoles, vevs];
+              CreateOneLoopPoleMassFunctions[diagonalizationPrecision, Cases[nPointFunctions, SelfEnergies`Tadpole[___]], vevs];
               *)
            loopMassesFunctions          = LoopMasses`CreateOneLoopPoleMassFunctions[diagonalizationPrecision, {}, {}];
            runningDRbarMassesPrototypes = LoopMasses`CreateRunningDRbarMassPrototypes[];
@@ -1296,10 +1295,10 @@ corresponding tadpole is real or imaginary (only in models with CP
                             "@tadpoleEqFunctions@"   -> tadpoleEqFunctions,
                             "@numberOfEWSBEquations@"-> ToString[TreeMasses`GetDimension[SARAH`HiggsBoson]],
                             "@calculateTreeLevelTadpoles@" -> IndentText[calculateTreeLevelTadpoles],
-                            "@calculateOneLoopTadpoles@"   -> IndentText[calculateOneLoopTadpoles],
-                            "@calculateTwoLoopTadpoles@"   -> IndentText[calculateTwoLoopTadpoles],
-                            "@calculateOneLoopTadpolesNoStruct@" -> IndentText[calculateOneLoopTadpolesNoStruct],
-                            "@calculateTwoLoopTadpolesNoStruct@" -> IndentText[calculateTwoLoopTadpolesNoStruct],
+                            "@calculateOneLoopTadpoles@"   -> IndentText @ IndentText[calculateOneLoopTadpoles],
+                            "@calculateTwoLoopTadpoles@"   -> IndentText @ IndentText @ IndentText[calculateTwoLoopTadpoles],
+                            "@calculateOneLoopTadpolesNoStruct@" -> IndentText @ IndentText[calculateOneLoopTadpolesNoStruct],
+                            "@calculateTwoLoopTadpolesNoStruct@" -> IndentText @ IndentText @ IndentText[calculateTwoLoopTadpolesNoStruct],
                             "@divideTadpoleByVEV@"     -> IndentText[divideTadpoleByVEV],
                             "@clearOutputParameters@"  -> IndentText[clearOutputParameters],
                             "@clearPhases@"            -> IndentText[clearPhases],

diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
@@ -560,7 +560,7 @@ therefore not be accessed in the form Glu(gO2).
                          "(" <> ToString[idx - 1] <> "));\n";
                  ];
               ];
-           Return[IndentText[body]];
+           body
           ];
 
 FillArrayWithTwoLoopTadpoles[higgsBoson_, arrayName_String, sign_String:"-", struct_String:""] :=
@@ -573,7 +573,7 @@ therefore not be accessed in the form Glu(gO2).
                body = body <> arrayName <> "[" <> ToString[v-1] <> "] " <> sign <> "= " <>
                       "tadpole_2l(" <> ToString[v-1] <> ");\n";
               ];
-           Return[IndentText[IndentText[body]]];
+           body
           ];
 
 DivideTadpoleByVEV[higgsAndVEV_List, arrayName_String] :=