From a29abca8da8ae689f92ad3ec9e1ad545f87bbda5 Mon Sep 17 00:00:00 2001
From: Philipp Arras <parras@mpa-garching.mpg.de>
Date: Mon, 9 Mar 2020 11:11:03 +0100
Subject: [PATCH] Cosmetics
---
nifty6/operators/energy_operators.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/nifty6/operators/energy_operators.py b/nifty6/operators/energy_operators.py
index 32d63dfa9..45cc759d5 100644
--- a/nifty6/operators/energy_operators.py
+++ b/nifty6/operators/energy_operators.py
@@ -19,17 +19,17 @@ import numpy as np
from .. import utilities
from ..domain_tuple import DomainTuple
-from ..multi_domain import MultiDomain
from ..field import Field
-from ..multi_field import MultiField
from ..linearization import Linearization
-from ..sugar import makeDomain, makeOp, full
+from ..multi_domain import MultiDomain
+from ..multi_field import MultiField
+from ..sugar import makeDomain, makeOp
from .linear_operator import LinearOperator
from .operator import Operator
from .sampling_enabler import SamplingEnabler
from .sandwich_operator import SandwichOperator
from .scaling_operator import ScalingOperator
-from .simple_linear_operators import VdotOperator, FieldAdapter
+from .simple_linear_operators import FieldAdapter, VdotOperator
class EnergyOperator(Operator):
@@ -130,14 +130,12 @@ class VariableCovarianceGaussianEnergy(EnergyOperator):
def apply(self, x):
self._check_input(x)
- from .contraction_operator import ContractionOperator
lin = isinstance(x, Linearization)
r = FieldAdapter(self._domain[self._r], self._r)
icov = FieldAdapter(self._domain[self._icov], self._icov)
res0 = r.vdot(r*icov).real
res1 = icov.log().sum()
- res = 0.5*(res0-res1)
- res = res(x)
+ res = (res0-res1).scale(0.5)(x)
if not lin:
return Field.scalar(res)
if not x.want_metric:
--
GitLab