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
51b15f45
Commit
51b15f45
authored
Jul 02, 2021
by
Walsh, Michael
Browse files
change CalibrationWorkspace to be of type MatrixWorkspace
parent
24a3950d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Framework/Algorithms/src/CombineDiffCal.cpp
View file @
51b15f45
...
...
@@ -47,7 +47,7 @@ void CombineDiffCal::init() {
std
::
make_unique
<
WorkspaceProperty
<
DataObjects
::
TableWorkspace
>>
(
"GroupedCalibration"
,
""
,
Direction
::
Input
),
"DiffCal table generated from calibrating grouped spectra. This is the source of DIFCgroup."
);
declareProperty
(
std
::
make_unique
<
WorkspaceProperty
<
DataObjects
::
Workspace
2D
>>
(
"CalibrationWorkspace"
,
""
,
Direction
::
Input
),
std
::
make_unique
<
WorkspaceProperty
<
API
::
Matrix
Workspace
>>
(
"CalibrationWorkspace"
,
""
,
Direction
::
Input
),
"Workspace where conversion from d-spacing to time-of-flight for each spectrum is determined from. This is the "
"source of DIFCarb."
);
declareProperty
(
...
...
@@ -141,7 +141,7 @@ void addRowFromGroupedCalibration(DataObjects::TableWorkspace_sptr ws, Mantid::A
/** Execute the algorithm.
*/
void
CombineDiffCal
::
exec
()
{
const
DataObjects
::
Workspace
2D
_sptr
calibrationWS
=
getProperty
(
"CalibrationWorkspace"
);
const
API
::
Matrix
Workspace_sptr
calibrationWS
=
getProperty
(
"CalibrationWorkspace"
);
DataObjects
::
TableWorkspace_sptr
presortedGroupedCalibrationWS
=
getProperty
(
"GroupedCalibration"
);
const
API
::
ITableWorkspace_sptr
groupedCalibrationWS
=
sortTableWorkspace
(
presortedGroupedCalibrationWS
);
...
...
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