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
71b0d278
Commit
71b0d278
authored
5 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Rename to NexusHDF5Descriptor
Signed-off-by:
Steven Hahn
<
hahnse@ornl.gov
>
parent
0d9d01b0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+7
-4
7 additions, 4 deletions
...ork/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
Framework/DataHandling/src/NexusFileLoader.cpp
+4
-2
4 additions, 2 deletions
Framework/DataHandling/src/NexusFileLoader.cpp
with
11 additions
and
6 deletions
Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+
7
−
4
View file @
71b0d278
...
...
@@ -7,13 +7,14 @@
#pragma once
#include
"MantidAPI/IFileLoader.h"
#include
"MantidNexus/HDF5Descriptor.h"
#include
"MantidKernel/System.h"
#include
"MantidNexus/NexusHDF5Descriptor.h"
namespace
Mantid
{
namespace
API
{
class
DLLExport
NexusFileLoader
:
public
IFileLoader
<
Mantid
::
Nexus
::
HDF5Descriptor
>
{
class
DLLExport
NexusFileLoader
:
public
IFileLoader
<
Mantid
::
Nexus
::
NexusHDF5Descriptor
>
{
public:
void
exec
()
override
;
void
createChildAlgorithm
(
const
std
::
string
&
name
,
...
...
@@ -21,9 +22,11 @@ public:
const
double
endProgress
=
-
1.
,
const
bool
enableLogging
=
true
,
const
int
&
version
=
-
1
)
override
;
void
setFileInfo
(
std
::
shared_ptr
<
Mantid
::
Nexus
::
HDF5Descriptor
>
fileInfo
);
void
setFileInfo
(
std
::
shared_ptr
<
Mantid
::
Nexus
::
NexusHDF5Descriptor
>
fileInfo
);
private:
std
::
shared_ptr
<
Mantid
::
Nexus
::
HDF5Descriptor
>
m_fileInfo
;
std
::
shared_ptr
<
Mantid
::
Nexus
::
Nexus
HDF5Descriptor
>
m_fileInfo
;
};
}
// namespace API
}
// namespace Mantid
This diff is collapsed.
Click to expand it.
Framework/DataHandling/src/NexusFileLoader.cpp
+
4
−
2
View file @
71b0d278
...
...
@@ -13,6 +13,8 @@ namespace Mantid::DataHandling {
const
double
endProgress
,
const
bool
enableLogging
,
const
int
&
version
)
{}
void
setFileInfo
(
std
::
shared_ptr
<
Mantid
::
Nexus
::
HDF5Descriptor
>
fileInfo
)
{}
void
setFileInfo
(
std
::
shared_ptr
<
Mantid
::
Nexus
::
NexusHDF5Descriptor
>
fileInfo
)
{
m_fileinfo
=
std
::
move
(
fileInfo
);
}
}
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