Fix ohmienvelope with wigglers (#870)

lfarv · web-flow · commit 37776638dc93 · 2024-12-11T15:43:42.000+01:00
* Typo in GWigSymplecticRadPass
* Added EnergyLossRadPass
* fix Matlab bug: string -&gt; char array
diff --git a/atmat/atphysics/Radiation/atdiffmat.m b/atmat/atphysics/Radiation/atdiffmat.m
@@ -15,7 +15,9 @@
 
 newmethods = {'BndMPoleSymplectic4RadPass', ...
               'StrMPoleSymplectic4RadPass', ...
-              'ExactMultipoleRadPass'};
+              'ExactMultipoleRadPass',...
+              'GWigSymplecticRadPass',...
+              'EnergyLossRadPass'};
 
 NumElements=length(ring);
 
@@ -62,7 +64,7 @@
     
     function elem=substitute(elem)
         if ~any(strcmp(elem.PassMethod, newmethods))
-            elem.PassMethod = "BndMPoleSymplectic4RadPass";
+            elem.PassMethod = 'BndMPoleSymplectic4RadPass';
         end
     end
 end
diff --git a/pyat/at/physics/radiation.py b/pyat/at/physics/radiation.py
@@ -31,7 +31,8 @@
     "BndMPoleSymplectic4RadPass",
     "StrMPoleSymplectic4RadPass",
     "ExactMultipoleRadPass",
-    "GWigSymplectic4RadPass",
+    "GWigSymplecticRadPass",
+    "EnergyLossRadPass",
 }
 
 _NSTEP = 60  # nb slices in a wiggler period

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@`
`31`	`31`	`"BndMPoleSymplectic4RadPass",`
`32`	`32`	`"StrMPoleSymplectic4RadPass",`
`33`	`33`	`"ExactMultipoleRadPass",`
`34`		`- "GWigSymplectic4RadPass",`
	`34`	`+ "GWigSymplecticRadPass",`
	`35`	`+ "EnergyLossRadPass",`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`_NSTEP = 60 # nb slices in a wiggler period`