AddChoice order is important, and must match enum declared in SarCalibrationLookupData.
I believe this should fix the issue, but I am unable to test that : WIP
Closes #2000 (closed)