Use beam emittance from model definition
Merge branch 'model-folder-refactoring'