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
0965b56d
Commit
0965b56d
authored
7 years ago
by
Zhou, Wenduo
Browse files
Options
Downloads
Patches
Plain Diff
Refs #20796. Fixed compiling error.
parent
391a7332
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Algorithms/src/FindPeakBackground.cpp
+3
-24
3 additions, 24 deletions
Framework/Algorithms/src/FindPeakBackground.cpp
with
3 additions
and
24 deletions
Framework/Algorithms/src/FindPeakBackground.cpp
+
3
−
24
View file @
0965b56d
...
@@ -231,7 +231,9 @@ int FindPeakBackground::findBackground(
...
@@ -231,7 +231,9 @@ int FindPeakBackground::findBackground(
// save endpoints
// save endpoints
min_peak
=
peaks
[
0
].
start
;
min_peak
=
peaks
[
0
].
start
;
// extra point for histogram input
// extra point for histogram input
max_peak
=
peaks
[
0
].
stop
+
sizex
-
sizey
;
// size_t sizex = inpX.size(); // inpWS->x(inpwsindex).size();
// size_t sizey = inpY.size(); // inpWS->y(inpwsindex).size();
max_peak
=
peaks
[
0
].
stop
+
inpX
.
size
()
-
inpY
.
size
();
goodfit
=
1
;
goodfit
=
1
;
}
else
{
}
else
{
// assume the whole thing is background
// assume the whole thing is background
...
@@ -573,28 +575,5 @@ void FindPeakBackground::createOutputWorkspaces() {
...
@@ -573,28 +575,5 @@ void FindPeakBackground::createOutputWorkspaces() {
m_outPeakTableWS
->
appendRow
();
m_outPeakTableWS
->
appendRow
();
}
}
void
FindPeakBackground
::
findStartStopIndex
(
size_t
&
istart
,
size_t
&
istop
)
{
// Generate output
auto
inpX
=
m_histogram
->
x
();
auto
inpY
=
m_histogram
->
y
();
// size_t sizex = inpX.size();
size_t
sizey
=
inpY
.
size
();
// initial value of start and stop x index
size_t
n
=
sizey
;
size_t
l0
=
0
;
if
(
m_vecFitWindows
.
size
()
>
1
)
{
Mantid
::
Algorithms
::
FindPeaks
fp
;
l0
=
fp
.
getIndex
(
inpX
,
m_vecFitWindows
[
0
]);
n
=
fp
.
getIndex
(
inpX
,
m_vecFitWindows
[
1
]);
if
(
n
<
sizey
)
n
++
;
}
istart
=
l0
;
istop
=
n
;
}
}
// namespace Algorithms
}
// namespace Algorithms
}
// namespace Mantid
}
// namespace Mantid
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