add subelements to dumpseq

Author: ldeniau

src/madl_sequence.mad

@@ -1694,7 +1694,7 @@ local function dumpseq (seq, filnam_, info_)
   -- header
   res[1] = 'sequence: ' .. seq.name .. ', ' ..
            'l=' .. (seq.l == uninitialized and 'uninitialized' or seq.l)
-  res[2] = 'idx  kind           flg name                    l          dl       \z
+  res[2] = 'idx  kind           flg name                    l           dl      \z
             spos       upos    uds'
   if info_ then
     eal0 = {dx=0, dy=0, ds=0, dtheta=0, dphi=0, dpsi=0}
@@ -1704,17 +1704,24 @@ local function dumpseq (seq, filnam_, info_)
 
   -- elements
   seq:foreach \e,i =>
-    local ds, uds = seq:ds(i), seq:upos(i)-seq:spos(i)
-    local dl = ds-e.l
-    res[#res+1] = string.format('%04d %-14s %-3d %-20s%9.3f%8.3g%s%11.3f%11.3f%8.3f%s',
-                  i, e.kind, e:get_flags(), e.name, e.l, dl, abs(dl) > eps and '*' or ' ',
-                  seq:spos(i), seq:upos(i), uds, (uds<0 or uds>ds) and '*' or '')
+    local ds, up, sp = seq:ds(i), seq:upos(i), seq:spos(i)
+    local dl, uds = ds-e.l, up-sp
+    res[#res+1] = string.format('%04d %-14s %-3d %-20s%9.3f%9.3g%11.3f%11.3f%8.3f%s',
+                  i, e.kind, e:get_flags(), e.name, e.l, dl, sp, up, uds,
+                  (uds<0 or uds>ds) and '*' or '')
     if info_ then
       local eal = seq:align(i) or eal0
       res[#res] = res[#res] ..
                   string.format('%11.4f%11.4f%11.4f%11.4f%11.4f%11.4f',
                     eal.dx, eal.dy, eal.ds, eal.dtheta, eal.dphi, eal.dpsi)
     end
+    for is=1,#e do
+      local es = e[is]
+      local el = es.sat*e.l
+      local sp = sp+el
+      res[#res+1] = string.format(' >%02d %-14s %-3d   %-18s%9.3f%9s%11.3f%11s%8s',
+                    is, es.kind, es:get_flags(), es.name, es.l, '-', sp, '-', '-')
+    end
   end
 
   -- return result as a string