master
Avoid adding TF2 and TF3 to global list of functions
Sim: splitted the matcher functions into their two AOD/miniAOD variants