Calibration enhancements

You are right, and I did not notice it. I think It is possible to split the struct in two parts, or initialize each calibration parameter by hand.