Merge branch 'master' into working_on_demos

65e28306 · Theo Steininger · 0fd5d047 · 69792e0f · 65e28306
Commit 65e28306 authored Jun 12, 2017 by Theo Steininger
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -170,6 +170,8 @@ class Field(Loggable, Versionable, object):
        else:
            dtype = np.dtype(dtype)

+        dtype = np.result_type(dtype, np.float)
+
        return dtype

    def _parse_distribution_strategy(self, distribution_strategy, val):