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
1a10ec3b
Commit
1a10ec3b
authored
4 years ago
by
mantid-builder
Committed by
Peterson, Peter
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
clang-format PR28432
c15855c6
parent
c15855c6
No related branches found
Branches containing commit
Tags
SAMMY-8.2-beta2
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/API/inc/MantidAPI/NexusFileLoader.h
+3
-2
3 additions, 2 deletions
Framework/API/inc/MantidAPI/NexusFileLoader.h
Framework/API/src/NexusFileLoader.cpp
+3
-2
3 additions, 2 deletions
Framework/API/src/NexusFileLoader.cpp
with
6 additions
and
4 deletions
Framework/API/inc/MantidAPI/NexusFileLoader.h
+
3
−
2
View file @
1a10ec3b
...
@@ -18,7 +18,8 @@ public:
...
@@ -18,7 +18,8 @@ public:
void
void
exec
()
override
final
;
// makes sure the NexusHDF5Descriptor is initialized
exec
()
override
final
;
// makes sure the NexusHDF5Descriptor is initialized
virtual
void
execLoader
()
=
0
;
// what would normally be called exec
virtual
void
execLoader
()
=
0
;
// what would normally be called exec
// the name of the property that the NexusHDF5Descriptor should be created against
// the name of the property that the NexusHDF5Descriptor should be created
// against
virtual
std
::
string
getFilenamePropertyName
()
const
=
0
;
virtual
std
::
string
getFilenamePropertyName
()
const
=
0
;
boost
::
shared_ptr
<
Algorithm
>
createChildAlgorithm
(
boost
::
shared_ptr
<
Algorithm
>
createChildAlgorithm
(
const
std
::
string
&
name
,
const
double
startProgress
=
-
1.
,
const
std
::
string
&
name
,
const
double
startProgress
=
-
1.
,
...
@@ -30,4 +31,4 @@ public:
...
@@ -30,4 +31,4 @@ public:
private:
private:
std
::
shared_ptr
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
m_fileInfo
;
std
::
shared_ptr
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
m_fileInfo
;
};
};
}
// namespace Mantid::
DataHandling
}
// namespace Mantid::
API
This diff is collapsed.
Click to expand it.
Framework/API/src/NexusFileLoader.cpp
+
3
−
2
View file @
1a10ec3b
...
@@ -10,7 +10,8 @@ namespace Mantid::API {
...
@@ -10,7 +10,8 @@ namespace Mantid::API {
void
NexusFileLoader
::
exec
()
{
void
NexusFileLoader
::
exec
()
{
// make sure the descriptor is initialized
// make sure the descriptor is initialized
if
(
!
m_fileInfo
)
{
if
(
!
m_fileInfo
)
{
const
std
::
string
filename
=
this
->
getPropertyValue
(
this
->
getFilenamePropertyName
());
const
std
::
string
filename
=
this
->
getPropertyValue
(
this
->
getFilenamePropertyName
());
m_fileInfo
=
m_fileInfo
=
std
::
make_shared
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
(
filename
);
std
::
make_shared
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
(
filename
);
}
}
...
@@ -35,4 +36,4 @@ void NexusFileLoader::setFileInfo(
...
@@ -35,4 +36,4 @@ void NexusFileLoader::setFileInfo(
std
::
shared_ptr
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
fileInfo
)
{
std
::
shared_ptr
<
Mantid
::
Kernel
::
NexusHDF5Descriptor
>
fileInfo
)
{
m_fileInfo
=
std
::
move
(
fileInfo
);
m_fileInfo
=
std
::
move
(
fileInfo
);
}
}
}
// namespace Mantid::
DataHandling
}
// namespace Mantid::
API
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