[Commit-gnuradio] r3490 - gnuradio/trunk/gr-radio-astronomy/src/python

[mleech]

Author: mleech
Date: 2006-09-04 22:13:44 -0600 (Mon, 04 Sep 2006)
New Revision: 3490

Modified:
   gnuradio/trunk/gr-radio-astronomy/src/python/local_calibrator.py
Log:
Changed calculation of receive power from squared I+Q

Modified: gnuradio/trunk/gr-radio-astronomy/src/python/local_calibrator.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/local_calibrator.py    
2006-09-05 04:13:03 UTC (rev 3489)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/local_calibrator.py    
2006-09-05 04:13:44 UTC (rev 3490)
@@ -65,10 +65,11 @@
 
     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 @@
     if not "calib_then" in globals():
         globals()["calib_then"] = now
 
-    delta = 5
+    delta = (l/1024)*5
                
     if (now - globals()["calib_then"]) >= delta: