Upgrade of D+ software for hierarchical modeling of X-ray scattering data from complex structures in solution, fibers and single orientations