Skip to content

Commit

Permalink
Remove unused headers and functions
Browse files Browse the repository at this point in the history 
to allow some tests to compile
  • Loading branch information
Dylan Harries committed Jan 11, 2017
1 parent 74a656b commit 0efb844
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 161 deletions.
109 changes: 2 additions & 107 deletions test/test.h
View file
Expand Up @@ -2,7 +2,6 @@
#ifndef TEST_H
#define TEST_H

#include "linalg.h"
#include "numerics2.hpp"
#include <cmath>
#include <type_traits>
Expand All @@ -17,25 +16,6 @@ int get_errors() {
return gErrors;
}

bool is_equal(const softsusy::DoubleMatrix& a, const softsusy::DoubleMatrix& b, double max_dev)
{
if (a.displayRows() != b.displayRows()) {
std::cout << "matrices have different number of rows\n";
return false;
}
if (a.displayCols() != b.displayCols()) {
std::cout << "matrices have different number of columns\n";
return false;
}
for (int i = 1; i <= a.displayRows(); ++i) {
for (int l = 1; l <= a.displayCols(); ++l) {
if (!is_equal(a(i,l), b(i,l), max_dev))
return false;
}
}
return true;
}

template <class DerivedA, class DerivedB>
bool is_equal(const Eigen::MatrixBase<DerivedA>& a,
const Eigen::MatrixBase<DerivedB>& b, double max_dev)
Expand Down Expand Up @@ -95,8 +75,8 @@ void check_equality(T a, T b, const std::string& testMsg, double max_dev)
}
}

void check_equality(softsusy::Complex a, softsusy::Complex b,
const std::string& testMsg, double max_dev)
template <typename T>
void check_equality(std::complex<T> a, std::complex<T> b, const std::string& testMsg, double max_dev)
{
std::ostringstream msg;
msg << testMsg << " (real part)";
Expand All @@ -115,61 +95,6 @@ void check_equality(int a, int b, const std::string& testMsg, double)
}
}

void check_equality(const softsusy::DoubleVector& a, const softsusy::DoubleVector& b,
const std::string& testMsg, double max_dev)
{
if (a.displayStart() != b.displayStart()) {
std::cout << "test failed: " << testMsg << ": "
<< "vectors have different start value: "
<< "a.displayStart() == " << a.displayStart()
<< ", b.displayStart() == " << b.displayStart()
<< std::endl;
gErrors++;
return;
}

if (a.displayEnd() != b.displayEnd()) {
std::cout << "test failed: " << testMsg << ": "
<< "vectors have different end value: "
<< "a.displayEnd() == " << a.displayEnd()
<< ", b.displayEnd() == " << b.displayEnd()
<< std::endl;
gErrors++;
return;
}

for (int i = a.displayStart(); i <= a.displayEnd(); ++i) {
std::ostringstream element;
element << testMsg << " [element " << i << "]";
check_equality(a(i), b(i), element.str(), max_dev);
}
}

void check_equality(const softsusy::DoubleMatrix& a, const softsusy::DoubleMatrix& b,
const std::string& testMsg, double max_dev)
{
for (int i = 1; i <= a.displayRows(); ++i) {
for (int l = 1; l <= a.displayCols(); ++l) {
std::ostringstream element;
element << testMsg << " [element " << i << "," << l << "]";
check_equality(a(i,l), b(i,l), element.str(), max_dev);
}
}
}

void check_equality(const softsusy::DoubleMatrix& b,
const Eigen::Matrix<double,3,3>& a,
const std::string& testMsg, double max_dev)
{
for (int i = 0; i < 3; ++i) {
for (int l = 0; l < 3; ++l) {
std::ostringstream element;
element << testMsg << " [element " << i << "," << l << "]";
check_equality(a(i,l), b(i+1,l+1), element.str(), max_dev);
}
}
}

template <class DerivedA, class DerivedB>
void check_equality(const Eigen::MatrixBase<DerivedA>& a,
const Eigen::MatrixBase<DerivedB>& b,
Expand Down Expand Up @@ -201,36 +126,6 @@ void check_equality(const Eigen::Array<double,NRows,NCols>& a,
}
}

void check_equality(const softsusy::ComplexMatrix& a, const softsusy::ComplexMatrix& b,
const std::string& testMsg, double max_dev)
{
for (int i = 1; i <= a.displayRows(); ++i) {
for (int l = 1; l <= a.displayCols(); ++l) {
std::ostringstream element;
element << testMsg << " [element " << i << "," << l << "]";
check_equality(a(i,l), b(i,l), element.str(), max_dev);
}
}
}

void check_equality(const softsusy::DoubleMatrix& a, const softsusy::ComplexMatrix& b,
const std::string& testMsg, double max_dev)
{
for (int i = 1; i <= a.displayRows(); ++i) {
for (int l = 1; l <= a.displayCols(); ++l) {
std::ostringstream element;
element << testMsg << " [element " << i << "," << l << "] ";
check_equality(softsusy::Complex(a(i,l), 0.0), b(i,l), element.str(), max_dev);
}
}
}

void check_equality(const softsusy::ComplexMatrix& a, const softsusy::DoubleMatrix& b,
const std::string& testMsg, double max_dev)
{
check_equality(b, a, testMsg, max_dev);
}

void check_condition(bool condition, const std::string& testMsg)
{
if (!condition) {
Expand Down
65 changes: 24 additions & 41 deletions test/test_CMSSM_slha.cpp
View file
Expand Up @@ -8,11 +8,8 @@
#include "CMSSM_model_slha.hpp"
#include "wrappers.hpp"
#include "ckm.hpp"
#include "utils.h"
#include "linalg.h"

using namespace flexiblesusy;
using namespace softsusy;

BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_cctor )
{
Expand All @@ -28,28 +25,21 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_cctor )
const double sinthWsq = 0.23122;
const double alpha1 = 5 * ALPHAMZ / (3 * (1 - sinthWsq));
const double alpha2 = ALPHAMZ / sinthWsq;
const double g1 = sqrt(4 * PI * alpha1);
const double g2 = sqrt(4 * PI * alpha2);
const double g3 = sqrt(4 * PI * ALPHASMZ);
const double g1 = Sqrt(4 * Pi * alpha1);
const double g2 = Sqrt(4 * Pi * alpha2);
const double g3 = Sqrt(4 * Pi * ALPHASMZ);
const double tanBeta = 10;
const double sinBeta = sin(atan(tanBeta));
const double cosBeta = cos(atan(tanBeta));
const double M12 = 100.0;
const double m0 = 250.0;
const double a0 = 50.0;
const double root2 = sqrt(2.0);
const double root2 = Sqrt(2.0);
const double vev = 246.0;
const double vu = vev * sinBeta;
const double vd = vev * cosBeta;
const double susyMu = 120.0;
const double BMu = sqr(2.0 * susyMu);
DoubleMatrix Yu_SS(3,3), Yd_SS(3,3), Ye_SS(3,3);
Yu_SS(3,3) = 165.0 * root2 / (vev * sinBeta);
Yd_SS(3,3) = 2.9 * root2 / (vev * cosBeta);
Ye_SS(3,3) = 1.77699 * root2 / (vev * cosBeta);
DoubleMatrix ID(3, 3), mm0_SS(3, 3);
for (int i=1; i<=3; i++) ID(i, i) = 1.0;
mm0_SS = ID * sqr(m0);
const double BMu = Sqr(2.0 * susyMu);

Eigen::Matrix<double,3,3> Yu(Eigen::Matrix<double,3,3>::Zero()),
Yd(Eigen::Matrix<double,3,3>::Zero()),
Expand All @@ -58,7 +48,7 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_cctor )
Yu(2,2) = 165.0 * root2 / (vev * sinBeta);
Yd(2,2) = 2.9 * root2 / (vev * cosBeta);
Ye(2,2) = 1.77699 * root2 / (vev * cosBeta);
mm0 = sqr(m0) * Eigen::Matrix<double,3,3>::Identity();
mm0 = Sqr(m0) * Eigen::Matrix<double,3,3>::Identity();

CMSSM<Two_scale> model(input);
model.set_scale(91);
Expand All @@ -77,8 +67,8 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_cctor )
model.set_md2(mm0);
model.set_mu2(mm0);
model.set_me2(mm0);
model.set_mHd2(sqr(m0));
model.set_mHu2(sqr(m0));
model.set_mHd2(Sqr(m0));
model.set_mHu2(Sqr(m0));
model.set_TYu(a0 * Yu);
model.set_TYd(a0 * Yd);
model.set_TYe(a0 * Ye);
Expand Down Expand Up @@ -128,28 +118,21 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_calculate_spectrum )
const double sinthWsq = 0.23122;
const double alpha1 = 5 * ALPHAMZ / (3 * (1 - sinthWsq));
const double alpha2 = ALPHAMZ / sinthWsq;
const double g1 = sqrt(4 * PI * alpha1);
const double g2 = sqrt(4 * PI * alpha2);
const double g3 = sqrt(4 * PI * ALPHASMZ);
const double g1 = Sqrt(4 * Pi * alpha1);
const double g2 = Sqrt(4 * Pi * alpha2);
const double g3 = Sqrt(4 * Pi * ALPHASMZ);
const double tanBeta = 10;
const double sinBeta = sin(atan(tanBeta));
const double cosBeta = cos(atan(tanBeta));
const double M12 = 100.0;
const double m0 = 250.0;
const double a0 = 50.0;
const double root2 = sqrt(2.0);
const double root2 = Sqrt(2.0);
const double vev = 246.0;
const double vu = vev * sinBeta;
const double vd = vev * cosBeta;
const double susyMu = 120.0;
const double BMu = sqr(2.0 * susyMu);
DoubleMatrix Yu_SS(3,3), Yd_SS(3,3), Ye_SS(3,3);
Yu_SS(3,3) = 165.0 * root2 / (vev * sinBeta);
Yd_SS(3,3) = 2.9 * root2 / (vev * cosBeta);
Ye_SS(3,3) = 1.77699 * root2 / (vev * cosBeta);
DoubleMatrix ID(3, 3), mm0_SS(3, 3);
for (int i=1; i<=3; i++) ID(i, i) = 1.0;
mm0_SS = ID * sqr(m0);
const double BMu = Sqr(2.0 * susyMu);

Eigen::Matrix<double,3,3> Yu(Eigen::Matrix<double,3,3>::Zero()),
Yd(Eigen::Matrix<double,3,3>::Zero()),
Expand All @@ -158,7 +141,7 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_calculate_spectrum )
Yu(2,2) = 165.0 * root2 / (vev * sinBeta);
Yd(2,2) = 2.9 * root2 / (vev * cosBeta);
Ye(2,2) = 1.77699 * root2 / (vev * cosBeta);
mm0 = sqr(m0) * Eigen::Matrix<double,3,3>::Identity();
mm0 = Sqr(m0) * Eigen::Matrix<double,3,3>::Identity();

CMSSM_slha<CMSSM<Two_scale> > model(input);
model.set_scale(91);
Expand All @@ -177,8 +160,8 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_calculate_spectrum )
model.set_md2(mm0);
model.set_mu2(mm0);
model.set_me2(mm0);
model.set_mHd2(sqr(m0));
model.set_mHu2(sqr(m0));
model.set_mHd2(Sqr(m0));
model.set_mHu2(Sqr(m0));
model.set_TYu(a0 * Yu);
model.set_TYd(a0 * Yd);
model.set_TYe(a0 * Ye);
Expand Down Expand Up @@ -216,21 +199,21 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_diagonal_yukawas )
const double sinthWsq = 0.23122;
const double alpha1 = 5 * ALPHAMZ / (3 * (1 - sinthWsq));
const double alpha2 = ALPHAMZ / sinthWsq;
const double g1 = sqrt(4 * PI * alpha1);
const double g2 = sqrt(4 * PI * alpha2);
const double g3 = sqrt(4 * PI * ALPHASMZ);
const double g1 = Sqrt(4 * Pi * alpha1);
const double g2 = Sqrt(4 * Pi * alpha2);
const double g3 = Sqrt(4 * Pi * ALPHASMZ);
const double tanBeta = 10;
const double sinBeta = sin(atan(tanBeta));
const double cosBeta = cos(atan(tanBeta));
const double M12 = 100.0;
const double m0 = 250.0;
const double a0 = 50.0;
const double root2 = sqrt(2.0);
const double root2 = Sqrt(2.0);
const double vev = 246.0;
const double vu = vev * sinBeta;
const double vd = vev * cosBeta;
const double susyMu = 120.0;
const double BMu = sqr(2.0 * susyMu);
const double BMu = Sqr(2.0 * susyMu);

Eigen::Matrix<double,3,3> Yu(Eigen::Matrix<double,3,3>::Zero()),
Yd(Eigen::Matrix<double,3,3>::Zero()),
Expand All @@ -252,7 +235,7 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_diagonal_yukawas )
Ye << 0.1, 0.2, 0.3,
-0.2, 0.4, 0.6,
0.3, 0.6, 1.77699 * root2 / (vev * sinBeta);
mm0 = sqr(m0) * Eigen::Matrix<double,3,3>::Identity();
mm0 = Sqr(m0) * Eigen::Matrix<double,3,3>::Identity();

CMSSM_slha<CMSSM<Two_scale> > model(input);
model.set_scale(91);
Expand All @@ -271,8 +254,8 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_two_scale_slha_diagonal_yukawas )
model.set_md2(mm0 * Yd);
model.set_mu2(mm0 * Yu);
model.set_me2(mm0 * Ye);
model.set_mHd2(sqr(m0));
model.set_mHu2(sqr(m0));
model.set_mHd2(Sqr(m0));
model.set_mHu2(Sqr(m0));
model.set_TYu(a0 * Yu);
model.set_TYd(a0 * Yd);
model.set_TYe(a0 * Ye);
Expand Down
17 changes: 8 additions & 9 deletions test/test_CMSSM_slha_input.cpp
View file
Expand Up @@ -7,8 +7,7 @@
#include "CMSSM_model_slha.hpp"
#include "CMSSM_slha_io.hpp"
#include "CMSSM_two_scale_model.hpp"
#include "def.h"
#include "utils.h"
#include "wrappers.hpp"

using namespace flexiblesusy;

Expand All @@ -23,21 +22,21 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_slha_reading )
const double sinthWsq = 0.23122;
const double alpha1 = 5 * ALPHAMZ / (3 * (1 - sinthWsq));
const double alpha2 = ALPHAMZ / sinthWsq;
const double g1 = sqrt(4 * softsusy::PI * alpha1);
const double g2 = sqrt(4 * softsusy::PI * alpha2);
const double g3 = sqrt(4 * softsusy::PI * ALPHASMZ);
const double g1 = Sqrt(4 * Pi * alpha1);
const double g2 = Sqrt(4 * Pi * alpha2);
const double g3 = Sqrt(4 * Pi * ALPHASMZ);
const double tanBeta = 10;
const double sinBeta = sin(atan(tanBeta));
const double cosBeta = cos(atan(tanBeta));
const double M12 = 100.0;
const double m0 = 250.0;
const double a0 = 50.0;
const double root2 = sqrt(2.0);
const double root2 = Sqrt(2.0);
const double vev = 246.0;
const double vu = vev * sinBeta;
const double vd = vev * cosBeta;
const double susyMu = 120.0;
const double BMu = sqr(2.0 * susyMu);
const double BMu = Sqr(2.0 * susyMu);

Eigen::Matrix<double,3,3> Yu(Eigen::Matrix<double,3,3>::Zero()),
Yd(Eigen::Matrix<double,3,3>::Zero()),
Expand Down Expand Up @@ -78,8 +77,8 @@ BOOST_AUTO_TEST_CASE( test_CMSSM_slha_reading )
model.set_md2(mm0);
model.set_mu2(mm0);
model.set_me2(mm0);
model.set_mHd2(sqr(m0));
model.set_mHu2(sqr(m0));
model.set_mHd2(Sqr(m0));
model.set_mHu2(Sqr(m0));
model.set_TYu(a0 * Yu);
model.set_TYd(a0 * Yd);
model.set_TYe(a0 * Ye);
Expand Down
7 changes: 3 additions & 4 deletions test/test_CMSSM_two_loop_spectrum.cpp
View file
Expand Up @@ -8,7 +8,6 @@
#include "ew_input.hpp"
#include "CMSSM_two_scale_model.hpp"
#include "lowe.h"
#include "utils.h"

using namespace flexiblesusy;
using namespace softsusy;
Expand All @@ -18,12 +17,12 @@ void ensure_tree_level_ewsb(CMSSM<Two_scale>& m)
// ensure that the EWSB eqs. are satisfied (Drees p.222)
const double vu = m.get_vu();
const double vd = m.get_vd();
const double gY = m.get_g1() * sqrt(0.6);
const double gY = m.get_g1() * Sqrt(0.6);
const double g2 = m.get_g2();
const double Mu = m.get_Mu();
const double BMu = m.get_BMu();
const double mHd2 = BMu*vu/vd - (sqr(gY) + sqr(g2))*(sqr(vd) - sqr(vu))/8. - sqr(Mu);
const double mHu2 = BMu*vd/vu + (sqr(gY) + sqr(g2))*(sqr(vd) - sqr(vu))/8. - sqr(Mu);
const double mHd2 = BMu*vu/vd - (Sqr(gY) + Sqr(g2))*(Sqr(vd) - Sqr(vu))/8. - Sqr(Mu);
const double mHu2 = BMu*vd/vu + (Sqr(gY) + Sqr(g2))*(Sqr(vd) - Sqr(vu))/8. - Sqr(Mu);
m.set_mHd2(mHd2);
m.set_mHu2(mHu2);
}
Expand Down

0 comments on commit 0efb844

Please sign in to comment.