Generalise IsScalar, IsMatrix, IsTensor functions to input parameters

FlexibleSUSY · Dec 7, 2016 · 593f4aa · 593f4aa
1 parent d81e520
commit 593f4aa
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/meta/Parameters.m b/meta/Parameters.m
@@ -176,7 +176,7 @@
 GetOutputParameters[] := allOutputParameters;
 GetPhases[] := allPhases;
 GetExtraParameters[] := First /@ allExtraParameters;
-GetExtraParametersAndType[] := allExtraParameters;
+GetExtraParametersAndTypes[] := allExtraParameters;
 
 additionalRealParameters = {};
 
@@ -255,12 +255,24 @@
 IsScalar[sym_] :=
     Length[SARAH`getDimParameters[sym]] === 1 || Length[SARAH`getDimParameters[sym]] == 0;
 
+IsScalar[sym_?IsInputParameter] :=
+   MatchQ[GetType[sym], CConversion`ScalarType[_]];
+
+IsScalar[sym_?IsExtraParameter] :=
+   MatchQ[GetType[sym], CConversion`ScalarType[_]];
+
 IsMatrix[sym_[Susyno`LieGroups`i1, SARAH`i2]] :=
     IsMatrix[sym];
 
 IsMatrix[sym_] :=
     Length[SARAH`getDimParameters[sym]] === 2;
 
+IsMatrix[sym_?IsInputParameter] :=
+   MatchQ[GetType[sym], CConversion`MatrixType[__]];
+
+IsMatrix[sym_?IsExtraParameter] :=
+   MatchQ[GetType[sym], CConversion`MatrixType[__]];
+
 IsSymmetricMatrixParameter[sym_[Susyno`LieGroups`i1, SARAH`i2]] :=
     IsSymmetricMatrixParameter[sym];
 
@@ -270,6 +282,12 @@
 IsTensor[sym_[Susyno`LieGroups`i1, SARAH`i2, SARAH`i3]] :=
     IsTensor[sym];
 
+IsTensor[sym_?IsInputParameter] :=
+   MatchQ[GetType[sym], CConversion`TensorType[_]];
+
+IsTensor[sym_?IsExtraParameter] :=
+   MatchQ[GetType[sym], CConversion`TensorType[_]];
+
 IsTensor[sym_] :=
     Length[SARAH`getDimParameters[sym]] > 2;
 
@@ -468,6 +486,9 @@
 GetType[sym_?IsInputParameter] :=
     Cases[GetInputParametersAndTypes[], {sym, _, type_} :> type][[1]];
 
+GetType[sym_?IsExtraParameter] :=
+    Cases[GetExtraParametersAndTypes[], {sym, _, type_} :> type][[1]];
+
 GetType[sym_] :=
     GetTypeFromDimension[sym, SARAH`getDimParameters[sym]];