...
 
Commits (3)
......@@ -355,13 +355,13 @@ while (nbpmu<=length(indBPM)*corropt.maxturns) && ~stopped
end
% measure trajectory
if ~firstmeasuredtraj
%if ~firstmeasuredtraj
disp('measure new trajectory')
[t] = obj.measuretrajectory;
firstmeasuredtraj = false;
end
% firstmeasuredtraj = false;
% end
% remove reference
ox=t(1,:)-reforbit(1,:);
......
......@@ -84,9 +84,9 @@ obj.state_hst =@()(strcmp(tango.Attribute([TANGO_HOST 'srmag/hst/all/CorrectorSt
obj.state_vst =@()(strcmp(tango.Attribute([TANGO_HOST 'srmag/vst/all/CorrectorStates']).value,'Disabled')==0); % V steerer status (ON OFF FAULT,...)
% index of correctors to exclude [0,n-1]
obj.orbit_cor_disabled_bpm =@()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-h/DisabledBPMsIndex']).value); % H steerer not in orbit correction
obj.orbit_cor_disabled_hst =@()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-h/DisabledActuatorsIndex']).value); % H steerer not in orbit correction
obj.orbit_cor_disabled_vst =@()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-v/DisabledActuatorsIndex']).value); % V steerer not in orbit correction
obj.orbit_cor_disabled_bpm =@()([]);% @()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-h/DisabledBPMsIndex']).value); % H steerer not in orbit correction
obj.orbit_cor_disabled_hst =@()([]);% @()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-h/DisabledActuatorsIndex']).value); % H steerer not in orbit correction
obj.orbit_cor_disabled_vst =@()([]);% @()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-v/DisabledActuatorsIndex']).value); % V steerer not in orbit correction
obj.autocor =@()(tango.Attribute([TANGO_HOST 'sr/beam-orbitcor/svd-auto']).state);
......
......@@ -230,12 +230,12 @@ classdef RingControl < handle
% returns a vector of true/false for correctors On and enabled
% in orbit correction
enabledhst = obj.state_hst;
enabledhst = obj.state_hst();
try
codisab = obj.orbit_cor_disabled_hst;
codisab = obj.orbit_cor_disabled_hst();
catch
warning(['could not read : ' obj.orbit_cor_disabled_hst]);
warning(['could not read : ' obj.orbit_cor_disabled_hst()]);
codisab=[];
end
......@@ -247,12 +247,12 @@ classdef RingControl < handle
% returns a vector of true/false for correctors On and enabled
% in orbit correction
enabledvst = obj.state_vst; % device not On
enabledvst = obj.state_vst(); % device not On
try
codisab = obj.orbit_cor_disabled_vst;
codisab = obj.orbit_cor_disabled_vst();
catch
warning(['could not read : ' obj.orbit_cor_disabled_vst]);
warning(['could not read : ' obj.orbit_cor_disabled_vst()]);
codisab=[];
end
......@@ -264,12 +264,12 @@ classdef RingControl < handle
% returns a vector of true/false for BPM with Status=0 (no error)
% and enabledin orbit correction
enabledbpm = obj.status_bpm ;
enabledbpm = obj.status_bpm() ;
try
codisab = obj.orbit_cor_disabled_bpm;
codisab = obj.orbit_cor_disabled_bpm();
catch
warning(['could not read : ' obj.orbit_cor_disabled_bpm]);
warning(['could not read : ' obj.orbit_cor_disabled_bpm()]);
codisab=[];
end
......