Refs #9736 Remove zeroed spectra from average.
Refs #9736 Use FindDetectorsOutsideLimits instead.

Also do a little light refactoring while we're here.
Merge remote-tracking branch 'origin/bugfix/9736_calib_sum_zero_spec'