Definitely noncalc based. At least at my school a calc-based would be worthless (unless you're in to deriving equations like mad.) Correct me if I'm wrong, but most schools that require 2 semesters of psychology don't specify what courses they are. I took general psychology and abnormal psychology, but I think you could basically take any psychology course that interests you.