Changeset c8c291b

Timestamp:

01/11/19 20:01:29 (6 years ago)

Author:

Thomas Uram <turam@…>

Branches:

master, pympi

Children:

33686f4

Parents:

dd56945

git-author:

Thomas Uram <turam@…> (01/11/19 20:01:29)

git-committer:

Thomas Uram <turam@…> (01/11/19 20:01:29)

Message:

Allow read of multiple variables with one call

File:

• python/genericio.py (modified) (3 diffs)

python/genericio.py

@@ -75 +75 @@
 libpygio.inspect_gio.argtypes=[ct.c_char_p]
 
-def gio_read(file_name,var_name):
+def gio_read_(file_name,var_name):
     if sys.version_info[0] == 3:
         file_name = bytes(file_name,'ascii')
@@ -89 +89 @@
     elif(var_type==0):
         #float
-        result = np.ndarray((var_size,field_count),dtype=np.float32)
+        result = np.ndarray((var_size),dtype=np.float32)
         libpygio.read_gio_float(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_float)),field_count)
         return result
     elif(var_type==1):
         #double
-        result = np.ndarray((var_size,field_count),dtype=np.float64)
+        result = np.ndarray((var_size),dtype=np.float64)
         libpygio.read_gio_double(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_double)),field_count)
         return result
     elif(var_type==2):
         #int32
-        result = np.ndarray((var_size,field_count),dtype=np.int32)
+        result = np.ndarray((var_size),dtype=np.int32)
         libpygio.read_gio_int32(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int32)),field_count)
         return result
     elif(var_type==3):
         #int64
-        result = np.ndarray((var_size,field_count),dtype=np.int64)
+        result = np.ndarray((var_size),dtype=np.int64)
         libpygio.read_gio_int64(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int64)),field_count)
         return result        
@@ -112 +112 @@
         libpygio.read_gio_uint16(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_uint16)),field_count)
         return result
+
+def gio_read(file_name,var_names):
+    ret = []
+    if not isinstance(var_names,list):
+        var_names = [ var_names ]
+    for var_name in var_names:
+        ret.append( gio_read_(file_name,var_name) )
+    return np.array( ret )
 
 def gio_has_variable(file_name,var_name):