updated for hadronic analysis. Also added support for custom subjet coll...

...ections and hooks for future trigger studies