Improve strategy for integrals used in capacity measurements

[WardLT]

Our integration routines are likely to be thrown off if the current jumps between two steps. We should implement a strategy for identifying discontinuities then integrating the segments on either side of them separately.