Merge pull request #547 from MethodicalAcceleratorDesign/hbu-dev

Hbu dev
MethodicalAcceleratorDesign · Feb 9, 2018 · 8cb3a08 · 8cb3a08
2 parents 9c2e407 + b375a43
commit 8cb3a08
Show file tree

Hide file tree

Showing 2 changed files with 823 additions and 720 deletions.
diff --git a/src/mad_dict.c b/src/mad_dict.c
@@ -1281,6 +1281,7 @@ const char *const_command_def =
 "knl      = [r, {0}], "
 "ksl      = [r, {0}], "
 "slice    = [i, 1],  "
+"thick    = [l, false, true], " /*hbu */
 "apertype = [s, circle, circle], "
 "aperture = [r, {0}], "
 "aper_offset = [r, {0}], "
@@ -2496,7 +2497,8 @@ const char *const_command_def =
   /* "verbose = [l, false, true], " will replace the "option, verbose" used only by makethin */
 "makeconsistent = [l, false, true],  " /*hbu */
 "minimizeparents = [l, true, false], " /*hbu */
-"makeendmarkers = [l, false, true];  " /*hbu */
+"makeendmarkers = [l, false, true],  " /*hbu */
+"moreexpressions = [i, 1]; " /*hbu */
 
 " "
 "survey: survey none 0 0 "