Skip to content

Commit

Permalink
add explicit softsusy namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Voigt committed Sep 4, 2015
1 parent 6ac8ef4 commit e0be0da
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
4 changes: 2 additions & 2 deletions examples/customized-betas/MSSMcbs_spectrum_generator.hpp
View file
Expand Up @@ -71,7 +71,7 @@ class MSSMcbs_spectrum_generator {
void set_calculate_sm_masses(bool flag) { calculate_sm_masses = flag; }
void set_threshold_corrections_loop_order(unsigned t) { threshold_corrections_loop_order = t; }

void run(const QedQcd& oneset, const CMSSM_input_parameters& input);
void run(const softsusy::QedQcd& oneset, const CMSSM_input_parameters& input);
void write_running_couplings(const std::string& filename = "CMSSM_rge_running.dat") const;
void write_spectrum(const std::string& filename = "CMSSM_spectrum.dat") const;

Expand Down Expand Up @@ -102,7 +102,7 @@ class MSSMcbs_spectrum_generator {
* @param input model input parameters
*/
template <class T>
void MSSMcbs_spectrum_generator<T>::run(const QedQcd& oneset,
void MSSMcbs_spectrum_generator<T>::run(const softsusy::QedQcd& oneset,
const CMSSM_input_parameters& input)
{
model.clear();
Expand Down
6 changes: 4 additions & 2 deletions examples/customized-betas/MSSMcbs_two_scale_initial_guesser.cpp
View file
Expand Up @@ -35,7 +35,7 @@ namespace flexiblesusy {

MSSMcbs_initial_guesser<Two_scale>::MSSMcbs_initial_guesser(
MSSMcbs<Two_scale>* model_,
const QedQcd& oneset_,
const softsusy::QedQcd& oneset_,
const MSSMcbs_low_scale_constraint<Two_scale>& low_constraint_,
const CMSSM_susy_scale_constraint<Two_scale>& susy_constraint_,
const CMSSM_high_scale_constraint<Two_scale>& high_constraint_
Expand Down Expand Up @@ -73,7 +73,9 @@ void MSSMcbs_initial_guesser<Two_scale>::guess()

void MSSMcbs_initial_guesser<Two_scale>::guess_susy_parameters()
{
QedQcd leAtMt(oneset);
using namespace softsusy;

softsusy::QedQcd leAtMt(oneset);
const double MZ = Electroweak_constants::MZ;
const double MW = Electroweak_constants::MW;
const double sinThetaW2 = 1.0 - Sqr(MW / MZ);
Expand Down
4 changes: 2 additions & 2 deletions examples/customized-betas/MSSMcbs_two_scale_initial_guesser.hpp
View file
Expand Up @@ -38,7 +38,7 @@ template<>
class MSSMcbs_initial_guesser<Two_scale> : public Initial_guesser<Two_scale> {
public:
MSSMcbs_initial_guesser(MSSMcbs<Two_scale>*,
const QedQcd&,
const softsusy::QedQcd&,
const MSSMcbs_low_scale_constraint<Two_scale>&,
const CMSSM_susy_scale_constraint<Two_scale>&,
const CMSSM_high_scale_constraint<Two_scale>&);
Expand All @@ -49,7 +49,7 @@ class MSSMcbs_initial_guesser<Two_scale> : public Initial_guesser<Two_scale> {

private:
MSSMcbs<Two_scale>* model;
QedQcd oneset;
softsusy::QedQcd oneset;
double mu_guess;
double mc_guess;
double mt_guess;
Expand Down
32 changes: 16 additions & 16 deletions examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp
View file
Expand Up @@ -56,7 +56,7 @@ MSSMcbs_low_scale_constraint<Two_scale>::MSSMcbs_low_scale_constraint()
}

MSSMcbs_low_scale_constraint<Two_scale>::MSSMcbs_low_scale_constraint(
MSSMcbs<Two_scale>* model_, const QedQcd& oneset_)
MSSMcbs<Two_scale>* model_, const softsusy::QedQcd& oneset_)
: Constraint<Two_scale>()
, model(model_)
, oneset(oneset_)
Expand Down Expand Up @@ -113,7 +113,7 @@ void MSSMcbs_low_scale_constraint<Two_scale>::set_model(Two_scale_model* model_)
model = cast_model<MSSMcbs<Two_scale>*>(model_);
}

void MSSMcbs_low_scale_constraint<Two_scale>::set_sm_parameters(const QedQcd& oneset_)
void MSSMcbs_low_scale_constraint<Two_scale>::set_sm_parameters(const softsusy::QedQcd& oneset_)
{
oneset = oneset_;
}
Expand All @@ -123,7 +123,7 @@ void MSSMcbs_low_scale_constraint<Two_scale>::clear()
scale = 0.;
initial_scale_guess = 0.;
model = NULL;
oneset = QedQcd();
oneset = softsusy::QedQcd();
MZDRbar = 0.;
new_g1 = 0.;
new_g2 = 0.;
Expand Down Expand Up @@ -156,8 +156,8 @@ void MSSMcbs_low_scale_constraint<Two_scale>::calculate_DRbar_gauge_couplings()
" constraint. You need to run the low-energy data set to this"
" scale!");

const double alpha_em = oneset.displayAlpha(ALPHA);
double alpha_s = oneset.displayAlpha(ALPHAS);
const double alpha_em = oneset.displayAlpha(softsusy::ALPHA);
double alpha_s = oneset.displayAlpha(softsusy::ALPHAS);

double delta_alpha_em = 0.;
double alS5DRbar_over_alS5MSbar = 1;
Expand Down Expand Up @@ -320,9 +320,9 @@ void MSSMcbs_low_scale_constraint<Two_scale>::calculate_DRbar_yukawa_couplings()
void MSSMcbs_low_scale_constraint<Two_scale>::calculate_Yu_DRbar()
{
Eigen::Matrix<double,3,3> topDRbar(Eigen::Matrix<double,3,3>::Zero());
topDRbar(0,0) = oneset.displayMass(mUp);
topDRbar(1,1) = oneset.displayMass(mCharm);
topDRbar(2,2) = oneset.displayMass(mTop);
topDRbar(0,0) = oneset.displayMass(softsusy::mUp);
topDRbar(1,1) = oneset.displayMass(softsusy::mCharm);
topDRbar(2,2) = oneset.displayMass(softsusy::mTop);

if (model->get_thresholds())
topDRbar(2,2) = model->calculate_MFu_DRbar(oneset.displayPoleMt(), 2);
Expand All @@ -335,12 +335,12 @@ void MSSMcbs_low_scale_constraint<Two_scale>::calculate_Yu_DRbar()
void MSSMcbs_low_scale_constraint<Two_scale>::calculate_Yd_DRbar()
{
Eigen::Matrix<double,3,3> bottomDRbar(Eigen::Matrix<double,3,3>::Zero());
bottomDRbar(0,0) = oneset.displayMass(mDown);
bottomDRbar(1,1) = oneset.displayMass(mStrange);
bottomDRbar(2,2) = oneset.displayMass(mBottom);
bottomDRbar(0,0) = oneset.displayMass(softsusy::mDown);
bottomDRbar(1,1) = oneset.displayMass(softsusy::mStrange);
bottomDRbar(2,2) = oneset.displayMass(softsusy::mBottom);

if (model->get_thresholds())
bottomDRbar(2,2) = model->calculate_MFd_DRbar(oneset.displayMass(mBottom), 2);
bottomDRbar(2,2) = model->calculate_MFd_DRbar(oneset.displayMass(softsusy::mBottom), 2);

const auto vd = MODELPARAMETER(vd);
MODEL->set_Yd(((1.4142135623730951*bottomDRbar)/vd).transpose());
Expand All @@ -350,12 +350,12 @@ void MSSMcbs_low_scale_constraint<Two_scale>::calculate_Yd_DRbar()
void MSSMcbs_low_scale_constraint<Two_scale>::calculate_Ye_DRbar()
{
Eigen::Matrix<double,3,3> electronDRbar(Eigen::Matrix<double,3,3>::Zero());
electronDRbar(0,0) = oneset.displayMass(mElectron);
electronDRbar(1,1) = oneset.displayMass(mMuon);
electronDRbar(2,2) = oneset.displayMass(mTau);
electronDRbar(0,0) = oneset.displayMass(softsusy::mElectron);
electronDRbar(1,1) = oneset.displayMass(softsusy::mMuon);
electronDRbar(2,2) = oneset.displayMass(softsusy::mTau);

if (model->get_thresholds())
electronDRbar(2,2) = model->calculate_MFe_DRbar(oneset.displayMass(mTau), 2);
electronDRbar(2,2) = model->calculate_MFe_DRbar(oneset.displayMass(softsusy::mTau), 2);

const auto vd = MODELPARAMETER(vd);
MODEL->set_Ye(((1.4142135623730951*electronDRbar)/vd).transpose());
Expand Down
6 changes: 3 additions & 3 deletions examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp
View file
Expand Up @@ -35,7 +35,7 @@ template<>
class MSSMcbs_low_scale_constraint<Two_scale> : public Constraint<Two_scale> {
public:
MSSMcbs_low_scale_constraint();
MSSMcbs_low_scale_constraint(MSSMcbs<Two_scale>*, const QedQcd&);
MSSMcbs_low_scale_constraint(MSSMcbs<Two_scale>*, const softsusy::QedQcd&);
virtual ~MSSMcbs_low_scale_constraint();
virtual void apply();
virtual double get_scale() const;
Expand All @@ -44,14 +44,14 @@ class MSSMcbs_low_scale_constraint<Two_scale> : public Constraint<Two_scale> {
void clear();
double get_initial_scale_guess() const;
void initialize();
void set_sm_parameters(const QedQcd&);
void set_sm_parameters(const softsusy::QedQcd&);
void set_threshold_corrections_loop_order(unsigned); ///< threshold corrections loop order

private:
double scale;
double initial_scale_guess;
MSSMcbs<Two_scale>* model;
QedQcd oneset;
softsusy::QedQcd oneset;
double MZDRbar;
double new_g1, new_g2, new_g3;
unsigned threshold_corrections_loop_order; ///< threshold corrections loop order
Expand Down

0 comments on commit e0be0da

Please sign in to comment.