Getting closer

This commit is contained in:
Dominik Werder
2021-04-10 09:43:27 +02:00
parent 1067869f34
commit b274e660ff
3 changed files with 18 additions and 16 deletions

View File

@@ -222,7 +222,7 @@ impl AggregatorTdim for MinMaxAvgScalarEventBatchAggregator {
Some(ts) => {
*ts < self.ts1
}
_ => panic!()
None => true,
}
}
@@ -788,7 +788,7 @@ async fn agg_x_dim_0_inner() {
buffer_size: 1024 * 4,
};
let bin_count = 20;
let ts1 = query.timebin as u64 * query.channel_config.time_bin_size * MS;
let ts1 = query.timebin as u64 * query.channel_config.time_bin_size;
let ts2 = ts1 + HOUR * 24;
let fut1 = crate::EventBlobsComplete::new(&query, &node)
.into_dim_1_f32_stream()
@@ -822,6 +822,7 @@ fn agg_x_dim_1() {
async fn agg_x_dim_1_inner() {
// sf-databuffer
// /data/sf-databuffer/daq_swissfel/daq_swissfel_3/byTime/S10BC01-DBAM070\:BAM_CH1_NORM/*
// S10BC01-DBAM070:BAM_CH1_NORM
let node = Node {
host: "localhost".into(),
port: 8888,
@@ -834,7 +835,7 @@ async fn agg_x_dim_1_inner() {
channel: Channel {
backend: "ks".into(),
keyspace: 3,
name: "S10BC01-DBAM070:BAM_CH1_NORM".into(),
name: "wave1".into(),
},
time_bin_size: DAY,
shape: Shape::Wave(1024),
@@ -842,12 +843,12 @@ async fn agg_x_dim_1_inner() {
big_endian: true,
compression: true,
},
timebin: 18722,
timebin: 0,
tb_file_count: 1,
buffer_size: 1024 * 4,
buffer_size: 17,
};
let bin_count = 100;
let ts1 = query.timebin as u64 * query.channel_config.time_bin_size * MS;
let bin_count = 10;
let ts1 = query.timebin as u64 * query.channel_config.time_bin_size;
let ts2 = ts1 + HOUR * 24;
let fut1 = crate::EventBlobsComplete::new(&query, &node)
.into_dim_1_f32_stream()