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
be2afeb3
Commit
be2afeb3
authored
9 years ago
by
Campbell, Stuart
Browse files
Options
Downloads
Patches
Plain Diff
Fix cppcheck warnings
parent
ad123570
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+5
-6
5 additions, 6 deletions
...amework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
with
5 additions
and
6 deletions
Code/Mantid/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
+
5
−
6
View file @
be2afeb3
...
...
@@ -340,9 +340,6 @@ namespace Algorithms
//PARALLEL_FOR1(outputWS)
for
(
int64_t
i
=
0
;
i
<
numberOfSpectra_i
;
++
i
)
{
int
emode
=
2
;
double
l1
,
l2
,
twoTheta
,
efixed
;
// Lets find what row this spectrum ID appears in our detector table.
...
...
@@ -352,6 +349,9 @@ namespace Algorithms
try
{
int
emode
=
2
;
double
l1
,
l2
,
twoTheta
,
efixed
;
double
deg2rad
=
M_PI
/
180.
;
auto
det
=
outputWS
->
getDetector
(
i
);
...
...
@@ -362,13 +362,12 @@ namespace Algorithms
g_log
.
debug
()
<<
"###### Spectra #"
<<
specid
<<
" ==> Workspace ID:"
<<
wsid
<<
std
::
endl
;
// Now we need to find the row that contains this spectrum
std
::
vector
<
int
>::
iterator
specIter
=
spectraColumn
.
begin
()
;
std
::
vector
<
int
>::
iterator
specIter
;
specIter
=
std
::
find
(
spectraColumn
.
begin
(),
spectraColumn
.
end
(),
specid
);
size_t
detectorRow
=
0
;
if
(
specIter
!=
spectraColumn
.
end
())
{
detectorRow
=
std
::
distance
(
spectraColumn
.
begin
(),
specIter
);
size_t
detectorRow
=
std
::
distance
(
spectraColumn
.
begin
(),
specIter
);
l1
=
l1Column
[
detectorRow
];
l2
=
l2Column
[
detectorRow
];
twoTheta
=
twoThetaColumn
[
detectorRow
]
*
deg2rad
;
...
...
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