Self control is a matter of choice, it's either you allow your emotions control you or you control them.
Self discipline is a personal principle which will boost your life both morally and spiritually.