Commit 6a516a14 authored by Achim Morschhauser's avatar Achim Morschhauser
Browse files

Very minor bugfixes in data_obs_* classes

parent c7fd6705
......@@ -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);
};
......
......@@ -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;
......
......@@ -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 constants 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);
......
......@@ -41,7 +41,6 @@ data_obs_vector::data_obs_vector(int Nsupp) {
N_supp = Nsupp;
N_data = 3;
MD=-99999;
init();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment