Restore AODToEgammaD3PD.py; used for testing.
Fix comparison in makexAOD.py broken by flake8 changes.