Expand calibration class

Now I actually can produce calibration matrices. This is as yet untested.