Skip to content

Commit

Permalink
Merge branch 'development' into weinberg_angle
Browse files Browse the repository at this point in the history
  • Loading branch information
@Markus-Bach
Markus-Bach committed May 20, 2016
2 parents 69e508e + 7677e0e commit b73b792
Show file tree
Hide file tree
Showing 24 changed files with 413 additions and 85 deletions.
6 changes: 3 additions & 3 deletions configure
View file
Expand Up @@ -285,7 +285,7 @@ log_package_information() {

#_____________________________________________________________________
guess_machine_word_size() {
local chip=$(uname -m | tr '[A-Z]' '[a-z]')
local chip="$(uname -m | tr '[A-Z]' '[a-z]')"
case "$chip" in
*32|i[36]86)
machine_word_size="32"; return 0 ;;
Expand Down Expand Up @@ -1024,7 +1024,7 @@ check_multiarch() {
fi

if test "x$linuxdist" = "xmultiarch"; then
if $(which dpkg-architecture > /dev/null 2>&1) ; then
if type dpkg-architecture > /dev/null 2>&1 ; then
if $(dpkg-architecture -qDEB_HOST_MULTIARCH > /dev/null 2>&1) ; then
checking_msg "dpkg-architecture"
debmultiarch=$(dpkg-architecture -qDEB_HOST_MULTIARCH 2> /dev/null)
Expand Down Expand Up @@ -2089,7 +2089,7 @@ enable_defines() {
fi

for a in ${ADDONS}; do
local addon_name=$(basename ${a})
local addon_name="$(basename ${a})"
DEFINE_ENABLE_ADDONS="${DEFINE_ENABLE_ADDONS}\n#define ENABLE_${addon_name} 1"
done
}
Expand Down
2 changes: 1 addition & 1 deletion doc/addons.dox
View file
Expand Up @@ -2,7 +2,7 @@
\page addons Addons
\tableofcontents

\section addons Addons
\section addons_sec Addons

A FlexibleSUSY addon is a program or library, which uses parts of the
FlexibleSUSY libraries or the generated models. An addon can be
Expand Down
8 changes: 4 additions & 4 deletions doc/building.dox
View file
Expand Up @@ -37,10 +37,10 @@ Setup a FlexibleSUSY model

See `./createmodel --help` for more details. Afterwards there will be

- a model directory models/<model>/
- a makefile module models/<model>/module.mk
- a Mathematica start script models/<model>/start.m
- and a FlexibleSUSY model file models/<model>/FlexibleSUSY.m
- a model directory <code>models/\<model\>/</code>
- a makefile module <code>models/\<model\>/module.mk</code>
- a Mathematica start script <code>models/\<model\>/start.m</code>
- and a FlexibleSUSY model file <code>models/\<model\>/FlexibleSUSY.m</code>

To modify the model details (input parameters, boundary conditions,
etc.), please edit the FlexibleSUSY model file
Expand Down
4 changes: 3 additions & 1 deletion meta/FlexibleSUSY.m
View file
Expand Up @@ -1278,7 +1278,7 @@ corresponding tadpole is real or imaginary (only in models with CP
fillSpectrumVectorWithSusyParticles = "",
fillSpectrumVectorWithSMParticles = "",
particleLaTeXNames = "",
particleNames = "", particleEnum = "", particleMultiplicity = "",
particleNames = "", particleEnum = "", particleMassEnum, particleMultiplicity = "",
particleMixingEnum = "", particleMixingNames = "",
parameterNames = "", parameterEnum = "", numberOfParameters = 0,
inputParameterEnum = "", inputParameterNames = "",
Expand All @@ -1305,6 +1305,7 @@ corresponding tadpole is real or imaginary (only in models with CP
Cases[inputParameters, {_, {"EXTPAR", _}, ___}]
];
particleEnum = TreeMasses`CreateParticleEnum[particles];
particleMassEnum = TreeMasses`CreateParticleMassEnum[particles];
particleMixingEnum = TreeMasses`CreateParticleMixingEnum[massMatrices];
particleMultiplicity = TreeMasses`CreateParticleMultiplicity[particles];
particleNames = TreeMasses`CreateParticleNames[particles];
Expand Down Expand Up @@ -1338,6 +1339,7 @@ corresponding tadpole is real or imaginary (only in models with CP
{ "@fillSpectrumVectorWithSusyParticles@" -> IndentText[fillSpectrumVectorWithSusyParticles],
"@fillSpectrumVectorWithSMParticles@" -> IndentText[IndentText[fillSpectrumVectorWithSMParticles]],
"@particleEnum@" -> IndentText[WrapLines[particleEnum]],
"@particleMassEnum@" -> IndentText[WrapLines[particleMassEnum]],
"@particleMixingEnum@" -> IndentText[WrapLines[particleMixingEnum]],
"@particleMultiplicity@" -> IndentText[WrapLines[particleMultiplicity]],
"@particleNames@" -> IndentText[WrapLines[particleNames]],
Expand Down
4 changes: 2 additions & 2 deletions meta/Parameters.m
View file
Expand Up @@ -100,7 +100,7 @@
DecreaseIndexLiterals::usage="";
IncreaseIndexLiterals::usage="";

DecreaseSumIdices::usage="";
DecreaseSumIndices::usage="";

GetEffectiveMu::usage="";
GetEffectiveMASqr::usage="";
Expand Down Expand Up @@ -1330,7 +1330,7 @@
DecreaseIndexLiterals[expr_, heads_List] :=
IncreaseIndexLiterals[expr, -1, heads];

DecreaseSumIdices[expr_] :=
DecreaseSumIndices[expr_] :=
expr //. SARAH`sum[idx_, start_, stop_, exp_] :> CConversion`IndexSum[idx, start - 1, stop - 1, exp];

GetEffectiveMu[] :=
Expand Down
2 changes: 1 addition & 1 deletion meta/SelfEnergies.m
View file
Expand Up @@ -428,7 +428,7 @@
prototype = type <> " " <> functionName <> ";\n";
decl = "\n" <> type <> " CLASSNAME::" <> functionName <> "\n{\n";
body = type <> " result;\n\n" <>
ExpandSums[DecreaseIndexLiterals[DecreaseSumIdices[expr], TreeMasses`GetParticles[]] /.
ExpandSums[DecreaseIndexLiterals[DecreaseSumIndices[expr], TreeMasses`GetParticles[]] /.
vertexRules /.
a_[List[i__]] :> a[i] /.
ReplaceGhosts[FlexibleSUSY`FSEigenstates] /.
Expand Down
40 changes: 20 additions & 20 deletions meta/THDM/Thresholds_1L_full.m
View file
Expand Up @@ -10,8 +10,7 @@
{B0, DB0, C0, D0, D2tilde, D4tilde, W};

(* flags *)
{ flagSferm, flagSfermZdd, flagSfermZud, flagSfermZuu, flagIno,
flagInoZdd, flagInoZud, flagInoZuu, flagdg };
{ flagSferm, flagIno, flagZdd, flagZud, flagZuu, flagdg };

(* options *)
{ coefficients, flags, loopFunctions, loopOrder, sumHead };
Expand Down Expand Up @@ -57,20 +56,21 @@
for the flags which mark the different contributions.";

GetTHDMThresholds1LLoopFunctions::usage = "Returns list of replacement
rules for the loop functions defined in Eq. (130)-(131) of
arxiv:0901.2065.";
rules for the loop functions defined in Eq. (B16)-(B17) of
Phys. Rev. D 84 (2011) 034030.
Note: The loop functions B0' and W in Eq. (130) arxiv:0901.2065v1
carry the wrong global sign.
";

Begin["THDMThresholds1L`Private`"];

GetTHDMThresholds1LFlags[] := {
flagSferm -> 1, (* Enable/disable sfermion contribution *)
flagSfermZdd -> -1, (* Enable/disable sfermion contribution in field renormalization Zdd *)
flagSfermZud -> 0, (* Enable/disable sfermion contribution in field renormalization Zud *)
flagSfermZuu -> -1, (* Enable/disable sfermion contribution in field renormalization Zuu *)
flagIno -> 1, (* Enable/disable gaugino + Higgsino contribution *)
flagInoZdd -> -1, (* Enable/disable gaugino + Higgsino contribution in field renormalization Zdd *)
flagInoZud -> 0, (* Enable/disable gaugino + Higgsino contribution in field renormalization Zud *)
flagInoZuu -> -1, (* Enable/disable gaugino + Higgsino contribution in field renormalization Zuu *)
flagZdd -> 1, (* Enable/disable field renormalization Zdd *)
flagZud -> 0, (* Enable/disable field renormalization Zud *)
flagZuu -> 1, (* Enable/disable field renormalization Zuu *)
flagdg -> 1 (* Enable/disable gauge coupling renormalization *)
};

Expand Down Expand Up @@ -415,8 +415,8 @@
],

DB0[m1_, m2_] :> If[PossibleZeroQ[m1 - m2],
1/(6*m2^2),
(m1^4 - m2^4 + 2 m1^2 m2^2 Log[m2^2/m1^2])/(2 (m1^2 - m2^2)^3)
-1/(6*m2^2),
-(m1^4 - m2^4 + 2 m1^2 m2^2 Log[m2^2/m1^2])/(2 (m1^2 - m2^2)^3)
],

C0[m1_, m2_, m3_] :> Which[
Expand Down Expand Up @@ -469,20 +469,20 @@
),

W[m1_, m2_, mu_] :> If[PossibleZeroQ[m1 - m2],
2/3 - 2 Log[mu^2/m2^2],
(- 2 Log[mu^2/m1^2]
- Log[m2^2/m1^2] (2 m2^6 - 6 m1^2 m2^4)/(m1^2 - m2^2)^3
- (m1^4 - 6 m2^2 m1^2 + m2^4)/(m1^2 - m2^2)^2)
-2/3 + 2 Log[mu^2/m2^2],
(+ 2 Log[mu^2/m1^2]
+ Log[m2^2/m1^2] (2 m2^6 - 6 m1^2 m2^4)/(m1^2 - m2^2)^3
+ (m1^4 - 6 m2^2 m1^2 + m2^4)/(m1^2 - m2^2)^2)
]
};

(* counter-terms *)

dgY := -dZB/2 flagdg;
dg2 := -dZW/2 flagdg;
dZdd := flagSfermZdd dZddSferm + flagInoZdd dZddIno;
dZud := flagSfermZud dZudSferm + flagInoZud dZudIno;
dZuu := flagSfermZuu dZuuSferm + flagInoZuu dZuuIno;
dZdd := flagSferm flagZdd dZddSferm + flagIno flagZdd dZddIno;
dZud := flagSferm flagZud dZudSferm + flagIno flagZud dZudIno;
dZuu := flagSferm flagZuu dZuuSferm + flagIno flagZuu dZuuIno;
(* Eq. (117) *)
dZW := Module[{i},
g2^2 kappa/6 (
Expand Down Expand Up @@ -728,7 +728,7 @@
loopOrder1 (-(g2^2 + gY^2)/4 Conjugate[dZud]);

lamBar[[7]] = lamHat[[7]] +
loopOrder1 ((g2^2 + gY^2)/4 dZud);
loopOrder1 ((g2^2 + gY^2)/4 Conjugate[dZud]);

Options[GetTHDMThresholds1L] = {
coefficients -> GetTHDMThresholds1LCoefficients[],
Expand Down
28 changes: 27 additions & 1 deletion meta/TreeMasses.m
View file
Expand Up @@ -24,6 +24,8 @@

CreateParticleEnum::usage="creates an enum of the particles";

CreateParticleMassEnum::usage="creates an enum of the particle masses";

CreateParticleMixingEnum::usage="creates enum with mixing matrices";

CreateParticleMultiplicity::usage="creates array of the particle
Expand Down Expand Up @@ -843,6 +845,30 @@
Return[result];
];

CreateParticleMassEnum[particles_List] :=
Module[{i, par, name, result = "", d, dim},
For[i = 1, i <= Length[particles], i++,
par = particles[[i]];
name = CConversion`ToValidCSymbolString[FlexibleSUSY`M[par]];
dim = GetDimension[par];
If[dim == 1,
If[i > 1, result = result <> ", ";];
result = result <> name;
,
For[d = 1, d <= dim, d++,
If[i > 1 || d > 1, result = result <> ", ";];
result = result <> name <> "_" <> ToString[d];
];
];
];
(* append enum state for the number of particles *)
If[Length[particles] > 0, result = result <> ", ";];
result = result <> "NUMBER_OF_MASSES";
result = "enum Masses : unsigned {" <>
result <> "};\n";
Return[result];
];

CreateParticleMixingEnum[mixings_List] :=
Module[{flatMixings, i, m, mix, name, type, result = ""},
flatMixings = Select[mixings, (GetMixingMatrixSymbol[#] =!= Null)&];
Expand Down Expand Up @@ -1962,7 +1988,7 @@ the fundamental representation of SU(3) in SARAH.
];
exprStr = CConversion`ExpandSums[
Parameters`DecreaseIndexLiterals[
Parameters`DecreaseSumIdices[expr]],
Parameters`DecreaseSumIndices[expr]],
result, type, initalValue];
];
exprStr
Expand Down
53 changes: 52 additions & 1 deletion meta/module.mk
View file
@@ -1,6 +1,50 @@
DIR := meta
MODNAME := meta

META_MSSM_SRC:= \
$(DIR)/MSSM/BDSZHiggs.m \
$(DIR)/MSSM/beta_BMu.m \
$(DIR)/MSSM/beta_g1.m \
$(DIR)/MSSM/beta_g2.m \
$(DIR)/MSSM/beta_g3.m \
$(DIR)/MSSM/beta_M1.m \
$(DIR)/MSSM/beta_M2.m \
$(DIR)/MSSM/beta_M3.m \
$(DIR)/MSSM/beta_md2.m \
$(DIR)/MSSM/beta_me2.m \
$(DIR)/MSSM/beta_mHd2.m \
$(DIR)/MSSM/beta_mHu2.m \
$(DIR)/MSSM/beta_ml2.m \
$(DIR)/MSSM/beta_mq2.m \
$(DIR)/MSSM/beta_mu2.m \
$(DIR)/MSSM/beta_Mu.m \
$(DIR)/MSSM/beta_TYd.m \
$(DIR)/MSSM/beta_TYe.m \
$(DIR)/MSSM/beta_TYu.m \
$(DIR)/MSSM/beta_Yd.m \
$(DIR)/MSSM/beta_Ye.m \
$(DIR)/MSSM/beta_Yu.m \
$(DIR)/MSSM/gamma_SdR.m \
$(DIR)/MSSM/gamma_SeR.m \
$(DIR)/MSSM/gamma_SHd.m \
$(DIR)/MSSM/gamma_SHu.m \
$(DIR)/MSSM/gamma_SlL.m \
$(DIR)/MSSM/gamma_SqL.m \
$(DIR)/MSSM/gamma_SuR.m

META_SM_SRC := \
$(DIR)/SM/beta_g1.m \
$(DIR)/SM/beta_g2.m \
$(DIR)/SM/beta_g3.m \
$(DIR)/SM/beta_gb.m \
$(DIR)/SM/beta_gtau.m \
$(DIR)/SM/beta_gt.m \
$(DIR)/SM/beta_lambda.m \
$(DIR)/SM/beta_m2.m

META_THDM_SRC:= \
$(DIR)/THDM/Thresholds_1L_full.m

META_SRC := \
$(DIR)/AnomalousDimension.m \
$(DIR)/BetaFunction.m \
Expand All @@ -10,6 +54,7 @@ META_SRC := \
$(DIR)/EffectiveCouplings.m \
$(DIR)/EWSB.m \
$(DIR)/FlexibleSUSY.m \
$(DIR)/Format.m \
$(DIR)/LatticeUtils.m \
$(DIR)/LoopFunctions.m \
$(DIR)/LoopMasses.m \
Expand All @@ -26,11 +71,17 @@ META_SRC := \
$(DIR)/ThresholdCorrections.m \
$(DIR)/Traces.m \
$(DIR)/TreeMasses.m \
$(DIR)/TwoLoopMSSM.m \
$(DIR)/TwoLoopQCD.m \
$(DIR)/Utils.m \
$(DIR)/Vertices.m \
$(DIR)/WeinbergAngle.m \
$(DIR)/WriteOut.m \
$(DIR)/WeinbergAngle.m
$(DIR)/writeRGE.m \
$(DIR)/writeNRGE.m \
$(META_MSSM_SRC) \
$(META_SM_SRC) \
$(META_THDM_SRC)

.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)

Expand Down

0 comments on commit b73b792

Please sign in to comment.