ATLSUSYSW-496; Move up "!input.caloCluster()" check for Electrons and Photons.
Moving up the existing check for null caloCluster() in the Electron case, and adding it also to the Photon case. Closes ATLSUSYSW-496.
Tests will fail until the reference files are synced to cvmfs (after changes from !27252 (merged)). They are already copied to eos so by evening this should be fine.