release-request-05263112-375a-4b1f-a657-a14bb2a5c5a3-for-git_oc-mr1-release-4185249 snap-temp-L63000000082739046
Change-Id: I5ad3b981f9a07ed8534b401ef63bc54fc705a1a6
diff --git a/trappy/utils.py b/trappy/utils.py
index 57b4ccd..47ef4ab 100644
--- a/trappy/utils.py
+++ b/trappy/utils.py
@@ -147,11 +147,9 @@
for key, value in data.iteritems():
if key == pivot:
continue
- try:
- if np.isnan(value):
- data[key] = pivot_map[data[pivot]][key]
- except:
- pass
+ # Fast check for if value is nan (faster than np.isnan + try/except)
+ if value != value and pivot_map.has_key(data[pivot]):
+ data[key] = pivot_map[data[pivot]][key]
# Get rid of primary/secondary labels
data['Time'] = data['Time'][1]
