Add depth fields to CyberShake database metadata

Fix error where error metric is not computed for unconditional selection

Clean up optimization function