reorganize the calorimeter regime section since property keys have changed