Updating 2D beam histogramming code.  Compiles, not checked.
Modify affineExcept to be derived from std::exception, not have errnumber.
Merge branch 'base'
Reflects change in affineExcept.