restructuring to increase code reuse/overlap between leptonic and hadronic channels

code restructuring in anticipation of leptonic channels such as making sure triggers are really orthogonal (preference on hadronic for now), and to allow more higgs types, not just htt/hbb.

took the chance to also rename a couple of things to be a touch prettier, and make args in run_hh somewhat more readable.

checked that the datacards perfectly synchronize with the latest nonres update w/o this code change: https://docs.google.com/presentation/d/1whHJ62l_7-_qOFl56ovtafTH80WTKzr1ea_1qosWGCE/edit?usp=sharing