Skip to content

GitLab

R
regression-tests
Commit b8fe2962 authored by adelmann's avatar adelmann 🎗
6 Browse files
Options

because of new collimator implementation we habe tiny changes in the number of surviving particles

parent abfaa091
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10724 additions and 11654 deletions
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal
View file @ b8fe2962
SDDS1
&description
text="Processor statistics 'BeamLine-1.in' 27/03/201821:08:00",
text="Processor statistics 'BeamLine-1.in' 12/04/201807:01:12",
contents="stat parameters"
&end
&parameter
......@@ -35,7 +35,7 @@ SDDS1
no_row_counts=1
&end
1
OPAL 1.9.0 git rev. #3808b8e7f372bc9f187ddd83ed3297e578f18f7b
OPAL 1.9.0 git rev. #71c06feb25db05a429869be47c26f8322b211204
opal-t
2.814700907870098e+02 3520
2.824700907870099e+02 3520
......@@ -63,43 +63,43 @@ opal-t
3.044700907870115e+02 3520
3.054700907870116e+02 3519
3.064700907870117e+02 3511
3.074700907870118e+02 3490
3.074700907870118e+02 3491
3.084700907870118e+02 3462
3.094700907870119e+02 3423
3.104700907870120e+02 3381
3.114700907870121e+02 3332
3.124700907870122e+02 3290
3.134700907870122e+02 3249
3.144700907870123e+02 3222
3.154700907870123e+02 3214
3.164700907870125e+02 3214
3.174700907870125e+02 3214
3.184700907870126e+02 3214
3.194700907870127e+02 3214
3.204700907870127e+02 3214
3.214700907870128e+02 3214
3.224700907870129e+02 3214
3.234700907870130e+02 3214
3.244700907870130e+02 3214
3.254700907870131e+02 3214
3.264700907870132e+02 3192
3.274700907870132e+02 3190
3.284700907870134e+02 3190
3.294700907870134e+02 3190
3.304700907870135e+02 3190
3.314700907870136e+02 3190
3.324700907870136e+02 3190
3.334700907870137e+02 3190
3.344700907870138e+02 3190
3.354700907870139e+02 3190
3.364700907870139e+02 3190
3.374700907870140e+02 3190
3.384700907870141e+02 3190
3.394700907870142e+02 3190
3.404700907870143e+02 3190
3.414700907870143e+02 3190
3.424700907870144e+02 3190
3.434700907870144e+02 3190
3.444700907870146e+02 3190
3.454700907870146e+02 3190
3.464700907870147e+02 3190
3.124700907870122e+02 3289
3.134700907870122e+02 3246
3.144700907870123e+02 3219
3.154700907870123e+02 3209
3.164700907870125e+02 3209
3.174700907870125e+02 3209
3.184700907870126e+02 3209
3.194700907870127e+02 3209
3.204700907870127e+02 3209
3.214700907870128e+02 3209
3.224700907870129e+02 3209
3.234700907870130e+02 3209
3.244700907870130e+02 3209
3.254700907870131e+02 3209
3.264700907870132e+02 3187
3.274700907870132e+02 3185
3.284700907870134e+02 3185
3.294700907870134e+02 3185
3.304700907870135e+02 3185
3.314700907870136e+02 3185
3.324700907870136e+02 3185
3.334700907870137e+02 3185
3.344700907870138e+02 3185
3.354700907870139e+02 3185
3.364700907870139e+02 3185
3.374700907870140e+02 3185
3.384700907870141e+02 3185
3.394700907870142e+02 3185
3.404700907870143e+02 3185
3.414700907870143e+02 3185
3.424700907870144e+02 3185
3.434700907870144e+02 3185
3.444700907870146e+02 3185
3.454700907870146e+02 3185
3.464700907870147e+02 3185
RegressionTests/BeamLine-1/reference/BeamLine-1.lbal.md5
View file @ b8fe2962
18c0a164908241b66ecd27fbfb32157b BeamLine-1.lbal
0c08027cd09b566f78d13d24fdc9899c BeamLine-1.lbal
RegressionTests/BeamLine-1/reference/BeamLine-1.out.md5
View file @ b8fe2962
fbbbb5424a3fa9342a5df12909d754d8 BeamLine-1.out
8fd9e5accea552874b3130890e4221a5 BeamLine-1.out
RegressionTests/BeamLine-1/reference/BeamLine-1.stat
View file @ b8fe2962
This source diff could not be displayed because it is too large. You can view the blob instead.
RegressionTests/BeamLine-1/reference/BeamLine-1.stat.md5
View file @ b8fe2962
766a9ec90abbaddd30e9c671a68abd52 BeamLine-1.stat
967b98afd92108bcd3ca3a9a13ede101 BeamLine-1.stat
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal
View file @ b8fe2962
SDDS1
&description
text="Processor statistics 'BeamLine-2.in' 27/03/201821:05:15",
text="Processor statistics 'BeamLine-2.in' 12/04/201807:03:54",
contents="stat parameters"
&end
&parameter
......@@ -35,7 +35,7 @@ SDDS1
no_row_counts=1
&end
1
OPAL 1.9.0 git rev. #3808b8e7f372bc9f187ddd83ed3297e578f18f7b
OPAL 1.9.0 git rev. #71c06feb25db05a429869be47c26f8322b211204
opal-t
2.814700907870098e+02 10000
2.824700907870099e+02 10000
......@@ -56,10 +56,10 @@ opal-t
2.974700907870110e+02 9981
2.984700907870111e+02 9970
2.994700907870111e+02 9966
3.004700907870113e+02 9958
3.014700907870113e+02 9941
3.004700907870113e+02 9959
3.014700907870113e+02 9944
3.024700907870114e+02 9899
3.034700907870115e+02 9847
3.034700907870115e+02 9849
3.044700907870115e+02 9789
3.054700907870116e+02 9723
3.064700907870117e+02 9651
......@@ -69,37 +69,37 @@ opal-t
3.104700907870120e+02 9321
3.114700907870121e+02 9206
3.124700907870122e+02 9115
3.134700907870122e+02 9035
3.144700907870123e+02 8985
3.154700907870123e+02 8974
3.164700907870125e+02 8974
3.174700907870125e+02 8974
3.184700907870126e+02 8974
3.194700907870127e+02 8974
3.204700907870127e+02 8974
3.214700907870128e+02 8974
3.224700907870129e+02 8974
3.234700907870130e+02 8964
3.244700907870130e+02 8921
3.254700907870131e+02 8882
3.264700907870132e+02 8868
3.274700907870132e+02 8863
3.284700907870134e+02 8863
3.294700907870134e+02 8863
3.304700907870135e+02 8863
3.314700907870136e+02 8863
3.324700907870136e+02 8863
3.334700907870137e+02 8863
3.344700907870138e+02 8863
3.354700907870139e+02 8863
3.364700907870139e+02 8863
3.374700907870140e+02 8863
3.384700907870141e+02 8863
3.394700907870142e+02 8863
3.404700907870143e+02 8863
3.414700907870143e+02 8863
3.424700907870144e+02 8863
3.434700907870144e+02 8863
3.444700907870146e+02 8863
3.454700907870146e+02 8863
3.464700907870147e+02 8857
3.134700907870122e+02 9036
3.144700907870123e+02 8983
3.154700907870123e+02 8971
3.164700907870125e+02 8971
3.174700907870125e+02 8971
3.184700907870126e+02 8971
3.194700907870127e+02 8971
3.204700907870127e+02 8971
3.214700907870128e+02 8971
3.224700907870129e+02 8971
3.234700907870130e+02 8961
3.244700907870130e+02 8920
3.254700907870131e+02 8880
3.264700907870132e+02 8865
3.274700907870132e+02 8860
3.284700907870134e+02 8860
3.294700907870134e+02 8860
3.304700907870135e+02 8860
3.314700907870136e+02 8860
3.324700907870136e+02 8860
3.334700907870137e+02 8860
3.344700907870138e+02 8860
3.354700907870139e+02 8860
3.364700907870139e+02 8860
3.374700907870140e+02 8860
3.384700907870141e+02 8860
3.394700907870142e+02 8860
3.404700907870143e+02 8860
3.414700907870143e+02 8860
3.424700907870144e+02 8860
3.434700907870144e+02 8860
3.444700907870146e+02 8860
3.454700907870146e+02 8860
3.464700907870147e+02 8855
RegressionTests/BeamLine-2/reference/BeamLine-2.lbal.md5
View file @ b8fe2962
f39fbd8c1f5167e65582e0fdc2ef30a6 BeamLine-2.lbal
cdcce8564024a59cb833916031f8f330 BeamLine-2.lbal
RegressionTests/BeamLine-2/reference/BeamLine-2.out
View file @ b8fe2962
This source diff could not be displayed because it is too large. You can view the blob instead.
RegressionTests/BeamLine-2/reference/BeamLine-2.out.md5
View file @ b8fe2962
48ec6531d2ce30a7886cf42d9c28ddaf BeamLine-2.out
cc5646523b916a0abda2d70010fb5f08 BeamLine-2.out
RegressionTests/BeamLine-2/reference/BeamLine-2.stat
View file @ b8fe2962
This source diff could not be displayed because it is too large. You can view the blob instead.
RegressionTests/BeamLine-2/reference/BeamLine-2.stat.md5
View file @ b8fe2962
acb24483d2e946cf9489eca4fdc2cad8 BeamLine-2.stat
87fd495fef7217d8bda0fbab47ffe302 BeamLine-2.stat
RegressionTests/PROSCAN-1/reference/PROSCAN-1.lbal.md5
View file @ b8fe2962
cc97d3cb31b912a955bf8f2e2d9b69e5 PROSCAN-1.lbal
eaaf107bd92400fd26af1f5371fc7f74 PROSCAN-1.lbal
RegressionTests/PROSCAN-1/reference/PROSCAN-1.out.md5
View file @ b8fe2962
036b76183baefda3c8b58d02e25308e9 PROSCAN-1.out
9da0b849629162ed92a092b08e158056 PROSCAN-1.out
RegressionTests/PROSCAN-1/reference/PROSCAN-1.stat.md5
View file @ b8fe2962
eada49891aae4235dab048638e69dba1 PROSCAN-1.stat
7a4537ce431e76ffe41d4e3eb720d0a0 PROSCAN-1.stat
RegressionTests/PROSCAN-2/reference/PROSCAN-2.lbal.md5
View file @ b8fe2962
36536e044252f7169a09fd87d5538088 PROSCAN-2.lbal
e6e7c53d3523ca22c8acb6f0cb8d81f6 PROSCAN-2.lbal
RegressionTests/PROSCAN-2/reference/PROSCAN-2.out.md5
View file @ b8fe2962
de964a4a007adf311382c38908cc2dc5 PROSCAN-2.out
c0e9022152aa3696b9559cb580fc1968 PROSCAN-2.out
RegressionTests/PROSCAN-2/reference/PROSCAN-2.stat.md5
View file @ b8fe2962
6f476fb11ac7985b83bb79c7e7b10a89 PROSCAN-2.stat
573e8ca99fe4caa889c15fd5fb21ad7e PROSCAN-2.stat
  • kraus @kraus ·
    Developer

    In the old implementation it was tested whether the particle is inside at R_i + \Delta t \cdot \beta_i \cdot c whereas in the new implementation we test at R_i. This could explain the difference in the results.

    Edited by kraus
  • kraus @kraus ·
    Developer

    I have to correct the above statement. R_i + \Delta t \cdot \beta_i \cdot c is used only to determine whether a particle is inside the element:

    const double z = R(2) + P(2) * recpgamma;

if ((z > 0.0) && (z <= getElementLength())) {

    I don't know what the motivation was to implement it this way. It's not comprehensible to me.

  • kraus @kraus ·
    Developer

    If I again use z = R(2) + P(2) * recpgamma then the results match again. This suggests that the difference is only caused by the difference of the above check.diff_num_particles

  • adelmann 🎗 @adelmann ·
    Owner

    Ok I am lost (sorry way too many things going on): what are we doing now? Will we there be an update in 1.6.x and 2.0.0 or everything finde now?

  • kraus @kraus ·
    Developer

    I just explained where the differences in the results stem from and that it was justified to update the reference.

    We could discuss whether it makes sense to use z = R(2) + P(2) + recpgamma to test z > 0 && z <= getElementLength() or, as we do now, z = R(2). I don't see any reason to use the former.

  • adelmann 🎗 @adelmann ·
    Owner

    Ok I understand and agree with the assessment.

Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment