Merge pull request swift-nav#21 from pmiettinen/fix-high-profile-and-…

…skip-samples Fix high_rate profile and skip-samples default value
valeri-atamaniouk · Apr 28, 2016 · 99f93b4 · 99f93b4
2 parents 40e4b5a + 966bb4b
commit 99f93b4
Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/peregrine/defaults.py b/peregrine/defaults.py
@@ -83,17 +83,17 @@
     'GPS_L2_IF': 7.4e6,
     'sampling_freq': 24.84375e6}
 
-# 'normal_rate' frequencies profile
+# 'high_rate' frequencies profile
 freq_profile_high_rate = {
-    'GPS_L1_IF': freq_profile_normal_rate['GPS_L1_IF'],
-    'GPS_L2_IF': freq_profile_normal_rate['GPS_L2_IF'],
+    'GPS_L1_IF': 14.58e6,
+    'GPS_L2_IF': 7.4e6,
     'sampling_freq': 99.375e6}
 
 freq_profile_lookup = {
     'custom_rate': freq_profile_peregrine,
-    'low_rate':    freq_profile_low_rate,
+    'low_rate': freq_profile_low_rate,
     'normal_rate': freq_profile_normal_rate,
-    'high_rate':   freq_profile_high_rate}
+    'high_rate': freq_profile_high_rate}
 
 L1CA_CHANNEL_BANDWIDTH_HZ = 1000
 L2C_CHANNEL_BANDWIDTH_HZ = 1000

diff --git a/peregrine/run.py b/peregrine/run.py
@@ -54,7 +54,6 @@ def __call__(self, parser, namespace, file_hnd, option_string=None):
     file_hnd.close()
 
 
-
 def populate_peregrine_cmd_line_arguments(parser):
   if sys.stdout.isatty():
     progress_bar_default = 'stdout'
@@ -97,7 +96,7 @@ def populate_peregrine_cmd_line_arguments(parser):
 
   skipExcl.add_argument("--skip-samples",
                         type=int,
-                        default=None,
+                        default=0,
                         metavar='N_SAMPLES',
                         help="How many samples to skip. Optional.")