Added merge method to Histogram class.
Fixed bug in parameter checking in ParameterSet.
Reorganization of PSF plotting script.