clearer syntax for access Higgs and Vector masses

FlexibleSUSY · Jul 28, 2016 · 348c763 · 348c763
1 parent 0dfa469
commit 348c763
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/meta/FlexibleSUSY.m b/meta/FlexibleSUSY.m
@@ -479,19 +479,19 @@ FlexibleSUSY model file (FlexibleSUSY.m).
 GeneralReplacementRules[] :=
     { "@VectorZ@"     -> ToValidCSymbolString[SARAH`VectorZ],
       "@VectorZ_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorZ] <> If[TreeMasses`GetDimension[SARAH`VectorZ] > 1, "(" <> num <> ")", ""],
-      "@VectorZ()_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorZ] <> "()" <> If[TreeMasses`GetDimension[SARAH`VectorZ] > 1, "(" <> num <> ")", ""],
+      "@VectorZ(" ~~ num_ ~~ ")@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorZ] <> If[TreeMasses`GetDimension[SARAH`VectorZ] > 1, "(" <> num <> ")", "()"],
       "@VectorP@"     -> ToValidCSymbolString[SARAH`VectorP],
       "@VectorW@"     -> ToValidCSymbolString[SARAH`VectorW],
       "@VectorW_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorW] <> If[TreeMasses`GetDimension[SARAH`VectorW] > 1, "(" <> num <> ")", ""],
-      "@VectorW()_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorW] <> "()" <> If[TreeMasses`GetDimension[SARAH`VectorW] > 1, "(" <> num <> ")", ""],
+      "@VectorW(" ~~ num_ ~~ ")@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`VectorW] <> If[TreeMasses`GetDimension[SARAH`VectorW] > 1, "(" <> num <> ")", "()"],
       "@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 <> ")", ""],
-      "@HiggsBoson()_" ~~ num_ ~~ "@" /; IntegerQ[ToExpression[num]] :> ToValidCSymbolString[SARAH`HiggsBoson] <> "()"<> If[TreeMasses`GetDimension[SARAH`HiggsBoson] > 1, "(" <> num <> ")", ""],
+      "@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],

diff --git a/templates/standard_model_matching.cpp.in b/templates/standard_model_matching.cpp.in
@@ -47,7 +47,7 @@ void @ModelName@_standard_model_matching::match_high_to_low_scale_model_tree_lev
    Standard_model& sm, @ModelName@_mass_eigenstates& model)
 {
    model.calculate_DRbar_masses();
-   sm.set_Lambdax(Sqr(model.get_M@HiggsBoson()_0@/sm.get_v()));
+   sm.set_Lambdax(Sqr(model.get_M@HiggsBoson(0)@/sm.get_v()));
    sm.calculate_DRbar_masses();
 }
 
@@ -249,8 +249,8 @@ void @ModelName@_standard_model_matching::match_low_to_high_scale_model(
    calculate_SM_pole_masses(model, sm);
 
    // running W, Z masses (via 1L matching)
-   const double mW2_1L = Sqr(sm.get_physical().MVWp) - Sqr(model.get_physical().M@VectorW_0@) + Sqr(model.get_M@VectorW()_0@);
-   const double mZ2_1L = Sqr(sm.get_physical().MVZ) - Sqr(model.get_physical().M@VectorZ_0@) + Sqr(model.get_M@VectorZ()_0@);
+   const double mW2_1L = Sqr(sm.get_physical().MVWp) - Sqr(model.get_physical().M@VectorW_0@) + Sqr(model.get_M@VectorW(0)@);
+   const double mZ2_1L = Sqr(sm.get_physical().MVZ) - Sqr(model.get_physical().M@VectorZ_0@) + Sqr(model.get_M@VectorZ(0)@);
 
    if (mZ2_1L < 0.)
       model.get_problems().flag_tachyon(@ModelName@_info::@VectorZ@);