allowing a new style pixel match to be done in the HLT

Fixes several bugs in the calculation of s2, the new pixel match variable and adds the ability to cut on barrel, intermediate and forward regions separately.