Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
b0472cb8
Commit
b0472cb8
authored
May 27, 2015
by
Raquel Alvarez Banos
Browse files
Re #11825 Progress should be a local variable
parent
8e43c2b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
View file @
b0472cb8
...
...
@@ -76,9 +76,6 @@ private:
/// Are we going to make a copy of the NeXus file to operate on ?
bool
m_makeNexusCopy
;
/// Algorithm progress keeper
API
::
Progress
*
m_progress
;
/// The workspace to load instrument and logs
API
::
MatrixWorkspace_sptr
ws
;
...
...
Code/Mantid/Framework/DataHandling/src/AppendGeometryToSNSNexus.cpp
View file @
b0472cb8
...
...
@@ -24,7 +24,7 @@ DECLARE_ALGORITHM(AppendGeometryToSNSNexus)
/** Constructor
*/
AppendGeometryToSNSNexus
::
AppendGeometryToSNSNexus
()
:
m_makeNexusCopy
(
false
),
m_progress
(),
m_instrumentLoadedCorrectly
(
false
),
:
m_makeNexusCopy
(
false
),
m_instrumentLoadedCorrectly
(
false
),
m_logsLoadedCorrectly
(
false
)
{}
//----------------------------------------------------------------------------------------------
...
...
@@ -162,7 +162,7 @@ void AppendGeometryToSNSNexus::exec() {
// Get the number of histograms/detectors
const
size_t
numDetectors
=
ws
->
getInstrument
()
->
getDetectorIDs
().
size
();
this
->
m_progress
=
new
API
::
P
rogress
(
this
,
0.0
,
1.0
,
numDetectors
);
API
::
Progress
p
rogress
(
this
,
0.0
,
1.0
,
numDetectors
);
// Get the instrument
Geometry
::
Instrument_const_sptr
instrument
=
ws
->
getInstrument
();
...
...
@@ -252,7 +252,7 @@ void AppendGeometryToSNSNexus::exec() {
nxfile
.
closeGroup
();
// close NXdetector
this
->
m_
progress
->
report
(
dets
.
size
());
progress
.
report
(
dets
.
size
());
}
else
{
throw
std
::
runtime_error
(
"Could not find any detectors for the bank named "
+
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment