SCISOFT NCD: SCI-1610 read diffraction metadata when NCD calibration
bean is empty an minor mask refactoring