tools/FastCalibration.cc adapted to updated lib