Everything but Ic_TP

Adapted correlation integral functions

Modified main() to match

Reproduces old results prefectly