iqgen: fixes for GLO signal generation.

Updated GLONASS C/N0 estimation and parameter handling.

Author: valeri-atamaniouk

peregrine/iqgen/generate.py

@@ -25,7 +25,6 @@
 import sys
 import traceback
 import logging
-import scipy
 import scipy.constants
 import numpy
 import time
@@ -434,8 +433,8 @@ def printSvInfo(sv_list, outputConfig, lpfFA_db, noiseParams, encoder):
     elif isinstance(_sv, GLOSatellite):
       band1 = outputConfig.GLONASS.L1
       band2 = outputConfig.GLONASS.L2
-      band1IncreaseDb = 60. - lpfFA_db[band1.INDEX]  # GLONASS L1
-      band2IncreaseDb = 60. - lpfFA_db[band2.INDEX]  # GLONASS L2
+      band1IncreaseDb = 57. - lpfFA_db[band1.INDEX]  # GLONASS L1
+      band2IncreaseDb = 57. - lpfFA_db[band2.INDEX]  # GLONASS L2
       signal1 = signals.GLONASS.L1S[_sv.prn]
       signal2 = signals.GLONASS.L2S[_sv.prn]
       _msg1 = _sv.getL1Message()
@@ -546,8 +545,8 @@ def generateSamples(outputFile,
   # Print out parameters
   #
   logger.info(
-    "Generating samples, sample rate={} Hz, interval={} seconds".format(
-      outputConfig.SAMPLE_RATE_HZ, nSamples / outputConfig.SAMPLE_RATE_HZ))
+      "Generating samples, sample rate={} Hz, interval={} seconds".format(
+          outputConfig.SAMPLE_RATE_HZ, nSamples / outputConfig.SAMPLE_RATE_HZ))
   logger.debug("Jobs: %d" % threadCount)
 
   _count = 0l
@@ -602,8 +601,8 @@ def generateSamples(outputFile,
 
   # Print out parameters
   logger.info(
-    "Generating samples, sample rate={} Hz, interval={} seconds".format(
-      outputConfig.SAMPLE_RATE_HZ, nSamples / outputConfig.SAMPLE_RATE_HZ))
+      "Generating samples, sample rate={} Hz, interval={} seconds".format(
+          outputConfig.SAMPLE_RATE_HZ, nSamples / outputConfig.SAMPLE_RATE_HZ))
   logger.debug("Jobs: %d" % threadCount)
   # Print out SV parameters
   printSvInfo(sv_list, outputConfig, lpfFA_db, noiseParams, encoder)

peregrine/iqgen/iqgen_main.py

@@ -272,9 +272,9 @@ def doUpdate(self, sv, parser, namespace, values, option_string):
           raise ValueError("Signal band must be specified before doppler")
       elif isinstance(sv, GLOSatellite):
         if sv.isL1Enabled():
-          frequency_hz = signals.GLONASS.L1S[sv.prn].CENTER_FREQUENCY_HZ
+          signal = signals.GLONASS.L1S[sv.prn]
         elif sv.isL2Enabled():
-          frequency_hz = signals.GLONASS.L2S[sv.prn].CENTER_FREQUENCY_HZ
+          signal = signals.GLONASS.L2S[sv.prn]
         else:
           raise ValueError("Signal band must be specified before doppler")
       else:
@@ -570,8 +570,7 @@ def __call__(self, parser, namespace, values, option_string=None):
   amplitudeGrp.add_argument('--amplitude-type',
                             default="poly",
                             choices=["poly", "sine"],
-                            help=
-                              "Configure amplitude type: polynomial or sine.",
+                            help="Configure amplitude type: polynomial or sine.",
                             action=UpdateAmplitudeType)
   amplitudeGrp.add_argument('--amplitude-units',
                             default="snr-db",
@@ -655,8 +654,7 @@ def __call__(self, parser, namespace, values, option_string=None):
                        action=UpdateTcxoType)
   parser.add_argument('--group-delays',
                       type=bool,
-                      help=
-                        "Enable/disable group delays simulation between bands")
+                      help="Enable/disable group delays simulation between bands")
   parser.add_argument('--debug',
                       type=argparse.FileType('wb'),
                       help="Debug output file")
@@ -739,9 +737,9 @@ def printOutputConfig(outputConfig, args):
   print "  GPS L1 IF:       ", outputConfig.GPS.L1.INTERMEDIATE_FREQUENCY_HZ
   print "  GPS L2 IF:       ", outputConfig.GPS.L2.INTERMEDIATE_FREQUENCY_HZ
   print "  GLONASS L1[0] IF:",\
-    outputConfig.GLONASS.L1.INTERMEDIATE_FREQUENCIES_HZ[0]
+      outputConfig.GLONASS.L1.INTERMEDIATE_FREQUENCIES_HZ[0]
   print "  GLONASS L2[0] IF:",\
-    outputConfig.GLONASS.L2.INTERMEDIATE_FREQUENCIES_HZ[0]
+      outputConfig.GLONASS.L2.INTERMEDIATE_FREQUENCIES_HZ[0]
   print "Other parameters:"
   print "  TCXO:           ", args.tcxo
   print "  noise sigma:    ", args.noise_sigma