lepton vs. photon cleaning

Resolves #152 (closed)

To be merged after !287 (merged), which also removes the dipohoton cut here. Might need to resolve conflicts first...