adds Multipole class to atdisable_6d atenable_6d (#874)

* fix disable_6d adding Multipole class

* add argument to help message

* fixing atenable_6d

* remove auto in passmethod for Multipole class

* remove auto for Multipole class

* add energy to autoMultipolePass

Author: oscarxblanco

atmat/atphysics/Radiation/atdisable_6d.m

@@ -33,6 +33,7 @@
 %   'quadpass'       pass method for quadrupoles. Default 'auto'
 %   'sextupass'      pass method for sextupoles. Default 'auto'
 %   'octupass'       pass method for bending magnets. Default 'auto'
+%   'multipolepass'  pass method for multipole magnets. Default 'auto'
 %   'wigglerpass'	 pass method for wigglers. Default 'auto'
 %   'quantdiffpass'  pass method for quantum diffusion. Default 'auto'
 %   'energylosspass' pass method for atenergyloss element. Default 'auto'
@@ -59,6 +60,7 @@
 
 % Process the keyword arguments
 [allpass,varargs]=getoption(varargin,'allpass',[]);
+[multipolepass,varargs]=getoption(varargs,'multipolepass',default_pass('auto'));
 [octupass,varargs]=getoption(varargs,'octupass',default_pass('auto'));
 [sextupass,varargs]=getoption(varargs,'sextupass',default_pass('auto'));
 [quadpass,varargs]=getoption(varargs,'quadpass',default_pass('auto'));
@@ -78,6 +80,7 @@
 modfun.Quadrupole=autoMultipolePass(quadpass);
 modfun.Sextupole=autoMultipolePass(sextupass);
 modfun.Octupole=autoMultipolePass(octupass);
+modfun.Multipole=autoMultipolePass(multipolepass);
 modfun.Wiggler=autoMultipolePass(wigglerpass);
 modfun.QuantDiff=autoIdentityPass(quantdiffpass);
 modfun.EnergyLoss=autoIdentityPass(energylosspass);

atmat/atphysics/Radiation/atenable_6d.m

@@ -34,6 +34,7 @@
 %   'quadpass'       pass method for quadrupoles. Default 'auto'
 %   'sextupass'      pass method for sextupoles. Default ''
 %   'octupass'       pass method for octupoles. Default ''
+%   'multipolepass'  pass method for multipole magnets. Default ''
 %   'wigglerpass'    pass method for wigglers. Default 'auto'
 %   'quantdiffpass'  pass method for quantum radiation. default 'auto'
 %   'energylosspass' pass method for energyloss element. default 'auto'
@@ -60,6 +61,7 @@
 
 % Process the keyword arguments
 [allpass,varargs]=getoption(varargin,'allpass',[]);
+[multipolepass,varargs]=getoption(varargs,'multipolepass',default_pass(''));
 [octupass,varargs]=getoption(varargs,'octupass',default_pass(''));
 [sextupass,varargs]=getoption(varargs,'sextupass',default_pass(''));
 [quadpass,varargs]=getoption(varargs,'quadpass',default_pass('auto'));
@@ -81,6 +83,7 @@
 mod.Quadrupole=autoMultipolePass(quadpass,energy);
 mod.Sextupole=autoMultipolePass(sextupass,energy);
 mod.Octupole=autoMultipolePass(octupass,energy);
+mod.Multipole=autoMultipolePass(multipolepass,energy);
 mod.Wiggler=autoMultipolePass(wigglerpass,energy);
 mod.QuantDiff=autoClassPass(quantdiffpass);
 mod.EnergyLoss=autoElemPass(energylosspass,'EnergyLossRadPass', energy);