I've finished rederiving the calibration curves self-consistently. These will now be applied to the data....