Merging Kevin and Alex's changes for ZFromData.cc

Adding in Kevin's dump function while preserving the formatting changes
from Alex's version.