Implemented sumpT dismabiguation for VBF and untagged categories.

Fixed #351
Also cleaned up duplicated code for diphoton pair selection.