Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
fcbc72ce
Commit
fcbc72ce
authored
Jun 01, 2018
by
Gagik Vardanyan
Browse files
Re #22212 clang format fix
parent
36ddb545
Changes
2
Hide whitespace changes
Inline
Side-by-side
Framework/DataHandling/src/LoadILLSANS.cpp
View file @
fcbc72ce
...
...
@@ -52,7 +52,7 @@ const std::string LoadILLSANS::category() const {
/// Algorithm's summary. @see Algorithm::summery
const
std
::
string
LoadILLSANS
::
summary
()
const
{
return
"Loads a ILL nexus files for SANS instruments D11, D22, D33."
;
return
"Loads a ILL nexus files for SANS instruments D11, D22, D33."
;
}
//----------------------------------------------------------------------------------------------
...
...
@@ -108,8 +108,8 @@ void LoadILLSANS::exec() {
progress
.
report
(
"Moving detectors"
);
moveDetectorsD33
(
std
::
move
(
detPos
));
if
(
m_isTOF
)
{
adjustTOF
();
moveSource
();
adjustTOF
();
moveSource
();
}
}
else
{
progress
.
report
(
"Initializing the workspace for "
+
m_instrumentName
);
...
...
@@ -699,15 +699,14 @@ void LoadILLSANS::adjustTOF() {
* Used only for D33 in TOF mode
*/
void
LoadILLSANS
::
moveSource
()
{
API
::
IAlgorithm_sptr
mover
=
createChildAlgorithm
(
"MoveInstrumentComponent"
);
mover
->
setProperty
<
MatrixWorkspace_sptr
>
(
"Workspace"
,
m_localWorkspace
);
mover
->
setProperty
(
"ComponentName"
,
"moderator"
);
mover
->
setProperty
(
"X"
,
0.
);
mover
->
setProperty
(
"Y"
,
0.
);
mover
->
setProperty
(
"Z"
,
-
m_sourcePos
);
mover
->
setProperty
(
"RelativePosition"
,
false
);
mover
->
executeAsChildAlg
();
API
::
IAlgorithm_sptr
mover
=
createChildAlgorithm
(
"MoveInstrumentComponent"
);
mover
->
setProperty
<
MatrixWorkspace_sptr
>
(
"Workspace"
,
m_localWorkspace
);
mover
->
setProperty
(
"ComponentName"
,
"moderator"
);
mover
->
setProperty
(
"X"
,
0.
);
mover
->
setProperty
(
"Y"
,
0.
);
mover
->
setProperty
(
"Z"
,
-
m_sourcePos
);
mover
->
setProperty
(
"RelativePosition"
,
false
);
mover
->
executeAsChildAlg
();
}
}
// namespace DataHandling
...
...
Framework/DataHandling/test/LoadILLSANSTest.h
View file @
fcbc72ce
...
...
@@ -37,9 +37,7 @@ public:
ConfigService
::
Instance
().
setFacility
(
"ILL"
);
}
void
tearDown
()
override
{
AnalysisDataService
::
Instance
().
clear
();
}
void
tearDown
()
override
{
AnalysisDataService
::
Instance
().
clear
();
}
void
test_name
()
{
LoadILLSANS
alg
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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