Support for final Run 2 MCP calibration

These changes are technical updates to the tool to create support for the final run 2 MCP recommendations.

This MR is not changing any of the default values or recommending an update to the current MCP recommendation. It is just to perform technical changes which should be transparent for any user of the current calibration recommendations