master
Don't use Totem T2 RecHits due to relVal geometry problems, DB vs xml
replace ctpps_2016 with ctpps modifier, where desirable