Provide test for average SLD in case of multi-particle layout; simplify computation
Bug #584 (closed) passed unnoticed because there is no test coverage for multi-particle layout with average materials.
Also, local function makeReLayout
in ReSample.cpp is too complicated.