fixed moving average calc to be by water year