[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 588a72: Implemented GMuonMinus2

GitHub noreply at github.com
Mon Oct 3 01:13:13 BST 2016


  Branch: refs/heads/feature-2.0
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 588a727e205e0e5d02e2b19f784cb3a4603c3ae8
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/588a727e205e0e5d02e2b19f784cb3a4603c3ae8
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M examples/customized-betas/MSSMcbs_spectrum_generator.hpp
    M meta/FlexibleSUSY.m
    A meta/GMuonMinus2.m
    M meta/SelfEnergies.m
    M meta/Vertices.m
    M meta/WriteOut.m
    M meta/module.mk
    M src/spectrum_generator_settings.cpp
    M src/spectrum_generator_settings.hpp
    A templates/g_muon_minus_2.cpp.in
    A templates/g_muon_minus_2.hpp.in
    M templates/module.mk
    M templates/module.mk.in
    M templates/run.cpp.in
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  Implemented GMuonMinus2


  Commit: 7fde21fe5cccd0e1d01ac4056cb5f7ae0da2511c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7fde21fe5cccd0e1d01ac4056cb5f7ae0da2511c
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in
    M templates/low_scale_spectrum_generator.hpp.in

  Log Message:
  -----------
  Added support for SM \(non-two-scale\) model


  Commit: d89fef404aaa99d4abe9027a295e8c62e0c7e73c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d89fef404aaa99d4abe9027a295e8c62e0c7e73c
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Added evaluation of type 4 diagrams and changed antiparticle representations \(old one was broken\)


  Commit: f2fc57d498c52a14cbd0a6133c1cc6fbf3cb134c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f2fc57d498c52a14cbd0a6133c1cc6fbf3cb134c
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M src/spectrum_generator_settings.cpp
    M src/spectrum_generator_settings.hpp
    M templates/g_muon_minus_2.cpp.in
    M templates/run.cpp.in

  Log Message:
  -----------
  Tons of fixes... Mainly unsigned vs unsigned issues in templates. Removed SLHA option. We always calculate GM2 for now.


  Commit: 67f572caa87893ca1b96d67ec18d2a8c134c35d4
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/67f572caa87893ca1b96d67ec18d2a8c134c35d4
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Removed unused \(and wrong\) code from meta/GMuonMinus2.m. Fixed a severe precision issue with the loop functions.


  Commit: d2b35e0c9179cbca8963bfe2ee6d50e990bcbf76
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d2b35e0c9179cbca8963bfe2ee6d50e990bcbf76
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Formatted cxx template files with astyle


  Commit: 0ecd96eb5bf75b574c7ff5d3a2720f202f5a9846
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0ecd96eb5bf75b574c7ff5d3a2720f202f5a9846
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M src/numerics2.hpp
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Added support for g++4.4


  Commit: e63815635d4bb4cdeb054fb75d7968e74cffd678
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/e63815635d4bb4cdeb054fb75d7968e74cffd678
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  Some indentation fixes


  Commit: 8fe7d8ccaa507f271081dd66e2e2ddafad45fc20
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/8fe7d8ccaa507f271081dd66e2e2ddafad45fc20
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Fixed \(rather severe\) typo


  Commit: 2bb98ba45265d0362b1cf70fe45c52b699124937
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2bb98ba45265d0362b1cf70fe45c52b699124937
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Some fixes and design changes


  Commit: 68517cb36c8e626d21cc792c074f5e2b7320d968
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/68517cb36c8e626d21cc792c074f5e2b7320d968
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    M model_files/E6SSM/LesHouches.in.E6SSM
    M model_files/MRSSM/LesHouches.in.MRSSM

  Log Message:
  -----------
  Added SM pole mass calculation


  Commit: 2c094d4c896973b35681119c0243cfba0e8c85da
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2c094d4c896973b35681119c0243cfba0e8c85da
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Calculate the muon pole mass on demand.


  Commit: 4dabe526b00387213e94d35a8e34ba75cb37ab16
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/4dabe526b00387213e94d35a8e34ba75cb37ab16
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Made the anti particles be derived from Particle


  Commit: 6c9de6925c8d8b69d9007575aac467f864ba6278
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6c9de6925c8d8b69d9007575aac467f864ba6278
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M meta/SelfEnergies.m

  Log Message:
  -----------
  Changed some function names and added a few comments


  Commit: 76e7102ac2acaa20cbd4ebfea7fc61df4988d661
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/76e7102ac2acaa20cbd4ebfea7fc61df4988d661
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Added lots of documentation and moved some vital functionality in meta/GMuonMinus2.m into separate functions.


  Commit: ef8b02bdfcbd98f5f3177ebc9655ca6b1c285a6f
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ef8b02bdfcbd98f5f3177ebc9655ca6b1c285a6f
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Fixed minor issues


  Commit: c1997883d82666a4e10359fd0320fbb754297ec0
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c1997883d82666a4e10359fd0320fbb754297ec0
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Now the correct couplings are returned, when the vertex type is a single componented vertex.


  Commit: 17747266c5316f7840e7d014e44d591259a57b81
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/17747266c5316f7840e7d014e44d591259a57b81
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-06 (Thu, 06 Aug 2015)

  Changed paths:
    M templates/run.cpp.in

  Log Message:
  -----------
  Removed call to set_amuon(). Interface is not decided upon yet.


  Commit: 7a48965de55bd96acbc6e1ef2e412bb5271e8020
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7a48965de55bd96acbc6e1ef2e412bb5271e8020
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-09 (Sun, 09 Aug 2015)

  Changed paths:
    M examples/customized-betas/MSSMcbs_spectrum_generator.hpp
    M meta/FlexibleSUSY.m
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    M model_files/E6SSM/LesHouches.in.E6SSM
    M model_files/MRSSM/LesHouches.in.MRSSM
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/module.mk.in
    M templates/run.cpp.in

  Log Message:
  -----------
  Further work on rebasing...


  Commit: cecf2eea836b399a8ec671e20ce6d7b84fb9d24b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/cecf2eea836b399a8ec671e20ce6d7b84fb9d24b
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-08-26 (Wed, 26 Aug 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Fixed invalid symbols.


  Commit: 84335c6d04aca5fa1c8709a19e828695f261c5c5
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/84335c6d04aca5fa1c8709a19e828695f261c5c5
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  remove unused variable


  Commit: 41401f9f41720f4f2d62b157ca896c82de3b9c76
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/41401f9f41720f4f2d62b157ca896c82de3b9c76
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/module.mk
    M templates/module.mk.in

  Log Message:
  -----------
  sort modules by name and remove douplicate


  Commit: 7ebee3525f09f7e0692bf7589951502d26ddfd9e
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7ebee3525f09f7e0692bf7589951502d26ddfd9e
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  remove redundant void argument type declaration


  Commit: 5af4b2ecd4c32cd54eace6fbf30823e3c2487b77
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/5af4b2ecd4c32cd54eace6fbf30823e3c2487b77
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  remove redundant "extern" declaration


  Commit: fc9767bf2d623c673951c91f46806e4fc1da84cc
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/fc9767bf2d623c673951c91f46806e4fc1da84cc
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  remove more redunant void argument type declarations


  Commit: d84a60d943ac026c25bcac7e1c0f848d4f4b3998
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d84a60d943ac026c25bcac7e1c0f848d4f4b3998
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/module.mk.in

  Log Message:
  -----------
  remove douplicate adding module to makefile variable


  Commit: 1fb57f309b9ce0504d99d7ba6393e0ff78cd7f7c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/1fb57f309b9ce0504d99d7ba6393e0ff78cd7f7c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  change calculate_amuon() interface: use const ref to model class

in order to guarantee that the model class will not be modified after
the function call


  Commit: 13658297d7168c58762b764e6de377d18b6a2162
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/13658297d7168c58762b764e6de377d18b6a2162
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  use <model>_mass_eigenstates class instead of template class

This allows the use of the GMM2 calculation for all BVP solvers.


  Commit: d5fb439802cf132f97bc07a49090666d66528a72
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d5fb439802cf132f97bc07a49090666d66528a72
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  extend brief documentation


  Commit: 7caba586039840f9a6036a1bc5b991f80a6816fc
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/7caba586039840f9a6036a1bc5b991f80a6816fc
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-09-13 (Sun, 13 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  remove unnecessary ;


  Commit: a3a3837151542f7897608325ae9a9f0d819ddd93
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a3a3837151542f7897608325ae9a9f0d819ddd93
  Author: Alexander Voigt <alexander.voigt at desy.de>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/SelfEnergies.m

  Log Message:
  -----------
  remove GMM2 hack of ignoring Null[] n-point functions

by putting the GMM2 vertices into a separate variable.

However, the vertex functions are still created inside the model
class.  This will be changed: The GMM2-specific vertices will be put
into the GMM2 module.


  Commit: b62a41b1d612671d209e07926cab8895a76b825c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b62a41b1d612671d209e07926cab8895a76b825c
  Author: Alexander Voigt <alexander.voigt at desy.de>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M meta/SelfEnergies.m

  Log Message:
  -----------
  generate only vertex functions necessary for tadpoles and self-energies

Thereby, vertices for GMM2 are ignored.  This commit will render the
GMM2 module non-compiling.


  Commit: dedc5a602061f5f3efcde98f6fda46f24fffb8f5
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/dedc5a602061f5f3efcde98f6fda46f24fffb8f5
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  Removed unused variable


  Commit: 784f13a9f27cad317a4676a21076c4779cb929a1
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/784f13a9f27cad317a4676a21076c4779cb929a1
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Removed 'void' arguments in function declarations


  Commit: 91d7d246ec0f04c4acf7881445205743b66ab72a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/91d7d246ec0f04c4acf7881445205743b66ab72a
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  We now use the 'mass_eigenstates' classes instead of the model templates directly.


  Commit: 57d59dd3438f1f54bc90a517ef73370b91e892f8
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/57d59dd3438f1f54bc90a517ef73370b91e892f8
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M templates/module.mk.in

  Log Message:
  -----------
  Removed duplicate filename in SRC/HDR list


  Commit: 2f6affbe2c5674d9113c3d934a44ccc88a43ed25
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2f6affbe2c5674d9113c3d934a44ccc88a43ed25
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Moved all internal GMM2 definitions into an anonymous namespace.


  Commit: ca775f148ab85518ac17ff96c7b071cdeb2fcefa
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ca775f148ab85518ac17ff96c7b071cdeb2fcefa
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-09-30 (Wed, 30 Sep 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Detached generation of nPointFunctions/vertexRules from the generation of the vertex data needed by GMM2. Fixed a local variable issue in WriteGMuonMinus2Class[].


  Commit: 48563aadd68175c9a2bbf93989d20c8c06d4f3a3
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/48563aadd68175c9a2bbf93989d20c8c06d4f3a3
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Fixed the GMM2 separation issue


  Commit: a7173204aade57ad5d2c394779376c51f4a537fd
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a7173204aade57ad5d2c394779376c51f4a537fd
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Added stub for muonCharge()


  Commit: f54ad062cf01ec698895c804ddbe5cc72ff5d478
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f54ad062cf01ec698895c804ddbe5cc72ff5d478
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Merge remote-tracking branch 'iolojz/refactoring' into HEAD


  Commit: 0775b109363a8a5e8e2e661d39fc4f926a73fc80
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0775b109363a8a5e8e2e661d39fc4f926a73fc80
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  Fixed error that resulted upon merge


  Commit: 515e51778bfd2995d275d7b68450d2362b06da93
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/515e51778bfd2995d275d7b68450d2362b06da93
  Author: Jobst Ziebell <Jobst.Ziebell at mailbox.tu-dresden.de>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Merge branch 'temp' into vertexRulesGMM2


  Commit: e53f7c262eef631df652c40a071f55cef7369155
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/e53f7c262eef631df652c40a071f55cef7369155
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-03 (Sat, 03 Oct 2015)

  Changed paths:
    M .gitattributes
    M ChangeLog
    M addons/gm2calc/MSSMNoFV_onshell.cpp
    M addons/gm2calc/MSSMNoFV_onshell.hpp
    M addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.cpp
    M addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.hpp
    M addons/gm2calc/MSSMNoFV_onshell_problems.cpp
    M addons/gm2calc/MSSMNoFV_onshell_problems.hpp
    M addons/gm2calc/MSSMNoFV_onshell_soft_parameters.cpp
    M addons/gm2calc/Makefile.in
    M addons/gm2calc/ffunctions.cpp
    M addons/gm2calc/ffunctions.hpp
    M addons/gm2calc/gm2_1loop.cpp
    M addons/gm2calc/gm2_1loop.hpp
    M addons/gm2calc/gm2_2loop.cpp
    M addons/gm2calc/gm2_2loop.hpp
    M addons/gm2calc/gm2_slha_io.cpp
    M addons/gm2calc/gm2_slha_io.hpp
    M addons/gm2calc/gm2calc.cpp
    M addons/gm2calc/gm2scan.cpp
    M config/Makefile.in
    M configure
    M createmodel
    M doc/release
    M examples/customized-betas/MSSMcbs_spectrum_generator.hpp
    M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.cpp
    M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.hpp
    M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp
    M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp
    M examples/tower/MSSMD5O_MSSMRHN_spectrum_generator.hpp
    M examples/tower/MSSMD5O_MSSMRHN_two_scale_initial_guesser.cpp
    M examples/tower/MSSMD5O_MSSMRHN_two_scale_initial_guesser.hpp
    M legacy/diagonalization.cpp
    M legacy/rk_legacy.cpp
    M meta/CConversion.m
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M meta/Parameters.m
    M meta/WriteOut.m
    A model_files/MSSMNoEWVEVs/FlexibleSUSY.m.in
    A model_files/SplitMSSM/FlexibleSUSY.m.in
    A model_files/SplitMSSM/LesHouches.in.SplitMSSM
    A model_files/SuperSplitMSSM/FlexibleSUSY.m.in
    A model_files/SuperSplitMSSM/LesHouches.in.SuperSplitMSSM
    R model_files/UnbrokenMSSM/FlexibleSUSY.m.in
    R model_files/cMSSM/FlexibleSUSY.m.in
    R model_files/cMSSM/LesHouches.in.cMSSM
    A model_files/complexMSSM/FlexibleSUSY.m.in
    A model_files/complexMSSM/LesHouches.in.complexMSSM
    M models/SoftsusyMSSM/SoftsusyMSSM_solver.hpp
    M models/SoftsusyMSSM/SoftsusyMSSM_two_scale.cpp
    M models/SoftsusyMSSM/SoftsusyMSSM_two_scale.hpp
    M models/SoftsusyMSSM/SoftsusyMSSM_two_scale_initial_guesser.cpp
    M models/SoftsusyMSSM/SoftsusyMSSM_two_scale_initial_guesser.hpp
    M models/SoftsusyMSSM/SoftsusyMSSM_two_scale_low_scale_constraint.cpp
    M models/SoftsusyMSSM/softpars.cpp
    M models/SoftsusyMSSM/softsusy.cpp
    M models/SoftsusyMSSM/softsusy.h
    M models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.cpp
    M models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale.hpp
    M models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_initial_guesser.cpp
    M models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_initial_guesser.hpp
    M models/SoftsusyNMSSM/SoftsusyNMSSM_two_scale_low_scale_constraint.cpp
    M models/sm/sm_two_scale.cpp
    M models/sm/sm_two_scale.hpp
    M models/smcw/smcw_two_scale.cpp
    M models/smcw/smcw_two_scale.hpp
    A sarah/MSSMNoEWVEVs/MSSMNoEWVEVs.m
    A sarah/MSSMNoEWVEVs/parameters.m
    A sarah/MSSMNoEWVEVs/particles.m
    M sarah/NSM/NSM.m
    M sarah/NSM/particles.m
    A sarah/SplitMSSM/SplitMSSM.m
    A sarah/SplitMSSM/parameters.m
    A sarah/SplitMSSM/particles.m
    R sarah/UnbrokenMSSM/UnbrokenMSSM.m
    R sarah/UnbrokenMSSM/parameters.m
    R sarah/UnbrokenMSSM/particles.m
    M src/def.h
    A src/dilog.cpp
    R src/dilog.f
    R src/dilog.h
    A src/dilog.hpp
    A src/dilogc.f
    M src/linalg.cpp
    M src/linalg.h
    M src/lowe.cpp
    M src/module.mk
    M src/mycomplex.h
    M src/numerics.cpp
    M src/numerics.h
    M src/rge.cpp
    M src/slha_io.cpp
    M src/slha_io.hpp
    A src/threshold_loop_functions.cpp
    A src/threshold_loop_functions.hpp
    M src/utils.cpp
    M src/utils.h
    M src/wrappers.hpp
    M src/xpr-matrix.h
    M templates/mass_eigenstates.cpp.in
    M templates/mass_eigenstates.hpp.in
    M templates/run.cpp.in
    M templates/run_cmd_line.cpp.in
    M templates/scan.cpp.in
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_initial_guesser.cpp.in
    M templates/two_scale_initial_guesser.hpp.in
    M templates/two_scale_initial_guesser_low_scale_model.cpp.in
    M templates/two_scale_initial_guesser_low_scale_model.hpp.in
    M templates/two_scale_low_scale_constraint.cpp.in
    M templates/two_scale_low_scale_constraint.hpp.in
    M templates/two_scale_soft_parameters.hpp.in
    M templates/two_scale_susy_scale_constraint.cpp.in
    M templates/utilities.cpp.in
    M test/module.mk
    M test/test.h
    M test/test_CConversion.m
    M test/test_CMSSM.hpp
    M test/test_CMSSMLowPrecision.cpp
    M test/test_CMSSMNoFV.hpp
    M test/test_CMSSMNoFV_two_loop_spectrum.cpp
    M test/test_CMSSM_like.hpp
    M test/test_CMSSM_slha.cpp
    M test/test_CMSSM_slha_input.cpp
    M test/test_CMSSM_two_loop_spectrum.cpp
    M test/test_MSSMNoFV_onshell.cpp
    M test/test_NSM_low_scale_constraint.cpp
    M test/test_SM_low_scale_constraint.cpp
    M test/test_betafunction.cpp
    M test/test_gm2calc.cpp
    A test/test_namespace_collisions.cpp
    M test/test_run_all_spectrum_generators.sh
    M test/test_two_scale_mssm_initial_guesser.cpp
    M test/test_two_scale_mssm_solver.cpp
    M test/test_two_scale_sm.cpp
    M test/test_two_scale_sm_smcw_integration.cpp
    M test/test_wrappers.cpp
    M utils/scan-slha.sh

  Log Message:
  -----------
  Merge branch 'development' into feature-GMM2


  Commit: 53ba567bd251c4e00abd87a8cdaa0978c148e20d
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/53ba567bd251c4e00abd87a8cdaa0978c148e20d
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-03 (Sat, 03 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in
    M templates/g_muon_minus_2.hpp.in

  Log Message:
  -----------
  Merge branch 'vertexRulesGMM2' into feature-GMM2


  Commit: 57c6038c8c4fcbca83b4a8af175bea8441c96ee9
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/57c6038c8c4fcbca83b4a8af175bea8441c96ee9
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-03 (Sat, 03 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Stroustrup function argument style


  Commit: 68faabafc73a2a4a6143c698f8d33dee71b76819
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/68faabafc73a2a4a6143c698f8d33dee71b76819
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  generate vertex expressions in ::vertex() function

Note: The particle indices are not yet assigned correctly to the
corresponding elements of `indices'.


  Commit: a7b56d8ac43e2763f9066ac0ca572f2a8fc0712a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a7b56d8ac43e2763f9066ac0ca572f2a8fc0712a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/TreeMasses.m

  Log Message:
  -----------
  Merge branch 'development' into feature-GMM2


  Commit: b07bedc5704febf3a1f3ebfc5bb1b17adb46fe80
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b07bedc5704febf3a1f3ebfc5bb1b17adb46fe80
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  replace back SARAH`DependenceNums

They will later be replaced by local variables, which are filled from
the return value of the corresponding model class methods.


  Commit: 9533ee0d296a0ba0b419c0ddd9f9ddf42dc234eb
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/9533ee0d296a0ba0b419c0ddd9f9ddf42dc234eb
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/SelfEnergies.m
    M meta/TreeMasses.m

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-GMM2


  Commit: ff267ddcaa62279aba50586dd930c96d74564d7a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ff267ddcaa62279aba50586dd930c96d74564d7a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  reuse ExpressionToString function from TreeMasses` module


  Commit: 69aa193c9e26f53f54299eb5e0045f3a3a4180bd
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/69aa193c9e26f53f54299eb5e0045f3a3a4180bd
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  declare field indices as local variables

Their values are extracted from the `indices' array.


  Commit: f54c6ad4f337fc0ca8239b79e10e12ad6adb2e44
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f54c6ad4f337fc0ca8239b79e10e12ad6adb2e44
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  no need to initialize complex variables to zero


  Commit: bda0e57a6568c3c5e1d244e94f9e43c1994911e4
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/bda0e57a6568c3c5e1d244e94f9e43c1994911e4
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/Parameters.m

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-GMM2


  Commit: d163fea2506bdc8a6a7c062898049a42baa3774e
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d163fea2506bdc8a6a7c062898049a42baa3774e
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  resolve derived parameters


  Commit: 2b40cc66d030aee187542fee263797612973c8c2
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2b40cc66d030aee187542fee263797612973c8c2
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  indenting loop functions


  Commit: ce3609fd0453f27d7ead3b384fa38be4a468fac6
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/ce3609fd0453f27d7ead3b384fa38be4a468fac6
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  using const where possible


  Commit: 66bc95f60dc5c9ee537b3e5ae6619a81d40e2b36
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/66bc95f60dc5c9ee537b3e5ae6619a81d40e2b36
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  fix warnings and do some restyling


  Commit: 6321c82b436c5f3e62e74860703f5e54ee230eec
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6321c82b436c5f3e62e74860703f5e54ee230eec
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M test/module.mk
    A test/test_SM_gmm2.cpp

  Log Message:
  -----------
  adding test for g-2 in the SM


  Commit: 577e41431cb4d7dc8204dd44058bb591d72d08ed
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/577e41431cb4d7dc8204dd44058bb591d72d08ed
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  restyle


  Commit: 5f24be885a04dfbaab03e66007d1eb08006dbe4a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/5f24be885a04dfbaab03e66007d1eb08006dbe4a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  remove threaded calculation stub

The calculation of g-2 is so incredibly fast, that opening threads
slows down the computation.


  Commit: 1d2b85def7b85f7d9427b6b3bf2323ab84b21f09
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/1d2b85def7b85f7d9427b6b3bf2323ab84b21f09
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  use complex result type as needed in the CMSSM for example


  Commit: aecaf85cff385345ba46baf11d0c05af8fe33c74
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/aecaf85cff385345ba46baf11d0c05af8fe33c74
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  remove SLHA g-2 interface

It will be replaced by a more general approach, maybe a struct with
important low-energy observables.


  Commit: 329156ed672938251fd4ee5772f87c290eb71bfe
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/329156ed672938251fd4ee5772f87c290eb71bfe
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  use shorter notation for unsigned int


  Commit: 80365b1fe9b11deccf92e5224d4e0e17f6fec6bd
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/80365b1fe9b11deccf92e5224d4e0e17f6fec6bd
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M .gitattributes
    M ChangeLog
    M addons/gm2calc/AUTHORS
    M addons/gm2calc/MSSMNoFV_onshell.cpp
    M addons/gm2calc/MSSMNoFV_onshell.hpp
    M addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.cpp
    M addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.hpp
    M addons/gm2calc/MSSMNoFV_onshell_physical.hpp
    M addons/gm2calc/MSSMNoFV_onshell_problems.cpp
    M addons/gm2calc/MSSMNoFV_onshell_problems.hpp
    M addons/gm2calc/MSSMNoFV_onshell_soft_parameters.hpp
    M addons/gm2calc/MSSMNoFV_onshell_susy_parameters.hpp
    R addons/gm2calc/Makefile.in
    M addons/gm2calc/README
    A addons/gm2calc/example.gm2
    A addons/gm2calc/example.slha
    M addons/gm2calc/gm2_1loop.cpp
    M addons/gm2calc/gm2_1loop.hpp
    M addons/gm2calc/gm2_2loop.cpp
    M addons/gm2calc/gm2_2loop.hpp
    M addons/gm2calc/gm2_error.hpp
    A addons/gm2calc/gm2_mb.cpp
    A addons/gm2calc/gm2_mb.hpp
    M addons/gm2calc/gm2_slha_io.cpp
    M addons/gm2calc/gm2_slha_io.hpp
    A addons/gm2calc/gm2_uncertainty.cpp
    A addons/gm2calc/gm2_uncertainty.hpp
    M addons/gm2calc/gm2calc.cpp
    R addons/gm2calc/gm2calc.in
    M addons/gm2calc/gm2scan.cpp
    M addons/gm2calc/module.mk
    R addons/gm2calc/module.src.mk
    R addons/gm2calc/slha.in
    M config/Makefile.customized-betas.in
    M config/Makefile.in
    M config/Makefile.standalone.in
    M config/Makefile.tower.in
    M config/config.h.in
    A config/depgen.cpp
    M config/module.mk
    M configure
    M doc/Doxyfile
    A doc/model_file.dox
    M doc/module.mk
    M examples/customized-betas/MSSMcbs_spectrum_generator.hpp
    M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.cpp
    M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.hpp
    M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp
    M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp
    M examples/customized-betas/custombetas.cpp
    M examples/lattice_fmssm.cpp
    M examples/lattice_fmssm_fmssmn.cpp
    M examples/lattice_numerical_fmssm.cpp
    M examples/lattice_numerical_fmssm_fmssmn.cpp
    M examples/switch_MSSM.cpp
    M examples/tower/MSSMD5O_MSSMRHN_spectrum_generator.hpp
    M examples/tower/MSSMD5O_MSSMRHN_two_scale_initial_guesser.cpp
    M examples/tower/MSSMD5O_MSSMRHN_two_scale_initial_guesser.hpp
    M examples/tower/run_tower.cpp
    M install-sarah
    M legacy/diagonalization.cpp
    M meta/BetaFunction.m
    M meta/CConversion.m
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M meta/LoopMasses.m
    M meta/Parameters.m
    M meta/SelfEnergies.m
    M meta/ThreeLoopSM.m
    M meta/ThresholdCorrections.m
    M meta/TreeMasses.m
    R model_files/CMSSMCPV/LesHouches.in.CMSSMCPV.wrong_higgs_state
    A model_files/CMSSMMatchedAtMTDRbar/FlexibleSUSY.m.in
    A model_files/CMSSMMatchedAtMTPole/FlexibleSUSY.m.in
    R model_files/E6SSM/LesHouches.in.E6SSM_nan
    A model_files/HSSUSY/FlexibleSUSY.m.in
    A model_files/HSSUSY/LesHouches.in.HSSUSY
    M model_files/NSM/FlexibleSUSY.m.in
    M model_files/NSM/LesHouches.in.NSM
    M model_files/SM/FlexibleSUSY.m.in
    M model_files/SM/LesHouches.in.SM
    M model_files/SMEWSBAtMZ/FlexibleSUSY.m.in
    A model_files/SSM/FlexibleSUSY.m.in
    A model_files/SSM/LesHouches.in.SSM
    M model_files/SplitMSSM/FlexibleSUSY.m.in
    M model_files/SplitMSSM/LesHouches.in.SplitMSSM
    R model_files/SuperSplitMSSM/FlexibleSUSY.m.in
    R model_files/SuperSplitMSSM/LesHouches.in.SuperSplitMSSM
    M model_files/UMSSM/FlexibleSUSY.m.in
    M model_files/UMSSM/LesHouches.in.UMSSM
    R model_files/lowNMSSM/LesHouches.in.lowNMSSM.pseudoscalar
    R model_files/lowNMSSM/LesHouches.in.lowNMSSM_goldstone_tachyon
    M models/SoftsusyMSSM/softsusy.cpp
    M models/SoftsusyNMSSM/run_softpoint.cpp
    M release/generate-models.sh
    M sarah/NSM/NSM.m
    M src/command_line_options.cpp
    M src/command_line_options.hpp
    M src/coupling_monitor.hpp
    A src/database.cpp
    A src/database.hpp
    M src/logger.hpp
    M src/lowe.cpp
    M src/lowe.h
    M src/module.mk
    M src/numerics2.hpp
    M src/slha_io.cpp
    M src/sm_twoloophiggs.cpp
    A src/split_threeloophiggs.cpp
    A src/split_threeloophiggs.hpp
    M src/threshold_loop_functions.cpp
    M src/threshold_loop_functions.hpp
    M src/two_loop_corrections.hpp
    M src/two_scale_convergence_tester_drbar.hpp
    M src/weinberg_angle.cpp
    M src/wrappers.hpp
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/info.cpp.in
    M templates/info.hpp.in
    M templates/input_parameters.cpp.in
    M templates/input_parameters.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/mass_eigenstates.cpp.in
    M templates/mass_eigenstates.hpp.in
    M templates/module.mk.in
    M templates/physical.cpp.in
    M templates/physical.hpp.in
    M templates/run.cpp.in
    M templates/run_cmd_line.cpp.in
    M templates/scan.cpp.in
    M templates/spectrum_generator_interface.hpp.in
    M templates/start.m.in
    M templates/two_scale_initial_guesser.cpp.in
    M templates/two_scale_initial_guesser.hpp.in
    M templates/two_scale_initial_guesser_low_scale_model.cpp.in
    M templates/two_scale_initial_guesser_low_scale_model.hpp.in
    M templates/two_scale_low_scale_constraint.cpp.in
    M templates/two_scale_low_scale_constraint.hpp.in
    M templates/utilities.cpp.in
    M templates/utilities.hpp.in
    A test/depgen/base.cpp
    A test/depgen/base.hpp
    A test/depgen/basedir_header.hpp
    A test/depgen/circular.cpp
    A test/depgen/circular.hpp
    A test/depgen/nonexisting.cpp
    A test/depgen/subdir/base.cpp
    A test/depgen/subdir/base.hpp
    A test/depgen/subdir/include_basedir_header.cpp
    A test/depgen/subdir/nonexisting.cpp
    M test/module.mk
    M test/test.h
    M test/test_CMSSMCKM_low_scale_constraint.cpp
    A test/test_CMSSMCPV_wrong_higgs_state.in.spc
    M test/test_CMSSMMassWInput_spectrum.cpp
    M test/test_CMSSMNoFV_low_scale_constraint.cpp
    M test/test_CMSSMNoFV_two_loop_spectrum.cpp
    A test/test_CMSSM_database.cpp
    A test/test_CMSSM_gluino.sh
    A test/test_CMSSM_gluino.spc.in
    M test/test_CMSSM_initial_guesser.cpp
    M test/test_CMSSM_low_scale_constraint.cpp
    M test/test_CMSSM_slha_doubled_blocks.sh
    M test/test_CMSSM_spectrum.cpp
    M test/test_CMSSM_two_loop_spectrum.cpp
    M test/test_CMSSM_weinberg_angle.cpp
    A test/test_E6SSM_nan.in.spc
    A test/test_HSSUSY_SUSYHD.dat
    A test/test_HSSUSY_SUSYHD.sh
    A test/test_HSSUSY_SUSYHD_msq_m3_degenerate.in.spc
    A test/test_HSSUSY_SUSYHD_msq_msu_m3_degenerate.in.spc
    A test/test_HSSUSY_SUSYHD_msq_msu_m3_msusy_degenerate.in.spc
    A test/test_HSSUSY_SUSYHD_msu_m3_degenerate.in.spc
    A test/test_HSSUSY_SUSYHD_nondegenerate.in.spc
    M test/test_NMSSM_initial_guesser.cpp
    M test/test_NMSSM_low_scale_constraint.cpp
    M test/test_NMSSM_spectrum.cpp
    M test/test_NSM_low_scale_constraint.cpp
    M test/test_NUTNMSSM_spectrum.cpp
    M test/test_SMHighPrecision_two_loop_spectrum.cpp
    M test/test_SM_3loop_beta.m
    M test/test_SM_low_scale_constraint.cpp
    M test/test_SM_two_loop_spectrum.cpp
    M test/test_SMnoGUT_3loop_beta.m
    A test/test_depgen.sh
    M test/test_gm2calc.cpp
    A test/test_lowNMSSM_goldstone_tachyon.in.spc
    A test/test_lowNMSSM_pseudoscalar.in.spc
    A test/test_lowe.cpp
    M test/test_run_all_spectrum_generators.sh
    M test/test_two_scale_mssm_initial_guesser.cpp
    M test/test_two_scale_mssm_solver.cpp
    M test/test_wrappers.cpp
    A utils/load-FlexibleSUSY.m
    A utils/scan-database.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'organization/development' into feature-GMM2


  Commit: 97d9707973b6f84160716febe097b7621e120b7a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/97d9707973b6f84160716febe097b7621e120b7a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  update template and output paths


  Commit: a13f10d0313fa42b642d95de80e307d38d37b3c5
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a13f10d0313fa42b642d95de80e307d38d37b3c5
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M meta/TreeMasses.m

  Log Message:
  -----------
  adding helper functions returning SM goldstone bosons


  Commit: 9dd65d96b359bd3a82e5e4b75ce53cf89ccf41aa
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/9dd65d96b359bd3a82e5e4b75ce53cf89ccf41aa
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M meta/GMuonMinus2.m
    M templates/g_muon_minus_2.cpp.in

  Log Message:
  -----------
  skipping diagrams with SM scalars (Higgs and Goldstone bosons)


  Commit: 0765937c0d2bed021faf6a434303d06750fab6d1
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0765937c0d2bed021faf6a434303d06750fab6d1
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M src/module.mk
    A src/observables.cpp
    A src/observables.hpp

  Log Message:
  -----------
  adding struct which contains calculated observables


  Commit: 861ca0b985a49f2eabe0979ae256c675ca1a7413
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/861ca0b985a49f2eabe0979ae256c675ca1a7413
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  adding function stub which writes the observables to the SLHAea object


  Commit: 62e9a2dbaee6fb591e3dafeccefe350bcb4b7b8a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/62e9a2dbaee6fb591e3dafeccefe350bcb4b7b8a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M templates/module.mk
    M templates/module.mk.in
    A templates/observables.cpp.in
    A templates/observables.hpp.in
    M templates/run.cpp.in

  Log Message:
  -----------
  adding function that calculates all observables

Note: I still need to generate

 * the function which calculates the observables
   calculate_observables() using the user-given information which
   output parameters to calculate

 * the function which writes the observables to the SLHAea object,
   using the information about where the output parameters should be
   written


  Commit: bc4a03edba3f6acad3896985dab727d954519cbf
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/bc4a03edba3f6acad3896985dab727d954519cbf
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    M meta/WriteOut.m
    M meta/module.mk
    M templates/observables.cpp.in
    M templates/run.cpp.in
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  allow user to add amu to extra SLHA output parameters


  Commit: 3ceee9830d41f8e426b32af698facaa49962711e
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/3ceee9830d41f8e426b32af698facaa49962711e
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M src/observables.cpp
    M src/observables.hpp
    M templates/utilities.cpp.in
    M templates/utilities.hpp.in

  Log Message:
  -----------
  allow writing observables to database


  Commit: 79a77e4125b64943bedf1f72c70602c61fe2f783
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/79a77e4125b64943bedf1f72c70602c61fe2f783
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/run.cpp.in

  Log Message:
  -----------
  write observables to database


  Commit: c628c55a43f4a382f3269a5a50c1a4435cd81fd9
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c628c55a43f4a382f3269a5a50c1a4435cd81fd9
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/utilities.hpp.in

  Log Message:
  -----------
  correcting signature of from_database()


  Commit: 2b6242b0e48e7014c3ea2d16e58096d97e885ad8
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2b6242b0e48e7014c3ea2d16e58096d97e885ad8
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M model_files/CMSSM/FlexibleSUSY.m.in
    M model_files/NMSSM/FlexibleSUSY.m.in
    M model_files/NUTNMSSM/FlexibleSUSY.m.in

  Log Message:
  -----------
  adding calculation of amu to a few models for illustration


  Commit: d419cc6a69453c84617e3618a7883a7f08556d1c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d419cc6a69453c84617e3618a7883a7f08556d1c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M src/spectrum_generator_settings.cpp
    M src/spectrum_generator_settings.hpp

  Log Message:
  -----------
  adding run-time configuration variable to disable observables


  Commit: 0f5cc53f7f5388b4fed843a0db7e1b3a7d9d9eed
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0f5cc53f7f5388b4fed843a0db7e1b3a7d9d9eed
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M meta/WriteOut.m
    M model_files/CMSSM/FlexibleSUSY.m.in
    M model_files/NMSSM/FlexibleSUSY.m.in
    M model_files/NUTNMSSM/FlexibleSUSY.m.in
    M model_files/SM/LesHouches.in.SM
    M src/observables.cpp
    M src/observables.hpp
    M templates/observables.cpp.in
    M templates/run.cpp.in
    M templates/run_cmd_line.cpp.in
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  allow calculation of observable at runtime

using FlexibleSUSY[15]


  Commit: c5dd7eaf2710c56787afd4c2d6635ff8b689d7b2
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c5dd7eaf2710c56787afd4c2d6635ff8b689d7b2
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/slha_io.hpp.in

  Log Message:
  -----------
  let the compiler create function overloads


  Commit: e7d6e44c78b08a3037d7f76cbe1a1438784adb3b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/e7d6e44c78b08a3037d7f76cbe1a1438784adb3b
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M examples/customized-betas/LesHouches.in.MSSMcbs
    M examples/tower/LesHouches.in.tower
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMCPV/LesHouches.in.CMSSMCPV
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    M model_files/E6SSM/LesHouches.in.E6SSM
    M model_files/LHInputMSSM/LesHouches.in.LHInputMSSM
    M model_files/MRSSM/LesHouches.in.MRSSM
    M model_files/MSSM/LesHouches.in.MSSM
    M model_files/MSSMNoFV/LesHouches.in.MSSMNoFV
    M model_files/MSSMNoFVSLHA2/LesHouches.in.MSSMNoFVSLHA2
    M model_files/MSSMNoFVatMGUT/LesHouches.in.MSSMNoFVatMGUT
    M model_files/MSSMatMGUT/LesHouches.in.MSSMatMGUT
    M model_files/NMSSM/LesHouches.in.NMSSM
    M model_files/NMSSMCPV/LesHouches.in.NMSSMCPV
    M model_files/NUHMSSM/LesHouches.in.NUHMSSM
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP1
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP2
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP3
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_GTP1
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_GTP2
    M model_files/NUTSMSSM/LesHouches.in.NUTSMSSM
    M model_files/SM/LesHouches.in.SM
    M model_files/SMHighScale/LesHouches.in.SMHighScale
    M model_files/SMSSM/LesHouches.in.SMSSM
    M model_files/SSM/LesHouches.in.SSM
    M model_files/THDMII/LesHouches.in.THDMII
    M model_files/UMSSM/LesHouches.in.UMSSM
    M model_files/cCMSSM/LesHouches.in.cCMSSM
    M model_files/complexMSSM/LesHouches.in.complexMSSM
    M model_files/lowMSSM/LesHouches.in.lowMSSM
    M model_files/lowNMSSM/LesHouches.in.TP1
    M model_files/lowNMSSM/LesHouches.in.TP2
    M model_files/lowNMSSM/LesHouches.in.TP3
    M model_files/lowNMSSM/LesHouches.in.TP4
    M model_files/lowNMSSM/LesHouches.in.TP5
    M model_files/lowNMSSM/LesHouches.in.TP6
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP1
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP2
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP3
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP4
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP5
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP6
    M model_files/munuSSM/LesHouches.in.munuSSM
    M test/test_CMSSMCPV_wrong_higgs_state.in.spc
    M test/test_CMSSM_gluino.spc.in
    M test/test_CMSSM_slha_doubled_blocks.spc.in
    M test/test_E6SSM_nan.in.spc

  Log Message:
  -----------
  adding default observable calculation option


  Commit: c3a3fb784ee834f61dbd8f159e1394f9ba5a5e93
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c3a3fb784ee834f61dbd8f159e1394f9ba5a5e93
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M meta/FlexibleSUSY.m
    A templates/a_muon.cpp.in
    A templates/a_muon.hpp.in
    R templates/g_muon_minus_2.cpp.in
    R templates/g_muon_minus_2.hpp.in
    M templates/module.mk
    M templates/module.mk.in
    M templates/observables.cpp.in
    M test/test_SM_gmm2.cpp

  Log Message:
  -----------
  consistent naming of a_muon modules


  Commit: b00e81ab6cd24f766e91cfde79b6f7c7749b200a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b00e81ab6cd24f766e91cfde79b6f7c7749b200a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/a_muon.cpp.in

  Log Message:
  -----------
  correcting SM diagram selection

We omit diagrams where *all* particles in the loop are SM particles.


  Commit: bff928dde2e53b71f36252bf99aba232216b526a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/bff928dde2e53b71f36252bf99aba232216b526a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Bugfix: fix syntax error in singlet pole mass access


  Commit: 4b0ab191e1261c7dca080e723d134105e6b4a0c9
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/4b0ab191e1261c7dca080e723d134105e6b4a0c9
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M model_files/CMSSMNoFV/FlexibleSUSY.m.in
    M model_files/MSSMNoFV/FlexibleSUSY.m.in

  Log Message:
  -----------
  add calculation of a_mu in *NoFV models


  Commit: 83083e49a396978bc7c9710d0b044a6afc18000e
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/83083e49a396978bc7c9710d0b044a6afc18000e
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M legacy/diagonalization.cpp

  Log Message:
  -----------
  Bugfix: fix compilation of legacy diagonalization module in debug mode


  Commit: cfb84b5b578aee1f1c33e231cbfa5b81a56a4b7a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/cfb84b5b578aee1f1c33e231cbfa5b81a56a4b7a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M templates/a_muon.cpp.in

  Log Message:
  -----------
  Bugfix: refer to correct particle index array


  Commit: b916b130dac52f7c3e2883cd3f633b1cc02ad0a3
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b916b130dac52f7c3e2883cd3f633b1cc02ad0a3
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M meta/GMuonMinus2.m

  Log Message:
  -----------
  Bugfix: muonCharge() must return electric charge of muon for consistency

In the one-loop diagrams the charge count of the photon emitter is
calculated as

   photonEmitterChargeCount =
       photonVertex.left().real() / muonCharge(context);

`photonVertex' returns the complete value of the vertex, including the
electric charge, e.  Therefore, `photonEmitterChargeCount' contains
the charge count only if `photonVertex' is divided by the muon charge,
including the electric charge, e.


  Commit: 6c645a52dcdcefe242851f9b3715865f8cc285a5
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/6c645a52dcdcefe242851f9b3715865f8cc285a5
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M templates/observables.hpp.in

  Log Message:
  -----------
  remove unnecessary forward declaration


  Commit: 66017a0b3b2661aecb78305e4b993d7b131aab7c
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/66017a0b3b2661aecb78305e4b993d7b131aab7c
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M ChangeLog
    M configure
    M src/database.cpp
    A src/derivative.hpp
    M src/module.mk
    M test/module.mk
    M test/test_CMSSM_database.cpp
    A test/test_derivative.cpp

  Log Message:
  -----------
  Merge branch 'development' into feature-GMM2


  Commit: 05bc55c8de584d2c15fa76f2a2ca65bde86baf3e
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/05bc55c8de584d2c15fa76f2a2ca65bde86baf3e
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M test/test_CMSSM_database.cpp

  Log Message:
  -----------
  test reading and writing of observables to database


  Commit: 66f4cb0ce52efbd2c8d281d53938f1873a03e8bf
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/66f4cb0ce52efbd2c8d281d53938f1873a03e8bf
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-11-27 (Fri, 27 Nov 2015)

  Changed paths:
    M test/test_CMSSM_database.cpp

  Log Message:
  -----------
  increase test precision on a_muon

because a_muon is tiny by definition


  Commit: d4d6f128dc08aecb632a0d7428ef3f9acfb5c096
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d4d6f128dc08aecb632a0d7428ef3f9acfb5c096
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-12-10 (Thu, 10 Dec 2015)

  Changed paths:
    A meta/Observables.m

  Log Message:
  -----------
  adding missing Observables.m module

Thanks to Jobst Ziebell


  Commit: faff7c106cab7d2fe1f027e831237a32b90424c3
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/faff7c106cab7d2fe1f027e831237a32b90424c3
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M .gitattributes
    M ChangeLog
    M README
    A addons/GM2Calc/AUTHORS
    A addons/GM2Calc/COPYING
    A addons/GM2Calc/MSSMNoFV_onshell.cpp
    A addons/GM2Calc/MSSMNoFV_onshell.hpp
    A addons/GM2Calc/MSSMNoFV_onshell_mass_eigenstates.cpp
    A addons/GM2Calc/MSSMNoFV_onshell_mass_eigenstates.hpp
    A addons/GM2Calc/MSSMNoFV_onshell_physical.cpp
    A addons/GM2Calc/MSSMNoFV_onshell_physical.hpp
    A addons/GM2Calc/MSSMNoFV_onshell_problems.cpp
    A addons/GM2Calc/MSSMNoFV_onshell_problems.hpp
    A addons/GM2Calc/MSSMNoFV_onshell_soft_parameters.cpp
    A addons/GM2Calc/MSSMNoFV_onshell_soft_parameters.hpp
    A addons/GM2Calc/MSSMNoFV_onshell_susy_parameters.cpp
    A addons/GM2Calc/MSSMNoFV_onshell_susy_parameters.hpp
    A addons/GM2Calc/README
    A addons/GM2Calc/example.gm2
    A addons/GM2Calc/example.slha
    A addons/GM2Calc/ffunctions.cpp
    A addons/GM2Calc/ffunctions.hpp
    A addons/GM2Calc/gm2_1loop.cpp
    A addons/GM2Calc/gm2_1loop.hpp
    A addons/GM2Calc/gm2_2loop.cpp
    A addons/GM2Calc/gm2_2loop.hpp
    A addons/GM2Calc/gm2_error.hpp
    A addons/GM2Calc/gm2_mb.cpp
    A addons/GM2Calc/gm2_mb.hpp
    A addons/GM2Calc/gm2_slha_io.cpp
    A addons/GM2Calc/gm2_slha_io.hpp
    A addons/GM2Calc/gm2_uncertainty.cpp
    A addons/GM2Calc/gm2_uncertainty.hpp
    A addons/GM2Calc/gm2calc.cpp
    A addons/GM2Calc/gm2scan.cpp
    A addons/GM2Calc/module.mk
    R addons/gm2calc/AUTHORS
    R addons/gm2calc/COPYING
    R addons/gm2calc/MSSMNoFV_onshell.cpp
    R addons/gm2calc/MSSMNoFV_onshell.hpp
    R addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.cpp
    R addons/gm2calc/MSSMNoFV_onshell_mass_eigenstates.hpp
    R addons/gm2calc/MSSMNoFV_onshell_physical.cpp
    R addons/gm2calc/MSSMNoFV_onshell_physical.hpp
    R addons/gm2calc/MSSMNoFV_onshell_problems.cpp
    R addons/gm2calc/MSSMNoFV_onshell_problems.hpp
    R addons/gm2calc/MSSMNoFV_onshell_soft_parameters.cpp
    R addons/gm2calc/MSSMNoFV_onshell_soft_parameters.hpp
    R addons/gm2calc/MSSMNoFV_onshell_susy_parameters.cpp
    R addons/gm2calc/MSSMNoFV_onshell_susy_parameters.hpp
    R addons/gm2calc/README
    R addons/gm2calc/example.gm2
    R addons/gm2calc/example.slha
    R addons/gm2calc/ffunctions.cpp
    R addons/gm2calc/ffunctions.hpp
    R addons/gm2calc/gm2_1loop.cpp
    R addons/gm2calc/gm2_1loop.hpp
    R addons/gm2calc/gm2_2loop.cpp
    R addons/gm2calc/gm2_2loop.hpp
    R addons/gm2calc/gm2_error.hpp
    R addons/gm2calc/gm2_mb.cpp
    R addons/gm2calc/gm2_mb.hpp
    R addons/gm2calc/gm2_slha_io.cpp
    R addons/gm2calc/gm2_slha_io.hpp
    R addons/gm2calc/gm2_uncertainty.cpp
    R addons/gm2calc/gm2_uncertainty.hpp
    R addons/gm2calc/gm2calc.cpp
    R addons/gm2calc/gm2scan.cpp
    R addons/gm2calc/module.mk
    M config/Makefile.in
    M config/config.h.in
    M configure
    M examples/tower/MSSMD5O_MSSMRHN_spectrum_generator.hpp
    M examples/tower/run_example.sh
    M install-sarah
    M meta/BetaFunction.m
    M meta/FlexibleSUSY.m
    M meta/LoopMasses.m
    M meta/Observables.m
    A meta/ThreeLoopMSSM.m
    A meta/ThreeLoopMSSM/allgennb.log
    A meta/ThreeLoopMSSM/beta_BMu.m
    A meta/ThreeLoopMSSM/beta_M1.m
    A meta/ThreeLoopMSSM/beta_M2.m
    A meta/ThreeLoopMSSM/beta_M3.m
    A meta/ThreeLoopMSSM/beta_Mu.m
    A meta/ThreeLoopMSSM/beta_TYd.m
    A meta/ThreeLoopMSSM/beta_TYe.m
    A meta/ThreeLoopMSSM/beta_TYu.m
    A meta/ThreeLoopMSSM/beta_Yd.m
    A meta/ThreeLoopMSSM/beta_Ye.m
    A meta/ThreeLoopMSSM/beta_Yu.m
    A meta/ThreeLoopMSSM/beta_g1.m
    A meta/ThreeLoopMSSM/beta_g2.m
    A meta/ThreeLoopMSSM/beta_g3.m
    A meta/ThreeLoopMSSM/beta_mHd2.m
    A meta/ThreeLoopMSSM/beta_mHu2.m
    A meta/ThreeLoopMSSM/beta_md2.m
    A meta/ThreeLoopMSSM/beta_me2.m
    A meta/ThreeLoopMSSM/beta_ml2.m
    A meta/ThreeLoopMSSM/beta_mq2.m
    A meta/ThreeLoopMSSM/beta_mu2.m
    A meta/ThreeLoopMSSM/extract_MSSM_beta_functions_from_hep-ph-0308231.m
    A meta/ThreeLoopMSSM/gamma_SHd.m
    A meta/ThreeLoopMSSM/gamma_SHu.m
    A meta/ThreeLoopMSSM/gamma_SdR.m
    A meta/ThreeLoopMSSM/gamma_SeR.m
    A meta/ThreeLoopMSSM/gamma_SlL.m
    A meta/ThreeLoopMSSM/gamma_SqL.m
    A meta/ThreeLoopMSSM/gamma_SuR.m
    A meta/ThreeLoopMSSM/gloss.ps
    M meta/ThreeLoopSM.m
    M meta/Traces.m
    M meta/Utils.m
    M meta/WriteOut.m
    M meta/module.mk
    M model_files/CMSSM/FlexibleSUSY.m.in
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMMatchedAtMTDRbar/FlexibleSUSY.m.in
    M model_files/CMSSMMatchedAtMTPole/FlexibleSUSY.m.in
    M model_files/CMSSMNoFV/FlexibleSUSY.m.in
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    M model_files/MSSM/FlexibleSUSY.m.in
    M model_files/MSSM/LesHouches.in.MSSM
    M model_files/MSSMNoFV/FlexibleSUSY.m.in
    M model_files/MSSMNoFV/LesHouches.in.MSSMNoFV
    M model_files/MSSMNoFVSLHA2/FlexibleSUSY.m.in
    M model_files/MSSMNoFVSLHA2/LesHouches.in.MSSMNoFVSLHA2
    M model_files/MSSMNoFVatMGUT/FlexibleSUSY.m.in
    M model_files/MSSMNoFVatMGUT/LesHouches.in.MSSMNoFVatMGUT
    M model_files/MSSMatMGUT/FlexibleSUSY.m.in
    M model_files/MSSMatMGUT/LesHouches.in.MSSMatMGUT
    M model_files/NMSSM/FlexibleSUSY.m.in
    M model_files/NMSSMCPV/FlexibleSUSY.m.in
    M model_files/NUHMSSM/FlexibleSUSY.m.in
    M model_files/NUHMSSM/LesHouches.in.NUHMSSM
    M model_files/NUTNMSSM/FlexibleSUSY.m.in
    M model_files/NUTSMSSM/FlexibleSUSY.m.in
    M model_files/SM/LesHouches.in.SM
    M model_files/SMSSM/FlexibleSUSY.m.in
    M model_files/lowMSSM/FlexibleSUSY.m.in
    M model_files/lowMSSM/LesHouches.in.lowMSSM
    M models/SoftsusyMSSM/module.mk
    M models/SoftsusyMSSM/softpars.cpp
    M models/SoftsusyMSSM/susy.cpp
    M models/SoftsusyMSSM/susy.h
    A models/SoftsusyMSSM/tensor.cpp
    A models/SoftsusyMSSM/tensor.h
    M sarah/E6SSM/parameters.m
    M sarah/E6SSM/particles.m
    M src/database.hpp
    M src/eigen_utils.hpp
    M src/error.hpp
    A src/gm2calc_interface.cpp
    A src/gm2calc_interface.hpp
    M src/lowe.cpp
    M src/lowe.h
    M src/module.mk
    M src/numerics.cpp
    M src/numerics2.hpp
    M src/observables.cpp
    M src/observables.hpp
    M src/problems.hpp
    M src/rk.cpp
    M src/rk.hpp
    M src/slha_io.cpp
    M src/two_scale_solver.cpp
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/module.mk.in
    M templates/observables.cpp.in
    M templates/observables.hpp.in
    M templates/run.cpp.in
    M templates/run_cmd_line.cpp.in
    M templates/slha_io.hpp.in
    M templates/two_scale_soft_beta_.cpp.in
    M templates/two_scale_soft_parameters.cpp.in
    M templates/two_scale_susy_parameters.cpp.in
    M test/module.mk
    A test/test_CMSSMNoFV_GM2Calc.sh
    A test/test_CMSSM_3loop_beta.m
    M test/test_CMSSM_database.cpp
    M test/test_CMSSM_model.cpp
    M test/test_HSSUSY_SUSYHD.sh

  Log Message:
  -----------
  Merge branch 'development' into feature-GMM2

Conflicts:
	meta/FlexibleSUSY.m
	meta/Observables.m
	meta/WriteOut.m
	model_files/CMSSMNoFV/FlexibleSUSY.m.in
	model_files/MSSMNoFV/FlexibleSUSY.m.in
	model_files/NMSSM/FlexibleSUSY.m.in
	model_files/NUTNMSSM/FlexibleSUSY.m.in
	model_files/SM/LesHouches.in.SM
	src/observables.cpp
	src/observables.hpp
	templates/observables.cpp.in
	templates/observables.hpp.in
	templates/run.cpp.in
	templates/run_cmd_line.cpp.in
	templates/slha_io.hpp.in
	test/test_CMSSM_database.cpp


  Commit: 381f822546d4f4dae7d5b52102a082749365f3ab
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/381f822546d4f4dae7d5b52102a082749365f3ab
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M meta/Observables.m
    M templates/observables.cpp.in

  Log Message:
  -----------
  prefix namespace explicitly

for clarity and in order to avoid naming conflicts if further function
calls are added.


  Commit: c681681b5914789e652d5ad96e0d4385c405ca6f
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c681681b5914789e652d5ad96e0d4385c405ca6f
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M meta/Observables.m

  Log Message:
  -----------
  no initialization if GM2Calc is not used


  Commit: 0e51d882529fc3c3b052e071fa813b60594c5bd0
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/0e51d882529fc3c3b052e071fa813b60594c5bd0
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-12-23 (Wed, 23 Dec 2015)

  Changed paths:
    M meta/WriteOut.m

  Log Message:
  -----------
  add used loop order to observables comments


  Commit: c8f033b5bf833c47280b3c3b12e9daf6b372d0fa
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c8f033b5bf833c47280b3c3b12e9daf6b372d0fa
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M .gitattributes
    M .gitignore
    M AUTHORS
    M BUGS
    M ChangeLog
    M README
    M TODO
    M addons/GM2Calc/MSSMNoFV_onshell.cpp
    M addons/GM2Calc/MSSMNoFV_onshell.hpp
    M addons/GM2Calc/ffunctions.cpp
    M addons/GM2Calc/ffunctions.hpp
    M addons/GM2Calc/gm2_1loop.cpp
    M addons/GM2Calc/gm2_2loop.cpp
    M addons/GM2Calc/gm2_mb.cpp
    M addons/GM2Calc/gm2_uncertainty.cpp
    M addons/GM2Calc/gm2_uncertainty.hpp
    M addons/GM2Calc/gm2calc.cpp
    M addons/GM2Calc/gm2scan.cpp
    M addons/GM2Calc/module.mk
    A addons/test_call_tsil/call_tsil.c
    A addons/test_call_tsil/call_tsil.h
    A addons/test_call_tsil/call_tsil.hpp
    A addons/test_call_tsil/call_tsil_cpp.cpp
    A addons/test_call_tsil/module.mk
    A addons/test_call_tsil/run.cpp
    M config/Makefile.customized-betas.in
    M config/Makefile.in
    M config/Makefile.standalone.in
    M config/Makefile.tower.in
    M config/config.h.in
    M config/depgen.cpp
    M config/flexiblesusy-config.in
    M config/install_stripped.sh
    A config/mathematica_include_paths.sh
    M config/module.mk
    R config/print_slha_block.awk
    R config/remove_slha_block.awk
    M configure
    M createmodel
    M doc/Doxyfile
    A doc/FlexibleEFTHiggs.dox
    A doc/addons.dox
    A doc/building.dox
    A doc/documentation.dox
    M doc/flexiblesusy-paper.tex
    A doc/hssusy.dox
    A doc/images/FS-models.xcf
    A doc/images/FS.xcf
    A doc/images/Mh_Xt.png
    A doc/install.dox
    A doc/librarylink.dox
    M doc/mainpage.dox.in
    A doc/meta_code.dox
    M doc/model_file.dox
    M doc/module.mk
    A doc/package.dox
    M doc/release
    A doc/slha_input.dox
    A doc/utilities.dox
    M examples/customized-betas/LesHouches.in.MSSMcbs
    M examples/module.mk
    M examples/tower/LesHouches.in.tower
    M fflite/module.mk
    M install-sarah
    M legacy/diagonalization.cpp
    M legacy/module.mk
    M meta/AnomalousDimension.m
    M meta/BetaFunction.m
    M meta/CConversion.m
    M meta/Constraint.m
    M meta/EWSB.m
    A meta/EffectiveCouplings.m
    A meta/FSMathLink.m
    A meta/FlexibleEFTHiggsMatching.m
    M meta/FlexibleSUSY.m
    A meta/LoopFunctions.m
    M meta/LoopMasses.m
    A meta/MSSM/BDSZHiggs.m
    A meta/MSSM/allgennb.log
    A meta/MSSM/beta_BMu.m
    A meta/MSSM/beta_M1.m
    A meta/MSSM/beta_M2.m
    A meta/MSSM/beta_M3.m
    A meta/MSSM/beta_Mu.m
    A meta/MSSM/beta_TYd.m
    A meta/MSSM/beta_TYe.m
    A meta/MSSM/beta_TYu.m
    A meta/MSSM/beta_Yd.m
    A meta/MSSM/beta_Ye.m
    A meta/MSSM/beta_Yu.m
    A meta/MSSM/beta_g1.m
    A meta/MSSM/beta_g2.m
    A meta/MSSM/beta_g3.m
    A meta/MSSM/beta_mHd2.m
    A meta/MSSM/beta_mHu2.m
    A meta/MSSM/beta_md2.m
    A meta/MSSM/beta_me2.m
    A meta/MSSM/beta_ml2.m
    A meta/MSSM/beta_mq2.m
    A meta/MSSM/beta_mu2.m
    A meta/MSSM/extract_MSSM_beta_functions_from_hep-ph-0308231.m
    A meta/MSSM/gamma_SHd.m
    A meta/MSSM/gamma_SHu.m
    A meta/MSSM/gamma_SdR.m
    A meta/MSSM/gamma_SeR.m
    A meta/MSSM/gamma_SlL.m
    A meta/MSSM/gamma_SqL.m
    A meta/MSSM/gamma_SuR.m
    A meta/MSSM/gloss.ps
    M meta/Observables.m
    M meta/Parameters.m
    A meta/RGIntegrator.m
    A meta/ReadSLHA.m
    A meta/SM/beta_g1.m
    A meta/SM/beta_g2.m
    A meta/SM/beta_g3.m
    A meta/SM/beta_gb.m
    A meta/SM/beta_gt.m
    A meta/SM/beta_gtau.m
    A meta/SM/beta_lambda.m
    A meta/SM/beta_m2.m
    A meta/SM/beta_m2_1303.4364.m
    A meta/SM/extract_SM_beta_functions_from_SUSYHD.m
    A meta/SM/extract_SM_beta_functions_m2_from_1303.4364.m
    M meta/SelfEnergies.m
    A meta/THDM/Thresholds_1L_full.m
    M meta/TestSuite.m
    M meta/ThreeLoopMSSM.m
    R meta/ThreeLoopMSSM/allgennb.log
    R meta/ThreeLoopMSSM/beta_BMu.m
    R meta/ThreeLoopMSSM/beta_M1.m
    R meta/ThreeLoopMSSM/beta_M2.m
    R meta/ThreeLoopMSSM/beta_M3.m
    R meta/ThreeLoopMSSM/beta_Mu.m
    R meta/ThreeLoopMSSM/beta_TYd.m
    R meta/ThreeLoopMSSM/beta_TYe.m
    R meta/ThreeLoopMSSM/beta_TYu.m
    R meta/ThreeLoopMSSM/beta_Yd.m
    R meta/ThreeLoopMSSM/beta_Ye.m
    R meta/ThreeLoopMSSM/beta_Yu.m
    R meta/ThreeLoopMSSM/beta_g1.m
    R meta/ThreeLoopMSSM/beta_g2.m
    R meta/ThreeLoopMSSM/beta_g3.m
    R meta/ThreeLoopMSSM/beta_mHd2.m
    R meta/ThreeLoopMSSM/beta_mHu2.m
    R meta/ThreeLoopMSSM/beta_md2.m
    R meta/ThreeLoopMSSM/beta_me2.m
    R meta/ThreeLoopMSSM/beta_ml2.m
    R meta/ThreeLoopMSSM/beta_mq2.m
    R meta/ThreeLoopMSSM/beta_mu2.m
    R meta/ThreeLoopMSSM/extract_MSSM_beta_functions_from_hep-ph-0308231.m
    R meta/ThreeLoopMSSM/gamma_SHd.m
    R meta/ThreeLoopMSSM/gamma_SHu.m
    R meta/ThreeLoopMSSM/gamma_SdR.m
    R meta/ThreeLoopMSSM/gamma_SeR.m
    R meta/ThreeLoopMSSM/gamma_SlL.m
    R meta/ThreeLoopMSSM/gamma_SqL.m
    R meta/ThreeLoopMSSM/gamma_SuR.m
    R meta/ThreeLoopMSSM/gloss.ps
    A meta/ThreeLoopQCD.m
    M meta/ThreeLoopSM.m
    R meta/ThreeLoopSM/beta_g1.m
    R meta/ThreeLoopSM/beta_g2.m
    R meta/ThreeLoopSM/beta_g3.m
    R meta/ThreeLoopSM/beta_gb.m
    R meta/ThreeLoopSM/beta_gt.m
    R meta/ThreeLoopSM/beta_gtau.m
    R meta/ThreeLoopSM/beta_lambda.m
    R meta/ThreeLoopSM/beta_m2.m
    R meta/ThreeLoopSM/beta_m2_1303.4364.m
    R meta/ThreeLoopSM/extract_SM_beta_functions_from_SUSYHD.m
    R meta/ThreeLoopSM/extract_SM_beta_functions_m2_from_1303.4364.m
    M meta/ThresholdCorrections.m
    M meta/TreeMasses.m
    R meta/TwoLoop.m
    A meta/TwoLoopMSSM.m
    A meta/TwoLoopQCD.m
    M meta/Utils.m
    M meta/Vertices.m
    M meta/WriteOut.m
    M meta/module.mk
    A model_files/BLSM/FlexibleSUSY.m.in
    A model_files/BLSM/LesHouches.in.BLSM
    A model_files/BLSMlightZp/FlexibleSUSY.m.in
    A model_files/BLSMlightZp/LesHouches.in.BLSMlightZp
    A model_files/BetaSM/FlexibleSUSY.m.in
    M model_files/CMSSM/FlexibleSUSY.m.in
    M model_files/CMSSM/LesHouches.in.CMSSM
    M model_files/CMSSMCKM/FlexibleSUSY.m.in
    M model_files/CMSSMCPV/FlexibleSUSY.m.in
    M model_files/CMSSMCPV/LesHouches.in.CMSSMCPV
    M model_files/CMSSMNoFV/FlexibleSUSY.m.in
    M model_files/CMSSMNoFV/LesHouches.in.CMSSMNoFV
    A model_files/CMSSMtower/FlexibleSUSY.m.in
    A model_files/CMSSMtower/LesHouches.in.CMSSMtower
    A model_files/DiracGauginos/FlexibleSUSY.m.in
    A model_files/DiracGauginos/LesHouches.in.DiracGauginos
    M model_files/E6SSM/LesHouches.in.E6SSM
    A model_files/E6SSMtower/FlexibleSUSY.m.in
    A model_files/E6SSMtower/LesHouches.in.E6SSMtower
    A model_files/HGTHDMIIMSSMBC/FlexibleSUSY.m.in
    A model_files/HGTHDMIIMSSMBC/LesHouches.in.HGTHDMIIMSSMBC
    A model_files/HGTHDMIIMSSMBCApprox/FlexibleSUSY.m.in
    A model_files/HGTHDMIIMSSMBCApprox/LesHouches.in.HGTHDMIIMSSMBCApprox
    A model_files/HGTHDMIIMSSMBCFull/FlexibleSUSY.m.in
    A model_files/HGTHDMIIMSSMBCFull/LesHouches.in.HGTHDMIIMSSMBCFull
    M model_files/HSSUSY/FlexibleSUSY.m.in
    M model_files/HSSUSY/LesHouches.in.HSSUSY
    A model_files/HTHDMIIMSSMBC/FlexibleSUSY.m.in
    A model_files/HTHDMIIMSSMBC/LesHouches.in.HTHDMIIMSSMBC
    M model_files/LHInputMSSM/LesHouches.in.LHInputMSSM
    A model_files/MDM/FlexibleSUSY.m.in
    A model_files/MDM/LesHouches.in.MDM
    M model_files/MRSSM/FlexibleSUSY.m.in
    M model_files/MRSSM/LesHouches.in.MRSSM
    A model_files/MRSSM2/FlexibleSUSY.m.in
    A model_files/MRSSM2/LesHouches.in.MRSSM2
    A model_files/MRSSMtower/FlexibleSUSY.m.in
    A model_files/MRSSMtower/LesHouches.in.MRSSMtower
    M model_files/MSSM/FlexibleSUSY.m.in
    M model_files/MSSM/LesHouches.in.MSSM
    A model_files/MSSMMuBMu/FlexibleSUSY.m.in
    A model_files/MSSMMuBMu/LesHouches.in.MSSMMuBMu
    M model_files/MSSMNoFV/FlexibleSUSY.m.in
    M model_files/MSSMNoFV/LesHouches.in.MSSMNoFV
    M model_files/MSSMNoFVSLHA2/LesHouches.in.MSSMNoFVSLHA2
    M model_files/MSSMNoFVatMGUT/LesHouches.in.MSSMNoFVatMGUT
    A model_files/MSSMNoFVtower/FlexibleSUSY.m.in
    A model_files/MSSMNoFVtower/LesHouches.in.MSSMNoFVtower
    M model_files/MSSMatMGUT/LesHouches.in.MSSMatMGUT
    A model_files/MSSMtower/FlexibleSUSY.m.in
    A model_files/MSSMtower/LesHouches.in.MSSMtower
    M model_files/NMSSM/FlexibleSUSY.m.in
    M model_files/NMSSM/LesHouches.in.NMSSM
    M model_files/NMSSMCPV/FlexibleSUSY.m.in
    M model_files/NMSSMCPV/LesHouches.in.NMSSMCPV
    A model_files/NMSSMtower/FlexibleSUSY.m.in
    A model_files/NMSSMtower/LesHouches.in.NMSSMtower
    A model_files/NMSSMtower/LesHouches.in.NMSSMtower_1507.05093_TP3
    M model_files/NUHMSSM/LesHouches.in.NUHMSSM
    A model_files/NUHMSSMalt/FlexibleSUSY.m.in
    A model_files/NUHMSSMalt/LesHouches.in.NUHMSSMalt
    A model_files/NUHMSSMalttower/FlexibleSUSY.m.in
    A model_files/NUHMSSMalttower/LesHouches.in.NUHMSSMalttower
    M model_files/NUTNMSSM/FlexibleSUSY.m.in
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP1
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP2
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_1308.1333_BP3
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_GTP1
    M model_files/NUTNMSSM/LesHouches.in.NUTNMSSM_GTP2
    M model_files/NUTSMSSM/FlexibleSUSY.m.in
    M model_files/NUTSMSSM/LesHouches.in.NUTSMSSM
    A model_files/NoInputParameters/FlexibleSUSY.m.in
    M model_files/SM/FlexibleSUSY.m.in
    M model_files/SM/LesHouches.in.SM
    M model_files/SMHighPrecision/FlexibleSUSY.m.in
    M model_files/SMHighScale/LesHouches.in.SMHighScale
    A model_files/SMNoRGEs/FlexibleSUSY.m.in
    M model_files/SMSSM/FlexibleSUSY.m.in
    M model_files/SMSSM/LesHouches.in.SMSSM
    A model_files/SMtower/FlexibleSUSY.m.in
    A model_files/SMtower/LesHouches.in.SMtower
    M model_files/SSM/FlexibleSUSY.m.in
    M model_files/SSM/LesHouches.in.SSM
    M model_files/SplitMSSM/LesHouches.in.SplitMSSM
    M model_files/THDMII/FlexibleSUSY.m.in
    M model_files/THDMII/LesHouches.in.THDMII
    A model_files/THDMIIMSSMBC/FlexibleSUSY.m.in
    A model_files/THDMIIMSSMBC/LesHouches.in.THDMIIMSSMBC
    A model_files/THDMIIMSSMBCApprox/FlexibleSUSY.m.in
    A model_files/THDMIIMSSMBCApprox/LesHouches.in.THDMIIMSSMBCApprox
    A model_files/THDMIIMSSMBCFull/FlexibleSUSY.m.in
    A model_files/THDMIIMSSMBCFull/LesHouches.in.THDMIIMSSMBCFull
    M model_files/TMSSM/FlexibleSUSY.m.in
    A model_files/TensorCoupling/FlexibleSUSY.m.in
    A model_files/TensorCoupling/LesHouches.in.TensorCoupling
    A model_files/U1xMSSM3G/FlexibleSUSY.m.in
    A model_files/U1xMSSM3G/LesHouches.in.U1xMSSM3G
    M model_files/UMSSM/FlexibleSUSY.m.in
    M model_files/UMSSM/LesHouches.in.UMSSM
    M model_files/YukawaCMSSM/FlexibleSUSY.m.in
    M model_files/cCMSSM/FlexibleSUSY.m.in
    M model_files/cCMSSM/LesHouches.in.cCMSSM
    M model_files/complexMSSM/FlexibleSUSY.m.in
    M model_files/complexMSSM/LesHouches.in.complexMSSM
    M model_files/lowMSSM/FlexibleSUSY.m.in
    M model_files/lowMSSM/LesHouches.in.lowMSSM
    M model_files/lowNMSSM/FlexibleSUSY.m.in
    M model_files/lowNMSSM/LesHouches.in.TP1
    M model_files/lowNMSSM/LesHouches.in.TP2
    M model_files/lowNMSSM/LesHouches.in.TP3
    M model_files/lowNMSSM/LesHouches.in.TP4
    M model_files/lowNMSSM/LesHouches.in.TP5
    M model_files/lowNMSSM/LesHouches.in.TP6
    M model_files/lowNMSSM/LesHouches.in.lowNMSSM
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP1
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP2
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP3
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP4
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP5
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.TP6
    M model_files/lowNMSSMTanBetaAtMZ/LesHouches.in.lowNMSSMTanBetaAtMZ
    M model_files/minMSSM/FlexibleSUSY.m.in
    M model_files/munuSSM/FlexibleSUSY.m.in
    M model_files/munuSSM/LesHouches.in.munuSSM
    M model_files/rootMSSM/FlexibleSUSY.m.in
    M models/SoftsusyFlavourMSSM/module.mk
    M models/SoftsusyMSSM/module.mk
    M models/SoftsusyNMSSM/module.mk
    M models/fmssm/module.mk
    M models/fmssmn/module.mk
    M models/sm/module.mk
    M models/smcw/module.mk
    M release/generate-models.sh
    A sarah/B-L-SM-lightZp/B-L-SM-lightZp.m
    A sarah/B-L-SM-lightZp/parameters.m
    A sarah/B-L-SM-lightZp/particles.m
    M sarah/E6SSM/parameters.m
    A sarah/HGTHDM-II/HGTHDM-II.m
    A sarah/HGTHDM-II/parameters.m
    A sarah/HGTHDM-II/particles.m
    A sarah/HGTHDM/HGTHDM.m
    A sarah/HGTHDM/parameters.m
    A sarah/HGTHDM/particles.m
    A sarah/HGTHDMw/HGTHDMw.m
    A sarah/HGTHDMw/parameters.m
    A sarah/HGTHDMw/particles.m
    A sarah/HTHDM-II/HTHDM-II.m
    A sarah/HTHDM-II/parameters.m
    A sarah/HTHDM-II/particles.m
    A sarah/HTHDM/HTHDM.m
    A sarah/HTHDM/parameters.m
    A sarah/HTHDM/particles.m
    M sarah/InertMSSM/particles.m
    A sarah/MDM/MDM.m
    A sarah/MDM/parameters.m
    A sarah/MDM/particles.m
    M sarah/MSSMNoEWVEVs/parameters.m
    M sarah/NSM/parameters.m
    A sarah/THDM-II/THDM-II.m
    A sarah/THDM-II/parameters.m
    A sarah/THDM-II/particles.m
    A sarah/THDM/THDM.m
    A sarah/THDM/parameters.m
    A sarah/THDM/particles.m
    A sarah/TensorCoupling/TensorCoupling.m
    A sarah/TensorCoupling/parameters.m
    A sarah/TensorCoupling/particles.m
    M slhaea/module.mk
    M slhaea/slhaea.h
    M src/betafunction.cpp
    M src/coupling_monitor.hpp
    M src/database.cpp
    M src/database.hpp
    M src/derivative.hpp
    M src/dilog.cpp
    A src/effective_couplings.cpp
    A src/effective_couplings.hpp
    A src/eigen_tensor.hpp
    M src/eigen_utils.hpp
    M src/error.hpp
    M src/ew_input.hpp
    M src/ewsb_solver.hpp
    M src/fixed_point_iterator.hpp
    M src/gsl_utils.cpp
    M src/gsl_utils.hpp
    A src/gsl_vector.cpp
    A src/gsl_vector.hpp
    M src/linalg.cpp
    M src/linalg.h
    M src/linalg2.hpp
    M src/lowe.cpp
    M src/lowe.h
    A src/mathlink_utils.hpp
    M src/minimizer.hpp
    M src/module.mk
    A src/mssm_twoloophiggs.cpp
    R src/mssm_twoloophiggs.f
    M src/mssm_twoloophiggs.h
    A src/mssm_twoloophiggs.hpp
    A src/mssm_twoloophiggs_impl.f
    M src/mycomplex.h
    M src/nmssm2loop.h
    A src/nmssm_twoloophiggs.cpp
    R src/nmssm_twoloophiggs.h
    A src/nmssm_twoloophiggs.hpp
    M src/numerics.cpp
    M src/numerics.h
    M src/numerics2.hpp
    R src/observables.cpp
    R src/observables.hpp
    A src/parallel.hpp
    A src/physical_input.cpp
    A src/physical_input.hpp
    M src/problems.hpp
    M src/root_finder.hpp
    M src/slha_io.cpp
    M src/slha_io.hpp
    M src/sm_twoloophiggs.cpp
    M src/sm_twoloophiggs.hpp
    M src/spectrum_generator_settings.cpp
    M src/spectrum_generator_settings.hpp
    A src/splitmssm_thresholds.cpp
    A src/splitmssm_thresholds.hpp
    A src/standard_model.cpp
    A src/standard_model.hpp
    A src/standard_model_effective_couplings.cpp
    A src/standard_model_effective_couplings.hpp
    A src/standard_model_low_scale_constraint.hpp
    A src/standard_model_physical.cpp
    A src/standard_model_physical.hpp
    A src/standard_model_two_scale_low_scale_constraint.cpp
    A src/standard_model_two_scale_low_scale_constraint.hpp
    A src/standard_model_two_scale_model.cpp
    A src/standard_model_two_scale_model.hpp
    M src/threshold_loop_functions.cpp
    M src/threshold_loop_functions.hpp
    M src/two_loop_corrections.hpp
    M src/two_scale_composite_convergence_tester.cpp
    M src/two_scale_model.hpp
    M src/two_scale_solver.hpp
    M src/weinberg_angle.cpp
    M src/wrappers.cpp
    M src/wrappers.hpp
    M src/xpr-base.h
    A templates/LesHouches.in
    A templates/effective_couplings.cpp.in
    A templates/effective_couplings.hpp.in
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/info.hpp.in
    A templates/librarylink.cpp.in
    A templates/librarylink.m.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/mass_eigenstates.cpp.in
    M templates/mass_eigenstates.hpp.in
    M templates/module.addon.mk.in
    M templates/module.mk
    M templates/module.mk.in
    M templates/observables.cpp.in
    M templates/observables.hpp.in
    M templates/run.cpp.in
    A templates/run.m.in
    M templates/run_cmd_line.cpp.in
    M templates/scan.cpp.in
    M templates/slha_io.cpp.in
    M templates/slha_io.hpp.in
    M templates/spectrum_generator_interface.hpp.in
    A templates/standard_model_high_scale_spectrum_generator.hpp.in
    A templates/standard_model_low_scale_spectrum_generator.hpp.in
    A templates/standard_model_matching.cpp.in
    A templates/standard_model_matching.hpp.in
    A templates/standard_model_two_scale_initial_guesser.cpp.in
    A templates/standard_model_two_scale_initial_guesser.hpp.in
    A templates/standard_model_two_scale_initial_guesser_low_scale_model.cpp.in
    A templates/standard_model_two_scale_initial_guesser_low_scale_model.hpp.in
    A templates/standard_model_two_scale_matching.cpp.in
    A templates/standard_model_two_scale_matching.hpp.in
    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_low_scale_constraint.hpp.in
    M templates/two_scale_model.cpp.in
    M templates/two_scale_model.hpp.in
    M templates/two_scale_model_slha.cpp.in
    M templates/two_scale_model_slha.hpp.in
    M templates/two_scale_soft_parameters.cpp.in
    M templates/two_scale_soft_parameters.hpp.in
    M templates/two_scale_susy_parameters.cpp.in
    M templates/two_scale_susy_parameters.hpp.in
    M templates/two_scale_susy_scale_constraint.cpp.in
    M templates/two_scale_susy_scale_constraint.hpp.in
    M templates/utilities.cpp.in
    M templates/utilities.hpp.in
    A test/depgen/comment.cpp
    A test/depgen/comment.hpp
    M test/module.mk
    M test/test.h
    M test/test.sh
    A test/test_BLSMlightZp_ZZp_mixing.sh
    M test/test_CConversion.m
    M test/test_CMSSMCPV_spectrum.sh
    M test/test_CMSSMCPV_wrong_higgs_state.in.spc
    M test/test_CMSSMMassWInput_spectrum.cpp
    M test/test_CMSSMNoFV_GM2Calc.sh
    M test/test_CMSSMNoFV_two_loop_spectrum.cpp
    M test/test_CMSSM_benchmark.cpp
    M test/test_CMSSM_benchmark.in.spc.in
    M test/test_CMSSM_database.cpp
    M test/test_CMSSM_gluino.spc.in
    M test/test_CMSSM_higgs_iteration.cpp
    M test/test_CMSSM_info.cpp
    M test/test_CMSSM_initial_guesser.cpp
    A test/test_CMSSM_librarylink.in.spc
    A test/test_CMSSM_librarylink.m
    A test/test_CMSSM_librarylink_parallel.m
    M test/test_CMSSM_model.cpp
    M test/test_CMSSM_slha.cpp
    M test/test_CMSSM_slha_doubled_blocks.spc.in
    M test/test_CMSSM_slha_output.cpp
    M test/test_CMSSM_slha_output.in.spc
    M test/test_CMSSM_spectrum.cpp
    M test/test_CMSSM_susy_scale_constraint.cpp
    M test/test_CMSSM_two_loop_spectrum.cpp
    M test/test_Constraint.m
    M test/test_E6SSM_nan.in.spc
    A test/test_HGTHDM_threshold_corrections_scale_invariance.m
    M test/test_HSSUSY_SUSYHD.sh
    M test/test_HSSUSY_SUSYHD_msq_m3_degenerate.in.spc
    M test/test_HSSUSY_SUSYHD_msq_msu_m3_degenerate.in.spc
    M test/test_HSSUSY_SUSYHD_msq_msu_m3_msusy_degenerate.in.spc
    M test/test_HSSUSY_SUSYHD_msu_m3_degenerate.in.spc
    M test/test_HSSUSY_SUSYHD_nondegenerate.in.spc
    A test/test_HSSUSY_thresholds.m
    A test/test_LoopFunctions.m
    M test/test_MSSMNoFV_onshell.cpp
    A test/test_MSSMNoFVtower.sh
    A test/test_MSSM_2L_analytic.m
    A test/test_MSSMtower.sh
    A test/test_MSSMtower_librarylink.sh
    M test/test_NMSSM.hpp
    M test/test_NMSSM_benchmark.in.spc.in
    M test/test_NMSSM_ewsb.cpp
    M test/test_NMSSM_initial_guesser.cpp
    M test/test_NMSSM_low_scale_constraint.cpp
    M test/test_NMSSM_self_energies.cpp
    M test/test_NMSSM_slha_output.cpp
    M test/test_NMSSM_slha_output.in.spc
    M test/test_NMSSM_spectrum.cpp
    M test/test_NMSSM_susy_scale_constraint.cpp
    A test/test_NMSSMtower.sh
    A test/test_NUHMSSMalttower.sh
    M test/test_NUTNMSSM_spectrum.cpp
    A test/test_RGIntegrator.m
    A test/test_ReadSLHA.m
    M test/test_SMHighPrecision_two_loop_spectrum.cpp
    M test/test_SMSSM_ewsb.cpp
    A test/test_SM_0L_RGEs.in.spc
    A test/test_SM_effective_couplings.cpp
    A test/test_SM_three_loop_spectrum.cpp
    M test/test_SM_two_loop_spectrum.cpp
    A test/test_SMtower.sh
    A test/test_THDMIIMSSMBCFull_approximation.sh
    A test/test_THDM_threshold_corrections.m
    A test/test_THDM_threshold_corrections_gauge.m
    A test/test_THDM_threshold_corrections_scale_invariance.m
    A test/test_ThreeLoopQCD.m
    M test/test_betafunction.cpp
    M test/test_cCMSSM.sh
    M test/test_depgen.sh
    M test/test_derivative.cpp
    A test/test_effective_couplings.cpp
    M test/test_ewsb_solver.cpp
    M test/test_fixed_point_iterator.cpp
    A test/test_flexiblesusy-config.sh
    M test/test_gm2calc.cpp
    A test/test_gsl_vector.cpp
    M test/test_linalg2.cpp
    M test/test_lowMSSM.sh
    M test/test_lowNMSSM_goldstone_tachyon.in.spc
    M test/test_lowNMSSM_pseudoscalar.in.spc
    M test/test_lowe.cpp
    M test/test_minimizer.cpp
    M test/test_numerics.cpp
    M test/test_pv.cpp
    M test/test_root_finder.cpp
    M test/test_run_all_spectrum_generators.sh
    M test/test_sfermions.cpp
    A test/test_threshold_loop_functions.cpp
    M test/test_two_scale_mssm_solver.cpp
    M test/test_wrappers.cpp
    A utils/convert_SPheno_to_FlexibleSUSY.m
    A utils/install-bash_completions.bash
    M utils/load-FlexibleSUSY.m
    A utils/print_slha_block.awk
    A utils/print_slha_block_entry.awk
    A utils/remove_slha_block.awk
    M utils/scan-slha.sh

  Log Message:
  -----------
  Merge branch 'feature-2.0' into feature-GMM2

Conflicts:
	meta/FlexibleSUSY.m
	meta/Observables.m
	meta/WriteOut.m
	meta/module.mk
	model_files/CMSSM/FlexibleSUSY.m.in
	model_files/MSSMNoFV/FlexibleSUSY.m.in
	model_files/NMSSM/FlexibleSUSY.m.in
	model_files/NUTNMSSM/FlexibleSUSY.m.in
	src/numerics2.hpp
	src/observables.cpp
	src/parallel.hpp
	templates/module.mk
	templates/module.mk.in
	templates/observables.cpp.in
	templates/slha_io.hpp.in
	test/module.mk
	test/test_CMSSM_database.cpp


  Commit: 35a7de64f573e44a791681f5c1bd04533d0670d2
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/35a7de64f573e44a791681f5c1bd04533d0670d2
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M meta/GMuonMinus2.m
    M meta/Observables.m
    M templates/a_muon.cpp.in
    M templates/a_muon.hpp.in
    M test/test_SM_gmm2.cpp

  Log Message:
  -----------
  better naming of g-2 namespace


  Commit: dc40c464479d7dec443e646b97cdc81835c01f2a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/dc40c464479d7dec443e646b97cdc81835c01f2a
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M meta/Observables.m
    M templates/a_muon.cpp.in
    M templates/a_muon.hpp.in
    M test/test_SM_gmm2.cpp

  Log Message:
  -----------
  name calculation function after namespace


  Commit: f703d0b7a9892c3f2c2a18bf0f3b60122f1a0d52
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f703d0b7a9892c3f2c2a18bf0f3b60122f1a0d52
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M model_files/SM/LesHouches.in.SM

  Log Message:
  -----------
  remove redundant input blocks


  Commit: 5dc165fc42d9a7325ef968adf21abe705b973b04
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/5dc165fc42d9a7325ef968adf21abe705b973b04
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M meta/FlexibleSUSY.m

  Log Message:
  -----------
  restore original indentation


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/f48981731ed2...5dc165fc42d9


More information about the Flexiblesusy-commits mailing list