From 6e1fb95f9e9ef53f74b685aa94ddf6e44dd2fe66 Mon Sep 17 00:00:00 2001 From: Jochem Snuverink Date: Fri, 10 Jul 2020 15:16:27 +0200 Subject: [PATCH] Resolve "Some regression test fails" --- .../Distribution-Binomial-1.in | 26 +++++++++---------- .../Quad-Simple-Test-1/Quad-Simple-Test-1.in | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in b/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in index 1be999f..e1460ad 100644 --- a/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in +++ b/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in @@ -35,19 +35,19 @@ REAL sigpy = sqrt((28.0*1.0e-9 / PMASS + 1.0)^2 - 1.0); REAL sigpz = sqrt((11.96*1.0e-9 / PMASS + 1.0)^2 - 1.0); Dist2:DISTRIBUTION, TYPE=BINOMIAL, - SIGMAX = 2.15e-03, - SIGMAPX = 1E-6, - CORRX = 0.0, - MX = 0.01, - SIGMAY = 0.50*23.e-03, - SIGMAPY = 28.0, - CORRY = 0.5, - MY = 990.0, - SIGMAT = 1.0e-1, - SIGMAPT = 11.96, - CORRT = -0.5, - MT = 2.0, - INPUTMOUNITS = EV; + SIGMAX = 2.15e-03, + SIGMAPX = 44.2129, + CORRX = 0.0, + MX = 0.01, + SIGMAY = 0.50*23.e-03, + SIGMAPY = 229223, + CORRY = 0.5, + MY = 990.0, + SIGMAT = 1.0e-1, + SIGMAPZ = 149811, + CORRZ = -0.5, + MT = 2.0, + INPUTMOUNITS = EV; beam1: BEAM, PARTICLE = PROTON, PC = P0, NPART = 1000000, BFREQ = BF * 1e-6, BCURRENT = BC; diff --git a/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in b/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in index bca0895..c573d72 100644 --- a/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in +++ b/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in @@ -25,10 +25,10 @@ D: DRIFT, L=2.0, ELEMEDGE=5.288+0.644; QUADTEST: LINE=(QP1,QP2,QP3,D); D1: DISTRIBUTION, TYPE=GAUSS, -SIGMAX= 5*1.0e-03, SIGMAPX= 0.696*1.0e06, CORRX= 0.0, -SIGMAY= 5*1.0e-03, SIGMAPY= 0.310*1.0e06, CORRY= 0.0, +SIGMAX= 5*1.0e-03, SIGMAPX= 36.146356*1.0e06, CORRX= 0.0, +SIGMAY= 5*1.0e-03, SIGMAPY= 24.121044*1.0e06, CORRY= 0.0, SIGMAT= 0.0005, -SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, INPUTMOUNITS=EV; +SIGMAPZ= 0.0, CORRZ= 0.0, R61= 0.0, INPUTMOUNITS=EV; FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64, PARFFTX=true, PARFFTY=true, PARFFTT=true, -- GitLab