Removed extra width definitions
Renamed tree gamma to photons