Separate data-creation and data-analysis scripts

Ideally we should have a data creation stage (which will also handle injections) and a data analysis stage. This requires a little logic in the code, but should allow future script development to be more modular and cleanly separate injections from the analysis (and consequently, injection analysis will be equivalent to real data analysis).