Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
d3b9506a
Commit
d3b9506a
authored
6 years ago
by
Sullivan, Brendan T
Browse files
Options
Downloads
Patches
Plain Diff
Re #24329 clang-format
parent
c84596b3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h
+1
-3
1 addition, 3 deletions
Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h
Framework/Crystal/src/SetCrystalLocation.cpp
+6
-7
6 additions, 7 deletions
Framework/Crystal/src/SetCrystalLocation.cpp
with
7 additions
and
10 deletions
Framework/Crystal/inc/MantidCrystal/SetCrystalLocation.h
+
1
−
3
View file @
d3b9506a
...
@@ -33,9 +33,7 @@ orientation .
...
@@ -33,9 +33,7 @@ orientation .
*/
*/
class
DLLExport
SetCrystalLocation
:
public
API
::
Algorithm
{
class
DLLExport
SetCrystalLocation
:
public
API
::
Algorithm
{
public:
public:
const
std
::
string
name
()
const
override
{
const
std
::
string
name
()
const
override
{
return
"SetCrystalLocation"
;
};
return
"SetCrystalLocation"
;
};
/// Summary of algorithms purpose
/// Summary of algorithms purpose
const
std
::
string
summary
()
const
override
{
const
std
::
string
summary
()
const
override
{
return
"This algorithm sets the sample location of the "
return
"This algorithm sets the sample location of the "
...
...
This diff is collapsed.
Click to expand it.
Framework/Crystal/src/SetCrystalLocation.cpp
+
6
−
7
View file @
d3b9506a
...
@@ -13,20 +13,20 @@
...
@@ -13,20 +13,20 @@
*/
*/
#include
"MantidCrystal/SetCrystalLocation.h"
#include
"MantidCrystal/SetCrystalLocation.h"
#include
"MantidAPI/IMDEventWorkspace.h"
#include
"MantidAPI/Run.h"
#include
"MantidAPI/Run.h"
#include
"MantidAPI/Sample.h"
#include
"MantidAPI/Sample.h"
#include
"MantidAPI/WorkspaceFactory.h"
#include
"MantidAPI/WorkspaceFactory.h"
#include
"MantidCrystal/CalibrationHelpers.h"
#include
"MantidCrystal/CalibrationHelpers.h"
#include
"MantidCrystal/PeakHKLErrors.h"
#include
"MantidCrystal/PeakHKLErrors.h"
#include
"MantidCrystal/SCDCalibratePanels.h"
#include
"MantidCrystal/SCDCalibratePanels.h"
#include
"MantidDataObjects/EventWorkspace.h"
#include
"MantidGeometry/Crystal/IPeak.h"
#include
"MantidGeometry/Crystal/IPeak.h"
#include
"MantidGeometry/Crystal/IndexingUtils.h"
#include
"MantidGeometry/Crystal/IndexingUtils.h"
#include
"MantidGeometry/Instrument/ComponentInfo.h"
#include
"MantidGeometry/Instrument/ComponentInfo.h"
#include
"MantidGeometry/Instrument/Goniometer.h"
#include
"MantidGeometry/Instrument/Goniometer.h"
#include
"MantidKernel/ArrayProperty.h"
#include
"MantidKernel/ArrayProperty.h"
#include
"MantidKernel/EnabledWhenProperty.h"
#include
"MantidKernel/EnabledWhenProperty.h"
#include
"MantidAPI/IMDEventWorkspace.h"
#include
"MantidDataObjects/EventWorkspace.h"
#include
<cstdarg>
#include
<cstdarg>
...
@@ -47,10 +47,9 @@ void SetCrystalLocation::init() {
...
@@ -47,10 +47,9 @@ void SetCrystalLocation::init() {
declareProperty
(
make_unique
<
WorkspaceProperty
<
EventWorkspace
>>
(
declareProperty
(
make_unique
<
WorkspaceProperty
<
EventWorkspace
>>
(
"InputWorkspace"
,
""
,
Direction
::
Input
),
"InputWorkspace"
,
""
,
Direction
::
Input
),
"Original event workspace"
);
"Original event workspace"
);
declareProperty
(
declareProperty
(
make_unique
<
WorkspaceProperty
<
EventWorkspace
>>
(
make_unique
<
WorkspaceProperty
<
EventWorkspace
>>
(
"OutputWorkspace"
,
"OutputWorkspace"
,
""
,
Direction
::
Output
),
""
,
Direction
::
Output
),
"Output event workspace with a modified sample position"
);
"Output event workspace with a modified sample position"
);
declareProperty
(
"NewX"
,
0.0
,
"New Absolute X position of crystal."
);
declareProperty
(
"NewX"
,
0.0
,
"New Absolute X position of crystal."
);
declareProperty
(
"NewY"
,
0.0
,
"New Absolute Y position of crystal."
);
declareProperty
(
"NewY"
,
0.0
,
"New Absolute Y position of crystal."
);
declareProperty
(
"NewZ"
,
0.0
,
"New Absolute Z position of crystal."
);
declareProperty
(
"NewZ"
,
0.0
,
"New Absolute Z position of crystal."
);
...
@@ -72,7 +71,7 @@ void SetCrystalLocation::exec() {
...
@@ -72,7 +71,7 @@ void SetCrystalLocation::exec() {
auto
&
componentInfo
=
outEvents
->
mutableComponentInfo
();
auto
&
componentInfo
=
outEvents
->
mutableComponentInfo
();
CalibrationHelpers
::
adjustUpSampleAndSourcePositions
(
CalibrationHelpers
::
adjustUpSampleAndSourcePositions
(
componentInfo
.
l1
(),
newSamplePos
,
componentInfo
);
componentInfo
.
l1
(),
newSamplePos
,
componentInfo
);
setProperty
(
"OutputWorkspace"
,
outEvents
);
setProperty
(
"OutputWorkspace"
,
outEvents
);
}
// exec
}
// exec
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment