Enable deembedding methods and more misc changes (#2123)

* deembedding and misc changes

* fixed flake errors

* fixes based on review comments

---------

Co-authored-by: vnktshr21 <[email protected]>

Author: vnktshr21

docs/nirfsg/class.rst

@@ -626,12 +626,12 @@ GenerationMode
 
 
 
-IQOutPortTermCfg
-----------------
+IQOutPortTerminalConfiguration
+------------------------------
 
-.. py:class:: IQOutPortTermCfg
+.. py:class:: IQOutPortTerminalConfiguration
 
-    .. py:attribute:: IQOutPortTermCfg.DIFFERENTIAL
+    .. py:attribute:: IQOutPortTerminalConfiguration.DIFFERENTIAL
 
 
 
@@ -641,7 +641,7 @@ IQOutPortTermCfg
 
 
 
-    .. py:attribute:: IQOutPortTermCfg.SINGLE_ENDED
+    .. py:attribute:: IQOutPortTerminalConfiguration.SINGLE_ENDED
 
 
 

docs/nirfsg/enums.rst

@@ -113,17 +113,17 @@ ports
         passes a string of :python:`'0, 1, 2'` to the set attribute function.
 
 
-lo_channels
------------
+los
+---
 
-    .. py:attribute:: nirfsg.Session.lo_channels[]
+    .. py:attribute:: nirfsg.Session.los[]
 
         If no prefix is added to the items in the parameter, the correct prefix will be added when
         the driver function call is made.
 
         .. code:: python
 
-            session.lo_channels['0-2'].channel_enabled = True
+            session.los['0-2'].channel_enabled = True
 
         passes a string of :python:`'LO0, LO1, LO2'` to the set attribute function.
 
@@ -134,9 +134,33 @@ lo_channels
 
         .. code:: python
 
-            session.lo_channels['LO0-LO2'].channel_enabled = True
+            session.los['LO0-LO2'].channel_enabled = True
 
         passes a string of :python:`'LO0, LO1, LO2'` to the set attribute function.
 
 
+device_temperatures
+-------------------
+
+    .. py:attribute:: nirfsg.Session.device_temperatures[]
+
+        .. code:: python
+
+            session.device_temperatures['0-2'].channel_enabled = True
+
+        passes a string of :python:`'0, 1, 2'` to the set attribute function.
+
+
+channels
+--------
+
+    .. py:attribute:: nirfsg.Session.channels[]
+
+        .. code:: python
+
+            session.channels['0-2'].channel_enabled = True
+
+        passes a string of :python:`'0, 1, 2'` to the set attribute function.
+
+
 

docs/nirfsg/rep_caps.rst

@@ -49,6 +49,7 @@ def __init__(self, ctypes_library):
         self.niRFSG_ConfigureRefClock_cfunc = None
         self.niRFSG_ConfigureSoftwareScriptTrigger_cfunc = None
         self.niRFSG_ConfigureSoftwareStartTrigger_cfunc = None
+        self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc = None
         self.niRFSG_CreateDeembeddingSparameterTableS2PFile_cfunc = None
         self.niRFSG_DeleteAllDeembeddingTables_cfunc = None
         self.niRFSG_DeleteDeembeddingTable_cfunc = None
@@ -57,7 +58,6 @@ def __init__(self, ctypes_library):
         self.niRFSG_DisableStartTrigger_cfunc = None
         self.niRFSG_ErrorMessage_cfunc = None
         self.niRFSG_ErrorQuery_cfunc = None
-        self.niRFSG_ExportSignal_cfunc = None
         self.niRFSG_GetAllNamedWaveformNames_cfunc = None
         self.niRFSG_GetAllScriptNames_cfunc = None
         self.niRFSG_GetAttributeViBoolean_cfunc = None
@@ -67,6 +67,8 @@ def __init__(self, ctypes_library):
         self.niRFSG_GetAttributeViSession_cfunc = None
         self.niRFSG_GetAttributeViString_cfunc = None
         self.niRFSG_GetChannelName_cfunc = None
+        self.niRFSG_GetDeembeddingSparameters_cfunc = None
+        self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc = None
         self.niRFSG_GetError_cfunc = None
         self.niRFSG_GetExternalCalibrationLastDateAndTime_cfunc = None
         self.niRFSG_GetMaxSettablePower_cfunc = None
@@ -353,6 +355,14 @@ def niRFSG_ConfigureSoftwareStartTrigger(self, vi):  # noqa: N802
                 self.niRFSG_ConfigureSoftwareStartTrigger_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_ConfigureSoftwareStartTrigger_cfunc(vi)
 
+    def niRFSG_CreateDeembeddingSparameterTableArray(self, vi, port, table_name, frequencies, frequencies_size, sparameter_table, sparameter_table_size, number_of_ports, sparameter_orientation):  # noqa: N802
+        with self._func_lock:
+            if self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc is None:
+                self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc = self._get_library_function('niRFSG_CreateDeembeddingSparameterTableArray')
+                self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc.argtypes = [ViSession, ctypes.POINTER(ViChar), ctypes.POINTER(ViChar), ctypes.POINTER(ViReal64), ViInt32, ctypes.POINTER(NIComplexNumber), ViInt32, ViInt32, ViInt32]  # noqa: F405
+                self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc.restype = ViStatus  # noqa: F405
+        return self.niRFSG_CreateDeembeddingSparameterTableArray_cfunc(vi, port, table_name, frequencies, frequencies_size, sparameter_table, sparameter_table_size, number_of_ports, sparameter_orientation)
+
     def niRFSG_CreateDeembeddingSparameterTableS2PFile(self, vi, port, table_name, s2p_file_path, sparameter_orientation):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_CreateDeembeddingSparameterTableS2PFile_cfunc is None:
@@ -417,14 +427,6 @@ def niRFSG_ErrorQuery(self, vi, error_code, error_message):  # noqa: N802
                 self.niRFSG_ErrorQuery_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_ErrorQuery_cfunc(vi, error_code, error_message)
 
-    def niRFSG_ExportSignal(self, vi, signal, signal_identifier, output_terminal):  # noqa: N802
-        with self._func_lock:
-            if self.niRFSG_ExportSignal_cfunc is None:
-                self.niRFSG_ExportSignal_cfunc = self._get_library_function('niRFSG_ExportSignal')
-                self.niRFSG_ExportSignal_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(ViChar), ctypes.POINTER(ViChar)]  # noqa: F405
-                self.niRFSG_ExportSignal_cfunc.restype = ViStatus  # noqa: F405
-        return self.niRFSG_ExportSignal_cfunc(vi, signal, signal_identifier, output_terminal)
-
     def niRFSG_GetAllNamedWaveformNames(self, vi, waveform_names, buffer_size, actual_buffer_size):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_GetAllNamedWaveformNames_cfunc is None:
@@ -497,6 +499,22 @@ def niRFSG_GetChannelName(self, vi, index, buffer_size, name):  # noqa: N802
                 self.niRFSG_GetChannelName_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_GetChannelName_cfunc(vi, index, buffer_size, name)
 
+    def niRFSG_GetDeembeddingSparameters(self, vi, sparameters, sparameter_array_size, number_of_sparameters, number_of_ports):  # noqa: N802
+        with self._func_lock:
+            if self.niRFSG_GetDeembeddingSparameters_cfunc is None:
+                self.niRFSG_GetDeembeddingSparameters_cfunc = self._get_library_function('niRFSG_GetDeembeddingSparameters')
+                self.niRFSG_GetDeembeddingSparameters_cfunc.argtypes = [ViSession, ctypes.POINTER(NIComplexNumber), ViInt32, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt32)]  # noqa: F405
+                self.niRFSG_GetDeembeddingSparameters_cfunc.restype = ViStatus  # noqa: F405
+        return self.niRFSG_GetDeembeddingSparameters_cfunc(vi, sparameters, sparameter_array_size, number_of_sparameters, number_of_ports)
+
+    def niRFSG_GetDeembeddingTableNumberOfPorts(self, vi, number_of_ports):  # noqa: N802
+        with self._func_lock:
+            if self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc is None:
+                self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc = self._get_library_function('niRFSG_GetDeembeddingTableNumberOfPorts')
+                self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32)]  # noqa: F405
+                self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc.restype = ViStatus  # noqa: F405
+        return self.niRFSG_GetDeembeddingTableNumberOfPorts_cfunc(vi, number_of_ports)
+
     def niRFSG_GetError(self, vi, error_code, error_description_buffer_size, error_description):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_GetError_cfunc is None:

generated/nirfsg/nirfsg/_library.py

@@ -315,6 +315,20 @@ def configure_software_start_trigger(self):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 
+    def create_deembedding_sparameter_table_array(self, port, table_name, frequencies, sparameter_table, sparameter_table_size, number_of_ports, sparameter_orientation):  # noqa: N802
+        vi_ctype = _visatype.ViSession(self._vi)  # case S110
+        port_ctype = ctypes.create_string_buffer(port.encode(self._encoding))  # case C020
+        table_name_ctype = ctypes.create_string_buffer(table_name.encode(self._encoding))  # case C020
+        frequencies_ctype = _get_ctypes_pointer_for_buffer(value=frequencies)  # case B510
+        frequencies_size_ctype = _visatype.ViInt32(0 if frequencies is None else len(frequencies))  # case S160
+        sparameter_table_ctype = _get_ctypes_pointer_for_buffer(value=sparameter_table, library_type=_complextype.NIComplexNumber)  # case B510
+        sparameter_table_size_ctype = _visatype.ViInt32(sparameter_table_size)  # case S150
+        number_of_ports_ctype = _visatype.ViInt32(number_of_ports)  # case S150
+        sparameter_orientation_ctype = _visatype.ViInt32(sparameter_orientation.value)  # case S130
+        error_code = self._library.niRFSG_CreateDeembeddingSparameterTableArray(vi_ctype, port_ctype, table_name_ctype, frequencies_ctype, frequencies_size_ctype, sparameter_table_ctype, sparameter_table_size_ctype, number_of_ports_ctype, sparameter_orientation_ctype)
+        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
+        return
+
     def create_deembedding_sparameter_table_s2p_file(self, port, table_name, s2p_file_path, sparameter_orientation):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         port_ctype = ctypes.create_string_buffer(port.encode(self._encoding))  # case C020
@@ -374,15 +388,6 @@ def error_query(self):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return int(error_code_ctype.value), error_message_ctype.value.decode(self._encoding)
 
-    def export_signal(self, signal, signal_identifier, output_terminal):  # noqa: N802
-        vi_ctype = _visatype.ViSession(self._vi)  # case S110
-        signal_ctype = _visatype.ViInt32(signal.value)  # case S130
-        signal_identifier_ctype = ctypes.create_string_buffer(signal_identifier.encode(self._encoding))  # case C020
-        output_terminal_ctype = ctypes.create_string_buffer(output_terminal.encode(self._encoding))  # case C020
-        error_code = self._library.niRFSG_ExportSignal(vi_ctype, signal_ctype, signal_identifier_ctype, output_terminal_ctype)
-        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
-        return
-
     def get_all_named_waveform_names(self):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         waveform_names_ctype = None  # case C050
@@ -481,6 +486,23 @@ def get_channel_name(self, index):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return name_ctype.value.decode(self._encoding)
 
+    def get_deembedding_sparameters(self, sparameters, sparameter_array_size):  # noqa: N802
+        vi_ctype = _visatype.ViSession(self._vi)  # case S110
+        sparameters_ctype = _get_ctypes_pointer_for_buffer(value=sparameters, library_type=_complextype.NIComplexNumber)  # case B510
+        sparameter_array_size_ctype = _visatype.ViInt32(sparameter_array_size)  # case S150
+        number_of_sparameters_ctype = _visatype.ViInt32()  # case S220
+        number_of_ports_ctype = _visatype.ViInt32()  # case S220
+        error_code = self._library.niRFSG_GetDeembeddingSparameters(vi_ctype, sparameters_ctype, sparameter_array_size_ctype, None if number_of_sparameters_ctype is None else (ctypes.pointer(number_of_sparameters_ctype)), None if number_of_ports_ctype is None else (ctypes.pointer(number_of_ports_ctype)))
+        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
+        return int(number_of_ports_ctype.value)
+
+    def get_deembedding_table_number_of_ports(self):  # noqa: N802
+        vi_ctype = _visatype.ViSession(self._vi)  # case S110
+        number_of_ports_ctype = _visatype.ViInt32()  # case S220
+        error_code = self._library.niRFSG_GetDeembeddingTableNumberOfPorts(vi_ctype, None if number_of_ports_ctype is None else (ctypes.pointer(number_of_ports_ctype)))
+        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
+        return int(number_of_ports_ctype.value)
+
     def get_error(self):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         error_code_ctype = _visatype.ViStatus()  # case S220

generated/nirfsg/nirfsg/_library_interpreter.py

@@ -273,7 +273,7 @@ class GenerationMode(Enum):
     '''
 
 
-class IQOutPortTermCfg(Enum):
+class IQOutPortTerminalConfiguration(Enum):
     DIFFERENTIAL = 15000
     r'''
     Sets the terminal configuration to differential.