added circuit possibilty 1s2p
fixed duplicates in calc_3p
added 3s