So no auto save before you entered that area?
if calm is not working permamently, it sounds like they've been angered to the point of a faction change or penality.
I'm not sure how to edit them apprioately for the npc's to be honest. I understand it can be done, but without knowing what setting it should of been before, I'm not going to suggest tampering with it.
So i'm not sure if this next advice will work (yes it's the same thing to reset a follower, so they can level up)
1. Open the console (~ key).
2. Click the NPC.
3. Type "disable", then hit enter.
4. Type "enable", then hit enter.
5. Close the console.