BPM and WPM fixes for odd grids#7

EkaterinaBolotskaya wants to merge 2 commits intooptbrea:mainoptbrea/diffractio:mainfrom

EkaterinaBolotskaya:bug/odd_grid_fixesEkaterinaBolotskaya/diffractio:bug/odd_grid_fixesCopy head branch name to clipboard