diff --git a/demos/getting_started_3.py b/demos/getting_started_3.py index b70fc6a64e55d99dae908959b31c7adcf6bb76cf..2ecc30574a77cad865698d6c4949e69657d5ae82 100644 --- a/demos/getting_started_3.py +++ b/demos/getting_started_3.py @@ -22,9 +22,8 @@ if __name__ == '__main__': ht = ift.HarmonicTransformOperator(harmonic_space, position_space) power_space = A.value.domain[0] power_distributor = ift.PowerDistributor(harmonic_space, power_space) - position = {} - position['xi'] = ift.Field.from_random('normal', harmonic_space) - position = ift.MultiField.from_dict(position) + position = ift.MultiField.from_dict( + {'xi': ift.Field.from_random('normal', harmonic_space)}) xi = ift.Variable(position)['xi'] Amp = power_distributor(A) @@ -35,6 +34,7 @@ if __name__ == '__main__': # apply some nonlinearity signal = ift.PointwisePositiveTanh(correlated_field) + # Building the Line of Sight response LOS_starts, LOS_ends = get_random_LOS(100) R = ift.LOSResponse(position_space, starts=LOS_starts, diff --git a/nifty5/models/linear_model.py b/nifty5/models/linear_model.py index 413786c2531c3d927a2daa25f6999980494d16d1..9612400db2abd2ebfb9dc406ba981152d0947e63 100644 --- a/nifty5/models/linear_model.py +++ b/nifty5/models/linear_model.py @@ -44,6 +44,7 @@ class LinearModel(Model): self._lin_op = lin_op self._inp = inp + # MR FIXME: what does this do? if isinstance(self._lin_op, SelectionOperator): self._lin_op = SelectionOperator(self._inp.value.domain, self._lin_op._key) diff --git a/nifty5/multi/multi_domain.py b/nifty5/multi/multi_domain.py index 6687f165df6fe115abdccde0085c26916a9274c2..51febbc718969db4d6fe6d62af019d80e6bddb5d 100644 --- a/nifty5/multi/multi_domain.py +++ b/nifty5/multi/multi_domain.py @@ -63,3 +63,9 @@ class MultiDomain(object): def __ne__(self, x): return not self.__eq__(x) + + def __str__(self): + res = "MultiDomain:\n" + for key, dom in zip(self._keys, self._domains): + res += key+": "+str(dom)+"\n" + return res