Fixed some details in PSD.java and CalibrationMetric