Commit d3a84b2d authored by Philipp Arras's avatar Philipp Arras
Browse files

Nicer IC 2

parent 30af4d9c
......@@ -32,12 +32,11 @@ class NonlinearWienerFilterEnergy(Energy):
self.nonlinearity = nonlinearity
self.ht = ht
self.power = power
position_map = self.ht(self.power * self.position)
m = self.ht(self.power * self.position)
self.LinearizedResponse = LinearizedSignalResponse(
Instrument, nonlinearity, ht, power, position_map, sunit)
Instrument, nonlinearity, ht, power, m, sunit)
position_map = ht(self.power * self.position)
residual = d - Instrument(sunit * nonlinearity(position_map))
residual = d - Instrument(sunit * nonlinearity(m))
self.N = N
self.S = S
self.inverter = inverter
......
......@@ -61,7 +61,7 @@ class GradientNormController(IterationController):
if self._name is not None:
msg += self._name+":"
msg += " Iteration #" + str(self._itcount)
msg += " energy={:.2E}".format(energy.value)
msg += " energy={:.6E}".format(energy.value)
msg += " gradnorm={:.2E}".format(energy.gradient_norm)
msg += " clvl=" + str(self._ccount)
dobj.mprint(msg)
......
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