Improved Algorithm for Close Geometry Characterization of Waste using Gamma-Ray Spectroscopy