fix for noise matrix absence and allow for double wrap correction in the future

[Laura2305]

@alexjaffray I think we can merge this. There's a bug fix and a function improvement.