Reinstate original parmaters
Simplify code
Moving intensity get function to cython