added three branches, removed EDFilter, fixed goodVertex selection