Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
7a137fc5
Commit
7a137fc5
authored
Oct 09, 2018
by
Purves, Murray
Browse files
Removing SRSI variable - it is/can always be inferred from other data
parent
41ed9514
Pipeline
#16183
passed with stages
in 8 minutes and 56 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixio/spectrum.cc
View file @
7a137fc5
...
...
@@ -231,10 +231,6 @@ void Spectrum::setDeviationPairOffsets(
mDeviationPairOffsets
=
deviationPairOffsets
;
}
short
Spectrum
::
srsi
()
const
{
return
mSrsi
;
}
void
Spectrum
::
setSrsi
(
short
srsi
)
{
mSrsi
=
srsi
;
}
int
Spectrum
::
spectrumDataCount
()
{
return
mSpectrumData
.
size
();
}
void
Spectrum
::
spectrumData
(
int
i
,
std
::
string
&
title
,
std
::
string
&
source
,
...
...
radixio/spectrum.hh
View file @
7a137fc5
...
...
@@ -83,8 +83,6 @@ class RADIX_PUBLIC Spectrum
void
setDeviationPairOffsets
(
const
std
::
array
<
std
::
array
<
std
::
array
<
std
::
array
<
float
,
4
>
,
8
>
,
8
>
,
20
>
&
deviationPairOffsets
);
short
srsi
()
const
;
void
setSrsi
(
short
srsi
);
int
spectrumDataCount
();
void
spectrumData
(
int
i
,
std
::
string
&
title
,
std
::
string
&
source
,
...
...
@@ -140,8 +138,6 @@ class RADIX_PUBLIC Spectrum
mDeviationPairEnergies
;
std
::
array
<
std
::
array
<
std
::
array
<
std
::
array
<
float
,
4
>
,
8
>
,
8
>
,
20
>
mDeviationPairOffsets
;
// Spectral record start index
short
mSrsi
;
// Spectrum data
std
::
vector
<
SpectrumData
>
mSpectrumData
;
...
...
radixio/spectrumpcfstream.i.hh
View file @
7a137fc5
...
...
@@ -112,8 +112,6 @@ bool SpectrumPCFStream<data_type>::read_from(const std::string &file)
{
mData
->
setDeviationPairPresence
(
deviationPairPresence
);
radix_line
(
" Deviation pairs present; reading..."
);
// Set SRSI to correct value
mData
->
setSrsi
(
83
);
// Read uncompressed deviation pairs
// Move to beginning of pairs (at 512 bytes)
...
...
@@ -146,8 +144,6 @@ bool SpectrumPCFStream<data_type>::read_from(const std::string &file)
{
mData
->
setDeviationPairPresence
(
deviationPairPresence
);
radix_line
(
" Compressed deviation pairs present; reading..."
);
// Set SRSI to correct value
mData
->
setSrsi
(
83
);
// Read compressed deviation pairs
// Move to beginning of pairs
...
...
@@ -177,8 +173,6 @@ bool SpectrumPCFStream<data_type>::read_from(const std::string &file)
{
mData
->
setDeviationPairPresence
(
""
);
radix_line
(
" No deviation pairs present"
);
// Set SRSI to correct value
mData
->
setSrsi
(
2
);
// Need to rewind to 256 bytes (start of spectrum header data)
stream
.
skipBytes
(
-
30
);
...
...
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