SHORT_SET: uses new signal/settings storage conventions

Author: Ryan Kingsbury

peregrine/short_set.py

@@ -595,7 +595,7 @@ def postprocess_short_samples(signal, prior_trajectory, t_prior, settings,
         prior_traj_func = False
         prior_traj = lambda t: prior_trajectory
 
-    sig_len_ms = len(signal) / settings.samplingFreq / 1E-3
+    sig_len_ms = len(signal) / settings.freq_profile['sampling_freq'] / 1E-3
     print "Signal is %.2f ms long." % sig_len_ms
 
     r_prior, v_prior = prior_traj(t_prior)

peregrine/warm_start.py

@@ -89,9 +89,11 @@ def warm_start(signal, t_prior, r_prior, v_prior, ephem, settings,
         if os.path.isfile("/etc/fftw/wisdom"):
             shutil.copy("/etc/fftw/wisdom", wiz_file)
 
-    a = acquisition.Acquisition(signal, settings.samplingFreq,
-                                settings.IF,
-                                settings.samplingFreq * gps.code_period,
+    samplingFreq = settings.freq_profile['sampling_freq']
+
+    a = acquisition.Acquisition(signal, samplingFreq,
+                                settings.freq_profile['GPS_L1_IF'],
+                                samplingFreq * settings.code_period,
                                 n_codes_integrate=n_codes_integrate,
                                 wisdom_file = wiz_file)
     # Attempt to acquire both the sats we predict are visible