Improved support for fast accelerator changes

This commit is contained in:
LemADEC 2017-05-21 03:02:45 +02:00
parent bb3075d5ac
commit 9ac17bef8d

View file

@ -378,6 +378,8 @@ public class AcceleratorSetup extends GlobalPosition {
public boolean isMajorChange(final AcceleratorSetup acceleratorSetup) { public boolean isMajorChange(final AcceleratorSetup acceleratorSetup) {
return acceleratorSetup == null return acceleratorSetup == null
|| trajectoryAccelerator == null
|| acceleratorSetup.trajectoryAccelerator == null
|| trajectoryAccelerator.size() != acceleratorSetup.trajectoryAccelerator.size() || trajectoryAccelerator.size() != acceleratorSetup.trajectoryAccelerator.size()
|| trajectoryTransfer.size() != acceleratorSetup.trajectoryTransfer.size() || trajectoryTransfer.size() != acceleratorSetup.trajectoryTransfer.size()
|| countMagnets[0] != acceleratorSetup.countMagnets[0] || countMagnets[0] != acceleratorSetup.countMagnets[0]