Made calc toast and testfloat more general
Semifixed alkalitet calc