Updates to hklgen and added hkl_model file to make bumps fit work