Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
db6bbdbb
Commit
db6bbdbb
authored
Mar 11, 2021
by
Jose Borreguero
Browse files
Refs #30857 remove commented code
parent
f54b9805
Changes
5
Hide whitespace changes
Inline
Side-by-side
Framework/DataObjects/inc/MantidDataObjects/LeanElasticPeak.h
View file @
db6bbdbb
...
...
@@ -69,11 +69,6 @@ public:
std
::
shared_ptr
<
const
Geometry
::
ReferenceFrame
>
getReferenceFrame
()
const
override
;
/*
bool findDetector() override;
bool findDetector(const Geometry::InstrumentRayTracer &) override;
*/
void
setSamplePos
(
double
,
double
,
double
)
override
;
void
setSamplePos
(
const
Mantid
::
Kernel
::
V3D
&
)
override
;
...
...
Framework/DataObjects/src/LeanElasticPeak.cpp
View file @
db6bbdbb
...
...
@@ -336,36 +336,6 @@ LeanElasticPeak &LeanElasticPeak::operator=(const LeanElasticPeak &other) {
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.
*/
...
...
Framework/DataObjects/test/LeanElasticPeakTest.h
View file @
db6bbdbb
...
...
@@ -41,9 +41,6 @@ public:
TS_ASSERT_EQUALS
(
p
.
getDetectorID
(),
-
1
)
TS_ASSERT_THROWS
(
p
.
getDetector
(),
const
Exception
::
NotImplementedError
&
)
TS_ASSERT_THROWS
(
p
.
getInstrument
(),
const
Exception
::
NotImplementedError
&
)
/*
TS_ASSERT_THROWS(p.findDetector(), const Exception::NotImplementedError &)
*/
TS_ASSERT_THROWS
(
p
.
getDetectorPosition
(),
const
Exception
::
NotImplementedError
&
)
TS_ASSERT_THROWS
(
p
.
getDetectorPositionNoCheck
(),
...
...
Framework/DataObjects/test/PeakTest.h
View file @
db6bbdbb
...
...
@@ -39,7 +39,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
class
PeakTest
:
public
CxxTest
::
TestSuite
{
private:
/// Common instrument
Instrument_sptr
inst
;
Instrument_sptr
indd
inst
;
Instrument_sptr
m_minimalInstrument
;
public:
...
...
Framework/Geometry/inc/MantidGeometry/Crystal/IPeak.h
View file @
db6bbdbb
...
...
@@ -62,10 +62,6 @@ public:
virtual
Mantid
::
Kernel
::
V3D
getQLabFrame
()
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
,
boost
::
optional
<
double
>
detectorDistance
)
=
0
;
virtual
void
setQLabFrame
(
const
Mantid
::
Kernel
::
V3D
&
QLabFrame
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment