Skip to content

Commit

Permalink
Merge pull request #789 from tpersson/addTests
Browse files Browse the repository at this point in the history 
Adds tests and updates the old lhc tests
  • Loading branch information
@madcern
madcern committed Jun 25, 2019
2 parents c007d96 + 60030d7 commit a8f6248
Show file tree
Hide file tree
Showing 128 changed files with 260,624 additions and 170,189 deletions.
3 changes: 1 addition & 2 deletions Makefile_test
View file
Expand Up @@ -106,7 +106,7 @@ $(call onlx64,$(user-cases),)

# user-cases are run only with tests-all on Lxplus + AFS + Gnu 64 bit
user-cases = \
test-lhc test-hllhc
test-lhc test-hllhc test-hllhc-wire test-hllhc-fma test-lhc-wire

# tests to remove (e.g. that relies on external resources)
tests-to-rm =
Expand Down Expand Up @@ -166,7 +166,6 @@ onlxp = $(if $(and $(call eq,$(OSTYPE),Linux),\
$(wildcard /afs/cern.ch/eng/lhc/optics),yes),$1,$2)
onlx64 = $(if $(and $(call eq,$(ARCH),64),\
$(call eq,$(OSTYPE),Linux),\
$(findstring lxplus,$(HOSTNAME)),\
$(wildcard /afs/cern.ch/eng/lhc/optics),yes),$1,$2)

# info on macros above
Expand Down
2 changes: 2 additions & 0 deletions tests/test-hllhc-fma/bb_lenses.dat.cfg
View file
@@ -0,0 +1,2 @@
* * any rel=1.e-6 abs=1e-11 #

1 change: 1 addition & 0 deletions tests/test-hllhc-fma/fc.2.cfg
View file
@@ -0,0 +1 @@
0-$ 0 omit='drift_'
5,230 changes: 5,230 additions & 0 deletions tests/test-hllhc-fma/fc.2.ref
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/test-hllhc-fma/fc.3.aux.cfg
View file
@@ -0,0 +1 @@
* * abs=8e-6
15 changes: 15 additions & 0 deletions tests/test-hllhc-fma/fc.3.aux.ref
View file
@@ -0,0 +1,15 @@
SYNC
35640 0.000348 0.000 0. 26658.883200 938.272081 1
1. 1.
NEXT
BEAM
2.3000e+11 2.49999 2.49999 1.3000e-01 4.5000e-04 1 0
NEXT
TUNE
QF 62.294999999999831
QD 60.269999999999939
NEXT
CHRO
SXF 20.103364959507687
SXD 19.920840613266371
NEXT
496 changes: 496 additions & 0 deletions tests/test-hllhc-fma/fc.3.ref
View file

Large diffs are not rendered by default.

533 changes: 533 additions & 0 deletions tests/test-hllhc-fma/fc.34.ref
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/test-hllhc-fma/fc.8.cfg
View file
@@ -0,0 +1,2 @@
* * any rel=1.e-6 abs=1e-11 #

88 changes: 88 additions & 0 deletions tests/test-hllhc-fma/fc.8.ref
View file
@@ -0,0 +1,88 @@
mbrb.5l4.b1..1 1.364953e-04 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 9.902471e-01 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 2.970468e+00 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 5.940799e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 -2.940663e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 2.966847e-02 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 2.009889e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 3.000000e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 -3.000000e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 2.009889e+00 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 2.966847e-02 0.000000e+00 0.000000000e+00
mbrs.5l4.b1..1 -2.940663e+00 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 5.940799e+00 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 2.970468e+00 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 9.902471e-01 0.000000e+00 0.000000000e+00
mbrb.5l4.b1..1 1.364951e-04 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 3.999893e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 3.222667e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 1.668215e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 -6.634635e-01 0.000000e+00 0.000000000e+00
mbxf.4l5..1 3.758258e+00 0.000000e+00 0.000000000e+00
mbxf.4l5..1 1.879129e+00 0.000000e+00 0.000000000e+00
mbxf.4l5..1 6.263764e-01 0.000000e+00 0.000000000e+00
mbxf.4l5..1 -8.818013e-11 0.000000e+00 0.000000000e+00
mbxf.4r5..1 8.818013e-11 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -6.263764e-01 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -1.879129e+00 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -3.758258e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 6.634635e-01 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -1.668215e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -3.222667e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -3.999893e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -2.999889e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -2.034411e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -1.034541e-01 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 2.792980e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -5.792869e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -2.896435e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -9.654783e-01 0.000000e+00 0.000000000e+00
mbx.4l8..1 -3.009148e-09 0.000000e+00 0.000000000e+00
mbxws.1l8 0.000000e+00 0.000000e+00 1.340585502e+01
mbxwh.1l8 0.000000e+00 0.000000e+00 1.340585502e+01
mblw.1r8 0.000000e+00 0.000000e+00 1.340585502e+01
mbxws.1r8 0.000000e+00 0.000000e+00 1.340585502e+01
mbrc.4l8.b1..1 2.046363e-09 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 9.654783e-01 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 2.896435e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 5.792869e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -2.792980e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 1.034541e-01 0.000000e+00 0.000000000e+00
mbx.4l8..1 2.034411e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 2.999889e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 3.999893e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 3.222667e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 1.668215e+00 0.000000e+00 0.000000000e+00
mbrd.4l5.b1..1 -6.634635e-01 0.000000e+00 0.000000000e+00
mbxf.4l5..1 3.758258e+00 0.000000e+00 0.000000000e+00
mbxf.4l5..1 1.879129e+00 0.000000e+00 0.000000000e+00
mbxf.4l5..1 6.263764e-01 0.000000e+00 0.000000000e+00
mbxf.4l5..1 -1.475411e-10 0.000000e+00 0.000000000e+00
mbxf.4r5..1 1.475411e-10 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -6.263764e-01 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -1.879129e+00 0.000000e+00 0.000000000e+00
mbxf.4r5..1 -3.758258e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 6.634635e-01 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -1.668215e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -3.222667e+00 0.000000e+00 0.000000000e+00
mbrd.4r5.b1..1 -3.999893e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -2.999889e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -2.034411e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 -1.034541e-01 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 2.792980e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -5.792869e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -2.896435e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -9.654783e-01 0.000000e+00 0.000000000e+00
mbx.4l8..1 -9.201528e-10 0.000000e+00 0.000000000e+00
mbxwt.1l2 0.000000e+00 0.000000e+00 -4.170381943e+00
mbwmd.1l2 0.000000e+00 0.000000e+00 -4.170381943e+00
mbaw.1r2 0.000000e+00 0.000000e+00 -4.170381943e+00
mbxwt.1r2 0.000000e+00 0.000000e+00 -4.170381943e+00
mbrc.4l8.b1..1 -5.258016e-10 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 9.654783e-01 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 2.896435e+00 0.000000e+00 0.000000000e+00
mbrc.4l8.b1..1 5.792869e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 -2.792980e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 1.034541e-01 0.000000e+00 0.000000000e+00
mbx.4l8..1 2.034411e+00 0.000000e+00 0.000000000e+00
mbx.4l8..1 2.999889e+00 0.000000e+00 0.000000000e+00
3 changes: 3 additions & 0 deletions tests/test-hllhc-fma/last_twiss.1.cfg
View file
@@ -0,0 +1,3 @@
44-46 * skip # head
* * any rel=1.1e-5 abs=1e-10 #

0 comments on commit a8f6248

Please sign in to comment.