Follow change of default muon geometry version (Moore!2424)

In addition, fix a couple of occasions of a wrong calo_raw_bank setting (leading to no calo objects being found)

@rjhunter sorry for missing this originally. Now the tests should work again.