Merge remote-tracking branch 'organization/feature-2.0' into feature-…

…higgs-2l
FlexibleSUSY · Mar 21, 2017 · 0d99e87 · 0d99e87
2 parents 651a314 + d85681c
commit 0d99e87
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/meta/CConversion.m b/meta/CConversion.m
@@ -805,7 +805,7 @@
                     SARAH`Mass2[a_?NumberQ]  :> Sqr[a] /.
                     SARAH`Mass2[a_]          :> Sqr[FlexibleSUSY`M[a]] /.
                     FlexibleSUSY`M[a_?NumberQ]   :> a /.
-                    FlexibleSUSY`M[bar[a_]]      :> FlexibleSUSY`M[a] /.
+                    FlexibleSUSY`M[SARAH`bar[a_]] :> FlexibleSUSY`M[a] /.
                     FlexibleSUSY`M[a_[idx_]]     :> ToValidCSymbol[FlexibleSUSY`M[a]][idx] /.
                     FlexibleSUSY`M[a_]           :> ToValidCSymbol[FlexibleSUSY`M[a]] /.
                     FlexibleSUSY`BETA[l_,p_]     :> FlexibleSUSY`BETA1[l,p] /.

diff --git a/meta/Parameters.m b/meta/Parameters.m
@@ -478,7 +478,7 @@
 IsRealExpression[Transpose[expr_]]  := IsRealExpression[expr];
 IsRealExpression[SARAH`Tp[expr_]]   := IsRealExpression[expr];
 IsRealExpression[SARAH`Adj[expr_]]  := IsRealExpression[expr];
-IsRealExpression[bar[expr_]]        := IsRealExpression[expr];
+IsRealExpression[SARAH`bar[expr_]]  := IsRealExpression[expr];
 
 IsRealExpression[expr_Symbol] := IsRealParameter[expr];
 

diff --git a/meta/SelfEnergies.m b/meta/SelfEnergies.m
@@ -2,6 +2,8 @@
 BeginPackage["SelfEnergies`", {"SARAH`", "TextFormatting`", "CConversion`", "TreeMasses`", "Parameters`", "Vertices`", "Utils`"}];
 
 FSSelfEnergy::usage="self-energy head";
+FSHeavySelfEnergy::usage="head for self-energy w/o BSM particles";
+FSHeavyRotatedSelfEnergy::usage="head for self-energy w/o BSM particles in mass eigenstate basis";
 Tadpole::usage="tadpole head";
 
 GetField::usage="Returns field in self-energy or tadpole";
@@ -136,20 +138,19 @@
            head[p,strippedExpr]
           ];
 
-ReplaceUnrotatedFields[SelfEnergies`FSSelfEnergy[p_,expr_]] :=
+ReplaceUnrotatedFields[SelfEnergies`FSSelfEnergy[p_,expr__]] :=
     SelfEnergies`FSSelfEnergy[p,expr];
 
-ReplaceUnrotatedFields[SelfEnergies`FSHeavySelfEnergy[p_,expr_]] :=
+ReplaceUnrotatedFields[SelfEnergies`FSHeavySelfEnergy[p_,expr__]] :=
     SelfEnergies`FSHeavySelfEnergy[p,expr];
 
 ReplaceUnrotatedFields[SelfEnergies`FSHeavyRotatedSelfEnergy[p_,expr__]] :=
-    Module[{result},
-           result = expr /. {
-               SARAH`Cp[a__][l_] :> ReplaceUnrotatedFields[SARAH`Cp[a][l]],
-               SARAH`Cp[a__]     :> ReplaceUnrotatedFields[SARAH`Cp[a]]
-                            };
-           SelfEnergies`FSHeavyRotatedSelfEnergy[p,result]
-          ];
+    SelfEnergies`FSHeavyRotatedSelfEnergy[p, Sequence @@ (
+        { expr } /. {
+            SARAH`Cp[a__][l_] :> ReplaceUnrotatedFields[SARAH`Cp[a][l]],
+            SARAH`Cp[a__]     :> ReplaceUnrotatedFields[SARAH`Cp[a]]
+        }
+    )];
 
 CreateMassEigenstateReplacements[] :=
     Cases[Join[
@@ -214,15 +215,15 @@ therefore not be accessed in the form Glu(gO2).
     ConvertSarahTadpoles[tadpoles];
 
 ConvertSarahTadpoles[tadpoles_List] :=
-    Module[{result, massESReplacements = CreateMassEigenstateReplacements[]},
-           result = (SelfEnergies`Tadpole @@ #)& /@ tadpoles /. massESReplacements;
+    Module[{result},
+           result = (SelfEnergies`Tadpole @@@ tadpoles) /. CreateMassEigenstateReplacements[];
            result = AppendFieldIndices[result, SARAH`gO1];
            result /. SARAH`Mass -> FlexibleSUSY`M
           ];
 
 ConvertSarahSelfEnergies[selfEnergies_List] :=
-    Module[{result, heavySE, massESReplacements = CreateMassEigenstateReplacements[]},
-           result = (SelfEnergies`FSSelfEnergy @@ #)& /@ selfEnergies /. massESReplacements;
+    Module[{result, heavySE},
+           result = (SelfEnergies`FSSelfEnergy @@@ selfEnergies) /. CreateMassEigenstateReplacements[];
            result = AppendFieldIndices[result, SARAH`gO1, SARAH`gO2];
            result = SplitFermionSelfEnergies[result];
            result = Remove1DimensionalFieldIndices[result];
@@ -317,7 +318,7 @@ therefore not be accessed in the form Glu(gO2).
 
 GetParticleList[Cp[a__][_]] := {a};
 
-IsUnrotated[bar[field_]] := IsUnrotated[field];
+IsUnrotated[SARAH`bar[field_]] := IsUnrotated[field];
 
 IsUnrotated[Susyno`LieGroups`conj[field_]] := IsUnrotated[field];