[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 75279e: Merge branch 'development' into feature-loop-verti...

[GitHub]

  Branch: refs/heads/development
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 75279ea9af0cb3c933dd13fd78d2872cb855d58b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/75279ea9af0cb3c933dd13fd78d2872cb855d58b
  Author: Dylan Harries <dylan.harries at adelaide.edu.au>
  Date:   2016-02-15 (Mon, 15 Feb 2016)

  Changed paths:
    M meta/EffectiveCouplings.m
    M sarah/InertMSSM/particles.m
    M src/standard_model.cpp

  Log Message:
  -----------
  Merge branch 'development' into feature-loop-vertices

Conflicts:
	src/standard_model.cpp


  Commit: 412d387c9ca549f48ac6259f5051928825b5e2ab
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/412d387c9ca549f48ac6259f5051928825b5e2ab
  Author: Dylan Harries <dylan.harries at adelaide.edu.au>
  Date:   2016-02-16 (Tue, 16 Feb 2016)

  Changed paths:
    M .gitignore
    M doc/model_file.dox
    M doc/module.mk
    A doc/slha_input.dox
    M meta/EffectiveCouplings.m
    M meta/FlexibleSUSY.m
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    M model_files/HSSUSY/LesHouches.in.HSSUSY
    M model_files/NMSSM/LesHouches.in.NMSSM
    M model_files/SM/LesHouches.in.SM
    M model_files/SMSSM/LesHouches.in.SMSSM
    M model_files/THDMII/LesHouches.in.THDMII
    M model_files/U1xMSSM3G/FlexibleSUSY.m.in
    A model_files/U1xMSSM3G/LesHouches.in.U1xMSSM3G
    M src/standard_model.cpp
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_initial_guesser.cpp.in
    M templates/two_scale_initial_guesser_low_scale_model.cpp.in
    M templates/two_scale_low_scale_constraint.cpp.in
    M templates/two_scale_susy_scale_constraint.cpp.in

  Log Message:
  -----------
  Merge branch 'development' into feature-loop-vertices


  Commit: 12004352de38809b96d42d0601351d0d21b28617
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/12004352de38809b96d42d0601351d0d21b28617
  Author: Dylan Harries <dylan.harries at adelaide.edu.au>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M ChangeLog
    M doc/mainpage.dox.in
    M doc/model_file.dox
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M meta/Parameters.m
    M model_files/CMSSM/FlexibleSUSY.m.in
    M model_files/CMSSMCKM/FlexibleSUSY.m.in
    M model_files/CMSSMCPV/FlexibleSUSY.m.in
    M model_files/DiracGauginos/FlexibleSUSY.m.in
    M model_files/HSSUSY/FlexibleSUSY.m.in
    M model_files/MSSM/FlexibleSUSY.m.in
    M model_files/MSSMNoFV/FlexibleSUSY.m.in
    M model_files/NMSSM/FlexibleSUSY.m.in
    M model_files/NMSSMCPV/FlexibleSUSY.m.in
    M model_files/NUTNMSSM/FlexibleSUSY.m.in
    M model_files/NUTSMSSM/FlexibleSUSY.m.in
    M model_files/SM/FlexibleSUSY.m.in
    M model_files/THDMII/FlexibleSUSY.m.in
    M model_files/U1xMSSM3G/FlexibleSUSY.m.in
    M model_files/U1xMSSM3G/LesHouches.in.U1xMSSM3G
    M model_files/cCMSSM/FlexibleSUSY.m.in
    M model_files/complexMSSM/FlexibleSUSY.m.in
    M model_files/lowMSSM/FlexibleSUSY.m.in
    M model_files/lowNMSSM/FlexibleSUSY.m.in
    M src/slha_io.hpp
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_low_scale_constraint.cpp.in
    M templates/two_scale_susy_scale_constraint.cpp.in
    M test/test_run_all_spectrum_generators.sh

  Log Message:
  -----------
  Merge branch 'development' into feature-loop-vertices


  Commit: d78e496a84e200f5c2118613b95bcb8a14805fc1
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d78e496a84e200f5c2118613b95bcb8a14805fc1
  Author: Dylan Harries <dylan.harries at adelaide.edu.au>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M meta/EffectiveCouplings.m

  Log Message:
  -----------
  Do not run model parameters in non-SUSY models


  Commit: a43be3e7a4f496efd1eeaa531058a649c2dd5e22
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a43be3e7a4f496efd1eeaa531058a649c2dd5e22
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-02-17 (Wed, 17 Feb 2016)

  Changed paths:
    M meta/EffectiveCouplings.m

  Log Message:
  -----------
  Merge remote-tracking branch 'FlexibleDecay/feature-loop-vertices' into development


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/40b396413202...a43be3e7a4f4