Commit 4b51e179 authored by beamdyn's avatar beamdyn

fixed device names and defaults

parent a4da1179
......@@ -66,7 +66,7 @@ classdef DynamicAperture < RingControl %& GridScan
obj.dfreq = 0; % on energy DA only by default
obj.scraper_positions = -[4:0.3:11]; % in [mm]
obj.scraper_positions = -[4.5:0.5:7]; % in [mm]
% measurement results
obj.x = NaN(length(obj.dfreq));
......@@ -74,14 +74,14 @@ classdef DynamicAperture < RingControl %& GridScan
obj.o = NaN(length(obj.dfreq));
obj.q = NaN(length(obj.dfreq),2);
obj.khdev = 'sr/ps-k1/1';
obj.kedev = 'sr/ps-ke/1';
obj.khdev = 'sr/ps-k4/4';
obj.kedev = 'sy/ps-ke/1';
obj.kickmode= 'fullbump'; % or 'singlekicker'
switch obj.kickmode
case 'fullbump'
obj.khdevCurr0 = tango.Attribute([obj.khdev '/Current']).value;
obj.khdevCurr0 = tango.Attribute([obj.khdev '/Current']).set;
case 'singlekicker'
obj.khdevCurr0 = 0;
otherwise
......@@ -106,7 +106,7 @@ classdef DynamicAperture < RingControl %& GridScan
otherwise
obj.kicker_amplitude_step =10;
obj.amplhk =[100:obj.kicker_amplitude_step:1500]; % initial kicker amplitudes to scan
obj.amplhk =[450:obj.kicker_amplitude_step:1500]; % initial kicker amplitudes to scan
end
obj.amplhk0 = obj.amplhk; % initial kicker amplitudes to scan
......@@ -149,7 +149,7 @@ classdef DynamicAperture < RingControl %& GridScan
disp(['delta frequency steps [Hz]: ' num2str(obj.dfreq)]);
disp(['Scraper positions [mm]: ' num2str(obj.scraper_positions)]);
disp(['measurement type: ' obj.measurement_type]);
disp(['Kicker used: ' obj.khdev]);
disp(['Kicker used: ' obj.khdev ' (' num2str(obj.khdevCurr0) ' A)']);
disp(['Ext. Kicker: ' obj.kedev]);
disp(['Kick mode: ' obj.kickmode]);
disp(['Kicker amplitudes: ' num2str(obj.amplhk)]);
......@@ -364,8 +364,12 @@ classdef DynamicAperture < RingControl %& GridScan
obj.scraper.set(scrappos,'wait'); % movable class takes care of waiting for setting to be reached
disp(['Scraper at : ' num2str(scrappos) ' mm']);
if ip==1
pause(60);
else
pause(10);
end
disp(['scan horizontal kicker']);
try
......
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