Fix for non 8 TeV SF scaling and fix for only creating data histograms for iteration 0