review comments addressed

Author: mohit-emerson

src/nirfsa/examples/nirfsa_getting_started_iq.py

@@ -12,33 +12,27 @@ def example(resource_name, options, iq_carrier_frequency, reference_level, numbe
         rfsa_session.reference_level = reference_level
         rfsa_session.iq_carrier_frequency = iq_carrier_frequency
         rfsa_session.number_of_samples = number_of_samples
-        rfsa_session.iq_rate = 1e6
 
-        iq_data_array = np.zeros(number_of_samples, dtype=np.complex128)
+        # Do something useful with the data.
+        # We will present average power: 10log(((I^2 + Q ^2) / 2R) * 1000), where
+        # R = 50 Ohms.
 
+        iq_data_array = np.zeros(number_of_samples, dtype=np.complex128)
         wfm_info = rfsa_session.read_iq_single_record_into(iq_data_array)
-
         samples = np.asarray(wfm_info.samples)
         accumulator = 0.0
-
-        # Do something useful with the data.
-        # We will present average power: 10log(((I^2 + Q ^2) / 2R) * 1000), where
-        # R = 50 Ohms.
         if len(samples) > 0:
             for sample in samples:
                 magnitude_squared = sample.real * sample.real + sample.imag * sample.imag
-
                 # we need to handle this because log(0) return a range error.
                 if magnitude_squared == 0.0:
                     magnitude_squared = 0.00000001
-
                 accumulator += 10.0 * np.log10((magnitude_squared / (2.0 * 50.0)) * 1000.0)
-
             print('Average power = %0.1f dBm' % (accumulator / len(samples)))
 
 
 def _main(argsv):
-    parser = argparse.ArgumentParser(description='Acquires a power spectrum using NI-RFSA.', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser = argparse.ArgumentParser(description='Acquires IQ data using NI-RFSA.', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     parser.add_argument('-n', '--resource-name', default='PXI1Slot2', help='Resource name of the NI RF signal analyzer.')
     parser.add_argument('-c', '--iq-carrier-frequency', default=1e9, type=float, help='IQ carrier frequency in Hz.')
     parser.add_argument('-r', '--reference-level', default=0.0, type=float, help='Reference level in dBm.')

src/nirfsa/examples/nirfsa_getting_started_spectrum.py

@@ -4,19 +4,17 @@
 import sys
 
 
-def example(resource_name, options, center_frequency, span, reference_level, number_of_spectral_lines):
+def example(resource_name, options, center_frequency, span, reference_level):
     with nirfsa.Session(resource_name=resource_name, id_query=False, reset_device=False, options=options) as rfsa_session:
         # Configurations
         rfsa_session.acquisition_type = nirfsa.AcquisitionType.SPECTRUM
         rfsa_session.reference_level = reference_level
         rfsa_session.resolution_bandwidth = 10e3
-
         rfsa_session.configure_spectrum_frequency(center_frequency=center_frequency, span=span)
-        rfsa_session.number_of_spectral_lines = number_of_spectral_lines
 
-        spectrum_buf = np.zeros(rfsa_session.number_of_spectral_lines, dtype=np.float64)
+        spectrum_buffer = np.zeros(rfsa_session.number_of_spectral_lines, dtype=np.float64)
 
-        spectrum_info = rfsa_session.read_power_spectrum_into(spectrum_buf, timeout=10.0)
+        spectrum_info = rfsa_session.read_power_spectrum_into(spectrum_buffer, timeout=10.0)
 
         # Do something useful with the data.
         # We will find the highest peak in a bin, which is not the actual highest
@@ -39,10 +37,9 @@ def _main(argsv):
     parser.add_argument('-c', '--center-frequency', default=1e9, type=float, help='Center frequency in Hz.')
     parser.add_argument('-s', '--span', default=100e6, type=float, help='Span in Hz.')
     parser.add_argument('-r', '--reference-level', default=0.0, type=float, help='Reference level in dBm.')
-    parser.add_argument('-l', '--number-of-spectral-lines', default=1024, type=int, help='Number of spectral lines to acquire.')
     parser.add_argument('-op', '--option-string', default='', type=str, help='Option string for the session.')
     args = parser.parse_args(argsv)
-    example(args.resource_name, args.option_string, args.center_frequency, args.span, args.reference_level, args.number_of_spectral_lines)
+    example(args.resource_name, args.option_string, args.center_frequency, args.span, args.reference_level)
 
 
 def main():
@@ -55,7 +52,7 @@ def test_example():
 
 
 def test_main():
-    cmd_line = ['--resource-name', 'simulated5841', '--center-frequency', '1e9', '--span', '100e6', '--reference-level', '-10', '--number-of-spectral-lines', '1024', '--option-string', 'Simulate=1, DriverSetup=Model:5841']
+    cmd_line = ['--resource-name', 'simulated5841', '--center-frequency', '1e9', '--span', '100e6', '--reference-level', '-10', '--option-string', 'Simulate=1, DriverSetup=Model:5841']
     _main(cmd_line)