Fix off-by-one error in CF/Radial counts of radials.

Had been treating the end index in the file like normal 0-based index
end points; however, they actually represent the last index in a sweep.

Also clean up some of the code.