take M2 and M into account when decreasing index literals

FlexibleSUSY · Mar 19, 2018 · 5b22000 · 5b22000
1 parent bd91948
commit 5b22000
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/meta/Constraint.m b/meta/Constraint.m
@@ -388,7 +388,7 @@
 
 CheckSetting[patt:{parameter_, value_}, constraintName_String, isInitial_] :=
     Module[{outputParameters, modelPars},
-           outputParameters = Parameters`GetOutputParameters[];
+           outputParameters = Parameters`GetAllMassOutputParameters[];
            If[MemberQ[outputParameters, parameter],
               Print["Error: In constraint ", constraintName, ": ", InputForm[patt]];
               Print["   ", parameter, " is a output parameter!"];
@@ -407,7 +407,7 @@
 CheckSetting[patt:( FlexibleSUSY`FSRestrictParameter[p_,__] | FlexibleSUSY`FSInitialSetting[p_,__] ),
              constraintName_String, __] :=
     Module[{outputParameters},
-           outputParameters = Parameters`GetOutputParameters[];
+           outputParameters = Parameters`GetAllMassOutputParameters[];
            If[MemberQ[outputParameters, p],
               Print["Error: In constraint ", constraintName, ": ", InputForm[patt]];
               Print["   ", p, " is a output parameter!"];
@@ -551,7 +551,9 @@
           ];
 
 CalculateScaleFromExpr[expr_, scaleName_String] :=
-    scaleName <> " = " <> CConversion`RValueToCFormString[Parameters`DecreaseIndexLiterals[expr, Parameters`GetOutputParameters[]]] <> ";\n";
+    scaleName <> " = " <> CConversion`RValueToCFormString[
+        Parameters`DecreaseIndexLiterals[expr, Parameters`GetAllMassOutputParameters[]]
+    ] <> ";\n";
 
 DefineAndDefaultInitialize[{t:FlexibleSUSY`Phase[_], _}] :=
     CConversion`CreateCType[GuessExtraParameterType[t]] <> " " <>

diff --git a/meta/EffectiveCouplings.m b/meta/EffectiveCouplings.m
@@ -546,10 +546,10 @@ previous results (e.g. define along the lines of f[p] := f[p] = ...)    *)
     Module[{symbols, poleMasses},
            symbols = Parameters`FindAllParameters[expr];
            poleMasses = {
-               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M[a_]]      /; MemberQ[Parameters`GetOutputParameters[],FlexibleSUSY`M[a]] :> FlexibleSUSY`M[a], {0,Infinity}],
-               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M[a_[__]]]  /; MemberQ[Parameters`GetOutputParameters[],FlexibleSUSY`M[a]] :> FlexibleSUSY`M[a], {0,Infinity}],
-               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M2[a_]]     /; MemberQ[Parameters`GetOutputParameters[],FlexibleSUSY`M2[a]] :> FlexibleSUSY`M2[a], {0,Infinity}],
-               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M2[a_[__]]] /; MemberQ[Parameters`GetOutputParameters[],FlexibleSUSY`M2[a]] :> FlexibleSUSY`M2[a], {0,Infinity}]
+               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M[a_]]      /; MemberQ[Parameters`GetAllMassOutputParameters[],FlexibleSUSY`M[a]] :> FlexibleSUSY`M[a], {0,Infinity}],
+               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M[a_[__]]]  /; MemberQ[Parameters`GetAllMassOutputParameters[],FlexibleSUSY`M[a]] :> FlexibleSUSY`M[a], {0,Infinity}],
+               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M2[a_]]     /; MemberQ[Parameters`GetAllMassOutputParameters[],FlexibleSUSY`M2[a]] :> FlexibleSUSY`M2[a], {0,Infinity}],
+               Cases[expr, FlexibleSUSY`Pole[FlexibleSUSY`M2[a_[__]]] /; MemberQ[Parameters`GetAllMassOutputParameters[],FlexibleSUSY`M2[a]] :> FlexibleSUSY`M2[a], {0,Infinity}]
                         };
            symbols = DeleteDuplicates[Flatten[symbols]];
            symbols = Complement[symbols, mixings];

diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -3525,7 +3525,7 @@ corresponding tadpole is real or imaginary (only in models with CP
 
            extraSLHAOutputBlocks = Parameters`DecreaseIndexLiterals[
                FlexibleSUSY`ExtraSLHAOutputBlocks,
-               Join[Parameters`GetOutputParameters[], Parameters`GetModelParameters[], Parameters`GetExtraParameters[]]
+               Join[Parameters`GetAllMassOutputParameters[], Parameters`GetModelParameters[], Parameters`GetExtraParameters[]]
            ];
 
            (* determine diagonalization precision for each particle *)

diff --git a/meta/Parameters.m b/meta/Parameters.m
@@ -125,6 +125,7 @@
 GetInputParametersAndTypes::usage="";
 GetModelParameters::usage="";
 GetOutputParameters::usage="";
+GetAllMassOutputParameters::usage="returns output parameters including all M[] symbols";
 GetExtraParameters::usage="";
 GetExtraParametersAndTypes::usage="";
 GetModelParametersWithMassDimension::usage="Returns model parameters
@@ -495,6 +496,9 @@
 GetPhases[] := allPhases;
 GetExtraParameters[] := First /@ allExtraParameters;
 GetExtraParametersAndTypes[] := allExtraParameters;
+GetAllMassOutputParameters[] :=
+    Join[allOutputParameters,
+         allOutputParameters /. FlexibleSUSY`M2 -> FlexibleSUSY`M];
 
 additionalRealParameters = {};
 
@@ -1503,7 +1507,7 @@
 
 IncreaseIndexLiterals[expr_, num_Integer] :=
     IncreaseIndexLiterals[expr, num, Join[GetInputParameters[], GetExtraParameters[],
-                                          allModelParameters, allOutputParameters]];
+                                          allModelParameters, GetAllMassOutputParameters[]]];
 
 IncreaseIndexLiterals[expr_, num_Integer, heads_List] :=
     Module[{indexedSymbols, rules, allHeads},
@@ -1663,7 +1667,7 @@
     Module[{par, indexSymbols, indexRanges, indices = {SARAH`gt1, SARAH`gt2}},
            indexSymbols = DeleteDuplicates[
                Join @@ (Cases[eq, par_[idx_ /; !FreeQ[idx,#]] /;
-                                  MemberQ[Join[GetModelParameters[], GetOutputParameters[]], par] :> {#,par},
+                                  MemberQ[Join[GetModelParameters[], GetAllMassOutputParameters[]], par] :> {#,par},
                               {0,Infinity}]& /@ indices)];
            indexRanges  = DeleteDuplicates[GetIdxRange /@ indexSymbols];
            If[indexRanges === {},
@@ -1780,7 +1784,7 @@
     DeleteCases[GetAllOutputParameterDependencies[expr /. GetDependenceSPhenoRules[]], _?NumericQ];
 
 GetOutputParameterDependencies[expr_] :=
-    Select[GetOutputParameters[],
+    Select[GetAllMassOutputParameters[],
            (!FreeQ[GetAllOutputParameterDependenciesReplaced[expr],#])&];
 
 GetExponent[a_^b_] := -I b;
@@ -1789,7 +1793,7 @@
 GetIntermediateOutputParameterDependencies[expr_] :=
     Complement[
         GetAllOutputParameterDependenciesReplaced[expr],
-        Join[GetOutputParameters[], GetInputParameters[], GetExponent /@ GetPhases[]]
+        Join[GetAllMassOutputParameters[], GetInputParameters[], GetExponent /@ GetPhases[]]
     ];
 
 CreateExtraParameterArrayGetter[{}] :=

diff --git a/meta/WeinbergAngle.m b/meta/WeinbergAngle.m
@@ -60,7 +60,7 @@
            availPars = Join[TreeMasses`GetParticles[],
                             Parameters`GetInputParameters[],
                             Parameters`GetModelParameters[],
-                            Parameters`GetOutputParameters[]];
+                            Parameters`GetAllMassOutputParameters[]];
            areDefined = MemberQ[availPars, #]& /@ requiredSymbols;
            DebugPrint["Error: Unknown symbol: ", #]& /@
               Cases[Utils`Zip[areDefined, requiredSymbols], {False, p_} :> p];