From d7e64a20266107b29ef22db855c29e4cd2541111 Mon Sep 17 00:00:00 2001
From: albajacas_a <arnau.albajacas@psi.ch>
Date: Wed, 5 May 2021 12:44:55 +0200
Subject: [PATCH] Resolve "Update eV to EVoverC in test that require it"
---
RegressionTests/BC1-1_fixme/BC1-1.in | 2 +-
RegressionTests/Degrader-1/Degrader-1.in | 2 +-
.../Distribution-Binomial-1/Distribution-Binomial-1.in | 2 +-
RegressionTests/Distribution-Gauss-1/Distribution-Gauss-1.in | 2 +-
RegressionTests/Distribution-Gauss-2/Distribution-Gauss-2.in | 2 +-
RegressionTests/MAP-FODO/MAP-FODO.in | 2 +-
RegressionTests/MAP-FODODipole/MAP-FODODipole.in | 2 +-
RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in | 2 +-
RegressionTests/Transfer-Line-fixme/Transfer-Line.in | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/RegressionTests/BC1-1_fixme/BC1-1.in b/RegressionTests/BC1-1_fixme/BC1-1.in
index 9370845e..ae753c31 100644
--- a/RegressionTests/BC1-1_fixme/BC1-1.in
+++ b/RegressionTests/BC1-1_fixme/BC1-1.in
@@ -76,7 +76,7 @@ Dist1:DISTRIBUTION, TYPE = gauss,
corry = 0.0,
OFFSETZ = 0.0,
sigmapt = 0.00040,
- INPUTMOUNITS = EV;
+ INPUTMOUNITS = EVOVERC;
/*
We can specity ONE field solver object
diff --git a/RegressionTests/Degrader-1/Degrader-1.in b/RegressionTests/Degrader-1/Degrader-1.in
index 5326f3a3..b0f5fef3 100644
--- a/RegressionTests/Degrader-1/Degrader-1.in
+++ b/RegressionTests/Degrader-1/Degrader-1.in
@@ -29,7 +29,7 @@ D1: DISTRIBUTION, TYPE=GAUSS,
SIGMAX= 5.0e-03, SIGMAPX=0.0, CORRX=0.0,
SIGMAY= 5.0e-03, SIGMAPY=0.0, CORRY=0.0,
SIGMAT= 0.0005,
-SIGMAPT=0.0, CORRT=0.0, R61=0.0, INPUTMOUNITS=EV;
+SIGMAPT=0.0, CORRT=0.0, R61=0.0, INPUTMOUNITS=EVOVERC;
FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
diff --git a/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in b/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in
index e1460adb..b80919a3 100644
--- a/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in
+++ b/RegressionTests/Distribution-Binomial-1/Distribution-Binomial-1.in
@@ -47,7 +47,7 @@ Dist2:DISTRIBUTION, TYPE=BINOMIAL,
SIGMAPZ = 149811,
CORRZ = -0.5,
MT = 2.0,
- INPUTMOUNITS = EV;
+ INPUTMOUNITS = EVOVERC;
beam1: BEAM, PARTICLE = PROTON, PC = P0, NPART = 1000000, BFREQ = BF * 1e-6, BCURRENT = BC;
diff --git a/RegressionTests/Distribution-Gauss-1/Distribution-Gauss-1.in b/RegressionTests/Distribution-Gauss-1/Distribution-Gauss-1.in
index 75a1c9fa..1fec6286 100644
--- a/RegressionTests/Distribution-Gauss-1/Distribution-Gauss-1.in
+++ b/RegressionTests/Distribution-Gauss-1/Distribution-Gauss-1.in
@@ -43,7 +43,7 @@ Dist2:DISTRIBUTION, TYPE = GAUSS,
SIGMAT = 1e-8 ,
CORRX = -0.0,
CORRY = 0.5,
- INPUTMOUNITS = EV;
+ INPUTMOUNITS = EVOVERC;
// pc: momentum per particle in GeV/c
diff --git a/RegressionTests/Distribution-Gauss-2/Distribution-Gauss-2.in b/RegressionTests/Distribution-Gauss-2/Distribution-Gauss-2.in
index d7b6137c..9227d409 100644
--- a/RegressionTests/Distribution-Gauss-2/Distribution-Gauss-2.in
+++ b/RegressionTests/Distribution-Gauss-2/Distribution-Gauss-2.in
@@ -42,7 +42,7 @@ Dist2:DISTRIBUTION, TYPE = GAUSS,
SIGMAT = 1e-8,
CORRX = -0.5,
CORRY = 0.5,
- INPUTMOUNITS = EV;
+ INPUTMOUNITS = EVOVERC;
value,{sigpx,sigpy,pzave};
diff --git a/RegressionTests/MAP-FODO/MAP-FODO.in b/RegressionTests/MAP-FODO/MAP-FODO.in
index aeb6a786..9ca01373 100644
--- a/RegressionTests/MAP-FODO/MAP-FODO.in
+++ b/RegressionTests/MAP-FODO/MAP-FODO.in
@@ -32,7 +32,7 @@ SIGMAX = 0, SIGMAPX = 1.0e06, CORRX = 0.0,
SIGMAY = 0, SIGMAPY = 1.0e06, CORRY = 0.0,
OFFSETZ = 0.005, SIGMAT = 0.0005,
SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0,
-INPUTMOUNITS=EV, WRITETOFILE= TRUE;
+INPUTMOUNITS=EVOVERC, WRITETOFILE= TRUE;
DIST: DISTRIBUTION, TYPE = FROMFILE, FNAME="data/FODO_DIST.dat"; //FNAME="PartDatabase.dat";
diff --git a/RegressionTests/MAP-FODODipole/MAP-FODODipole.in b/RegressionTests/MAP-FODODipole/MAP-FODODipole.in
index 5dd79eff..dfae4761 100644
--- a/RegressionTests/MAP-FODODipole/MAP-FODODipole.in
+++ b/RegressionTests/MAP-FODODipole/MAP-FODODipole.in
@@ -42,7 +42,7 @@ DIST1: DISTRIBUTION, TYPE=GAUSS,
SIGMAX= 7.112474638*emit, SIGMAPX= 0.9137370817117192*emit, CORRX= -2.344980132*emit,
SIGMAY= 1.3592143*emit, SIGMAPY= 0.9320892051315421*emit, CORRY= 0.5166323417*emit,
OFFSETZ = 0.005, SIGMAT= 0.0005,
-SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, INPUTMOUNITS=EV, WRITETOFILE=TRUE;
+SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, INPUTMOUNITS=EVOVERC, WRITETOFILE=TRUE;
DIST: DISTRIBUTION, TYPE = FROMFILE, FNAME= "data/FODODipole_DIST.dat";
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 c573d721..bbec9406 100644
--- a/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in
+++ b/RegressionTests/Quad-Simple-Test-1/Quad-Simple-Test-1.in
@@ -28,7 +28,7 @@ D1: DISTRIBUTION, TYPE=GAUSS,
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,
-SIGMAPZ= 0.0, CORRZ= 0.0, R61= 0.0, INPUTMOUNITS=EV;
+SIGMAPZ= 0.0, CORRZ= 0.0, R61= 0.0, INPUTMOUNITS=EVOVERC;
FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64,
PARFFTX=true, PARFFTY=true, PARFFTT=true,
diff --git a/RegressionTests/Transfer-Line-fixme/Transfer-Line.in b/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
index 21bdbddc..7a6eede4 100644
--- a/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
+++ b/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
@@ -74,7 +74,7 @@ Dist1405bin:DISTRIBUTION, TYPE=binomial,
r61 = -0.8,
r51 = -0.6,
r52 = -0.83,
- INPUTMOUNITS = EV;
+ INPUTMOUNITS = EVOVERC;
--
GitLab