ANL: Fixed so that fName gets set depending on input BEFORE SetupMeasurement gets called

Routines: Fixed so that the norm parameters get the sample type appended
to them so Minuit or NUISANCE can't get confused about normalisation parameter names
(don't think it would but doesn't hurt to be careful!)