Merge pull request #679 from tpersson/updateVersionNumber

Update version number and enables to plot when there are only solenoids

Author: madcern

VERSION

@@ -1,3 +1,3 @@
-VERSION      = 5.04.01
+VERSION      = 5.04.02
 VERSION_NUM  = 50401
-VERSION_DATE = 2018.07.10
+VERSION_DATE = 2018.10.02

doc/latexuguide/coverpage.tex

@@ -18,7 +18,7 @@
 \begin{center}\LARGE                 % document title
 \textbf{The MAD-X Program} \\
 (Methodical Accelerator Design) \\
-Version 5.04.01 \\
+Version 5.04.02 \\
 \textbf{User's Reference Manual}
 \end{center}
 \vskip 1.5em

doc/latexuguide/uguide.tex

@@ -44,7 +44,7 @@
 %\addeditor{IT}
 
 \usepackage{versions}
-\markversion{5.04.01} % update coverpage.tex too
+\markversion{5.04.02} % update coverpage.tex too
 
 %\usepackage{comment}
 

src/plot.f90

@@ -326,7 +326,7 @@ subroutine pefill(ierr)
 
   !--- codes see in peschm
   ! plot types (pltyp) as a function of mad code
-  data ilist / 0, 21, 1, 0, 2, 10, 12, 8, 0, 9,  &
+  data ilist / 0, 21, 1, 0, 2, 10, 12, 8, 15, 9,  &
                6,  0, 0, 0, 0,  0,  4, 4, 4, 0,  &
                0,  0, 0, 0, 0,  0, 14, 0, 0, 0,  &
                0,  0, 0, 0, 0,  0,  9, 0, 0, 0,  &
@@ -449,7 +449,6 @@ subroutine pefill(ierr)
      if (itbv.eq.1 .and. advance_to_pos(tabname, j).eq.0) goto 100
 
      k = double_from_table_row(tabname, horname, j, currpos)
-
      if (itbv .eq. 1)  then
         currtyp = node_value('mad8_type ')
         if (currtyp .eq. 39) currtyp = 15
@@ -1893,6 +1892,7 @@ subroutine peschm (nel, ityp, hr, es, ee, actwin)
   !                       12: positive oct                               *
   !                       13: negative oct                               *
   !                       14: lcavity                                    *
+  !                       15: solenoid                                   *
   !                       21: rbend, zero tilt                           *
   !                       27: rbend, non-zero tilt                       *
   !                       37: crab cavity                                *

tests/test-plot-2/madx.ps.cfg

@@ -2,8 +2,10 @@
 12048 	7     abs=1	   # 860 vs 859
     218 * skip 		     # (MAD-X version and date)
     222 * skip
-   2315 * skip
+   2308 * skip
    2319 * skip
+   2304 * skip
+   4390 * skip
    4412 * skip
    4416 * skip
    6609 * skip
@@ -12,8 +14,19 @@
    8461 * skip
   17855 * skip
   17859 * skip
-  23373 * skip
-  23377 * skip
+  4394 * skip
+  6577 * skip
+  6581 * skip
+  8407 * skip
+  8411 * skip
+  17777 * skip
+  17781 * skip
+  23290 * skip
+  23294 * skip
+
+
+
+
   17217	9 skip	# MacOS Gnu 32 gcc 4.9
 2316 * skip
 2320 * skip