Skip to content

Corrector magnet changes #90

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

Merged
willrogers merged 2 commits into from
Sep 13, 2018
Merged

Corrector magnet changes #90

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
583a83c
Update the csv files and scripts that generate them to correct fields…
T-Nicholls Sep 12, 2018
26f10e8
Update tests to work with new corrector magnet field names.
T-Nicholls Sep 13, 2018
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
688 changes: 344 additions & 344 deletions pytac/data/DIAD/devices.csv
View file
Open in desktop

Large diffs are not rendered by default.

688 changes: 344 additions & 344 deletions pytac/data/DIAD/unitconv.csv
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions pytac/data/VMX/devices.csv
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions pytac/data/VMX/unitconv.csv
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions pytac/data/VMXSP/devices.csv
View file
Open in desktop

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions pytac/data/VMXSP/unitconv.csv
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions test/test_machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ def test_load_correctors(lattice, n_correctors):
assert len(hcm) == n_correctors
assert len(vcm) == n_correctors
for element in hcm:
# each one has b0, h_fofb_disabled and h_sofb_disabled fields.
assert {'b0', 'h_sofb_disabled',
# each one has x_kick, h_fofb_disabled and h_sofb_disabled fields.
assert {'x_kick', 'h_sofb_disabled',
'h_fofb_disabled'}.issubset(element.get_fields()[pytac.LIVE])
for element in vcm:
# each one has a0, v_fofb_disabled and v_sofb_disabled fields.
assert {'a0', 'v_sofb_disabled',
# each one has y_kick, v_fofb_disabled and v_sofb_disabled fields.
assert {'y_kick', 'v_sofb_disabled',
'v_fofb_disabled'}.issubset(element.get_fields()[pytac.LIVE])


Expand Down
4 changes: 2 additions & 2 deletions utils/load_mml.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,13 @@ function insertpvs(index, pvs)
elseif strcmp(type, 'BEND')
field = 'b0';
elseif strcmp(type, 'VSTR')
field = 'a0';
field = 'y_kick';
alt_prefix = strrep(strrep(get_pv, 'DI', 'PC'), ':I', '');
alt_template = strcat(alt_prefix, ':%s:DISABLED');
alt_pv1 = pv_struct('v_fofb_disabled', sprintf(alt_template, 'FAST'), '');
alt_pv2 = pv_struct('v_sofb_disabled', sprintf(alt_template, 'SLOW'), '');
elseif strcmp(type, 'HSTR')
field = 'b0';
field = 'x_kick';
alt_prefix = strrep(strrep(get_pv, 'DI', 'PC'), ':I', '');
alt_template = strcat(alt_prefix, ':%s:DISABLED');
alt_pv1 = pv_struct('h_fofb_disabled', sprintf(alt_template,'FAST'), '');
Expand Down
4 changes: 2 additions & 2 deletions utils/load_unitconv.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function load_unitconv(ringmode, renamedIndexes)
hcor_index = hcor_index + 1;
end
id = write_linear_data(data.field(2) / data.current(2), 0);
fprintf(f_units, '%d,%s,poly,%d\n', renamedIndexes(hcor_index), 'b0', id);
fprintf(f_units, '%d,%s,poly,%d\n', renamedIndexes(hcor_index), 'x_kick', id);
end

vcor = getfamilydata('VCM');
Expand All @@ -70,7 +70,7 @@ function load_unitconv(ringmode, renamedIndexes)
vcor_index = vcor_index + 1;
end
id = write_linear_data(data.field(2) / data.current(2), 0);
fprintf(f_units, '%d,%s,poly,%d\n', renamedIndexes(vcor_index), 'a0', id);
fprintf(f_units, '%d,%s,poly,%d\n', renamedIndexes(vcor_index), 'y_kick', id);
end


Expand Down