Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
8be8f772
Commit
8be8f772
authored
Dec 13, 2018
by
Dimitar Tasev
Browse files
Fixed cppcheck error, added column export into saveNexus, re #24007
parent
5f6d3f87
Changes
1
Hide whitespace changes
Inline
Side-by-side
Framework/DataObjects/src/PeaksWorkspace.cpp
View file @
8be8f772
...
...
@@ -838,73 +838,81 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
//
Bin Count
column
file
->
writeData
(
"column_7"
,
b
in
Count
);
//
Intensity over Sigma
column
file
->
writeData
(
"column_7"
,
in
tensityOverSigma
);
file
->
openData
(
"column_7"
);
file
->
putAttr
(
"name"
,
"Sigma Intensity"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Bin Count column
file
->
writeData
(
"column_8"
,
binCount
);
file
->
openData
(
"column_8"
);
file
->
putAttr
(
"name"
,
"Bin Count"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Initial Energy column
file
->
writeData
(
"column_
8
"
,
initialEnergy
);
file
->
openData
(
"column_
8
"
);
file
->
writeData
(
"column_
9
"
,
initialEnergy
);
file
->
openData
(
"column_
9
"
);
file
->
putAttr
(
"name"
,
"Initial Energy"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Final Energy column
file
->
writeData
(
"column_
9
"
,
finalEnergy
);
file
->
openData
(
"column_
9
"
);
file
->
writeData
(
"column_
10
"
,
finalEnergy
);
file
->
openData
(
"column_
10
"
);
file
->
putAttr
(
"name"
,
"Final Energy"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Wave Length Column
file
->
writeData
(
"column_1
0
"
,
waveLength
);
file
->
openData
(
"column_1
0
"
);
file
->
writeData
(
"column_1
1
"
,
waveLength
);
file
->
openData
(
"column_1
1
"
);
file
->
putAttr
(
"name"
,
"Wave Length"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Scattering Column
file
->
writeData
(
"column_1
1
"
,
scattering
);
file
->
openData
(
"column_1
1
"
);
file
->
writeData
(
"column_1
2
"
,
scattering
);
file
->
openData
(
"column_1
2
"
);
file
->
putAttr
(
"name"
,
"Scattering"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// D Spacing Column
file
->
writeData
(
"column_1
2
"
,
dSpacing
);
file
->
openData
(
"column_1
2
"
);
file
->
writeData
(
"column_1
3
"
,
dSpacing
);
file
->
openData
(
"column_1
3
"
);
file
->
putAttr
(
"name"
,
"D Spacing"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// TOF Column
file
->
writeData
(
"column_1
3
"
,
TOF
);
file
->
openData
(
"column_1
3
"
);
file
->
writeData
(
"column_1
4
"
,
TOF
);
file
->
openData
(
"column_1
4
"
);
file
->
putAttr
(
"name"
,
"TOF"
);
file
->
putAttr
(
"interpret_as"
,
specifyDouble
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Run Number column
file
->
writeData
(
"column_1
4
"
,
runNumber
);
file
->
openData
(
"column_1
4
"
);
file
->
writeData
(
"column_1
5
"
,
runNumber
);
file
->
openData
(
"column_1
5
"
);
file
->
putAttr
(
"name"
,
"Run Number"
);
file
->
putAttr
(
"interpret_as"
,
specifyInteger
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Peak Number column
file
->
writeData
(
"column_1
7
"
,
peakNumber
);
file
->
openData
(
"column_1
7
"
);
file
->
writeData
(
"column_1
8
"
,
peakNumber
);
file
->
openData
(
"column_1
8
"
);
file
->
putAttr
(
"name"
,
"Peak Number"
);
file
->
putAttr
(
"interpret_as"
,
specifyInteger
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
...
...
@@ -914,8 +922,8 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
std
::
vector
<
int
>
array_dims
;
array_dims
.
push_back
(
static_cast
<
int
>
(
peaks
.
size
()));
array_dims
.
push_back
(
9
);
file
->
writeData
(
"column_1
5
"
,
goniometerMatrix
,
array_dims
);
file
->
openData
(
"column_1
5
"
);
file
->
writeData
(
"column_1
6
"
,
goniometerMatrix
,
array_dims
);
file
->
openData
(
"column_1
6
"
);
file
->
putAttr
(
"name"
,
"Goniometer Matrix"
);
file
->
putAttr
(
"interpret_as"
,
"A matrix of 3x3 doubles"
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
...
...
@@ -925,7 +933,7 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
std
::
vector
<
int64_t
>
dims
;
dims
.
push_back
(
np
);
dims
.
push_back
(
static_cast
<
int
>
(
maxShapeJSONLength
));
const
std
::
string
name
=
"column_1
6
"
;
const
std
::
string
name
=
"column_1
7
"
;
file
->
makeData
(
name
,
NeXus
::
CHAR
,
dims
,
false
);
file
->
openData
(
name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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