merged in changes from upstream, including major changes to the THcHodoscope class. I had to manually propagate some of these changes because of the differences in implementation for this classs.