This PR fix Can latest issue with 1.1:
Checked with the dataset in /scisoft/darfix/datasets/test_mainx_2
/scisoft/darfix/datasets/test_mainx_2
!!! to port to 'main' branch !!!