Skip to content

Backwards compatible bpm fields initialization #34

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
kparasch wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Backwards compatible bpm fields initialization #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81939f
rename BPM_FIELDS_TO_INITIALIZE to BPM_FIELDS_TO_INITIALIZE_ZEROS
kparasch Apr 10, 2026
348474d
move initialization of bpm_system fields to the class and call initia…
kparasch Apr 10, 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
7 changes: 1 addition & 6 deletions pySC/configuration/bpm_system_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import logging

from ..core.simulated_commissioning import SimulatedCommissioning
from ..core.bpm_system import BPM_FIELDS_TO_INITIALISE, BPM_FIELDS_TO_INITIALISE_ONES
from .general import get_error, get_indices_and_names
from .supports_conf import generate_element_misalignments

Expand Down Expand Up @@ -87,11 +86,7 @@ def configure_bpms(SC: SimulatedCommissioning) -> None:
SC.bpm_system.noise_tbt_x = np.array(bpms_tbt_noise)
SC.bpm_system.noise_tbt_y = np.array(bpms_tbt_noise)

nbpm = len(bpms_indices)
for field in BPM_FIELDS_TO_INITIALISE:
setattr(SC.bpm_system, field, np.zeros(nbpm, dtype=float))
for field in BPM_FIELDS_TO_INITIALISE_ONES:
setattr(SC.bpm_system, field, np.ones(nbpm, dtype=float))
SC.bpm_system.initialize_empty_arrays()

for index, bpm_category in zip(bpms_indices, bpms_categories):
generate_element_misalignments(SC, index, bpms_conf[bpm_category])
Expand Down
17 changes: 14 additions & 3 deletions pySC/core/bpm_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
def _rotation_matrix(a):
return np.array([[np.cos(a), -np.sin(a)], [np.sin(a), np.cos(a)]])

BPM_FIELDS_TO_INITIALISE = ['offsets_x', 'offsets_y', 'rolls',
'bba_offsets_x', 'bba_offsets_y',
'reference_x', 'reference_y']
BPM_FIELDS_TO_INITIALISE_ZEROS = ['offsets_x', 'offsets_y', 'rolls',
'bba_offsets_x', 'bba_offsets_y',
'reference_x', 'reference_y']

# These fields are initialized to ones (not zeros) — multiplicative corrections
BPM_FIELDS_TO_INITIALISE_ONES = ['gain_corrections_x', 'gain_corrections_y']
Expand Down Expand Up @@ -54,8 +54,19 @@ class BPMSystem(BaseModel, extra='forbid'):
def initialize(self):
if len(self.rolls) > 0:
self.update_rot_matrices()
if len(self.indices):
self.initialize_empty_arrays()
return self

def initialize_empty_arrays(self):
nbpm = len(self.indices)
for field in BPM_FIELDS_TO_INITIALISE_ZEROS:
if not len(getattr(self, field)): # array is empty
setattr(self, field, np.zeros(nbpm, dtype=float))
for field in BPM_FIELDS_TO_INITIALISE_ONES:
if not len(getattr(self, field)): # array is empty
setattr(self, field, np.ones(nbpm, dtype=float))

def update_rot_matrices(self):
self._rot_matrices = _rotation_matrix(self.rolls)

Expand Down
Loading