More aggressive combination of diagonal operators

Merged Martin Reinecke requested to merge diag_hack into NIFTy_4

Merge request reports