added logdoublenormal likefunc, updated general_likefunc_NMSSM