Characterizing and correcting electron and hole trapping in germanium cross-strip detectors