Skip to content

feat: prioritize primary usage case for performance #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
baltzell wants to merge 1 commit into from
+11 −11
Closed

feat: prioritize primary usage case for performance #1249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/MagneticFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,14 +1387,14 @@ public void removeMapOverlap() {
public boolean hasActiveTorus() {

if (_activeField != null) {
if (_activeField instanceof Torus) {
if (_activeField instanceof CompositeField) {
return ((CompositeField) _activeField).hasTorus();
} else if (_activeField instanceof CompositeProbe) {
return ((CompositeProbe) _activeField).hasTorus();
} else if (_activeField instanceof Torus) {
return true;
} else if (_activeField instanceof TorusProbe) {
return true;
} else if (_activeField instanceof CompositeProbe) {
return ((CompositeProbe) _activeField).hasTorus();
} else if (_activeField instanceof CompositeField) {
return ((CompositeField) _activeField).hasTorus();
}
}

Expand All @@ -1408,15 +1408,15 @@ public boolean hasActiveTorus() {
*/
public boolean hasActiveSolenoid() {
if (_activeField != null) {
if (_activeField instanceof Solenoid) {
if (_activeField instanceof CompositeField) {
return ((CompositeField) _activeField).hasSolenoid();
} else if (_activeField instanceof CompositeProbe) {
return ((CompositeProbe) _activeField).hasSolenoid();
} else if (_activeField instanceof Solenoid) {
return true;
} else if (_activeField instanceof SolenoidProbe) {
return true;
} else if (_activeField instanceof CompositeProbe) {
return ((CompositeProbe) _activeField).hasSolenoid();
} else if (_activeField instanceof CompositeField) {
return ((CompositeField) _activeField).hasSolenoid();
}
}
}

return false;
Expand Down