move PF SuperClusters and PFEGamma to use consumes interface