COMPLETELY revamped the mock2 code, added to calibrate.py (all-in-one program).