working on mdev tdev

gwbres · Dec 27, 2021 · 6075e8c · 6075e8c
1 parent e71d270
commit 6075e8c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -195,21 +195,22 @@ fn calc_modified (data: &Vec<f64>, tau: f64, is_var: bool) -> Result<(f64,f64),
         n += 1.0_f64;
         i += 1 
     }
-    let mut dev = sum /2.0 /n;
+    let mut dev = sum /2.0 /n /tau /tau; // * rate
     if !is_var {
-        dev = dev.powf(0.5_f64)
+        dev = dev.powf(0.5_f64) / tau
     }
-    dev /= tau; // * rate
 
     Ok((dev, dev/(n.powf(0.5_f64))))
 }
 
 /// Computes `time` deviation / variance
 /// at desired `tau` offset (s)
 fn calc_time (data: &Vec<f64>, tau: f64, is_var: bool) -> Result<(f64,f64), Error> {
-    let (mdev,err) = calc_modified(data, tau, is_var)?;
-    //Ok((mdev * tau / 3.0), err)
-    Ok((mdev * tau / (3.0_f64).powf(0.5_f64), err))
+    let (mdev,mderr) = calc_modified(data, tau, is_var)?;
+    Ok((
+        mdev * tau / (3.0_f64).powf(0.5_f64),
+        mderr // mderr / ns.powf(0.5_f64)
+    ))
 }
 
 /// Computes desired statistics in `Three Cornerned Hat` fashion.