Merge pull request #570 from tpersson/testFixing

This PR should fix most of the test cases for the different platforms.
MethodicalAcceleratorDesign · Feb 15, 2018 · 83128e5 · 83128e5
2 parents de3f5b1 + 32f2012
commit 83128e5
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 64 deletions.
diff --git a/tests/test-aperture-2/test-aperture-2.cfg b/tests/test-aperture-2/test-aperture-2.cfg
@@ -1,8 +1,8 @@
 1-7        *     skip         # head
 79-85	   *     abs=1.1e-15   # orbit finder
 
-123        1     rel=1e-15     # energy , more digits printed on some platforms
-129        1     rel=2e-15     # machine length, more digits printed on some platforms
+124        1     rel=3e-15     # energy , more digits printed on some platforms
+130        1     rel=2e-15     # machine length, more digits printed on some platforms
 
 136        *     abs=1e-9      # survey after ptc_twiss
 

diff --git a/tests/test-cororbit-4/test-cororbit-4.cfg b/tests/test-cororbit-4/test-cororbit-4.cfg
@@ -7,7 +7,7 @@
 210-211	    2	  abs=1.1e-16    # idem
 219	    2	  abs=1.1e-9     # chromaticity
 225	    2	  abs=1.1e-6	 # betymax
-2002        2     rel=9e-7       # iteration error
+2002        2     rel=3e-6       # iteration error
 2003-2006   * 	  rel=6.0e-6	 # idem
 2014-2023   * 	  rel=7.0e-7  	 # Twiss output
 2020        3     abs=5e-8

diff --git a/tests/test-ibs-4/test-ibs-4.cfg b/tests/test-ibs-4/test-ibs-4.cfg
@@ -1,3 +1,4 @@
 1-7     *     skip         # head
 84      1     abs=2e-19    # sige
 #76     *     abs=1e-14    # alpha_x
+*       *     abs=1e-16    # for the rest differene
diff --git a/tests/test-makethin-2/test-makethin-2.cfg b/tests/test-makethin-2/test-makethin-2.cfg
@@ -1 +1,2 @@
 1-7       *     skip    # head
+*         *     abs=1e-12
diff --git a/tests/test-makethin-3/test-makethin-3.cfg b/tests/test-makethin-3/test-makethin-3.cfg
@@ -1 +1,2 @@
 1-7       *     skip    # head
+*         *     abs=1e-12
diff --git a/tests/test-ptc-twiss-2/test-ptc-twiss-2.cfg b/tests/test-ptc-twiss-2/test-ptc-twiss-2.cfg
@@ -3,6 +3,6 @@
 28-46     *     rel=1e-9	  # summary
 48-53     *     rel=1e-9	  # parameters	  
 54        1     rel=1e-14     # energy
-59        1     abs=1e-10     # machine length
+59-50     1     abs=1e-10     # machine length
 66        *     any abs=6.4e-10 rel=1e-9      # survey after - Linux 32
 95-143    *     any abs=5e-10 rel=5e-8 # ptc twiss summary
diff --git a/tests/test-sequence-4/all_survey.ref b/tests/test-sequence-4/all_survey.ref
diff --git a/tests/test-track-11/test-track-11.cfg b/tests/test-track-11/test-track-11.cfg
@@ -1,5 +1,5 @@
 1-7       *  skip
-*         *  any abs=1e-20 rel=1e-16
+*         *  any abs=3e-19 rel=1e-16
 487-488	  *  rel=3.5e-5  # closed orbit from twiss
 494-512	  *  rel=3.4e-5  # twiss summary
 515-516	  *  rel=3.5e-5  # closed orbit from twiss

diff --git a/tests/test-track-rotations/test-track-rotations.ref b/tests/test-track-rotations/test-track-rotations.ref
@@ -3,7 +3,7 @@
   +     MAD-X 5.03.07  (64 bit, Linux)       +
   + Support: mad@cern.ch, http://cern.ch/mad +
   + Release   date: 2017.10.20               +
-  + Execution date: 2018.02.08 17:56:48      +
+  + Execution date: 2018.02.15 09:43:00      +
   ++++++++++++++++++++++++++++++++++++++++++++
 circum=3;
 
@@ -111,6 +111,7 @@ use, sequence=seq_ptc;
 
 ptc_create_universe;
 
+Determined SECTOR NMUL MAX :  0
 ptc_create_layout,model=2, method=6, nst=5, exact=true, closed_layout=false;
 
  MAD-X Beam Parameters

diff --git a/tests/test-xrotation/test-xrotation.ref b/tests/test-xrotation/test-xrotation.ref
@@ -3,7 +3,7 @@
   +     MAD-X 5.03.07  (64 bit, Linux)       +
   + Support: mad@cern.ch, http://cern.ch/mad +
   + Release   date: 2017.10.20               +
-  + Execution date: 2018.02.08 17:54:29      +
+  + Execution date: 2018.02.15 09:45:26      +
   ++++++++++++++++++++++++++++++++++++++++++++
 circum=3;
 
@@ -164,6 +164,7 @@ select, flag=twiss, column=name, s, x,px, y, py, PT, T;
 
 ptc_create_universe;
 
+Determined SECTOR NMUL MAX :  0
 ptc_create_layout,model=2, method=6, nst=5, exact=true, closed_layout=false;
 
  MAD-X Beam Parameters

diff --git a/tests/test-yrotation/test-yrotation.ref b/tests/test-yrotation/test-yrotation.ref
@@ -3,7 +3,7 @@
   +     MAD-X 5.03.07  (64 bit, Linux)       +
   + Support: mad@cern.ch, http://cern.ch/mad +
   + Release   date: 2017.10.20               +
-  + Execution date: 2018.02.08 17:55:15      +
+  + Execution date: 2018.02.15 09:44:55      +
   ++++++++++++++++++++++++++++++++++++++++++++
 circum=3;
 
@@ -146,6 +146,7 @@ select, flag=twiss, column=name, s, x,px, y, py, PT, T;
 
 ptc_create_universe;
 
+Determined SECTOR NMUL MAX :  0
 ptc_create_layout,model=2, method=6, nst=5, exact=true, closed_layout=false;
 
  MAD-X Beam Parameters