heterogeneous ray tracing nearly working - can now plot neutron tracks
merged with master