Unifying the concepts of scattering and structure factor in ordered and disordered samples. Issue 2 (31st March 2021)