diff --git a/App/src/TestFormFactor.cpp b/App/src/TestFormFactor.cpp
index 9a3ab368b9ba1a8bfe15207c0d130bc094f9b20a..9f95d1f60baf1a410786bb3db89274529c06da32 100644
--- a/App/src/TestFormFactor.cpp
+++ b/App/src/TestFormFactor.cpp
@@ -58,8 +58,8 @@ void TestFormFactor::execute()
it.getIndex());
double phi_f = M_PI*(*p_y_axis)[index_y]/180.0;
Bin1D alpha_f_bin_degrees = p_z_axis->getBin(index_z);
- Bin1D alpha_f_bin = { M_PI*alpha_f_bin_degrees.m_lower/180.0,
- M_PI*alpha_f_bin_degrees.m_upper/180.0 };
+ Bin1D alpha_f_bin(M_PI*alpha_f_bin_degrees.m_lower/180.0,
+ M_PI*alpha_f_bin_degrees.m_upper/180.0);
double alpha_f = alpha_f_bin.getMidPoint();
cvector_t k_f;
k_f.setLambdaAlphaPhi(lambda, alpha_f, phi_f);
diff --git a/App/src/TestInfLongBox.cpp b/App/src/TestInfLongBox.cpp
index 8660f82002b39ce9dc3ca66c22dad55681da972e..d29fd3c5b8f612924e8ae0a33d8207763fa3242f 100644
--- a/App/src/TestInfLongBox.cpp
+++ b/App/src/TestInfLongBox.cpp
@@ -126,7 +126,7 @@ void TestInfLongBox::drawff()
cvector_t k_f;
k_f.setLambdaAlphaPhi(lambda, M_PI*af/180.0, M_PI*pf/180.0);
- Bin1D alpha_f_bin = {M_PI*af0/180.0, M_PI*af/180.0};
+ Bin1D alpha_f_bin(M_PI*af0/180.0, M_PI*af/180.0);
Bin1DCVector k_f_bin(k_f0, k_f);
af0 = af;
diff --git a/App/src/TestInfLongRipple1.cpp b/App/src/TestInfLongRipple1.cpp
index cbca3ca6849e26e18f11b6fe7f2811cede7c80d2..037136f2a18d19bd8474287c0abb1d8395e2cf0f 100644
--- a/App/src/TestInfLongRipple1.cpp
+++ b/App/src/TestInfLongRipple1.cpp
@@ -126,7 +126,7 @@ void TestInfLongRipple1::drawff()
cvector_t k_f;
k_f.setLambdaAlphaPhi(lambda, M_PI*af/180.0, M_PI*pf/180.0);
- Bin1D alpha_f_bin = {M_PI*af0/180.0, M_PI*af/180.0};
+ Bin1D alpha_f_bin(M_PI*af0/180.0, M_PI*af/180.0);
Bin1DCVector k_f_bin(k_f0, k_f);
af0 = af;
diff --git a/App/src/TestInfLongRipple2.cpp b/App/src/TestInfLongRipple2.cpp
index d20b9881b9027703271e7023a4ffd8365a3d7cc0..448bce6d59fdfda1a21b55efd389bfc8b8752fb8 100644
--- a/App/src/TestInfLongRipple2.cpp
+++ b/App/src/TestInfLongRipple2.cpp
@@ -127,7 +127,7 @@ void TestInfLongRipple2::drawff()
cvector_t k_f;
k_f.setLambdaAlphaPhi(lambda, M_PI*af/180.0, M_PI*pf/180.0);
- Bin1D alpha_f_bin = {M_PI*af0/180.0, M_PI*af/180.0};
+ Bin1D alpha_f_bin(M_PI*af0/180.0, M_PI*af/180.0);
Bin1DCVector k_f_bin(k_f0, k_f);
af0 = af;
diff --git a/App/src/TestMiscellaneous.cpp b/App/src/TestMiscellaneous.cpp
index f5aeee6a6b941d43ae7bfc3e070dd0b0411efed2..760228c294344635c57997abe0f2be77eb0f6ceb 100644
--- a/App/src/TestMiscellaneous.cpp
+++ b/App/src/TestMiscellaneous.cpp
@@ -381,7 +381,7 @@ void TestMiscellaneous::test_FormFactor()
cvector_t q(x,y,z);
cvector_t q0(0.0,0.0,0.0);
Bin1DCVector q0_bin(q0, q0);
- Bin1D zero_bin = { 0.0, 0.0 };
+ Bin1D zero_bin;
double value = std::abs(ff.evaluate(q,q0_bin, zero_bin));
if(iz==50) h2->Fill(x,y,std::abs(ff.evaluate(q,q0_bin, zero_bin)));
@@ -494,7 +494,7 @@ void TestMiscellaneous::test_FormFactor1()
cvector_t q(x,y,z);
cvector_t q0(0.0,0.0,0.0);
Bin1DCVector q0_bin(q0, q0);
- Bin1D zero_bin = { 0.0, 0.0 };
+ Bin1D zero_bin;
double value = std::abs(ff.evaluate(q,q0_bin, zero_bin));
//double valuep = std::abs(ff.evaluate(q,q0_bin, zero_bin));
//double valuer = std::abs(ff.evaluate(q,q0_bin, zero_bin));
diff --git a/App/src/TestPolarizedDWBATerms.cpp b/App/src/TestPolarizedDWBATerms.cpp
index 768b3317f6ec2c3b9d1f35d50409e01e189ed9b7..3b1a01c36998de453cdeb9a40f8739dd28b45395 100644
--- a/App/src/TestPolarizedDWBATerms.cpp
+++ b/App/src/TestPolarizedDWBATerms.cpp
@@ -60,8 +60,8 @@ TestPolarizedDWBATerms::TestPolarizedDWBATerms()
void TestPolarizedDWBATerms::execute()
{
- Bin1D alpha_f_bin = { m_alpha_f, m_alpha_f };
- Bin1D zero_bin = { 0.0, 0.0 };
+ Bin1D alpha_f_bin(m_alpha_f, m_alpha_f);
+ Bin1D zero_bin;
mp_scalar_ff->calculateTerms(m_ki, m_kf_bin, alpha_f_bin);
mp_matrix_ff->calculateTerms(m_ki, m_kf_bin, alpha_f_bin, zero_bin);
@@ -77,8 +77,8 @@ void TestPolarizedDWBATerms::initWavevectors()
{
m_ki.setLambdaAlphaPhi(0.21, -m_alpha_i, 0.0);
- Bin1D alpha_bin = { m_alpha_f, m_alpha_f };
- Bin1D phi_bin = { 0.0, 0.0 };
+ Bin1D alpha_bin( m_alpha_f, m_alpha_f );
+ Bin1D phi_bin;
m_kf_bin = Bin1DCVector(0.21, alpha_bin, phi_bin);
}
diff --git a/Core/FormFactors/inc/IFormFactor.h b/Core/FormFactors/inc/IFormFactor.h
index 652fa7ec258f1ce8d24b039b3b481cbbed2c62cb..cad90e9486ee1b96888f6109657aaf4f47c7dc67 100644
--- a/Core/FormFactors/inc/IFormFactor.h
+++ b/Core/FormFactors/inc/IFormFactor.h
@@ -110,7 +110,7 @@ inline double IFormFactor::getVolume() const
{
cvector_t zero_vector;
Bin1DCVector zero_vector_bin(zero_vector, zero_vector);
- Bin1D zero_bin = { 0.0, 0.0 };
+ Bin1D zero_bin;
return std::abs(evaluate(zero_vector, zero_vector_bin, zero_bin));
}
diff --git a/Core/Tools/inc/Bin.h b/Core/Tools/inc/Bin.h
index a63ef8b6b03d1f2ba74df5202e4ab1f8b8da4b0a..8006b2b37faa00365ecca217ec4a656fd571e839 100644
--- a/Core/Tools/inc/Bin.h
+++ b/Core/Tools/inc/Bin.h
@@ -28,6 +28,8 @@
struct BA_CORE_API_ Bin1D
{
+ Bin1D() {}
+ Bin1D(double lower, double upper) : m_lower(lower), m_upper(upper) {}
double m_lower; //!< lower bound of the bin
double m_upper; //!< upper bound of the bin
double getMidPoint() const { return (m_lower + m_upper)/2.0; }
diff --git a/Core/Tools/src/CustomBinAxis.cpp b/Core/Tools/src/CustomBinAxis.cpp
index c6507648b355649fed34b059fedb24c000f9d9e0..30a839c10e5f7a2900c50d1b97d63fd803fbf3f4 100644
--- a/Core/Tools/src/CustomBinAxis.cpp
+++ b/Core/Tools/src/CustomBinAxis.cpp
@@ -43,7 +43,7 @@ Bin1D CustomBinAxis::getBin(size_t index) const
if(index >= m_nbins)
throw Exceptions::OutOfBoundsException("CustomBinAxis::getBin() -> Error. Wrong index.");
- Bin1D result = { m_bin_centers[index], m_bin_centers[index] };
+ Bin1D result(m_bin_centers[index], m_bin_centers[index]);
return result;
}
diff --git a/Core/Tools/src/FixedBinAxis.cpp b/Core/Tools/src/FixedBinAxis.cpp
index 9f54ad241db5f8d02a744801aa02dc8037f6009a..11a0d4a79155fa17787a50425252bbe9891c0c8c 100644
--- a/Core/Tools/src/FixedBinAxis.cpp
+++ b/Core/Tools/src/FixedBinAxis.cpp
@@ -42,7 +42,7 @@ Bin1D FixedBinAxis::getBin(size_t index) const
throw Exceptions::OutOfBoundsException("FixedBinAxis::getBin() -> Error. Wrong index.");
double step = (m_end - m_start)/m_nbins;
- Bin1D result = { m_start + step*index, m_start + step*(index+1) };
+ Bin1D result( m_start + step*index, m_start + step*(index+1) );
return result;
}
diff --git a/Core/Tools/src/VariableBinAxis.cpp b/Core/Tools/src/VariableBinAxis.cpp
index 402cd7038c71c452a1cfa59b2d229600d51bdb9c..9f8b3023e009d74d709e65399b0cf4cedee17429 100644
--- a/Core/Tools/src/VariableBinAxis.cpp
+++ b/Core/Tools/src/VariableBinAxis.cpp
@@ -48,7 +48,7 @@ Bin1D VariableBinAxis::getBin(size_t index) const
if(index >= m_nbins)
throw Exceptions::OutOfBoundsException("VariableBinAxis::getBin() -> Error. Wrong index.");
- Bin1D result = { m_bin_boundaries[index], m_bin_boundaries[index+1] };
+ Bin1D result(m_bin_boundaries[index], m_bin_boundaries[index+1]);
return result;
}