small bug fixes and switch to use of deltaPhi function instead of calculating it ourselves
fixed bug in which dPT instead of dPhi was selected on
commented things out to remove compiler warnings