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
8ee3e10a
Commit
8ee3e10a
authored
8 years ago
by
Raquel Alvarez
Browse files
Options
Downloads
Patches
Plain Diff
Re #18117 Removing code that is never used
parent
2817020e
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
+0
-9
0 additions, 9 deletions
Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
Framework/Algorithms/src/Stitch1D.cpp
+2
-48
2 additions, 48 deletions
Framework/Algorithms/src/Stitch1D.cpp
with
2 additions
and
57 deletions
Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
+
0
−
9
View file @
8ee3e10a
...
...
@@ -73,15 +73,6 @@ private:
Mantid
::
API
::
MatrixWorkspace_sptr
integration
(
Mantid
::
API
::
MatrixWorkspace_sptr
&
input
,
const
double
&
start
,
const
double
&
stop
);
/// Perform multiplication over a range
Mantid
::
API
::
MatrixWorkspace_sptr
multiplyRange
(
Mantid
::
API
::
MatrixWorkspace_sptr
&
input
,
const
int
&
startBin
,
const
int
&
endBin
,
const
double
&
factor
);
/// Perform multiplication over a range
Mantid
::
API
::
MatrixWorkspace_sptr
multiplyRange
(
Mantid
::
API
::
MatrixWorkspace_sptr
&
input
,
const
int
&
startBin
,
const
double
&
factor
);
/// Create a single valued workspace
Mantid
::
API
::
MatrixWorkspace_sptr
singleValueWS
(
double
val
);
/// Calclate the weighted mean
Mantid
::
API
::
MatrixWorkspace_sptr
...
...
This diff is collapsed.
Click to expand it.
Framework/Algorithms/src/Stitch1D.cpp
+
2
−
48
View file @
8ee3e10a
...
...
@@ -145,7 +145,7 @@ void Stitch1D::init() {
"input workspaces."
);
declareProperty
(
make_unique
<
PropertyWithValue
<
bool
>>
(
"ScaleRHSWorkspace"
,
true
,
Direction
::
Input
),
"Scaling either with respect to workspace
1
or workspace
2
"
);
"Scaling either with respect to
LHS
workspace or
RHS
workspace"
);
declareProperty
(
make_unique
<
PropertyWithValue
<
bool
>>
(
"UseManualScaleFactor"
,
false
,
Direction
::
Input
),
"True to use a provided value for the scale factor."
);
...
...
@@ -280,7 +280,7 @@ std::vector<double> Stitch1D::getRebinParams(MatrixWorkspace_sptr &lhsWS,
return
result
;
}
/**Runs the Rebin Algorithm as a child
/**Runs the Rebin Algorithm as a child
and replaces special values
@param input :: The input workspace
@param params :: a vector<double> containing rebinning parameters
@return A shared pointer to the resulting MatrixWorkspace
...
...
@@ -360,52 +360,6 @@ MatrixWorkspace_sptr Stitch1D::integration(MatrixWorkspace_sptr &input,
return
outWS
;
}
/**Runs the MultiplyRange Algorithm as a child defining an end bin
@param input :: The input workspace
@param startBin :: The first bin int eh range to multiply
@param endBin :: The last bin in the range to multiply
@param factor :: The multiplication factor
@return A shared pointer to the resulting MatrixWorkspace
*/
MatrixWorkspace_sptr
Stitch1D
::
multiplyRange
(
MatrixWorkspace_sptr
&
input
,
const
int
&
startBin
,
const
int
&
endBin
,
const
double
&
factor
)
{
auto
multiplyRange
=
this
->
createChildAlgorithm
(
"MultiplyRange"
);
multiplyRange
->
setProperty
(
"InputWorkspace"
,
input
);
multiplyRange
->
setProperty
(
"StartBin"
,
startBin
);
multiplyRange
->
setProperty
(
"EndBin"
,
endBin
);
multiplyRange
->
setProperty
(
"Factor"
,
factor
);
g_log
.
information
(
"MultiplyRange StartBin: "
+
std
::
to_string
(
startBin
));
g_log
.
information
(
"MultiplyRange EndBin: "
+
std
::
to_string
(
endBin
));
g_log
.
information
(
"MultiplyRange Factor: "
+
boost
::
lexical_cast
<
std
::
string
>
(
factor
));
multiplyRange
->
execute
();
MatrixWorkspace_sptr
outWS
=
multiplyRange
->
getProperty
(
"OutputWorkspace"
);
return
outWS
;
}
/**Runs the MultiplyRange Algorithm as a child
@param input :: The input workspace
@param startBin :: The first bin int eh range to multiply
@param factor :: The multiplication factor
@return A shared pointer to the resulting MatrixWorkspace
*/
MatrixWorkspace_sptr
Stitch1D
::
multiplyRange
(
MatrixWorkspace_sptr
&
input
,
const
int
&
startBin
,
const
double
&
factor
)
{
auto
multiplyRange
=
this
->
createChildAlgorithm
(
"MultiplyRange"
);
multiplyRange
->
setProperty
(
"InputWorkspace"
,
input
);
multiplyRange
->
setProperty
(
"StartBin"
,
startBin
);
multiplyRange
->
setProperty
(
"Factor"
,
factor
);
g_log
.
information
(
"MultiplyRange StartBin: "
+
std
::
to_string
(
startBin
));
g_log
.
information
(
"MultiplyRange Factor: "
+
boost
::
lexical_cast
<
std
::
string
>
(
factor
));
multiplyRange
->
execute
();
MatrixWorkspace_sptr
outWS
=
multiplyRange
->
getProperty
(
"OutputWorkspace"
);
return
outWS
;
}
/**Runs the WeightedMean Algorithm as a child
@param inOne :: The first input workspace
@param inTwo :: The second input workspace
...
...
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