From db3e0bfad0a473420ad7bd1e23f78be5d8ed6e63 Mon Sep 17 00:00:00 2001
From: Philipp Arras <parras@mpa-garching.mpg.de>
Date: Fri, 5 Oct 2018 22:07:52 +0200
Subject: [PATCH] Simplification

---
 nifty5/operators/linear_operator.py | 6 ++----
 nifty5/operators/operator.py        | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/nifty5/operators/linear_operator.py b/nifty5/operators/linear_operator.py
index 1c2694a18..c96ca439c 100644
--- a/nifty5/operators/linear_operator.py
+++ b/nifty5/operators/linear_operator.py
@@ -263,8 +263,6 @@ class LinearOperator(Operator):
             s = "The operator's and field's domains don't match."
             from ..domain_tuple import DomainTuple
             from ..multi_domain import MultiDomain
-            if not isinstance(self._dom(mode),
-                              [DomainTuple, MultiDomain]) or isinstance(
-                                  x.domain, [DomainTuple, MultiDomain]):
-                s += " One of the domains is neither a `DomainTuple` nor a `MultiDomain`."
+            if not isinstance(self._dom(mode), [DomainTuple, MultiDomain]):
+                s += " Your operator's domain is neither a `DomainTuple` nor a `MultiDomain`."
             raise ValueError(s)
diff --git a/nifty5/operators/operator.py b/nifty5/operators/operator.py
index 61f361324..4306ad89e 100644
--- a/nifty5/operators/operator.py
+++ b/nifty5/operators/operator.py
@@ -70,10 +70,8 @@ class Operator(NiftyMetaBase()):
             s = "The operator's and field's domains don't match."
             from ..domain_tuple import DomainTuple
             from ..multi_domain import MultiDomain
-            if not isinstance(self._dom(mode),
-                              [DomainTuple, MultiDomain]) or isinstance(
-                                  x.domain, [DomainTuple, MultiDomain]):
-                s += " One of the domains is neither a `DomainTuple` nor a `MultiDomain`."
+            if not isinstance(self._dom(mode), [DomainTuple, MultiDomain]):
+                s += " Your operator's domain is neither a `DomainTuple` nor a `MultiDomain`."
             raise ValueError(s)
 
     def __call__(self, x):
-- 
GitLab