Dipolarity: CLHEP 2-vec -> TVector2
Angularity: revert to using jet.p4() now it is fixed upstream