Commit 9c3975d8 authored by Simone Liuzzo's avatar Simone Liuzzo

corrected pinhole locations (2.2mrad for ID and cell 09 instead of cell01 for BM

parent 5cc5ec6e
......@@ -4,7 +4,7 @@
pind=~any(atgetcells(mach,'FamName','PINHOLE_D(\d\d)?'));
if pinid && ~isempty(ebs.model.pinhole_id)
fprintf('Add ID pinholes...\n');
dl1a5 = atgetcells(mach, 'FamName', 'DL1A_5');
dl1a5 = atgetcells(mach, 'FamName', 'DL1A_5\w*'); % include canted
nbdl = sum(dl1a5);
if nbdl == 1 % standard cell or injection cell
msk=true;
......@@ -17,7 +17,7 @@
pinlist=arrayfun(@(c) atmarker(sprintf('PINHOLE_ID%02d',c)),ebs.model.pinhole_id,'UniformOutput',false);
end
dl1a5(dl1a5)=msk(1:nbdl);
loc=1.5e-3./cellfun(@(el) el.BendingAngle, mach(dl1a5));
loc=2.2e-3./cellfun(@(el) el.BendingAngle, mach(dl1a5));
mach=atinsertelems(mach,dl1a5,loc,pinlist);
end
if pind && ~isempty(ebs.model.pinhole_bm)
......
......@@ -33,7 +33,7 @@ classdef model < atmodel
%pinholeD17 Pinhole bm 17
%pinholeID25 Pinhole id 25
%pinholeD27 Pinhole bm 27
%pinholeD01 Pinhole bm 01
%pinholeD09 Pinhole bm 09
%
%
%Available parameters:
......@@ -63,7 +63,7 @@ classdef model < atmodel
properties (Constant, Hidden)
pinhole_id=[7 25]
pinhole_bm=[17 27 1]
pinhole_bm=[9 17 27]
end
% properties (Constant, Access=private, Hidden)
......
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