|
[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] d7e0b3: remove input parameter struct member from the cons...GitHub noreply at github.comSat Mar 28 10:27:40 GMT 2015
Branch: refs/heads/feature-complex-parameters Home: https://github.com/FlexibleSUSY/FlexibleSUSY Commit: d7e0b3cf92dd2a2f0b1015d16c7d140fd29f17f0 https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d7e0b3cf92dd2a2f0b1015d16c7d140fd29f17f0 Author: Alexander Voigt <Alexander.Voigt at desy.de> Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M examples/customized-betas/MSSMcbs_spectrum_generator.hpp M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp M examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp M templates/low_scale_spectrum_generator.hpp.in M templates/spectrum_generator.hpp.in M templates/two_scale_high_scale_constraint.cpp.in M templates/two_scale_high_scale_constraint.hpp.in M templates/two_scale_low_scale_constraint.cpp.in M templates/two_scale_low_scale_constraint.hpp.in M templates/two_scale_susy_scale_constraint.cpp.in M templates/two_scale_susy_scale_constraint.hpp.in M test/test_CMSSMNoFV_low_scale_constraint.cpp M test/test_CMSSM_high_scale_constraint.cpp M test/test_CMSSM_initial_guesser.cpp M test/test_CMSSM_low_scale_constraint.cpp M test/test_CMSSM_spectrum.cpp M test/test_CMSSM_susy_scale_constraint.cpp M test/test_NMSSM_high_scale_constraint.cpp M test/test_NMSSM_initial_guesser.cpp M test/test_NMSSM_low_scale_constraint.cpp M test/test_NMSSM_spectrum.cpp M test/test_NMSSM_susy_scale_constraint.cpp M test/test_SM_low_scale_constraint.cpp Log Message: ----------- remove input parameter struct member from the constraints Reason: The input parameter struct is a member of the model class. The reaons for this is, that charges might in principle be input (in the UMSSM for example) or the sign of mu. However, we should avoid redundancy and therefore remove the additional input parameter struct from all constraints. Commit: 355799f1407215bbfc810f9bfee5eb3f2b6e0e2f https://github.com/FlexibleSUSY/FlexibleSUSY/commit/355799f1407215bbfc810f9bfee5eb3f2b6e0e2f Author: Alexander Voigt <Alexander.Voigt at desy.de> Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.cpp M examples/customized-betas/MSSMcbs_two_scale_initial_guesser.hpp M templates/low_scale_spectrum_generator.hpp.in M templates/spectrum_generator.hpp.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 test/test_CMSSM_initial_guesser.cpp M test/test_CMSSM_spectrum.cpp M test/test_NMSSM_initial_guesser.cpp M test/test_NMSSM_spectrum.cpp Log Message: ----------- remove local copy of input parameter struct to avoid redundance Reaons: Same as previous commit. Commit: cea4dc0fb3c6d48ba58b9e7596e339e1dfb05cd4 https://github.com/FlexibleSUSY/FlexibleSUSY/commit/cea4dc0fb3c6d48ba58b9e7596e339e1dfb05cd4 Author: Alexander Voigt <Alexander.Voigt at desy.de> Date: 2015-03-28 (Sat, 28 Mar 2015) Changed paths: 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 meta/Constraint.m M meta/FlexibleSUSY.m M meta/Parameters.m M templates/low_scale_spectrum_generator.hpp.in M templates/spectrum_generator.hpp.in M templates/two_scale_high_scale_constraint.cpp.in M templates/two_scale_high_scale_constraint.hpp.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_susy_scale_constraint.cpp.in M templates/two_scale_susy_scale_constraint.hpp.in M test/test_CMSSMNoFV_low_scale_constraint.cpp M test/test_CMSSM_high_scale_constraint.cpp M test/test_CMSSM_initial_guesser.cpp M test/test_CMSSM_low_scale_constraint.cpp M test/test_CMSSM_spectrum.cpp M test/test_CMSSM_susy_scale_constraint.cpp M test/test_NMSSM_high_scale_constraint.cpp M test/test_NMSSM_initial_guesser.cpp M test/test_NMSSM_low_scale_constraint.cpp M test/test_NMSSM_spectrum.cpp M test/test_NMSSM_susy_scale_constraint.cpp M test/test_SM_low_scale_constraint.cpp Log Message: ----------- Merge branch 'development' into feature-complex-parameters Conflicts: templates/two_scale_high_scale_constraint.cpp.in templates/two_scale_low_scale_constraint.cpp.in templates/two_scale_susy_scale_constraint.cpp.in Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/7ff0c2fb8d6a...cea4dc0fb3c6
More information about the Flexiblesusy-commits mailing list |