Commit 566899b1 authored by Simone Liuzzo's avatar Simone Liuzzo
Browse files

changed search string for BM sources

parent 1cbf1a5f
......@@ -8,6 +8,7 @@ classdef model < atmodel
%vbpm: Vertical BPMs
%di: All dipole
%qp: All quadrupoles
%qf8d: Tilted QF8D quadrupoles (splitted for 2PW modelling)
%dq: All dipole-quadrupoles
%sx: All sextpoles
%oc: All octupoles
......@@ -132,6 +133,8 @@ classdef model < atmodel
idx=atgetcells(this.ring,'FamName','O[FDIJ]\w*');
case 'qp'
idx=atgetcells(this.ring,'Class','Quadrupole');
case 'qf8d'
idx=atgetcells(this.ring,'FamName','QF8D\w*') & atgetcells(this.ring,'Class','Bend') ;
case 'dq'
idx=atgetcells(this.ring,'FamName','DQ\w*');
case 'di'
......@@ -145,15 +148,15 @@ classdef model < atmodel
case 'bm'
idx=atgetcells(this.ring,'FamName','BM\w*|^bm\d+');
case '3pw'
idx=atgetcells(this.ring,'BMType','3PW\w*');
idx=atgetcells(this.ring,'FamName','3PW\w*-w*');
case '2pw'
idx=atgetcells(this.ring,'BMType','2PW\w*');
idx=atgetcells(this.ring,'FamName','2PW[AB]-\w*');
case '2pwa'
idx=atgetcells(this.ring,'BMType','2PW_A');
idx=atgetcells(this.ring,'FamName','2PWA-\w*');
case '2pwb'
idx=atgetcells(this.ring,'BMType','2PW_B');
idx=atgetcells(this.ring,'FamName','2PWB-\w*');
case 'sbm'
idx=atgetcells(this.ring,'BMType','SBM');
idx=atgetcells(this.ring,'FamName','SBM-\w*');
case 'diag'
idx=atgetcells(this.ring,'FamName','DR_38$|^DR_K1'); % K1 occupies the space in cell 3
case 'kickers'
......@@ -219,12 +222,18 @@ classdef model < atmodel
muyc=(27 + tunes(2));
end
[~,qpk]=ebs.opticsmatching(this.ring,...
[~,qpk,dqk,qf8dk]=ebs.opticsmatching(this.ring,...
'mux',muxc,'muy',muyc,...
'noDQ',true,varargin{2:end});
this.setfieldvalue('qp','PolynomB',{1,2},qpk)
this.setfieldvalue('dq','PolynomB',{1,2},dqk)
this.setfieldvalue('qf8d','PolynomB',{1,2},qf8dk)
error('NAN in tune response file!')
error('NAN in tune response file!')
error('NAN in tune response file!')
error('NAN in tune response file!')
error('NAN in tune response file!')
otherwise
error('tunefix mode not correct. see help ebs.model.settune');
......
Supports Markdown
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