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

…higgs-2l
FlexibleSUSY · Mar 22, 2017 · 0f1e312 · 0f1e312
2 parents 4a9198e + f4ccf9c
commit 0f1e312
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -1168,8 +1168,8 @@ corresponding tadpole is real or imaginary (only in models with CP
              ];
            higgsToEWSBEqAssociation     = CreateHiggsToEWSBEqAssociation[];
            oneLoopTadpoles              = Cases[nPointFunctions, SelfEnergies`Tadpole[___]];
-           calculateOneLoopTadpoles     = SelfEnergies`FillArrayWithOneLoopTadpoles[higgsToEWSBEqAssociation, "tadpole", "-"];
-           calculateOneLoopTadpolesNoStruct = SelfEnergies`FillArrayWithOneLoopTadpoles[higgsToEWSBEqAssociation, "tadpole", "+"];
+           calculateOneLoopTadpoles     = SelfEnergies`FillArrayWithLoopTadpoles[1, higgsToEWSBEqAssociation, "tadpole", "-"];
+           calculateOneLoopTadpolesNoStruct = SelfEnergies`FillArrayWithLoopTadpoles[1, higgsToEWSBEqAssociation, "tadpole", "+"];
            divideTadpoleByVEV           = SelfEnergies`DivideTadpoleByVEV[Parameters`DecreaseIndexLiterals @ CreateVEVToTadpoleAssociation[], "tadpole"];
            If[SARAH`UseHiggs2LoopMSSM === True ||
               FlexibleSUSY`UseHiggs2LoopNMSSM === True,

diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
@@ -26,7 +26,7 @@
 CreateHeavyRotatedSelfEnergyFunctionName::usage="creates heavy rotated
 self-energy function name for a given field";
 
-FillArrayWithOneLoopTadpoles::usage="add one-loop tadpoles to array"
+FillArrayWithLoopTadpoles::usage="add loop tadpoles to array"
 
 FillArrayWithTwoLoopTadpoles::usage="add two-loop tadpoles to array"
 
@@ -544,13 +544,13 @@ therefore not be accessed in the form Glu(gO2).
            {prototypes, defs}
           ];
 
-FillArrayWithOneLoopTadpoles[higgsAndIdx_List, arrayName_String, sign_String:"-", struct_String:""] :=
+FillArrayWithLoopTadpoles[loopLevel_, higgsAndIdx_List, arrayName_String, sign_String:"-", struct_String:""] :=
     Module[{body = "", v, field, idx, head, functionName},
            For[v = 1, v <= Length[higgsAndIdx], v++,
                field = higgsAndIdx[[v,1]];
                idx = higgsAndIdx[[v,2]];
                head = CConversion`ToValidCSymbolString[higgsAndIdx[[v,3]]];
-               functionName = CreateTadpoleFunctionName[field, 1];
+               functionName = CreateTadpoleFunctionName[field, loopLevel];
                If[TreeMasses`GetDimension[field] == 1,
                   body = body <> arrayName <> "[" <> ToString[v-1] <> "] " <> sign <> "= " <>
                          head <> "(" <> struct <> functionName <> "());\n";