2nd pass at waterCalibration

Signed-off-by: Andrew McKinney <mckinney@neuro.duke.edu>