From c320874dd0444cff1f1d9669e3f3efa9dd2a74c7 Mon Sep 17 00:00:00 2001
From: mleech
Date: Tue, 5 Sep 2006 04:13:44 +0000
Subject: Changed calculation of receive power from squared I+Q

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3490 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gr-radio-astronomy/src/python/local_calibrator.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gr-radio-astronomy/src')

diff --git a/gr-radio-astronomy/src/python/local_calibrator.py b/gr-radio-astronomy/src/python/local_calibrator.py
index 6c5fb4f1f..578d07e9a 100755
--- a/gr-radio-astronomy/src/python/local_calibrator.py
+++ b/gr-radio-astronomy/src/python/local_calibrator.py
@@ -65,10 +65,11 @@ def calib_numogate_ridge_observatory_total_power(data):
 
     rainbow_file = open (filenamestr+".tpdat","a")
   
-    r = (math.sqrt(data) / 2048) * 1000.0
+    r = (data / 4096.0)
+    flt = "%6.3f" % r
     #r = calib_default_total_power(data)
     inter = globals()["calib_decln"]
-    rainbow_file.write(str(ephem.hours(sidtime))+" "+str(r)+" "+str(inter)+"\n")
+    rainbow_file.write(str(ephem.hours(sidtime))+" "+flt+" "+str(inter)+"\n")
     rainbow_file.close()
     return(r)
 
@@ -101,7 +102,7 @@ def calib_numogate_ridge_observatory_fft(data,l):
     if not "calib_then" in globals():
         globals()["calib_then"] = now
 
-    delta = 5
+    delta = (l/1024)*5
 		
     if (now - globals()["calib_then"]) >= delta:
 
-- 
cgit