fixed bug in plotting macro xs and computing nuclide number density
resolved conflicts