diff --git a/nifty/__init__.py b/nifty/__init__.py
index 2c1a96d2f8ef31c13bd83c1be971d081d77768e6..572f0f82d3c8c0473d728012ce10c008186fe6c5 100644
--- a/nifty/__init__.py
+++ b/nifty/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/nifty/basic_arithmetics.py b/nifty/basic_arithmetics.py
index 30735f6b65314ed42fa0c8ad3972cafbeba73e95..c17f2cd110fd1f9b14407cd73a1fc31669ba7b7b 100644
--- a/nifty/basic_arithmetics.py
+++ b/nifty/basic_arithmetics.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from d2o import distributed_data_object
diff --git a/nifty/config/__init__.py b/nifty/config/__init__.py
index d39be63fa4d64189614dff3d1f2214f3b32da8f2..a4432e9dde79317b9bc80da7f32da8dae096b09d 100644
--- a/nifty/config/__init__.py
+++ b/nifty/config/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty_config import dependency_injector,\
diff --git a/nifty/config/d2o_config.py b/nifty/config/d2o_config.py
index 414eb7b5fa4ec0abd24e1c11429d139813618f86..c5d3385d6a7dc64ca85edf8830c1b55c1c5a36d3 100644
--- a/nifty/config/d2o_config.py
+++ b/nifty/config/d2o_config.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import os
diff --git a/nifty/config/nifty_config.py b/nifty/config/nifty_config.py
index 687a05f1865865235cace1108cb28349eb00c875..fc71a5ccd4ffd4e5d0f36c16e5d59c3680114cfc 100644
--- a/nifty/config/nifty_config.py
+++ b/nifty/config/nifty_config.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import matplotlib_init
diff --git a/nifty/domain_object.py b/nifty/domain_object.py
index 3a04fae72006ec2ce2c1ad8e28fd6a20d278d4ad..638b879cd4cd5a602a025f26ee68df3f6c80f0b6 100644
--- a/nifty/domain_object.py
+++ b/nifty/domain_object.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
from nifty.nifty_meta import NiftyMeta
diff --git a/nifty/energies/__init__.py b/nifty/energies/__init__.py
index 6353111fe39996f34bc9b3af9cc87cef29b3a2d3..0ac10a4dd67b6c24d79edc7092c54bc756c8426b 100644
--- a/nifty/energies/__init__.py
+++ b/nifty/energies/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from energy import Energy
from line_energy import LineEnergy
diff --git a/nifty/energies/energy.py b/nifty/energies/energy.py
index 851f201e76cf884481f307083809864eaf0486e0..d5d8b2fd3308d39af516abb6ffdeb35636dff200 100644
--- a/nifty/energies/energy.py
+++ b/nifty/energies/energy.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.nifty_meta import NiftyMeta
diff --git a/nifty/energies/line_energy.py b/nifty/energies/line_energy.py
index 27f09399fca9d381c842b77f4756cbf319b8622b..dcefbdc23819e9614b4dd96669db02e823077fb5 100644
--- a/nifty/energies/line_energy.py
+++ b/nifty/energies/line_energy.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from .energy import Energy
diff --git a/nifty/energies/memoization.py b/nifty/energies/memoization.py
index f2635751d1aa42e31f72e1a327313789648e2b97..7142dab8291f4e41ad7fc2951a1f40f26ca15525 100644
--- a/nifty/energies/memoization.py
+++ b/nifty/energies/memoization.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
def memo(f):
diff --git a/nifty/field.py b/nifty/field.py
index 3fca09e0437cab467432106d362b8f627ee464d9..37759f62d7a6230a65ba3df1b7357dc310790014 100644
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/nifty/field_types/__init__.py b/nifty/field_types/__init__.py
index cebb34156ff8b529f75d1ba1079ac0a8cc19f337..a9fd176dcd85472a6c5ad37790210a2785624a9b 100644
--- a/nifty/field_types/__init__.py
+++ b/nifty/field_types/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from field_type import FieldType
from field_array import FieldArray
diff --git a/nifty/field_types/field_array.py b/nifty/field_types/field_array.py
index 4318afa2f3b029c246d992bdaf1cfc25358c8600..9c2af98d537a51a3c943614e8f61e2b39a847198 100644
--- a/nifty/field_types/field_array.py
+++ b/nifty/field_types/field_array.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from field_type import FieldType
diff --git a/nifty/field_types/field_type.py b/nifty/field_types/field_type.py
index ca3256664058883c2dff91404e12af896697a015..ffb2ff17ecb9894b4da2830bea3e57007a4e8d89 100644
--- a/nifty/field_types/field_type.py
+++ b/nifty/field_types/field_type.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.domain_object import DomainObject
diff --git a/nifty/minimization/__init__.py b/nifty/minimization/__init__.py
index 83001f4911b1c9564d21cdb8a56860278ca7bc33..ec18339ad552eb727e2eac43c339b769651067d9 100644
--- a/nifty/minimization/__init__.py
+++ b/nifty/minimization/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from line_searching import *
from conjugate_gradient import ConjugateGradient
diff --git a/nifty/minimization/conjugate_gradient.py b/nifty/minimization/conjugate_gradient.py
index 181e6d3c133489cc25f1d9291345b8398d0a6c1e..00a12efa9be1f9ce57b899c3c9b37572d0a1ed4e 100644
--- a/nifty/minimization/conjugate_gradient.py
+++ b/nifty/minimization/conjugate_gradient.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
import numpy as np
diff --git a/nifty/minimization/descent_minimizer.py b/nifty/minimization/descent_minimizer.py
index 9e32e524eb0467a1c69b58b3bb1ea1784f4eaef0..46805fa54a9082cc97d24341e104b12004e21e46 100644
--- a/nifty/minimization/descent_minimizer.py
+++ b/nifty/minimization/descent_minimizer.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
from nifty.nifty_meta import NiftyMeta
diff --git a/nifty/minimization/line_searching/__init__.py b/nifty/minimization/line_searching/__init__.py
index cfa7d8649cab5ac6845ea66a9bfd0872bc557aa1..1a94b949190ca144303441a8c653af748353db85 100644
--- a/nifty/minimization/line_searching/__init__.py
+++ b/nifty/minimization/line_searching/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from line_search import LineSearch
from line_search_strong_wolfe import LineSearchStrongWolfe
diff --git a/nifty/minimization/line_searching/line_search.py b/nifty/minimization/line_searching/line_search.py
index a811bc52d68d770a42fb46221489aa6982fe0c5d..e17f5e787091f47c6fade5068aadbde747fae0db 100644
--- a/nifty/minimization/line_searching/line_search.py
+++ b/nifty/minimization/line_searching/line_search.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
diff --git a/nifty/minimization/line_searching/line_search_strong_wolfe.py b/nifty/minimization/line_searching/line_search_strong_wolfe.py
index 8d97cb2936fa0a923a1a3990d3ca8ead26a500df..c3fcccf2a272ef029845002e380a5f82be8327e1 100644
--- a/nifty/minimization/line_searching/line_search_strong_wolfe.py
+++ b/nifty/minimization/line_searching/line_search_strong_wolfe.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/minimization/relaxed_newton.py b/nifty/minimization/relaxed_newton.py
index eeb1650c84830642f8c3cac67ba923d2a2365119..5d7767caecd1f8ef374e7f2468b6f93deda55182 100644
--- a/nifty/minimization/relaxed_newton.py
+++ b/nifty/minimization/relaxed_newton.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from .descent_minimizer import DescentMinimizer
from .line_searching import LineSearchStrongWolfe
diff --git a/nifty/minimization/steepest_descent.py b/nifty/minimization/steepest_descent.py
index 8d2311935d8411d20409dffb9d306a081fcadd6d..fae8ab527466048985b7b4c9822823db0ec6faaf 100644
--- a/nifty/minimization/steepest_descent.py
+++ b/nifty/minimization/steepest_descent.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from .descent_minimizer import DescentMinimizer
diff --git a/nifty/minimization/vl_bfgs.py b/nifty/minimization/vl_bfgs.py
index 5eae3af900aea583172edc3c1ab93cb8e449a5d4..d41ae986773052c62164314a5d086ee28756be10 100644
--- a/nifty/minimization/vl_bfgs.py
+++ b/nifty/minimization/vl_bfgs.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/nifty_utilities.py b/nifty/nifty_utilities.py
index d4fc9c547e92a2af14f138a6a5fa6e62224f1b19..f565c5667fabfb93950f5c4eef69cdb525099b8e 100644
--- a/nifty/nifty_utilities.py
+++ b/nifty/nifty_utilities.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from itertools import product
diff --git a/nifty/operators/__init__.py b/nifty/operators/__init__.py
index e0580f19ed7c49b1154a8ef414b5495d2a1bea09..69a02595609812739350528eea8f642b398e2f27 100644
--- a/nifty/operators/__init__.py
+++ b/nifty/operators/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/nifty/operators/composed_operator/__init__.py b/nifty/operators/composed_operator/__init__.py
index 6890e3f20f5987eb619754f32a386932676dca22..7a7b45ae4074161116e7f9012b9a468346044677 100644
--- a/nifty/operators/composed_operator/__init__.py
+++ b/nifty/operators/composed_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from composed_operator import ComposedOperator
diff --git a/nifty/operators/composed_operator/composed_operator.py b/nifty/operators/composed_operator/composed_operator.py
index d600cad26575db026b2b2854c0b6c9a29558f574..66d1a74493541023d274af44c55bb036f4fa6cd8 100644
--- a/nifty/operators/composed_operator/composed_operator.py
+++ b/nifty/operators/composed_operator/composed_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.operators.linear_operator import LinearOperator
diff --git a/nifty/operators/diagonal_operator/__init__.py b/nifty/operators/diagonal_operator/__init__.py
index a265d0e17149dd22a38bfd695c5e77c1f09f343d..f27fe09a5d9a9effe2e50a27cb8dd1630f418209 100644
--- a/nifty/operators/diagonal_operator/__init__.py
+++ b/nifty/operators/diagonal_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from diagonal_operator import DiagonalOperator
diff --git a/nifty/operators/diagonal_operator/diagonal_operator.py b/nifty/operators/diagonal_operator/diagonal_operator.py
index 467330c7a261182c7c836e30e5f6845112db7701..77f843fc2736aadda966116e66f1608c1cc6fbf2 100644
--- a/nifty/operators/diagonal_operator/diagonal_operator.py
+++ b/nifty/operators/diagonal_operator/diagonal_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/operators/endomorphic_operator/__init__.py b/nifty/operators/endomorphic_operator/__init__.py
index 4b1dce953f6b727dfe2f16e93d7aeaccba4592dc..7f2b08f1822418ebdb6cc5fb89c0c78e94e18431 100644
--- a/nifty/operators/endomorphic_operator/__init__.py
+++ b/nifty/operators/endomorphic_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from endomorphic_operator import EndomorphicOperator
diff --git a/nifty/operators/endomorphic_operator/endomorphic_operator.py b/nifty/operators/endomorphic_operator/endomorphic_operator.py
index cde405f480fe4ed649323bfe104c5a21c2bf3fc2..e5ed46862786245629603a577a57e6594a1dd1e0 100644
--- a/nifty/operators/endomorphic_operator/endomorphic_operator.py
+++ b/nifty/operators/endomorphic_operator/endomorphic_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
diff --git a/nifty/operators/fft_operator/__init__.py b/nifty/operators/fft_operator/__init__.py
index ffc3a57347d4cd55ea5203b1c127c300a4cf47a8..c0247fdece024338baf35fc145f7fb27b0944f7a 100644
--- a/nifty/operators/fft_operator/__init__.py
+++ b/nifty/operators/fft_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from transformations import *
from fft_operator import FFTOperator
diff --git a/nifty/operators/fft_operator/fft_operator.py b/nifty/operators/fft_operator/fft_operator.py
index b614ef5df6cb196daabb89498377a66ebfed1866..074c963207bfa32040a81cd45a79298088e0de8a 100644
--- a/nifty/operators/fft_operator/fft_operator.py
+++ b/nifty/operators/fft_operator/fft_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/operators/fft_operator/transformations/__init__.py b/nifty/operators/fft_operator/transformations/__init__.py
index 0b96384729f40e08eef30cfaef10adc479d7846e..c917fbc7d3664d11f7c91625f8bbbf6229c2a9f0 100644
--- a/nifty/operators/fft_operator/transformations/__init__.py
+++ b/nifty/operators/fft_operator/transformations/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from rgrgtransformation import RGRGTransformation
from gllmtransformation import GLLMTransformation
diff --git a/nifty/operators/fft_operator/transformations/gllmtransformation.py b/nifty/operators/fft_operator/transformations/gllmtransformation.py
index 7029f80eac7e05f7d967d5de3250665179a0037e..9061ce627a5c972eb74628596c3ae64125d30b92 100644
--- a/nifty/operators/fft_operator/transformations/gllmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/gllmtransformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/operators/fft_operator/transformations/hplmtransformation.py b/nifty/operators/fft_operator/transformations/hplmtransformation.py
index c8cb157108cbe4bbe7432a54e461870db370bfac..a416934c8675839833c0490cb5037caa7b682297 100644
--- a/nifty/operators/fft_operator/transformations/hplmtransformation.py
+++ b/nifty/operators/fft_operator/transformations/hplmtransformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/operators/fft_operator/transformations/lmgltransformation.py b/nifty/operators/fft_operator/transformations/lmgltransformation.py
index 44e5c54e8a6c3422fe31705865bd9614ac536a45..d153e37f751810b85671aaa55988211614cb4ded 100644
--- a/nifty/operators/fft_operator/transformations/lmgltransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmgltransformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from nifty.config import dependency_injector as gdi
diff --git a/nifty/operators/fft_operator/transformations/lmhptransformation.py b/nifty/operators/fft_operator/transformations/lmhptransformation.py
index 0e9d1e392ff1c14a7bb0e8c391b00cf8a0366e2e..c4952b113d0d6e7418196b7fc453283c425f7109 100644
--- a/nifty/operators/fft_operator/transformations/lmhptransformation.py
+++ b/nifty/operators/fft_operator/transformations/lmhptransformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from nifty.config import dependency_injector as gdi
diff --git a/nifty/operators/fft_operator/transformations/rg_transforms.py b/nifty/operators/fft_operator/transformations/rg_transforms.py
index 0ccdb22c5d7f95adde9c6b220e81aebc6abc8ff8..8a28c9e01664c73ec6b4767af4bd1153e93739e1 100644
--- a/nifty/operators/fft_operator/transformations/rg_transforms.py
+++ b/nifty/operators/fft_operator/transformations/rg_transforms.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import warnings
diff --git a/nifty/operators/fft_operator/transformations/rgrgtransformation.py b/nifty/operators/fft_operator/transformations/rgrgtransformation.py
index 62212f351f6e0648d90e80f2d9a61406bd0c7cce..862d78710dc08e87e77a72411c8c3d70cdd06915 100644
--- a/nifty/operators/fft_operator/transformations/rgrgtransformation.py
+++ b/nifty/operators/fft_operator/transformations/rgrgtransformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from transformation import Transformation
diff --git a/nifty/operators/fft_operator/transformations/slicing_transformation.py b/nifty/operators/fft_operator/transformations/slicing_transformation.py
index 6b9f23f8b1f8ba5c906bbf72f5e7c451ff36d65b..8d2b0aa54e482d61914dcfe304c408c1071fd1a9 100644
--- a/nifty/operators/fft_operator/transformations/slicing_transformation.py
+++ b/nifty/operators/fft_operator/transformations/slicing_transformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
import numpy as np
diff --git a/nifty/operators/fft_operator/transformations/transformation.py b/nifty/operators/fft_operator/transformations/transformation.py
index 3f8c850d27c1e2816bcf029da13ee7dd6bf72da4..a35705d0600d38f24443c4cfd81b0d3f1d286ff6 100644
--- a/nifty/operators/fft_operator/transformations/transformation.py
+++ b/nifty/operators/fft_operator/transformations/transformation.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
diff --git a/nifty/operators/fft_operator/transformations/transformation_cache.py b/nifty/operators/fft_operator/transformations/transformation_cache.py
index ad02de278be019c77704f7b93c59e4c3405ddd2b..26425f7bc79c0d8044899ebde5c89571949ad709 100644
--- a/nifty/operators/fft_operator/transformations/transformation_cache.py
+++ b/nifty/operators/fft_operator/transformations/transformation_cache.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
class _TransformationCache(object):
diff --git a/nifty/operators/invertible_operator_mixin/__init__.py b/nifty/operators/invertible_operator_mixin/__init__.py
index d2013a869a742324d04b0a2b966cdcf540d8e09b..c7a2cb1078604472b26b8e954236c4611fea4869 100644
--- a/nifty/operators/invertible_operator_mixin/__init__.py
+++ b/nifty/operators/invertible_operator_mixin/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from invertible_operator_mixin import InvertibleOperatorMixin
\ No newline at end of file
diff --git a/nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py b/nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py
index 65c3f5f25dc5db140beb0efca919371c18932e39..e134656b455e290fc5c64605bc3573dae3fadb67 100644
--- a/nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py
+++ b/nifty/operators/invertible_operator_mixin/invertible_operator_mixin.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.minimization import ConjugateGradient
diff --git a/nifty/operators/linear_operator/__init__.py b/nifty/operators/linear_operator/__init__.py
index 1d3303110a360d2dc5ef154deab2b87909f58f77..2b2cb961a042f7386b7d2828f516ac176b79941c 100644
--- a/nifty/operators/linear_operator/__init__.py
+++ b/nifty/operators/linear_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from linear_operator import LinearOperator
diff --git a/nifty/operators/linear_operator/linear_operator.py b/nifty/operators/linear_operator/linear_operator.py
index a1715435506f40bb02ec41eb613bfec975c2dfef..c57e03972f33cb6f46ade9abddb704c0a1878727 100644
--- a/nifty/operators/linear_operator/linear_operator.py
+++ b/nifty/operators/linear_operator/linear_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
from nifty.nifty_meta import NiftyMeta
diff --git a/nifty/operators/projection_operator/__init__.py b/nifty/operators/projection_operator/__init__.py
index 9dc485be102cb873cc025151321288f1c2ed4b2b..9374e34599794a2ed7a9f2d958c7bd8bbd2078b3 100644
--- a/nifty/operators/projection_operator/__init__.py
+++ b/nifty/operators/projection_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from projection_operator import ProjectionOperator
diff --git a/nifty/operators/projection_operator/projection_operator.py b/nifty/operators/projection_operator/projection_operator.py
index 3298b556adee8acb483609a39bf5ff706e4e4c71..998110b06e32293c3e28933ba5184ccd66188439 100644
--- a/nifty/operators/projection_operator/projection_operator.py
+++ b/nifty/operators/projection_operator/projection_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/operators/propagator_operator/__init__.py b/nifty/operators/propagator_operator/__init__.py
index 61d962c4299059adbe8f5fab63d8f7dd8a27239b..8214db89ea0d36afb0ecfd75c84d36f22ddd5038 100644
--- a/nifty/operators/propagator_operator/__init__.py
+++ b/nifty/operators/propagator_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from propagator_operator import PropagatorOperator
from harmonic_propagator_operator import HarmonicPropagatorOperator
\ No newline at end of file
diff --git a/nifty/operators/propagator_operator/harmonic_propagator_operator.py b/nifty/operators/propagator_operator/harmonic_propagator_operator.py
index 8789847a8a96dbc2dfa679cf388c5e213fdd6636..221ad2bdecc4a8c097a86fb34b7421f1bde1abc2 100644
--- a/nifty/operators/propagator_operator/harmonic_propagator_operator.py
+++ b/nifty/operators/propagator_operator/harmonic_propagator_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.operators import EndomorphicOperator,\
FFTOperator,\
diff --git a/nifty/operators/propagator_operator/propagator_operator.py b/nifty/operators/propagator_operator/propagator_operator.py
index 6bdf5c163023f994fba9a9e3924d1527ee4b22ea..afb4495c709e09a47708b74de77a2b7b49c2d83f 100644
--- a/nifty/operators/propagator_operator/propagator_operator.py
+++ b/nifty/operators/propagator_operator/propagator_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty.operators import EndomorphicOperator,\
FFTOperator,\
diff --git a/nifty/operators/smoothing_operator/__init__.py b/nifty/operators/smoothing_operator/__init__.py
index d254e649a9ee6022d12d98fe9acc5851cb50ad8e..c0eb24343de870621853755160542f221837c941 100644
--- a/nifty/operators/smoothing_operator/__init__.py
+++ b/nifty/operators/smoothing_operator/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from .smoothing_operator import SmoothingOperator
diff --git a/nifty/operators/smoothing_operator/smoothing_operator.py b/nifty/operators/smoothing_operator/smoothing_operator.py
index 741600c6787a0c5890d14e9743e90b377b9c3a7a..b306b8c2d3b1f1274d0a35c42406614694335e36 100644
--- a/nifty/operators/smoothing_operator/smoothing_operator.py
+++ b/nifty/operators/smoothing_operator/smoothing_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
diff --git a/nifty/probing/__init__.py b/nifty/probing/__init__.py
index a33cbb981d4d044a57a6f41d70ab7c7ce210e371..dc798b264864ded720c748036c79eb2adbab327f 100644
--- a/nifty/probing/__init__.py
+++ b/nifty/probing/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from prober import Prober
from mixin_classes import *
diff --git a/nifty/probing/mixin_classes/__init__.py b/nifty/probing/mixin_classes/__init__.py
index 75a3db6ff5742d4585d57d2c4a09a9ed247a34e7..00863b525b2b282f2d6b3f81e4d42f0a1292f23c 100644
--- a/nifty/probing/mixin_classes/__init__.py
+++ b/nifty/probing/mixin_classes/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from diagonal_prober_mixin import DiagonalProberMixin
from trace_prober_mixin import TraceProberMixin
diff --git a/nifty/probing/mixin_classes/diagonal_prober_mixin.py b/nifty/probing/mixin_classes/diagonal_prober_mixin.py
index 7c64b84ef69f3a25b056b7676f8a0c8b30831169..0432050dbe815e3b7b68b9fab15b96083081ab81 100644
--- a/nifty/probing/mixin_classes/diagonal_prober_mixin.py
+++ b/nifty/probing/mixin_classes/diagonal_prober_mixin.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
class DiagonalProberMixin(object):
diff --git a/nifty/probing/mixin_classes/trace_prober_mixin.py b/nifty/probing/mixin_classes/trace_prober_mixin.py
index f77d22b390392a3acf49d8d04e90273f45fd7efc..713e3b547d9af8414f9eda9baa6e5de6d062fde9 100644
--- a/nifty/probing/mixin_classes/trace_prober_mixin.py
+++ b/nifty/probing/mixin_classes/trace_prober_mixin.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
class TraceProberMixin(object):
diff --git a/nifty/probing/prober/__init__.py b/nifty/probing/prober/__init__.py
index db2ef5450c7c4ce3e17c3e097a3471814fec6003..5ccbcce873632622797aaa9deff2777434bb86d5 100644
--- a/nifty/probing/prober/__init__.py
+++ b/nifty/probing/prober/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from prober import Prober
diff --git a/nifty/probing/prober/prober.py b/nifty/probing/prober/prober.py
index fcad98a4d70177f5d89ba373aa04ab39a586cdf0..b2f85f54335f2027bd50ab996c69d0979ae2a9e9 100644
--- a/nifty/probing/prober/prober.py
+++ b/nifty/probing/prober/prober.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/random.py b/nifty/random.py
index f5642564b3026bd7fd17aa5d16fbd439528130bb..1246517f9c4adfb08b0927b50621427140ab06f0 100644
--- a/nifty/random.py
+++ b/nifty/random.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/spaces/__init__.py b/nifty/spaces/__init__.py
index cccb26749f1d199d3eb316073a8355c917ba08c7..81c572d443955a40f19680e6bb8d14d94d6ec851 100644
--- a/nifty/spaces/__init__.py
+++ b/nifty/spaces/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from gl_space import GLSpace
from hp_space import HPSpace
diff --git a/nifty/spaces/gl_space/__init__.py b/nifty/spaces/gl_space/__init__.py
index da13b8aea819b298138a4f0bc2483d95ec605391..1856f20a02ec3f84e705a2de36832baf3bb0403f 100644
--- a/nifty/spaces/gl_space/__init__.py
+++ b/nifty/spaces/gl_space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from gl_space import GLSpace
diff --git a/nifty/spaces/gl_space/gl_space.py b/nifty/spaces/gl_space/gl_space.py
index 8f79829e4bb858beebd563867d34cb3236f9a4ba..7fc3812a915f9e14e9af8e1606c7406487a63395 100644
--- a/nifty/spaces/gl_space/gl_space.py
+++ b/nifty/spaces/gl_space/gl_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/nifty/spaces/hp_space/__init__.py b/nifty/spaces/hp_space/__init__.py
index 9ed3c8abf82cb6486528b23129d2e1658f6e6edb..9f6bf29c14fffb021a433802bdfb3b0509f93244 100644
--- a/nifty/spaces/hp_space/__init__.py
+++ b/nifty/spaces/hp_space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from hp_space import HPSpace
diff --git a/nifty/spaces/hp_space/hp_space.py b/nifty/spaces/hp_space/hp_space.py
index 09d87112abe632cd749cb5d20541cb1f42316248..fbcfcfe034086ee49da825ccf8873b0d3fa10f41 100644
--- a/nifty/spaces/hp_space/hp_space.py
+++ b/nifty/spaces/hp_space/hp_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/spaces/lm_space/__init__.py b/nifty/spaces/lm_space/__init__.py
index 029ba8ae93973814473370227d9b2222c884a94d..e43aeaa0528e5840f03ff78c86ccc1af2035d16c 100644
--- a/nifty/spaces/lm_space/__init__.py
+++ b/nifty/spaces/lm_space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from lm_space import LMSpace
diff --git a/nifty/spaces/lm_space/lm_space.py b/nifty/spaces/lm_space/lm_space.py
index 0cf01177e084d0cbbd8e5703be5f6372cde7626a..c29b2d72b8ad37a1f99bb9a73e32792ff1bbed7a 100644
--- a/nifty/spaces/lm_space/lm_space.py
+++ b/nifty/spaces/lm_space/lm_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/nifty/spaces/power_space/__init__.py b/nifty/spaces/power_space/__init__.py
index fd032cf8184368dffb30534d9aa182e8c829ebca..cad1d25cf32750eb271d1a83dc3eb9d981c35648 100644
--- a/nifty/spaces/power_space/__init__.py
+++ b/nifty/spaces/power_space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from power_space import PowerSpace
from power_index_factory import PowerIndexFactory
\ No newline at end of file
diff --git a/nifty/spaces/power_space/power_index_factory.py b/nifty/spaces/power_space/power_index_factory.py
index ab14e5662f2ec221d0cd652e71b8809be6e54cb0..8caeee21d36db0df4767334b4d70bc9101091ec7 100644
--- a/nifty/spaces/power_space/power_index_factory.py
+++ b/nifty/spaces/power_space/power_index_factory.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from power_indices import PowerIndices
diff --git a/nifty/spaces/power_space/power_indices.py b/nifty/spaces/power_space/power_indices.py
index bff17e0ec6b4a073c0af4aba2c26d8e7124c264b..9841a005cce5ec31d0088a9a5a546c53e127c4a1 100644
--- a/nifty/spaces/power_space/power_indices.py
+++ b/nifty/spaces/power_space/power_indices.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
from d2o import distributed_data_object,\
diff --git a/nifty/spaces/power_space/power_space.py b/nifty/spaces/power_space/power_space.py
index 1e3fbcccff9f9a98d4339fbb7327dcc555a5ce1d..6b60aabe3fbb514fc9621a4fbae8029a534371ab 100644
--- a/nifty/spaces/power_space/power_space.py
+++ b/nifty/spaces/power_space/power_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import numpy as np
diff --git a/nifty/spaces/rg_space/__init__.py b/nifty/spaces/rg_space/__init__.py
index b5efcf9fdc00044109fd94e419e23668a8168fc2..e90fb343aab0f5ffc1d51e9620e475c0457bbc75 100644
--- a/nifty/spaces/rg_space/__init__.py
+++ b/nifty/spaces/rg_space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from rg_space import RGSpace
diff --git a/nifty/spaces/rg_space/rg_space.py b/nifty/spaces/rg_space/rg_space.py
index e06307d0511c85d5d95ecbb74fcd15cf57857bd4..ff8b07a81943e02289b3d79316e7b3f6b4c83e54 100644
--- a/nifty/spaces/rg_space/rg_space.py
+++ b/nifty/spaces/rg_space/rg_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
"""
.. __ ____ __
@@ -286,10 +286,6 @@ class RGSpace(Space):
return dists
def get_fft_smoothing_kernel_function(self, sigma):
-
- if sigma is None:
- sigma = np.sqrt(2) * np.max(self.distances)
-
return lambda x: np.exp(-0.5 * np.pi**2 * x**2 * sigma**2)
# ---Added properties and methods---
diff --git a/nifty/spaces/space/__init__.py b/nifty/spaces/space/__init__.py
index 281b1c876f4817ec4aa5545ec6f2cfd12f3b4ea0..2b000a62a8a7f7d4e733a437c354d7a0f8fbd1af 100644
--- a/nifty/spaces/space/__init__.py
+++ b/nifty/spaces/space/__init__.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,5 +10,10 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from space import Space
diff --git a/nifty/spaces/space/space.py b/nifty/spaces/space/space.py
index 624207d9c44e25800c95e8b90ee0c3e9c54a330f..a6f5227f9326b004c79a7b27c7606db12295acbc 100644
--- a/nifty/spaces/space/space.py
+++ b/nifty/spaces/space/space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import abc
diff --git a/nifty/sugar.py b/nifty/sugar.py
index e3804ff2b8d5a7b64ff96efcc0d7e2b72ad694fc..c567738151301e13ac8320122f7558a71511f7b8 100644
--- a/nifty/sugar.py
+++ b/nifty/sugar.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from nifty import PowerSpace,\
Field,\
diff --git a/nifty/version.py b/nifty/version.py
index 04678f84a2ed856b0ddb7c714b8e774360e7f3fd..5d993bb74978ca363353593c84a4fd4036a58ffe 100644
--- a/nifty/version.py
+++ b/nifty/version.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
# Store the version here so:
# 1) we don't load dependencies by storing it in __init__.py
diff --git a/setup.py b/setup.py
index 54dfa4ed1fe87ae803fe2a2a19e7e03d8dd15f6e..b36055e7a3bbc689e6a06bc7427d009cda943688 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from setuptools import setup, find_packages
diff --git a/test/common.py b/test/common.py
index 8042d8246196ef4fa535943c2aa360b9ee0495c1..797ed80642e6eda2788562589a4d06d46c7c1cc2 100644
--- a/test/common.py
+++ b/test/common.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import d2o
import numpy as np
diff --git a/test/test_field.py b/test/test_field.py
index 11c73cee6f74183016b4953297371d82aad64e9f..a2b0491c4c4b0aaaa9b3bd0c2caebf6ab55fbd71 100644
--- a/test/test_field.py
+++ b/test/test_field.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
diff --git a/test/test_operators/test_fft_operator.py b/test/test_operators/test_fft_operator.py
index c63f91bc847b296bcda9cc3269aeb72330ba3fb4..1f55c645e793da8477a03a7bbc55ba9a384cde13 100644
--- a/test/test_operators/test_fft_operator.py
+++ b/test/test_operators/test_fft_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_operators/test_smoothing_operator.py b/test/test_operators/test_smoothing_operator.py
index 08505d0eb08838ee3e1d7e6f5dcc54be25bd170c..f5c107b81b3db548a67e9959b262a5ec4881c61f 100644
--- a/test/test_operators/test_smoothing_operator.py
+++ b/test/test_operators/test_smoothing_operator.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_serialization.py b/test/test_serialization.py
index 2cea198cff81db506cc65df695da647d9892c531..37e77167e7437b3f2943c86d160d6f31ca76356a 100644
--- a/test/test_serialization.py
+++ b/test/test_serialization.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
diff --git a/test/test_spaces/test_gl_space.py b/test/test_spaces/test_gl_space.py
index c37c8218f3b2086a04a6c988f42e53f96513b897..3d0a053ca1a473a35904687d9385894f70a5b911 100644
--- a/test/test_spaces/test_gl_space.py
+++ b/test/test_spaces/test_gl_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_spaces/test_hp_space.py b/test/test_spaces/test_hp_space.py
index e68b93ee750b9d87d2ec680f9f9b904930b391e5..790f505f4588e38d8b0bee461961f671a484fa99 100644
--- a/test/test_spaces/test_hp_space.py
+++ b/test/test_spaces/test_hp_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_spaces/test_interface.py b/test/test_spaces/test_interface.py
index 927d68df8aff2fa8418e846e84df06fffc3ed358..771d82eaf691a989d879d09d657a4935612c8e80 100644
--- a/test/test_spaces/test_interface.py
+++ b/test/test_spaces/test_interface.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_spaces/test_lm_space.py b/test/test_spaces/test_lm_space.py
index b058a357f5e7724f89b0a9b2414319751ce25c10..15a81525b2f2a9c9b6136586c8384b6114b0108e 100644
--- a/test/test_spaces/test_lm_space.py
+++ b/test/test_spaces/test_lm_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
import unittest
import numpy as np
diff --git a/test/test_spaces/test_power_space.py b/test/test_spaces/test_power_space.py
index 86b27d1221ded8bd503e9f4105c616e5485d4fee..f1fcfdf688e85481524fe0294163664a8713e89d 100644
--- a/test/test_spaces/test_power_space.py
+++ b/test/test_spaces/test_power_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division
diff --git a/test/test_spaces/test_rg_space.py b/test/test_spaces/test_rg_space.py
index ae468c1870145856c5f55f421197b1b8ef7989e8..e3f950c71b6b236d8cc7f04a022d195bbf882936 100644
--- a/test/test_spaces/test_rg_space.py
+++ b/test/test_spaces/test_rg_space.py
@@ -1,8 +1,3 @@
-# NIFTy
-# Copyright (C) 2017 Theo Steininger
-#
-# Author: Theo Steininger
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -15,6 +10,11 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright(C) 2013-2017 Max-Planck-Society
+#
+# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
+# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import division