Adding Vadim's changes to L1Trigger/SCTriggerPrimitives