Skip to content

Commit

Permalink
Refs #10305. Removing fix points for now.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Wedel committed Feb 6, 2015
1 parent 6d66569 commit c35dd71
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,18 @@ class MANTID_GEOMETRY_DLL SymmetryElementWithAxis : public SymmetryElement {

V3R getAxis() const { return m_axis; }
V3R getTranslation() const { return m_translation; }
V3R getFixPoint() const { return m_fixPoint; }

protected:
SymmetryElementWithAxis();

void setAxis(const V3R &axis);
void setTranslation(const V3R &translation) { m_translation = translation; }
void setFixPoint(const V3R &fixPoint) { m_fixPoint = fixPoint; }

V3R determineTranslation(const SymmetryOperation &operation) const;
V3R determineAxis(const Kernel::IntMatrix &matrix) const;
V3R determineFixPoint(const Kernel::IntMatrix &matrix,
const V3R &vector) const;

V3R m_axis;
V3R m_translation;
V3R m_fixPoint;
};

class MANTID_GEOMETRY_DLL SymmetryElementRotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,6 @@ SymmetryElementWithAxis::determineAxis(const Kernel::IntMatrix &matrix) const {
return axis;
}

V3R SymmetryElementWithAxis::determineFixPoint(const Kernel::IntMatrix &matrix,
const V3R &vector) const {
UNUSED_ARG(matrix);
UNUSED_ARG(vector);

return V3R(0, 0, 0);
}

SymmetryElementRotation::SymmetryElementRotation()
: SymmetryElementWithAxis() {}

Expand Down
10 changes: 0 additions & 10 deletions Code/Mantid/Framework/Geometry/test/SymmetryElementTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,6 @@ class SymmetryElementTest : public CxxTest::TestSuite {
TS_ASSERT_EQUALS(element.getTranslation(), validAxis);
}

void testSymmetryElementWithAxisSetFixPoint() {
MockSymmetryElementWithAxis element;

V3R validAxis(1, 0, 0);
TS_ASSERT_THROWS_NOTHING(element.setFixPoint(validAxis));

TS_ASSERT_EQUALS(element.getFixPoint(), validAxis);
}

void testSymmetryElementWithAxisDetermineTranslation() {
MockSymmetryElementWithAxis element;

Expand Down Expand Up @@ -185,7 +176,6 @@ class SymmetryElementTest : public CxxTest::TestSuite {
TS_ASSERT_EQUALS(element.determineAxis(twoFoldRotationHex210.matrix()),
rotationAxis2xx0);


V3R rotationAxisx2x0 = V3R(1, 2, 0);
SymmetryOperation twoFoldRotationHex120("y-x,y,-z");
TS_ASSERT_EQUALS(element.determineAxis(twoFoldRotationHex120.matrix()),
Expand Down

0 comments on commit c35dd71

Please sign in to comment.