self-discipline 与 self-control 是同一个意思吗?

self-control n.[U]the ability to remain calm and not show your emotions even though you are feeling angry,excited,etc.自制力；自我控制
Example：It took all his self-control not to shout at them.他强压怒火,没有向他们叫嚷.
self-discipline n.[U]the ability to make yourself do sth,especially sth.difficult or unpleasant自律能力；自我约束能力
Example：It takes a lot of self-discipline to go jogging in winter.在冬天跑步是需要很大的自律力的.
根据英文释义,②用两者都可以.