diff --git a/Core/Geometry/inc/BasicVector3D.h b/Core/Geometry/inc/BasicVector3D.h
index 52c6bf30020fc656f6be035729bdf7206612d6ff..4f91e524fdc4135247ca81b3d84717e0b33868f3 100644
--- a/Core/Geometry/inc/BasicVector3D.h
+++ b/Core/Geometry/inc/BasicVector3D.h
@@ -202,7 +202,7 @@ public:
{
T k = Units::PI2/_lambda;
v_[0] = k*std::cos(_alpha) * std::cos(_phi);
- v_[1] = k*std::cos(_alpha) * std::sin(_phi);
+ v_[1] = -k*std::cos(_alpha) * std::sin(_phi);
v_[2] = k*std::sin(_alpha);
}
};
diff --git a/Core/Geometry/src/BasicVector3D.cpp b/Core/Geometry/src/BasicVector3D.cpp
index 38ccf433082fe7e2c87bf70b7c3431d9ba7615d1..4cb52e47b5160cea51f6be06ea5ae386614afe2c 100644
--- a/Core/Geometry/src/BasicVector3D.cpp
+++ b/Core/Geometry/src/BasicVector3D.cpp
@@ -90,7 +90,7 @@ complex_t BasicVector3D<complex_t>::magxy() const
template<>
double BasicVector3D<double>::phi() const
{
- return x() == 0.0 && y() == 0.0 ? 0.0 : std::atan2(y(),x());
+ return x() == 0.0 && y() == 0.0 ? 0.0 : std::atan2(-y(),x());
}
//! Returns polar angle.
diff --git a/Core/PythonAPI/src/ParameterDistribution.pypp.cpp b/Core/PythonAPI/src/ParameterDistribution.pypp.cpp
index de113ebfae03e00c97dae12d7781a727ede4cfea..5681b4dd5e1e420091fb792879b9764979f31c43 100644
--- a/Core/PythonAPI/src/ParameterDistribution.pypp.cpp
+++ b/Core/PythonAPI/src/ParameterDistribution.pypp.cpp
@@ -59,8 +59,7 @@ void register_ParameterDistribution_class(){
ParameterDistribution_exposer.def(
"getMainParameterName"
- , getMainParameterName_function_type( &::ParameterDistribution::getMainParameterName )
- , "get the main parameter's name." );
+ , getMainParameterName_function_type( &::ParameterDistribution::getMainParameterName ) );
}
{ //::ParameterDistribution::getMaxValue
@@ -87,8 +86,7 @@ void register_ParameterDistribution_class(){
ParameterDistribution_exposer.def(
"getNbrSamples"
- , getNbrSamples_function_type( &::ParameterDistribution::getNbrSamples )
- , "get number of samples for this distribution." );
+ , getNbrSamples_function_type( &::ParameterDistribution::getNbrSamples ) );
}
{ //::ParameterDistribution::getSigmaFactor
@@ -97,8 +95,7 @@ void register_ParameterDistribution_class(){
ParameterDistribution_exposer.def(
"getSigmaFactor"
- , getSigmaFactor_function_type( &::ParameterDistribution::getSigmaFactor )
- , "get the sigma factor." );
+ , getSigmaFactor_function_type( &::ParameterDistribution::getSigmaFactor ) );
}
{ //::ParameterDistribution::linkParameter
diff --git a/Core/Samples/inc/Lattice.h b/Core/Samples/inc/Lattice.h
index d30df180aa7fc434e6e3756efd41a72958935663..3c7cd37faf11287e25d42a7ee5929591899bf950 100644
--- a/Core/Samples/inc/Lattice.h
+++ b/Core/Samples/inc/Lattice.h
@@ -67,10 +67,6 @@ public:
void computeReciprocalLatticeVectorsWithinRadius(
const kvector_t& input_vector, double radius) const;
-
- //! Returns a list of rotation angles within a specified range that hit a maximal set of small Bragg peaks
- std::vector<double> collectBraggAngles(size_t size, double max_radius, const TRange<double>& phi_range, const TRange<double>& z_range) const;
-
//! Sets a selection rule for the reciprocal vectors
void setSelectionRule(const ISelectionRule& p_selection_rule) {
delete mp_selection_rule;
diff --git a/Core/Samples/src/Lattice.cpp b/Core/Samples/src/Lattice.cpp
index 49f834e2c8a93311deb14d982749d75ed5fdfbc8..68222b092c0e2d171bfc24f7830355e4531cc5fc 100644
--- a/Core/Samples/src/Lattice.cpp
+++ b/Core/Samples/src/Lattice.cpp
@@ -124,31 +124,6 @@ void Lattice::computeReciprocalLatticeVectorsWithinRadius(
m_b1, m_b2, m_b3, m_a1, m_a2, m_a3);
}
-std::vector<double> Lattice::collectBraggAngles(size_t size, double max_radius,
- const TRange<double>& phi_range, const TRange<double>& z_range) const
-{
- std::vector<double> result;
-// int granularity = std::max(1000, (int)size); //
- double brillouin_volume = 8*Units::PI*Units::PI*Units::PI/getVolume();
- double max_volume = max_radius*max_radius*phi_range.getDifference()*z_range.getDifference()/2.0;
- int max_nbr_angles = (int)(max_volume/brillouin_volume);
- if (size < (size_t)max_nbr_angles) {
- max_radius *= (double)size/max_nbr_angles;
- }
- double radius = std::max(max_radius, z_range.getUpperBound());
-
- computeReciprocalLatticeVectorsWithinRadius(kvector_t(0.0, 0.0, 0.0), radius);
- const KVectorContainer& rec_vectors = getKVectorContainer();
- for(KVectorContainer::const_iterator it = rec_vectors.begin(); it!= rec_vectors.end(); ++it) {
- const kvector_t& rvec = (*it);
- double phi = rvec.phi();
- if (rvec.magxy()<max_radius && phi_range.inRange(phi) && z_range.inRange(rvec.z())) {
- result.push_back(phi);
- }
- }
- return result;
-}
-
Lattice Lattice::createFCCLattice(double a)
{
double b = a/2.0;
diff --git a/Core/Tools/inc/Types.h b/Core/Tools/inc/Types.h
index 258f231f5c0fe8676d8cdbd53c5a1285da144ea5..fbc772d18971e49fb1e9b145768b1e4e16cd9d24 100644
--- a/Core/Tools/inc/Types.h
+++ b/Core/Tools/inc/Types.h
@@ -30,7 +30,6 @@ typedef std::vector<double> vdouble1d_t;
typedef std::vector<vdouble1d_t> vdouble2d_t;
typedef std::pair<complex_t, complex_t> complexpair_t;
-
#endif // TYPES_H
diff --git a/Tests/UnitTests/TestCore/BeamTest.h b/Tests/UnitTests/TestCore/BeamTest.h
index b21be3e6ffc633a6c0876c43aa4fe7b62a74686f..e4ed89b04eea4f6c385e3cbef1878a7a907ac00f 100644
--- a/Tests/UnitTests/TestCore/BeamTest.h
+++ b/Tests/UnitTests/TestCore/BeamTest.h
@@ -45,7 +45,7 @@ TEST_F(BeamTest, BeamAssignment)
Beam beam_copy = *P_beam;
EXPECT_NEAR(1.83423, beam_copy.getCentralK()[0], 0.00001);
- EXPECT_NEAR(2.85664, beam_copy.getCentralK()[1], 0.00001);
+ EXPECT_NEAR(-2.85664, beam_copy.getCentralK()[1], 0.00001);
EXPECT_NEAR(-5.28712, beam_copy.getCentralK()[2], 0.00001);
EXPECT_EQ(double(2.0), beam_copy.getIntensity());
EXPECT_EQ(size_t(4), beam_copy.getParameterPool()->size());
diff --git a/Tests/UnitTests/TestCore/InstrumentTest.h b/Tests/UnitTests/TestCore/InstrumentTest.h
index af09bbab314e2bc7ac3586c925a719b8f6a602ce..058bb684dc6b8573490593830c904c4fa1f1a53a 100644
--- a/Tests/UnitTests/TestCore/InstrumentTest.h
+++ b/Tests/UnitTests/TestCore/InstrumentTest.h
@@ -37,7 +37,7 @@ TEST_F(InstrumentTest, BeamManipulation)
double lambda(1), alpha(-1), phi(1);
double k = 2.*Units::PI/lambda;
double x = k*std::cos(alpha) * std::cos(phi);
- double y = k*std::cos(alpha) * std::sin(phi);
+ double y = -k*std::cos(alpha) * std::sin(phi);
double z = k*std::sin(alpha);
m_instrument.setBeamParameters(lambda, -1.0*alpha, phi);
EXPECT_DOUBLE_EQ(x, m_instrument.getBeam().getCentralK().x() );
diff --git a/dev-tools/python-bindings/settings_core.py b/dev-tools/python-bindings/settings_core.py
index de5487c1bb9fdf55154d9305e081f00c6e9aa319..6c69c80a09a0fd7e1af2ca5f6382cedc467d3a78 100644
--- a/dev-tools/python-bindings/settings_core.py
+++ b/dev-tools/python-bindings/settings_core.py
@@ -421,7 +421,7 @@ def ManualExcludeMemberFunctions(mb):
to_exclude=['Iterator', 'iterator', 'DWBASimulation']
to_exclude_exact=['inverse', 'transformed',
'getNearestLatticeVectorCoordinates',
- 'getNearestReciprocalLatticeVectorCoordinates', 'collectBraggAngles',
+ 'getNearestReciprocalLatticeVectorCoordinates',
'getKVectorContainer', 'begin', 'end'
]
for f in mb.member_functions():