old CalculateCpp
Merge branch 'master' of https://github.com/gofrito/SCtrackAnalysis

Conflicts:
	src/CalculateCpp.py