BUG: shape determined from pulse programs with string variables

jjhelmus · jjhelmus · commit a998c1de63f7 · 2013-05-11T11:29:39.000-05:00
diff --git a/nmrglue/fileio/bruker.py b/nmrglue/fileio/bruker.py
@@ -541,12 +541,12 @@ def guess_shape(dic):
     # if there in no pulse program parameters in dictionary return currect
     # shape after removing zeros
     if "pprog" not in dic or "loop" not in dic["pprog"]:
-        return tuple([int(i) for i in shape if i >= 1]), cplex
+        return tuple([int(i) for i in shape if i > 1]), cplex
 
     # if pulseprogram dictionary is missing loop or incr return current shape
     pprog = dic["pprog"]
     if "loop" not in pprog or "incr" not in pprog:
-        return tuple([int(i) for i in shape if i >= 1]), cplex
+        return tuple([int(i) for i in shape if i > 1]), cplex
 
     # determine indirect dimension sizes from pulseprogram parameters
     loop = pprog["loop"]
@@ -559,6 +559,13 @@ def guess_shape(dic):
         if v in rep.keys():
             loop[i] = rep[v]
 
+    # if the loop variables contains strings, return current shape
+    # these variables could be resolved from the var key in the pprog dict
+    # but this would require executing unknown code to perform the
+    # arithmetic present in the string.
+    if str in [type(e) for e in loop]:
+        return tuple([int(i) for i in shape if i > 1]), cplex
+
     # size of indirect dimensions based on number of loops in pulse program
     # there are two kinds of loops, active and passive.
     # active loops are from indirect dimension increments, the corresponding
