Skip to content

Commit

Permalink
Find extra parameters as well
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Harries committed Dec 7, 2016
1 parent 5ca045c commit 8e66431
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions meta/Parameters.m
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
allParameters = DeleteDuplicates[
Join[allModelParameters, allOutPars,
GetInputParameters[], Phases`GetArg /@ allPhases,
GetDependenceSPhenoSymbols[]]];
GetDependenceSPhenoSymbols[], GetExtraParameters[]]];
compactExpr = RemoveProtectedHeads[expr];
(* find all model parameters with SARAH head *)
symbols = DeleteDuplicates[Flatten[
Expand Down Expand Up @@ -874,7 +874,7 @@

FindAllParametersClassified[expr_] :=
Module[{symbols = DeleteDuplicates[Flatten[FindAllParameters[expr]]],
inputPars, modelPars, outputPars,
inputPars, modelPars, outputPars, extraPars,
poleMasses, phases, depNum, allOutPars},
allOutPars = DeleteDuplicates[Flatten[
Join[allOutputParameters,
Expand All @@ -891,13 +891,15 @@
outputPars = DeleteDuplicates[Select[symbols, (MemberQ[allOutPars,#])&]];
phases = DeleteDuplicates[Select[symbols, (MemberQ[Phases`GetArg /@ allPhases,#])&]];
depNum = DeleteDuplicates[Select[symbols, (MemberQ[GetDependenceSPhenoSymbols[],#])&]];
extraPars = DeleteDuplicates[Select[symbols, (MemberQ[GetExtraParameters[],#])&]];
{
FSModelParameters -> modelPars,
FSInputParameters -> inputPars,
FSOutputParameters -> outputPars,
FSPhysicalOutputParameters -> poleMasses,
FSPhases -> phases,
FSDerivedParameters -> depNum
FSDerivedParameters -> depNum,
FSExtraParameters -> extraPars
}
];

Expand Down

0 comments on commit 8e66431

Please sign in to comment.