X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-radio-astronomy%2Fsrc%2Fpython%2Flocal_calibrator.py;h=d76060c0f5ebd7338316e71723b2282af745eb6d;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=792ee0d4d424450cba221e537fd1ba1ccded6fdb;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/gr-radio-astronomy/src/python/local_calibrator.py b/gr-radio-astronomy/src/python/local_calibrator.py
index 792ee0d4..d76060c0 100755
--- a/gr-radio-astronomy/src/python/local_calibrator.py
+++ b/gr-radio-astronomy/src/python/local_calibrator.py
@@ -6,7 +6,7 @@
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -25,6 +25,14 @@ import math
 import ephem
 import time
 
+#
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# NO LONGER USED
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+#
+
+
 #
 # Simple class for allowing local definition of a calibration function
 #  for raw samples coming from the RA detector chain.  Each observatory
@@ -49,8 +57,8 @@ def calib_numogate_ridge_observatory_total_power(data):
     #  a long time to figure that out.  If they don't arrive as strings,
     #  the calculations for sidereal time are complete garbage
     #
-    me.long = str(-76.043)
-    me.lat = str(44.967)
+    me.long = globals()["calib_long"]
+    me.lat = globals()["calib_lat"]
 
     me.date = ephem.now()
     sidtime = me.sidereal_time()
@@ -102,8 +110,8 @@ def calib_numogate_ridge_observatory_fft(data,l):
     #  a long time to figure that out.  If they don't arrive as strings,
     #  the calculations for sidereal time are complete garbage
     #
-    me.long = str(-76.043)
-    me.lat = str(44.967)
+    me.long = globals()["calib_long"]
+    me.lat = globals()["calib_lat"]
 
     me.date = ephem.now()
     sidtime = me.sidereal_time()
@@ -129,7 +137,7 @@ def calib_numogate_ridge_observatory_fft(data,l):
         globals()["calib_then"] = now
         numogate_file = open (filenamestr+".sdat","a")
   
-        r = calib_default_fft(data,l)
+        r = data
         inter = globals()["calib_decln"]
         fc = globals()["calib_freq_setting"]
         fc = fc / 1000000
@@ -179,3 +187,9 @@ def calib_set_decln(dec):
 
 def calib_set_prefix(pfx):
     globals()["calib_prefix"] = pfx
+
+def calib_set_long(long):
+    globals()["calib_long"] = long
+
+def calib_set_lat(lat):
+    globals()["calib_lat"] = lat