Corrections in fn_time

1 files changed, 12 insertions, 8 deletions

diff --git a/python/misc_utils/fn_time.py b/python/misc_utils/fn_time.py
index cf03681..96314b8 100644
--- a/python/misc_utils/fn_time.py
+++ b/python/misc_utils/fn_time.py
@@ -22,6 +22,7 @@
 # 
 from math import floor, ceil
 from random import uniform
+from grgsm import fn_time_delta_cpp
 
 __hyper_frame = 26*51*2048
 __symb_rate = 13.0e6/48.0
@@ -37,7 +38,7 @@ __frame_period = 8*__ts_period
 def fnmod_delta(fn1, fn2):
     h2 = __hyper_frame/2
     delta = (fn1%__hyper_frame)-(fn2%__hyper_frame)
-  
+    
     if delta >= h2:
         delta = delta - __hyper_frame
     elif delta < -h2:
@@ -49,7 +50,7 @@ def fn_time_diff_delta(fn_x, fn_ref, time_diff_hint=0):
     frames_diff = int(round(time_diff_hint/__frame_period))
     fn_ref_hint = (fn_ref + frames_diff)
     fn_delta = fnmod_delta(fn_x,fn_ref_hint)+frames_diff
-    
+
     return fn_delta
 
 #fn_time_delta computes difference between reference frame number and a second frame number. It also computes timestamp of the second frame number. The full list of parameters is following:
@@ -73,16 +74,19 @@ def fn_time_delta(fn_ref, time_ref, fn_x, time_hint=None, ts_num=0, ts_ref=0):
 if __name__ == "__main__":
     fn1 = 10000
     ts_ref = 4
-    time1 = 10
-    for fn2 in xrange(__hyper_frame/2+fn1-10,__hyper_frame/2*10+fn1+10,10):
+    time1 = 10.5
+    for fn2 in xrange(__hyper_frame/2+fn1-10,__hyper_frame/2*10+fn1+100,10):
         ts_x = int(uniform(0,8))
-        time2 = time1 + (fn2-fn1)*__frame_period + (ts_ref-ts_x)*__ts_period
+        time2 = time1 + (fn2-fn1)*__frame_period + (ts_x-ts_ref)*__ts_period
         error = uniform(-6200,6200)
         time2_err = time2+error
         fn_delta, time2_precise = fn_time_delta(fn1, time1, fn2, time2_err, ts_x, ts_ref)
+        time2_precise_cpp = fn_time_delta_cpp(fn1, (int(time1),time1-int(time1)), fn2, (int(time2_err),time2_err-int(time2_err)), ts_x, ts_ref)
         if fn_delta != fn2-fn1:
             print "bad fn:", fn2, error#, 'fn_delta:'+str(fn_delta), time2, error, frames_diff_h4, (time2-time1)/(__hyper_frame*__frame_period), time_diff_hint_h4_prev, time_diff_hint
-        time_diff_hint = time2 - time2_precise
-        if time_diff_hint > 0.0001:
-            print "bad time diff"
+#        time_diff_hint = time2 - time2_precise
+        time_diff_hint = time2_precise_cpp[0]+time2_precise_cpp[1] - time2_precise
 
+        if abs(time_diff_hint) > 0.0001:
+            print "time2_precise_cpp",time2_precise_cpp," time2_precise",time2_precise," time_ref",time1," time_hint",time2_err
+            print ""