Tarwathie is clearly a variant of the tune we're discussing.  I know of the MacCalmans, but I don't have any of their material to hand.  If anybody would like to be specific about differences between the midi I've made from Tattie's guide and the tune as they remember it, I'll gladly incorporate those.