cleanup generator, more correct sampling of time of collision
Merge pull request #4306 from civanch/cleanup_gen_interface

Cleanup G4 interface to generators