Ensure SARAH symbols are replaced in Which

when searching for parameters in an expression
FlexibleSUSY · Jan 17, 2017 · 41fb896 · 41fb896
1 parent 8fb1ed6
commit 41fb896
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/meta/Parameters.m b/meta/Parameters.m
@@ -307,7 +307,7 @@
                  Cases[compactExpr, SARAH`Q[a_]     /; MemberQ[parameters,SARAH`Q[a]] :> SARAH`Q[a], {0,Infinity}]
                }]];
            (* remove parameters found from compactExpr *)
-           compactExpr = compactExpr /. (RuleDelayed[#, CConversion`ToValidCSymbolString[#]]& /@ symbols);
+           compactExpr = compactExpr /. (RuleDelayed[#, Evaluate[CConversion`ToValidCSymbolString[#]]]& /@ symbols);
            (* find all parameters without SARAH head in compactExpr *)
            symbols = Join[symbols,
                { Cases[compactExpr, a_Symbol /; MemberQ[parameters,a], {0,Infinity}],

diff --git a/test/test_Parameters.m b/test/test_Parameters.m
@@ -147,6 +147,11 @@
              Sort[{SARAH`B[Mu], SARAH`Q[WOp]}]
             ];
 
+expr = Which[WOp > 1, Sqrt[B[Mu]]];
+
+TestEquality[Sort[Parameters`FindAllParameters[expr]],
+             Sort[{B[Mu], WOp}]];
+
 Print["testing GetType[] ..."];
 
 TestEquality[Parameters`GetType[x],