Commit db6bbdbb authored by Jose Borreguero's avatar Jose Borreguero
Browse files

Refs #30857 remove commented code

parent f54b9805
...@@ -69,11 +69,6 @@ public: ...@@ -69,11 +69,6 @@ public:
std::shared_ptr<const Geometry::ReferenceFrame> std::shared_ptr<const Geometry::ReferenceFrame>
getReferenceFrame() const override; getReferenceFrame() const override;
/*
bool findDetector() override;
bool findDetector(const Geometry::InstrumentRayTracer &) override;
*/
void setSamplePos(double, double, double) override; void setSamplePos(double, double, double) override;
void setSamplePos(const Mantid::Kernel::V3D &) override; void setSamplePos(const Mantid::Kernel::V3D &) override;
......
...@@ -336,36 +336,6 @@ LeanElasticPeak &LeanElasticPeak::operator=(const LeanElasticPeak &other) { ...@@ -336,36 +336,6 @@ LeanElasticPeak &LeanElasticPeak::operator=(const LeanElasticPeak &other) {
return *this; return *this;
} }
/** After creating a peak using the Q in the lab frame,
* the detPos is set to the direction of the detector (but the detector is
*unknown)
*
* Using the instrument set in the peak, perform ray tracing
* to find the exact detector.
*
* @return true if the detector ID was found.
*/
/*
bool LeanElasticPeak::findDetector() {
throw Exception::NotImplementedError(
"LeanElasticPeak has no detector information");
}
*/
/**
* Performs the same algorithm as findDetector() but uses a pre-existing
* InstrumentRayTracer object to be able to take adavtange of its caches.
* This method should be preferred if findDetector is to be called many times
* over the same instrument.
* @return true if the detector ID was found.
*/
/*
bool LeanElasticPeak::findDetector(const InstrumentRayTracer &) {
throw Exception::NotImplementedError(
"LeanElasticPeak has no detector information");
}
*/
/** /**
Forwarding function. Exposes the detector position directly. Forwarding function. Exposes the detector position directly.
*/ */
......
...@@ -41,9 +41,6 @@ public: ...@@ -41,9 +41,6 @@ public:
TS_ASSERT_EQUALS(p.getDetectorID(), -1) TS_ASSERT_EQUALS(p.getDetectorID(), -1)
TS_ASSERT_THROWS(p.getDetector(), const Exception::NotImplementedError &) TS_ASSERT_THROWS(p.getDetector(), const Exception::NotImplementedError &)
TS_ASSERT_THROWS(p.getInstrument(), const Exception::NotImplementedError &) TS_ASSERT_THROWS(p.getInstrument(), const Exception::NotImplementedError &)
/*
TS_ASSERT_THROWS(p.findDetector(), const Exception::NotImplementedError &)
*/
TS_ASSERT_THROWS(p.getDetectorPosition(), TS_ASSERT_THROWS(p.getDetectorPosition(),
const Exception::NotImplementedError &) const Exception::NotImplementedError &)
TS_ASSERT_THROWS(p.getDetectorPositionNoCheck(), TS_ASSERT_THROWS(p.getDetectorPositionNoCheck(),
......
...@@ -39,7 +39,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out, ...@@ -39,7 +39,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
class PeakTest : public CxxTest::TestSuite { class PeakTest : public CxxTest::TestSuite {
private: private:
/// Common instrument /// Common instrument
Instrument_sptr inst; Instrument_sptr inddinst;
Instrument_sptr m_minimalInstrument; Instrument_sptr m_minimalInstrument;
public: public:
......
...@@ -62,10 +62,6 @@ public: ...@@ -62,10 +62,6 @@ public:
virtual Mantid::Kernel::V3D getQLabFrame() const = 0; virtual Mantid::Kernel::V3D getQLabFrame() const = 0;
virtual Mantid::Kernel::V3D getQSampleFrame() const = 0; virtual Mantid::Kernel::V3D getQSampleFrame() const = 0;
/*
virtual bool findDetector() = 0;
virtual bool findDetector(const InstrumentRayTracer &tracer) = 0;
*/
virtual void setQSampleFrame(const Mantid::Kernel::V3D &QSampleFrame, virtual void setQSampleFrame(const Mantid::Kernel::V3D &QSampleFrame,
boost::optional<double> detectorDistance) = 0; boost::optional<double> detectorDistance) = 0;
virtual void setQLabFrame(const Mantid::Kernel::V3D &QLabFrame, virtual void setQLabFrame(const Mantid::Kernel::V3D &QLabFrame,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment