new JetID implementation for JetAnalyzer
Resolved conflicts.