Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Achim Morschhauser
GeomagLogger
Commits
6a516a14
Commit
6a516a14
authored
Nov 26, 2020
by
Achim Morschhauser
Browse files
Very minor bugfixes in data_obs_* classes
parent
c7fd6705
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/data_obs_vector.hpp
View file @
6a516a14
...
...
@@ -61,12 +61,13 @@ class data_obs_vector : public data_obs
/** Get a string representation of the form
"YYYY MM DD HH mm ss mil XXXXX.XX YYYYY.YY ZZZZZ.ZZ TT.TT TT.TT"
where mil: milliseconds*/
int
string
(
std
::
string
*
string
,
int
precision
);
virtual
int
string
(
std
::
string
*
string
,
int
precision
);
/** Parse a string representation of the form
"YYYY MM DD HH mm ss mil XXXXX.XX YYYYY.YY ZZZZZ.ZZ TT.TT TT.TT"
where mil: milliseconds*/
int
parse
(
std
::
string
*
string
);
virtual
int
parse
(
std
::
string
*
string
);
};
...
...
include/driver_obs_obsdaq.hpp
View file @
6a516a14
...
...
@@ -59,6 +59,10 @@ double valid_filter_rates[11];
static
const
int
valid_filter_rates_num
=
11
;
const
char
*
filter_cmds
[
11
];
/** Number of data channels */
int
N_data
=
3
;
/** Number of supplementary channels */
int
N_supp
=
4
;
/** Counting variable for binary data supplemental channels */
int
supp_count
=
0
;
...
...
src/Obs_Calibration_Vector.cpp
View file @
6a516a14
...
...
@@ -67,7 +67,7 @@ int Obs_Calibration_Vector::calibrate(data_obs* data){
// Check compatibility with data
if
(
data
->
get_Ndata
()
+
data
->
get_Nsupp
()
!=
N
){
std
::
cerr
<<
"Calibration constant do not match data!"
std
::
cerr
<<
"Calibration constant
s
do not match data!"
<<
std
::
endl
;
return
(
-
1
);
}
...
...
@@ -78,7 +78,7 @@ int Obs_Calibration_Vector::calibrate(data_obs* data){
data
->
get_all
(
datav
);
for
(
int
i
=
0
;
i
<
N
;
i
++
){
if
(
datav
[
i
]
!=
MD
)
;
datav
[
i
]
=
datav
[
i
]
*
scale
[
i
]
+
offset
[
i
];
if
(
datav
[
i
]
!=
MD
)
datav
[
i
]
=
datav
[
i
]
*
scale
[
i
]
+
offset
[
i
];
}
data
->
set_all
(
datav
);
...
...
src/data_obs_vector.cpp
View file @
6a516a14
...
...
@@ -41,7 +41,6 @@ data_obs_vector::data_obs_vector(int Nsupp) {
N_supp
=
Nsupp
;
N_data
=
3
;
MD
=-
99999
;
init
();
...
...
Write
Preview
Supports
Markdown
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