Commit cf88ed2e authored by Theo Steininger's avatar Theo Steininger

Update sugar.py

parent 3c388314
Pipeline #12815 failed with stages
in 5 minutes and 5 seconds
...@@ -25,7 +25,6 @@ __all__ = ['create_power_operator'] ...@@ -25,7 +25,6 @@ __all__ = ['create_power_operator']
def create_power_operator(domain, power_spectrum, dtype=None, def create_power_operator(domain, power_spectrum, dtype=None,
distribution_strategy='not'): distribution_strategy='not'):
<<<<<<< nifty/sugar.py
""" Creates a diagonal operator with the given power spectrum. """ Creates a diagonal operator with the given power spectrum.
Constructs a diagonal operator that lives over the specified domain. Constructs a diagonal operator that lives over the specified domain.
...@@ -50,8 +49,6 @@ def create_power_operator(domain, power_spectrum, dtype=None, ...@@ -50,8 +49,6 @@ def create_power_operator(domain, power_spectrum, dtype=None,
DiagonalOperator : An operator that implements the given power spectrum. DiagonalOperator : An operator that implements the given power spectrum.
""" """
=======
>>>>>>> nifty/sugar.py
power_domain = PowerSpace(domain, power_domain = PowerSpace(domain,
distribution_strategy=distribution_strategy) distribution_strategy=distribution_strategy)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment