Fix recent look-ahead bug; new trigger efficiency determination cuts