Still fixing the cosmic ray generator
Merge branch 'master' into kwierman_working
Fixed Rock Definition