Fix double fwd jet trigger
infile name change
More generic implementation