Split doDatacards from doTables

Useful because of having the two signal components condensed into one for datacards, and for the different normalization