CP algs: Make sure pt is not used in preselection if not enabled at this point (master version)
Manual sweep of !55142 (merged).
Make sure pt is not used in preselection if not enabled at this point. Otherwise pt cut is also implicitly used.
Another option would be to run pt selection last, but this would require yet another reorganisation which we can probably leave for block configuration.