Merge branch 'master' of gitlab.mpcdf.mpg.de:ift/NIFTy

a39a3f96 · Pumpe, Daniel (dpumpe) · a56337b0 · 69792e0f · a39a3f96
Commit a39a3f96 authored Jun 12, 2017 by Pumpe, Daniel (dpumpe)
--- 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):