UPdated macros for running with Geant4