Add PMTCal and PMTUncal data, remove MTC data