Allow rejection based on pixel or sct holes individually

Previous the standard selection would select only on combined silicon holes, and speciceal selections were implemented that also selected individually on pixel or sct holes. These changes allow both to be set also for the standard analyses