generalise particle references in the templates

MSSM:

  HiggsBoson_0   ->   hh(0)
  HiggsBoson_1   ->   hh(1)
  HiggsBoson(1)  ->   hh(1)

SM:

  HiggsBoson_0   ->   hh      # has no index
  HiggsBoson(0)  ->   hh(0)   # always puts index in parenthesis

Conflicts:
	meta/FlexibleSUSY.m

meta/FlexibleSUSY.m

@@ -468,27 +468,32 @@ FlexibleSUSY model file (FlexibleSUSY.m).
 GUTNormalization[coupling_] :=
     Parameters`GetGUTNormalization[coupling];
 
+ParticleIndexRule[par_, name_String] := {
+    "@" <> name <> "@" -> ToValidCSymbolString[par],
+    "@" <> name <> "_" ~~ num___ ~~ "@" /; StringFreeQ[num, "@"] :>
+    ToValidCSymbolString[par] <> If[TreeMasses`GetDimension[par] > 1, "(" <> num <> ")", ""],
+    "@" <> name <> "(" ~~ num___ ~~ ")@" /; StringFreeQ[num, "@"] :>
+    ToValidCSymbolString[par] <> If[TreeMasses`GetDimension[par] > 1, "(" <> num <> ")", "()"]
+};
+
 GeneralReplacementRules[] :=
-    { "@VectorZ@"     -> ToValidCSymbolString[SARAH`VectorZ],
-      "@VectorP@"     -> ToValidCSymbolString[SARAH`VectorP],
-      "@VectorW@"     -> ToValidCSymbolString[SARAH`VectorW],
-      "@VectorG@"     -> ToValidCSymbolString[SARAH`VectorG],
-      "@TopQuark@"    -> ToValidCSymbolString[SARAH`TopQuark],
-      "@BottomQuark@" -> ToValidCSymbolString[SARAH`BottomQuark],
-      "@Electron@"    -> ToValidCSymbolString[SARAH`Electron],
-      "@Neutrino@"    -> ToValidCSymbolString[SARAH`Neutrino],
-      "@HiggsBoson@"  -> ToValidCSymbolString[SARAH`HiggsBoson],
-      "@HiggsBoson_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`HiggsBoson] <> If[TreeMasses`GetDimension[SARAH`HiggsBoson] > 1, "(" <> num <> ")", ""],
-      "@PseudoScalarBoson@" -> ToValidCSymbolString[SARAH`PseudoScalarBoson],
-      "@ChargedHiggs@"   -> ToValidCSymbolString[SARAH`ChargedHiggs],
-      "@TopSquark@"      -> ToValidCSymbolString[SARAH`TopSquark],
-      "@TopSquark_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`TopSquark] <> If[TreeMasses`GetDimension[SARAH`TopSquark] > 1, "(" <> num <> ")", ""],
-      "@BottomSquark@"   -> ToValidCSymbolString[SARAH`BottomSquark],
-      "@BottomSquark_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`BottomSquark] <> If[TreeMasses`GetDimension[SARAH`BottomSquark] > 1, "(" <> num <> ")", ""],
-      "@Sneutrino@"      -> ToValidCSymbolString[SARAH`Sneutrino],
-      "@Selectron@"      -> ToValidCSymbolString[SARAH`Selectron],
-      "@Gluino@"         -> ToValidCSymbolString[SARAH`Gluino],
-      "@UpYukawa@"       -> ToValidCSymbolString[SARAH`UpYukawa],
+    Join[
+    ParticleIndexRule[SARAH`VectorZ, "VectorZ"],
+    ParticleIndexRule[SARAH`VectorW, "VectorW"],
+    ParticleIndexRule[SARAH`VectorP, "VectorP"],
+    ParticleIndexRule[SARAH`VectorG, "VectorG"],
+    ParticleIndexRule[SARAH`TopQuark, "TopQuark"],
+    ParticleIndexRule[SARAH`BottomQuark, "BottomQuark"],
+    ParticleIndexRule[SARAH`Electron, "Electron"],
+    ParticleIndexRule[SARAH`Neutrino, "Neutrino"],
+    ParticleIndexRule[SARAH`HiggsBoson, "HiggsBoson"],
+    ParticleIndexRule[SARAH`PseudoScalarBoson, "PseudoScalarBoson"],
+    ParticleIndexRule[SARAH`ChargedHiggs, "ChargedHiggs"],
+    ParticleIndexRule[SARAH`TopSquark, "TopSquark"],
+    ParticleIndexRule[SARAH`Sneutrino, "Sneutrino"],
+    ParticleIndexRule[SARAH`Selectron, "Selectron"],
+    ParticleIndexRule[SARAH`Gluino, "Gluino"],
+    { "@UpYukawa@"       -> ToValidCSymbolString[SARAH`UpYukawa],
       "@DownYukawa@"     -> ToValidCSymbolString[SARAH`DownYukawa],
       "@ElectronYukawa@" -> ToValidCSymbolString[SARAH`ElectronYukawa],
       "@LeftUpMixingMatrix@"   -> ToValidCSymbolString[SARAH`UpMatrixL],
@@ -526,7 +531,8 @@ FlexibleSUSY model file (FlexibleSUSY.m).
       "@SARAHVersion@"        -> SA`Version,
       "@FlexibleSUSYVersion@" -> FS`Version,
       "@FlexibleSUSYGitCommit@" -> FS`GitCommit
-    };
+    }
+    ];
 
 
 WriteRGEClass[betaFun_List, anomDim_List, files_List,