Diverge See merge request 29id/IEXcode!8
# Conflicts: # iexcode/instruments/ARPES.py # iexcode/instruments/Octupole.py