Inclusion of trigger reco in New JO reco resulted in some logic duplication. This MR reduces that.
Further followups will be needed to:
Tagging @rbielski @tamartin