Commit 76568d69 authored by Philipp Arras's avatar Philipp Arras
Browse files

Merge branch 'fixup-gig-energy' into NIFTy_6

parents d37dc659 ba23e132
Pipeline #70328 passed with stages
in 15 minutes and 41 seconds
......@@ -23,7 +23,7 @@ from ..multi_domain import MultiDomain
from ..field import Field
from ..multi_field import MultiField
from ..linearization import Linearization
from ..sugar import makeDomain, makeOp
from ..sugar import makeDomain, makeOp, full
from .linear_operator import LinearOperator
from .operator import Operator
from .sampling_enabler import SamplingEnabler
......@@ -130,9 +130,20 @@ class VariableCovarianceGaussianEnergy(EnergyOperator):
def apply(self, x):
res0 = x[self._r].vdot(x[self._r]*x[self._icov]).real
res1 = x[self._icov].log().sum()
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.conjugate()*r*icov
sum_it = ContractionOperator(, None)
res0 = sum_it(res0).real
res1 = sum_it(icov.log())
res = 0.5*(res0-res1)
res = res(x)
if not lin:
return Field.scalar(res)
if not x.want_metric:
return res
mf = {self._r: x.val[self._icov], self._icov: .5*x.val[self._icov]**(-2)}
metric = makeOp(MultiField.from_dict(mf))
return res.add_metric(SandwichOperator.make(x.jac, metric))
Supports Markdown
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