Some cleanup of addSignal()

Doing some basic clean up (adding braces, defining consts, breaking up
lines) so that future content edits are easier to understand.
Modify HcalTriggerPrimitiveAlgo to work with 1x1HF