sepaating souce location and chi computation
Former-commit-id: d573f83aa1c8903084e9907e38c7141ff0bdc4e5