bauer/WHAM
1
0
Fork 0
mirror of https://github.com/dnlbauer/WHAM.git synced 2026-09-10 22:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix data read

Browse Source
This commit is contained in:
Daniel Bauer
2018-10-06 11:30:13 +02:00
parent 0dc8e90c02
commit 1caf7f6c63
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/io.rs
View File

@@ -121,12 +121,15 @@ fn read_window_file(window_file: &str, cfg: &Config) -> Option<Histogram> {
} }
} }
if max_bin == min_bin { println!("{}", global_hist.len());
if (max_bin == min_bin && global_hist[max_bin] == 0.0) || max_bin < min_bin {
None // zero length histogram None // zero length histogram
} else { } else {
println!("{}/{}, {:?}", min_bin, max_bin, global_hist);
// trim global hist to save memory // trim global hist to save memory
global_hist.truncate(max_bin+1); global_hist.truncate(max_bin+1);
global_hist.drain(..min_bin); global_hist.drain(..min_bin);
println!("{}/{} ->{:?}", min_bin, max_bin, &global_hist);
let num_points: f32 = global_hist.iter().sum(); let num_points: f32 = global_hist.iter().sum();
Some(Histogram::new(min_bin, max_bin, num_points as u32, global_hist)) Some(Histogram::new(min_bin, max_bin, num_points as u32, global_hist))