Merge branch 'development' into feature-SMtower-noSMgeneration-no-hacks

Conflicts:
	.gitattributes
	configure
	meta/FlexibleSUSY.m
	meta/ThresholdCorrections.m
	src/lowe.cpp
	src/lowe.h
	src/module.mk
	src/standard_model.cpp
	src/standard_model.hpp
	templates/module.mk.in
	test/module.mk
	test/test.sh

.gitattributes

@@ -1,19 +1,20 @@
 .gitignore                      export-ignore
 .gitattributes                  export-ignore
+TODO                            export-ignore
+
+addons/test_*                   export-ignore
+
+doc/images                      export-ignore
 doc/release                     export-ignore
 doc/FlexibleFuture.txt          export-ignore
-TODO                            export-ignore
 
 examples/lattice_fmssm.cpp                  export-ignore
 examples/lattice_fmssm_fmssmn.cpp           export-ignore
 examples/lattice_numerical_fmssm.cpp        export-ignore
 examples/lattice_numerical_fmssm_fmssmn.cpp export-ignore
 examples/switch_MSSM.cpp                    export-ignore
 
-meta/Format.m                   export-ignore
-meta/writeNRGE.m                export-ignore
-meta/writeRGE.m                 export-ignore
-
+model_files/BetaSM              export-ignore
 model_files/CMSSMFPIAbsolute    export-ignore
 model_files/CMSSMFPIRelative    export-ignore
 model_files/CMSSMFPITadpole     export-ignore
@@ -26,21 +27,23 @@ model_files/CMSSMMediumPrecision export-ignore
 model_files/CMSSMHighPrecision  export-ignore
 model_files/CMSSMMassWInput     export-ignore
 model_files/CMSSMConvergenceTester export-ignore
+model_files/BLSMlightZp         export-ignore
 model_files/InertMSSM           export-ignore
 model_files/LHInputMSSM         export-ignore
+model_files/MDM                 export-ignore
 model_files/minMSSM             export-ignore
+model_files/NoInputParameters   export-ignore
 model_files/NoYukawaMSSM        export-ignore
 model_files/NSM                 export-ignore
 model_files/rootMSSM            export-ignore
 model_files/YukawaCMSSM         export-ignore
 model_files/UnbrokenMSSM        export-ignore
 model_files/SMHighPrecision     export-ignore
 model_files/SMnoGUT             export-ignore
-model_files/cSM                 export-ignore
-model_files/complexMSSM         export-ignore
-model_files/cCMSSM              export-ignore
-model_files/CMSSMCPV            export-ignore
-model_files/NMSSMCPV            export-ignore
+model_files/SMNoRGEs            export-ignore
+model_files/TensorCoupling      export-ignore
+model_files/THDMIIMSSMBCApprox  export-ignore
+model_files/HGTHDMIIMSSMBCApprox export-ignore
 model_files/SMtower             export-ignore
 
 models/fmssm                    export-ignore
@@ -50,11 +53,14 @@ models/smcw                     export-ignore
 
 release                         export-ignore
 
+sarah/B-L-SM-lightZp            export-ignore
 sarah/InertMSSM                 export-ignore
+sarah/MDM                       export-ignore
 sarah/NoYukawaMSSM              export-ignore
 sarah/NSM                       export-ignore
 sarah/UnbrokenMSSM              export-ignore
 sarah/SMnoGUT                   export-ignore
+sarah/TensorCoupling            export-ignore
 
 src/SM.cpp                           export-ignore
 src/SM.hpp                           export-ignore

.gitignore

@@ -38,6 +38,7 @@ doc/flexiblesusy-paper.pdf
 doc/version.tex
 doc/mainpage.dox
 doc/html/
+doc/man/
 
 # automatically generated files from the hand-written example
 # lattice models
@@ -54,9 +55,24 @@ models/fmssmn/fmssmn_lattice_numerical_constraints_dependence.cpp
 models/fmssmn/fmssmn_lattice_numerical_constraints_functions.f
 models/fmssmn/fmssmn_lattice_rge.f
 models/fmssmn/fmssmn_lattice_translator.inc
+models/*/LesHouches.out.*
+models/**/
+!models/sm/
+!models/smcw/
+!models/SoftsusyMSSM/
+!models/SoftsusyNMSSM/
+
+model_files/*/LesHouches.out.*
 
 Output/
 
+release/*.tar.gz
+release/*.tar.gz.md5
+release/*.*.*
+
+test/*.db
 test/*.log
+test/*.out
 test/*.spc
 test/*.spc.*
+test/LesHouches.out.*

BUGS

@@ -22,37 +22,11 @@ via
    ./configure --disable-threads
 
 
-Expressing the Weinberg angle in terms of the gauge couplings
--------------------------------------------------------------
-
-Currently FlexibleSUSY needs to express the Weinberg angle ThetaW in
-terms of running DR-bar parameters, as gauge couplings etc.  The
-reason is that SARAH expresses some mass matrices and vertices in
-terms of ThetaW.  Since these mass matrices need to be sometimes
-calculated in the DR-bar scheme, ThetaW needs to be known in the
-DR-bar scheme as well.  And this is can be done by expressing ThetaW
-in terms of the fundamental DR-bar parameters.
-
-However, it can happen that Mathematica and FlexibleSUSY are not able
-to express ThetaW in terms of the fundamental DR-bar parameters.  This
-happens for examples in models with extra U(1) gauge groups, where Z
-and Z' mix.  In this case the following error occurs:
-
-   ExpressWeinbergAngleInTermsOfGaugeCouplings::noSolution: 
-   Error: could not express the Weinberg angle ThetaW
-     in terms of the gauge couplings. ...
-
-In this case FlexibleSUSY will use the Standard Model definition of
-ThetaW
-
-   ThetaW = ArcTan[g1/g2] ,
-
-plus a GUT normalization of g1, if defined.  However, this definition
-might not be correct in each model.
-
-In future versions of FlexibleSUSY, ThetaW will be eliminated
-completely from all expressions and replaced by the value given in
-SARAH`DependenceSPheno in the SARAH`ParameterDefinitionsMain list.  By
-default this value is (see SARAH/Modesl/parameters.m)
-
-   DependenceSPheno -> ArcCos[Abs[ZZ[1,1]]]
+Tensor couplings
+----------------
+
+FlexibleSUSY cannot yet deal with tensor couplings (couplings with 3
+or more indices) in the Lagrangian/Superpotential.  In order to make
+such models work in FlexibleSUSY, please split the tensor coupling
+terms in the Lagrangian/Superpotential into a sum of terms with a
+matrix coupling structure.