Added back support for S2 screens.

Put asserts in solver LR and calc_E_short_range to check for invalid screens.