make joint_tf_wavelet_factory take M in scat_opt