Skip to content
GitLab
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
55f517e7
Commit
55f517e7
authored
Apr 09, 2021
by
Thomas Edwards
Browse files
Push ready, only error printing
parent
c9f00a94
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Filter_Obs.cpp
View file @
55f517e7
...
...
@@ -362,17 +362,17 @@ int Filter_Obs::lowpass_PLASMON_1Hz(buffer_obs* buffer_in,
// --------------------------------------------------------------
// Degbugging monitoring info
// --------------------------------------------------------------
std
::
cerr
<<
"-----------------------------------"
<<
std
::
endl
;
timestamp
=
tofilter1
.
back
()
->
get_time
(
"%Y-%m-%d %H:%M:%S"
,
true
);
//
std::cerr << "-----------------------------------" << std::endl;
//
timestamp=tofilter1.back()->get_time("%Y-%m-%d %H:%M:%S",true);
// Determine number of blocks
float
num_blocks
=
(
elapsed_time_last_block
/
(
1e9
/
16.
));
total_blocks
+=
num_blocks
;
// Debug printing
std
::
cerr
<<
"Total blocks: "
<<
total_blocks
<<
std
::
endl
;
std
::
cerr
<<
"Data in que: "
<<
tofilter1
.
size
()
<<
std
::
endl
;
std
::
cerr
<<
"Blocks*8: "
<<
round
(
8
*
(
total_blocks
))
<<
std
::
endl
;
//
//
Debug printing
//
std::cerr << "Total blocks: " << total_blocks << std::endl;
//
std::cerr << "Data in que: " << tofilter1.size() << std::endl;
//
std::cerr << "Blocks*8: " << round(8*(total_blocks)) << std::endl;
// --------------------------------------------------------------
// Given the elapsed time, can we run some number of filters to
...
...
@@ -411,16 +411,16 @@ int Filter_Obs::lowpass_PLASMON_1Hz(buffer_obs* buffer_in,
filter_jitter
-=
8
;
}
}
// Debug printing
std
::
cerr
<<
"Latest timestamp: "
<<
timestamp
<<
" | "
;
std
::
cerr
<<
"No. Rec: "
<<
tofilter1
.
size
()
<<
" | "
;
std
::
cerr
<<
"Elapsed time: "
;
std
::
cerr
<<
elapsed_time_last_block
<<
" | "
;
std
::
cerr
<<
"Expected blocks: "
<<
num_blocks
<<
" | "
;
std
::
cerr
<<
"Slip count: "
<<
slip_count
<<
" | "
;
std
::
cerr
<<
"Filters: "
<<
total_blocks
/
16.
<<
std
::
endl
;
std
::
cerr
<<
"Data in que: "
<<
tofilter1
.
size
()
<<
" | blocks*8: "
<<
time_block_check
<<
" | Run the filter?: "
<<
run_the_filter
<<
std
::
endl
;
std
::
cerr
<<
"OOR err, Filter Jitter: "
<<
filter_jitter
<<
" | "
;
//
//
Debug printing
//
std::cerr << "Latest timestamp: " << timestamp << " | ";
//
std::cerr << "No. Rec: " << tofilter1.size() << " | ";
//
std::cerr << "Elapsed time: ";
//
std::cerr << elapsed_time_last_block << " | ";
//
std::cerr << "Expected blocks: " << num_blocks << " | ";
//
std::cerr << "Slip count: " << slip_count << " | ";
//
std::cerr << "Filters: " << total_blocks/16. << std::endl;
//
std::cerr << "Data in que: " << tofilter1.size() << " | blocks*8: " << time_block_check << " | Run the filter?: " << run_the_filter << std::endl;
//
std::cerr << "OOR err, Filter Jitter: " << filter_jitter << " | ";
// Filter data
filter1_win
=
&
filter1_wins
.
at
(
129
+
filter_jitter
);
...
...
@@ -428,8 +428,8 @@ int Filter_Obs::lowpass_PLASMON_1Hz(buffer_obs* buffer_in,
filter_data_temp
->
filter_fir_sym
(
&
filter1_slice
,
filter1_win
);
points_to_drop
=
8
+
filter_jitter
;
// Debug printing
std
::
cerr
<<
"points_to_drop: "
<<
points_to_drop
<<
std
::
endl
;
//
//
Debug printing
//
std::cerr << "points_to_drop: " << points_to_drop << std::endl;
// Append this data to the queue for filter 2
tofilter2
.
push_back
(
new
data_obs_vector
(
filter_data_temp
));
...
...
@@ -443,8 +443,8 @@ int Filter_Obs::lowpass_PLASMON_1Hz(buffer_obs* buffer_in,
}
tofilter1
.
erase
(
tofilter1
.
begin
(),
tofilter1
.
begin
()
+
points_to_drop
);
// Debug printing
std
::
cerr
<<
"Total blocks (post filter): "
<<
total_blocks
<<
std
::
endl
;
//
//
Debug printing
//
std::cerr << "Total blocks (post filter): " << total_blocks << std::endl;
// remove a time block and update our estimate
time_block_check
=
round
(
8
*
(
total_blocks
));
...
...
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