trapping parameters
Merge branch 'master' of https://github.com/micramm/HaeffnerLabLattice