fix muon and dimuon trigger effs
add closure tests back in