fix issues introduced by 1e96449#60

kjmeagher merged 2 commits intomainicecube/simweights:mainfrom

kjm/explicit_pdficecube/simweights:kjm/explicit_pdfCopy head branch name to clipboard