Skip to content

feat: keep track of field types during initialization instead of checking later #1251

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

Open
baltzell wants to merge 3 commits into
base: development
Choose a base branch
from
Open

feat: keep track of field types during initialization instead of checking later #1251

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13480c2
keep track of field types instead of checking later
baltzell May 8, 2026
e095567
follow magfield naming conventions
baltzell May 9, 2026
1b0a956
fix initialization
baltzell May 9, 2026
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
30 changes: 15 additions & 15 deletions common-tools/cnuphys/magfield/src/main/java/cnuphys/magfield/CompositeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
@SuppressWarnings("serial")
public class CompositeField extends ArrayList<IMagField> implements IMagField {

boolean _hasTorus;
boolean _hasSolenoid;

/**
* Checks whether the field has been set to always return zero.
*
Expand Down Expand Up @@ -43,7 +46,16 @@ public boolean add(IMagField field) {
}
}

return super.add(field);
_hasSolenoid = false;
_hasTorus = false;
if (super.add(field)) {
for (IMagField ifield : this) {
if (ifield instanceof Solenoid) _hasSolenoid = true;
if (ifield instanceof Torus) _hasTorus = true;
}
return true;
}
return false;
}

@Override
Expand All @@ -69,13 +81,7 @@ public String getName() {
* @return <code>true</code> if we have a torus
*/
public boolean hasTorus() {
for (IMagField field : this) {
if (field instanceof Torus) {
return true;
}
}

return false;
return _hasTorus;
}

/**
Expand All @@ -84,13 +90,7 @@ public boolean hasTorus() {
* @return <code>true</code> if we have a solenoid
*/
public boolean hasSolenoid() {
for (IMagField field : this) {
if (field instanceof Solenoid) {
return true;
}
}

return false;
return _hasSolenoid;
}

/**
Expand Down