Updated calibration object to use by triggger simulator and simulator itself