Official Diagnostic protocol for Xf and CaLsol

Summary
Official Diagnostic protocol for Xf and CaLsol