Reordered rcut factors and removed excess tuple makers
Updated how trimmed PFJets are handled