diff options
| -rw-r--r-- | trappy/utils.py | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ def merge_dfs(pr_df, sec_df, pivot): 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] |