Fill out SRMHD measurement function, fix Mach number in NRHYD