From 62976c13d56af50ecfe0abc5fb14c55d494ea0f7 Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve@pm.me>
Date: Wed, 17 Oct 2018 10:06:16 +0200
Subject: [PATCH] better way to check for empty bump version to 2.3
---
ess/TraceWin.py | 4 ++--
ess/__init__.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ess/TraceWin.py b/ess/TraceWin.py
index a585e62..dd8b89d 100644
--- a/ess/TraceWin.py
+++ b/ess/TraceWin.py
@@ -199,11 +199,11 @@ class dst:
}
# get X and Y data
dx=np.array(self[x])
- if mask!=None:
+ if isinstance(mask, np.ndarray):
dx = dx[mask]
if y!=None:
dy = np.array(self[y])
- if mask!=None:
+ if isinstance(mask, np.ndarray):
dy=dy[mask]
if x in ['x','y','xp','yp']:
diff --git a/ess/__init__.py b/ess/__init__.py
index ab19743..7829938 100644
--- a/ess/__init__.py
+++ b/ess/__init__.py
@@ -1,5 +1,5 @@
__all__ = ["fieldmap", "installed", "lib_tw", "SP_Relativity", "TraceWin" "TTF"]
-__version__ = '2.2'
+__version__ = '2.3'
from . import TraceWin
from . import installed
from . import lib_tw
--
GitLab