fixes based on testing

Author: vnktshr21

generated/nirfsg/nirfsg/session.py

@@ -8265,20 +8265,20 @@ def write_arb_waveform(self, waveform_name, waveform_data_array, more_data_pendi
                 One or more of the referenced properties are not in the Python API for this driver.
 
         '''
+        import numpy
         if str(type(waveform_data_array)).find("'numpy.ndarray'") != -1:
-            import numpy
             if waveform_data_array.dtype == numpy.complex128:
-                self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
+                return self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
             elif waveform_data_array.dtype == numpy.complex64:
-                self._write_arb_waveform_complex_f32(waveform_name, waveform_data_array, more_data_pending)
+                return self._write_arb_waveform_complex_f32(waveform_name, waveform_data_array, more_data_pending)
             elif waveform_data_array.dtype == numpy.int16:
-                self._write_arb_waveform_complex_i16(waveform_name, waveform_data_array)
+                return self._write_arb_waveform_complex_i16(waveform_name, waveform_data_array)
             else:
                 raise TypeError("Unsupported dtype. Is {}, expected {} or {} or {}".format(waveform_data_array.dtype, numpy.complex128, numpy.complex64, numpy.int16))
         else:
             raise TypeError("Unsupported dtype. Expected {} or {} or {}".format(numpy.complex128, numpy.complex64, numpy.int16))
 
-        self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
+        return self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
 
     @ivi_synchronized
     def write_p2p_endpoint_i16(self, stream_endpoint, number_of_samples, endpoint_data):

src/nirfsg/system_tests/test_system_nirfsg.py

@@ -110,7 +110,7 @@ def test_get_external_calibration_last_date_and_time(self, test_rfsg_device_sess
 
     @pytest.mark.skipif(use_simulated_session is True, reason="Bad date returned by driver for simulated device")
     def test_get_self_calibration_last_date_and_time(self, test_rfsg_device_session):
-        dt = test_rfsg_device_session.get_self_calibration_last_date_and_time()
+        dt = test_rfsg_device_session.get_self_calibration_last_date_and_time(nirfsg.Module.PRIMARY_MODULE)
         assert isinstance(dt, hightime.datetime)
 
     def test_get_terminal_name(self, test_rfsg_device_session):
@@ -333,14 +333,14 @@ def test_configure_software_trigger(self, test_rfsg_device_session):
         assert test_rfsg_device_session.script_triggers[0].script_trigger_type == nirfsg.ScriptTrigType.SOFTWARE
 
     def test_configure_digital_edge_trigger(self, test_rfsg_device_session):
-        test_rfsg_device_session.configure_digital_edge_start_trigger('PXI_Trig1', nirfsg.ScriptTrigDigEdgeEdge.RISING)
+        test_rfsg_device_session.configure_digital_edge_start_trigger('PXI_Trig1', nirfsg.StartTrigDigEdgeEdge.RISING)
         test_rfsg_device_session.configure_digital_edge_script_trigger('scriptTrigger1', 'PXI_Trig2', nirfsg.ScriptTrigDigEdgeEdge.FALLING)
         assert test_rfsg_device_session.start_trigger_type == nirfsg.StartTrigType.DIGITAL_EDGE
-        assert test_rfsg_device_session.start_trigger_terminal_name == 'PXI_Trig1'
+        assert test_rfsg_device_session.digital_edge_start_trigger_source == 'PXI_Trig1'
         assert test_rfsg_device_session.digital_edge_start_trigger_edge == nirfsg.StartTrigDigEdgeEdge.RISING
         assert test_rfsg_device_session.script_triggers[1].script_trigger_type == nirfsg.ScriptTrigType.DIGITAL_EDGE
-        assert test_rfsg_device_session.script_triggers[1].script_trigger_terminal_name == 'PXI_Trig2'
-        assert test_rfsg_device_session.digital_edge_script_trigger_edge == nirfsg.ScriptTrigDigEdgeEdge.FALLING
+        assert test_rfsg_device_session.script_triggers[1].digital_edge_script_trigger_source == 'PXI_Trig2'
+        assert test_rfsg_device_session.script_triggers[1].digital_edge_script_trigger_edge == nirfsg.ScriptTrigDigEdgeEdge.FALLING
 
     def test_disable_trigger(self, test_rfsg_device_session):
         test_rfsg_device_session.configure_software_start_trigger()
@@ -386,14 +386,14 @@ def test_export_signal_with_invalid_terminal(self, test_rfsg_device_session):
     def test_save_load_configuration(self, test_rfsg_device_session):
         test_rfsg_device_session.configure_rf(2e9, -5.0)
         test_rfsg_device_session.iq_rate = 1e6
-        test_rfsg_device_session.save_configurations_to_file(get_test_file_path('tempConfiguration.json'))
+        test_rfsg_device_session.save_configurations_to_file('', get_test_file_path('tempConfiguration.json'))
         assert os.path.exists(get_test_file_path('tempConfiguration.json'))
         test_rfsg_device_session.configure_rf(3e9, -15.0)
         test_rfsg_device_session.iq_rate = 2e6
         assert test_rfsg_device_session.frequency == 3e9
         assert test_rfsg_device_session.power_level == -15.0
         assert test_rfsg_device_session.iq_rate == 2e6
-        test_rfsg_device_session.load_configurations_from_file(get_test_file_path('tempConfiguration.json'))
+        test_rfsg_device_session.load_configurations_from_file('', get_test_file_path('tempConfiguration.json'))
         assert test_rfsg_device_session.frequency == 2e9
         assert test_rfsg_device_session.power_level == -5.0
         assert test_rfsg_device_session.iq_rate == 1e6
@@ -519,8 +519,8 @@ def test_send_software_edge_trigger(self, test_rfsg_device_session):
             test_rfsg_device_session.send_software_edge_trigger(nirfsg.SoftwareTriggerType.SCRIPT, 'scriptTrigger0')
 
     def test_deembedding_table_with_s2p_file(self, test_rfsg_device_session):
-        test_rfsg_device_session.create_deembedding_sparameter_table_s2_p_file('', 'myTable1', get_test_file_path('samples2pfile.s2p'), nirfsg.SparameterOrientation.PORT2)
-        test_rfsg_device_session.create_deembedding_sparameter_table_s2_p_file('', 'myTable2', get_test_file_path('samples2pfile.s2p'), nirfsg.SparameterOrientation.PORT1)
+        test_rfsg_device_session.create_deembedding_sparameter_table_s2p_file('', 'myTable1', get_test_file_path('samples2pfile.s2p'), nirfsg.SparameterOrientation.PORT2)
+        test_rfsg_device_session.create_deembedding_sparameter_table_s2p_file('', 'myTable2', get_test_file_path('samples2pfile.s2p'), nirfsg.SparameterOrientation.PORT1)
         test_rfsg_device_session.configure_deembedding_table_interpolation_linear('', 'myTable1', nirfsg.Format.MAGNITUDE_AND_PHASE)
         test_rfsg_device_session.deembedding_port[''].deembedding_selected_table = 'myTable1'
         with test_rfsg_device_session.initiate():

src/nirfsg/templates/session.py/write_arb_waveform.py.mako

@@ -8,17 +8,17 @@
 
         ${helper.get_function_docstring(f, False, config, indent=8)}
         '''
+        import numpy
         if str(type(waveform_data_array)).find("'numpy.ndarray'") != -1:
-            import numpy
             if waveform_data_array.dtype == numpy.complex128:
-                self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
+                return self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
             elif waveform_data_array.dtype == numpy.complex64:
-                self._write_arb_waveform_complex_f32(waveform_name, waveform_data_array, more_data_pending)
+                return self._write_arb_waveform_complex_f32(waveform_name, waveform_data_array, more_data_pending)
             elif waveform_data_array.dtype == numpy.int16:
-                self._write_arb_waveform_complex_i16(waveform_name, waveform_data_array)
+                return self._write_arb_waveform_complex_i16(waveform_name, waveform_data_array)
             else:
                 raise TypeError("Unsupported dtype. Is {}, expected {} or {} or {}".format(waveform_data_array.dtype, numpy.complex128, numpy.complex64, numpy.int16))
         else:
             raise TypeError("Unsupported dtype. Expected {} or {} or {}".format(numpy.complex128, numpy.complex64, numpy.int16))
 
-        self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)
+        return self._write_arb_waveform_complex_f64(waveform_name, waveform_data_array, more_data_pending)