Commit 591b4598 authored by Simone Liuzzo's avatar Simone Liuzzo
Browse files

Merge branch 'AddSkew' into 'master'

added skew quadrupoles in RingControl

See merge request !9
parents c3a3493f ec28be80
......@@ -25,6 +25,8 @@ obj.cv8 = movable('');
obj.cv9 = movable('');
obj.sh = movable([TANGO_HOST 'srmag/hst/all/Strengths'],'absolute',true,'limits',[-4e-4 4e-4]);
obj.sv = movable([TANGO_HOST 'srmag/vst/all/Strengths'],'absolute',true,'limits',[-4e-4 4e-4]);
% limits can be higher, but they depend on the strengths of the steerers
obj.skew = movable([TANGO_HOST 'srmag/sqp/all/CorrectionStrengths'],'absolute',true,'limits',[-1.5e-2 1.5e-2]);
obj.rf = movable([TANGO_HOST 'srrf/master-oscillator/1/Frequency'],'absolute',false,'limits',[0.99 1.01]);
obj.quad = movable([TANGO_HOST 'srmag/m-q/all/CorrectionStrengths']);
obj.sext = movable([TANGO_HOST 'srmag/m-s/all/CorrectionStrengths']);
......@@ -84,8 +86,9 @@ ring = mod.ring;
obj.indBPM = mod.get(0,'bpm')';
obj.indHst = sort([mod.get(0,'steerh'); mod.get(0,'dq')])';
obj.indVst = mod.get(0,'steerv')';
obj.indSkew = mod.get(0,'skew')';
% mae sure steerers have KickAngle.
% make sure steerers have KickAngle.
ring = atsetfieldvalues(ring,obj.indHst,'KickAngle',{1,1},0);
ring = atsetfieldvalues(ring,obj.indHst,'KickAngle',{1,2},0);
ring = atsetfieldvalues(ring,obj.indVst,'KickAngle',{1,1},0);
......
......@@ -36,6 +36,7 @@ classdef RingControl < handle
quad % quadrupoles
sext % sextupoles
octu % octupoles
skew % skew quadrupole correctors
ke % device to control KE
gun % device to control Gun
......@@ -104,6 +105,7 @@ classdef RingControl < handle
indQuad % indexes of Quadrupoles in AT rmodel
indSext % indexes of Sextupoles in AT rmodel
indOctu % indexes of Octupoles in AT rmodel
indSkew % indexes of Skew Quadrupole Correctors in AT rmodel
% properties below should be private
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment