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
e92e0949
Commit
e92e0949
authored
6 years ago
by
Dimitar Tasev
Browse files
Options
Downloads
Patches
Plain Diff
Reverted saving out I/Sigma column to file, re #24007
parent
74e7ef74
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/DataObjects/src/PeaksWorkspace.cpp
+21
-31
21 additions, 31 deletions
Framework/DataObjects/src/PeaksWorkspace.cpp
with
21 additions
and
31 deletions
Framework/DataObjects/src/PeaksWorkspace.cpp
+
21
−
31
View file @
e92e0949
...
...
@@ -723,7 +723,6 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
std
::
vector
<
double
>
L
(
np
);
std
::
vector
<
double
>
intensity
(
np
);
std
::
vector
<
double
>
sigmaIntensity
(
np
);
std
::
vector
<
double
>
intensityOverSigma
(
np
);
std
::
vector
<
double
>
binCount
(
np
);
std
::
vector
<
double
>
initialEnergy
(
np
);
std
::
vector
<
double
>
finalEnergy
(
np
);
...
...
@@ -746,7 +745,6 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
L
[
i
]
=
p
.
getL
();
intensity
[
i
]
=
p
.
getIntensity
();
sigmaIntensity
[
i
]
=
p
.
getSigmaIntensity
();
intensityOverSigma
[
i
]
=
p
.
getIntensityOverSigma
();
binCount
[
i
]
=
p
.
getBinCount
();
initialEnergy
[
i
]
=
p
.
getInitialEnergy
();
finalEnergy
[
i
]
=
p
.
getFinalEnergy
();
...
...
@@ -838,81 +836,73 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
file
->
closeData
();
// Intensity over Sigma column
file
->
writeData
(
"column_7"
,
intensityOverSigma
);
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
->
writeData
(
"column_
7
"
,
binCount
);
file
->
openData
(
"column_
7
"
);
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_
9
"
,
initialEnergy
);
file
->
openData
(
"column_
9
"
);
file
->
writeData
(
"column_
8
"
,
initialEnergy
);
file
->
openData
(
"column_
8
"
);
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_
10
"
,
finalEnergy
);
file
->
openData
(
"column_
10
"
);
file
->
writeData
(
"column_
9
"
,
finalEnergy
);
file
->
openData
(
"column_
9
"
);
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
1
"
,
waveLength
);
file
->
openData
(
"column_1
1
"
);
file
->
writeData
(
"column_1
0
"
,
waveLength
);
file
->
openData
(
"column_1
0
"
);
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
2
"
,
scattering
);
file
->
openData
(
"column_1
2
"
);
file
->
writeData
(
"column_1
1
"
,
scattering
);
file
->
openData
(
"column_1
1
"
);
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
3
"
,
dSpacing
);
file
->
openData
(
"column_1
3
"
);
file
->
writeData
(
"column_1
2
"
,
dSpacing
);
file
->
openData
(
"column_1
2
"
);
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
4
"
,
TOF
);
file
->
openData
(
"column_1
4
"
);
file
->
writeData
(
"column_1
3
"
,
TOF
);
file
->
openData
(
"column_1
3
"
);
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
5
"
,
runNumber
);
file
->
openData
(
"column_1
5
"
);
file
->
writeData
(
"column_1
4
"
,
runNumber
);
file
->
openData
(
"column_1
4
"
);
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
8
"
,
peakNumber
);
file
->
openData
(
"column_1
8
"
);
file
->
writeData
(
"column_1
7
"
,
peakNumber
);
file
->
openData
(
"column_1
7
"
);
file
->
putAttr
(
"name"
,
"Peak Number"
);
file
->
putAttr
(
"interpret_as"
,
specifyInteger
);
file
->
putAttr
(
"units"
,
"Not known"
);
// Units may need changing when known
...
...
@@ -922,8 +912,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
6
"
,
goniometerMatrix
,
array_dims
);
file
->
openData
(
"column_1
6
"
);
file
->
writeData
(
"column_1
5
"
,
goniometerMatrix
,
array_dims
);
file
->
openData
(
"column_1
5
"
);
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
...
...
@@ -933,7 +923,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
7
"
;
const
std
::
string
name
=
"column_1
6
"
;
file
->
makeData
(
name
,
NeXus
::
CHAR
,
dims
,
false
);
file
->
openData
(
name
);
...
...
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