Fix unit tests

Author: Adel Mamin

peregrine/analysis/tracking_loop.py

@@ -102,7 +102,7 @@ def main():
 
   ms_to_process = int(args.ms_to_process)
 
-  if args.short_long_cycles is not None:
+  if args.short_long_cycles:
     tracker_options = {'mode': 'short-long-cycles'}
   else:
     tracker_options = None

peregrine/defaults.py

@@ -136,6 +136,11 @@
     'pll_bw': (40, 35, 30, 25, 20, 18, 16, 14, 12, 10, 8, 7, 6.5, 6, 5.5, 5),
     'coherent_ms': (1, 2, 4, 5, 10, 20) }
 
+l2c_track_params = {
+    'fll_bw': (1, 0),
+    'pll_bw': (20, 18, 16, 14, 12, 10, 8, 7, 6.5, 6, 5.5, 5),
+    'coherent_ms': (20,) }
+
 l1ca_loop_filter_params_template = {
      'code_params': (1., 0.7, 1.),   # NBW, zeta, k
      'carr_params': (20., 0.7, 1.),   # NBW, zeta, k
@@ -144,6 +149,14 @@
      'carr_to_code': 1540.           # carr_to_code
     }
 
+l2c_loop_filter_params_template = {
+     'code_params': (1., 0.7, 1.),   # NBW, zeta, k
+     'carr_params': (20., 0.7, 1.),   # NBW, zeta, k
+     'loop_freq': 1000.,             # 1000/coherent_ms
+     'carr_freq_b1': 1.,             # FLL NBW
+     'carr_to_code': 1200.           # carr_to_code
+    }
+
 # Tracking stages. See track.c for more details.
 # 1;20 ms stages
 l1ca_stage_params_slow = \

peregrine/run.py

@@ -140,6 +140,7 @@ def populate_peregrine_cmd_line_arguments(parser):
 
   fpgaSim.add_argument("--short-long-cycles",
                         help="Use FPGA short-long cycle simulation.",
+                        default=False,
                         action="store_true")
 
   signalParam = parser.add_argument_group('Signal tracking',
@@ -186,7 +187,7 @@ def main():
   else:
     raise NotImplementedError()
 
-  if args.short_long_cycles is not None:
+  if args.short_long_cycles:
     tracker_options = {'mode': 'short-long-cycles'}
   else:
     tracker_options = None

peregrine/tracking.py

@@ -235,11 +235,13 @@ def __init__(self, params):
       if mode == 'short-long-cycles':
         self.short_n_long = True
 
+    self.bit_sync_prev = self.bit_sync
+
     self.track_settled = False
     self.fsm_index = 0
     self.fsm_states = get_fsm_states(ms=self.coherent_ms,
                                      short_n_long=self.short_n_long,
-                                     bit_sync=False)
+                                     bit_sync=self.bit_sync)
 
     self.lock_detect = lock_detect.LockDetector(
         k1=self.lock_detect_params["k1"],
@@ -472,11 +474,10 @@ def _run_track_profile_selection(self):
 
     """
 
-    bit_sync = self.nav_bit_sync.bit_sync_acquired()
-    if bit_sync and not self.bit_sync:
+    if self.bit_sync and not self.bit_sync_prev:
       # we just got bit sync
       self.track_profile_timer_ms = 0
-    self.bit_sync = bit_sync
+      self.bit_sync_prev = self.bit_sync
 
     if self.lock_detect_outp:
 
@@ -956,6 +957,8 @@ def __init__(self, params):
     params['sample_index'] = params['samples']['sample_index']
     params['carrier_freq'] = gps_constants.l1
 
+    self.bit_sync = False
+
     TrackingChannel.__init__(self, params)
 
     self.nav_msg = NavMsg()
@@ -1012,6 +1015,8 @@ def _run_nav_data_decoding(self):
     self.track_result.tow[self.i] = tow if tow >= 0 else (
         self.track_result.tow[self.i - 1] + self.coherent_ms)
 
+    self.bit_sync = self.nav_bit_sync.bit_sync_acquired()
+
     # Handover to L2C if possible
     if self.l2c_handover and not self.l2c_handover_acq and \
        'samples' in self.samples[gps_constants.L2C] and sync:
@@ -1051,16 +1056,23 @@ def __init__(self, params):
     cn0_0 = 10 * np.log10(params['acq'].snr)
     cn0_0 += 10 * np.log10(defaults.L2C_CHANNEL_BANDWIDTH_HZ)
     params['cn0_0'] = cn0_0
-    params['track_profiles'] = defaults.l2c_track_profiles
+
     params['lock_detect_params'] = defaults.l2c_lock_detect_params_20ms
     params['IF'] = params['samples'][gps_constants.L2C]['IF']
     params['prn_code'] = L2CMCodes[params['acq'].prn]
     params['code_freq_init'] = params['acq'].doppler * \
         gps_constants.l2c_chip_rate / gps_constants.l2
+
+    params['track_params'] = defaults.l2c_track_params
+    params['loop_filter_params_template'] = \
+        defaults.l2c_loop_filter_params_template
+
     params['chipping_rate'] = gps_constants.l2c_chip_rate
     params['sample_index'] = 0
     params['carrier_freq'] = gps_constants.l2
 
+    self.bit_sync = True
+
     TrackingChannel.__init__(self, params)
 
     self.cnav_msg = CNavMsg()

tests/test_common.py

@@ -149,8 +149,7 @@ def run_peregrine(file_name, file_format, freq_profile,
                   skip_param, skip_val,
                   skip_tracking=True,
                   skip_navigation=True,
-                  pipelining=None,
-                  short_long_cycles=None):
+                  short_long_cycles=False):
 
   parameters = [
     'peregrine',
@@ -166,11 +165,8 @@ def run_peregrine(file_name, file_format, freq_profile,
   if skip_navigation:
     parameters += ['-n']
 
-  if pipelining:
-    parameters += ['--pipelining', str(pipelining)]
-
   if short_long_cycles:
-    parameters += ['--short-long-cycles', str(short_long_cycles)]
+    parameters += ['--short-long-cycles']
 
   # Replace argv with args to skip tracking and navigation.
   with patch.object(sys, 'argv', parameters):

tests/test_tracking.py

@@ -28,7 +28,7 @@
 
 def run_tracking_loop(prn, signal, dopp, phase, file_name, file_format,
                       freq_profile, skip_val, norun=False, l2chandover=False,
-                      pipelining=None, short_long_cycles=None):
+                      short_long_cycles=False):
   parameters = [
     'tracking_loop',
     '-P', str(prn),
@@ -41,10 +41,8 @@ def run_tracking_loop(prn, signal, dopp, phase, file_name, file_format,
     '--skip-samples', str(skip_val)
   ]
 
-  if pipelining:
-    parameters += ['--pipelining', str(pipelining)]
-  elif short_long_cycles:
-    parameters += ['--short-long-cycles', str(short_long_cycles)]
+  if short_long_cycles:
+    parameters += ['--short-long-cycles']
 
   if norun:
     parameters.append('--no-run')
@@ -78,34 +76,33 @@ def get_tr_loop_res_file_name(sample_file, prn, band):
 def run_track_test(samples_file, expected_lock_ratio, init_doppler,
                    init_code_phase, prn, file_format, freq_profile,
                    skip_samples=None, skip_ms=None,
-                   pipelining=None, short_long_cycles=None):
+                   short_long_cycles=False):
 
   bands = fileformat_to_bands(file_format)
 
   skip_param, skip_val = get_skip_params(skip_samples, skip_ms)
 
   run_peregrine(samples_file, file_format, freq_profile,
                 skip_param, skip_val, skip_tracking=False,
-                pipelining=pipelining, short_long_cycles=short_long_cycles)
+                short_long_cycles=short_long_cycles)
 
   for band in bands:
     dopp_ratio = 1
     if band == "l2c":
       dopp_ratio = l2 / l1
     run_tracking_loop(prn, band, init_doppler * dopp_ratio, init_code_phase,
                       samples_file, file_format, freq_profile, 0,
-                      pipelining=pipelining,
                       short_long_cycles=short_long_cycles)
 
   #code_phase = propagate_code_phase(init_code_phase,
                  #get_sampling_freq(freq_profile),
                  #skip_param, skip_val)
 
   check_per_track_results(expected_lock_ratio, samples_file, prn, bands,
-                          pipelining, short_long_cycles)
+                          short_long_cycles)
 
   check_tr_loop_track(expected_lock_ratio, samples_file, prn, bands,
-                      pipelining, short_long_cycles)
+                      short_long_cycles)
 
   # Clean-up.
   os.remove(get_acq_result_file_name(samples_file))
@@ -115,7 +112,7 @@ def run_track_test(samples_file, expected_lock_ratio, init_doppler,
 
 
 def check_per_track_results(expected_lock_ratio, filename, prn, bands,
-                            pipelining, short_long_cycles):
+                            short_long_cycles):
   ret = {}
   print "Peregrine tracking:"
   for band in bands:
@@ -137,14 +134,14 @@ def check_per_track_results(expected_lock_ratio, filename, prn, bands,
       print "band =", band
       lock_ratio = float(lock_detect_outp_sum) / lock_detect_outp_len
       print "lock_ratio =", lock_ratio
-      if (not short_long_cycles and not pipelining) or band != L2C:
+      if not short_long_cycles or band != L2C:
         assert lock_ratio >= expected_lock_ratio
       ret[band]['lock_ratio'] = lock_ratio
   return ret
 
 
 def check_tr_loop_track(expected_lock_ratio, filename, prn, bands,
-                        pipelining, short_long_cycles):
+                        short_long_cycles):
   ret = {}
   print "Tracking loop:"
   for band in bands:
@@ -161,7 +158,7 @@ def check_tr_loop_track(expected_lock_ratio, filename, prn, bands,
       print "band =", band
       lock_ratio = float(lock_detect_outp_sum) / lock_detect_outp_len
       print "lock_ratio =", lock_ratio
-      if (not short_long_cycles and not pipelining) or band != L2C:
+      if not short_long_cycles or band != L2C:
         assert lock_ratio >= expected_lock_ratio
       ret[band]['lock_ratio'] = lock_ratio
   return ret
@@ -185,9 +182,9 @@ def test_tracking():
   run_track_test(samples, 0.6, init_doppler, init_code_phase, prn, file_format,
     freq_profile)
   run_track_test(samples, 0.3, init_doppler, init_code_phase, prn, file_format,
-    freq_profile, pipelining=0.5)
+    freq_profile)
   run_track_test(samples, 0.3, init_doppler, init_code_phase, prn, file_format,
-    freq_profile, short_long_cycles=0.5)
+                 freq_profile, short_long_cycles=True)
 
   os.remove(samples)