Cleanup of MeasureNight and use header info for file time if not in filename