From 6a6b2e9763acfccf74dc7c2eaa49a3d93ceeba25 Mon Sep 17 00:00:00 2001
From: ext-calvo_p <pedro.calvo@ciemat.es>
Date: Tue, 9 Feb 2021 14:22:35 +0100
Subject: [PATCH] update particle-matter interaction types
---
RegressionTests/Degrader-1/Degrader-1.in | 2 +-
RegressionTests/Degrader-2/Degrader-2.in | 16 ++++++++--------
RegressionTests/GasStripping/GasStripping.in | 2 +-
RegressionTests/MAP-Gantry2/MAP-Gantry2.in | 8 ++++----
.../Transfer-Line-fixme/Transfer-Line.in | 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/RegressionTests/Degrader-1/Degrader-1.in b/RegressionTests/Degrader-1/Degrader-1.in
index d205f593..5326f3a3 100644
--- a/RegressionTests/Degrader-1/Degrader-1.in
+++ b/RegressionTests/Degrader-1/Degrader-1.in
@@ -16,7 +16,7 @@ REAL rf = 50.6328e6; //need to be confirmed
VALUE,{gamma,brho,Edes,beta,gambet};
-DEGPHYS: PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="Graphite";
+DEGPHYS: PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="Graphite";
DEG1: DEGRADER, L=0.01, ELEMEDGE=0.02, OUTFN="DEG1.h5", PARTICLEMATTERINTERACTION=DEGPHYS;
diff --git a/RegressionTests/Degrader-2/Degrader-2.in b/RegressionTests/Degrader-2/Degrader-2.in
index 959cf717..3f086dd2 100644
--- a/RegressionTests/Degrader-2/Degrader-2.in
+++ b/RegressionTests/Degrader-2/Degrader-2.in
@@ -66,32 +66,32 @@ D12: DRIFT, L=0.086, ELEMEDGE=3.559;
MMAP7X: MONITOR, OUTFN="MMAP7X.h5", ELEMEDGE=3.645;
MMAP8Y: MONITOR, OUTFN="MMAP8Y.h5", ELEMEDGE=3.645;
Titan1: DRIFT, L=0.000228, ELEMEDGE=3.645;
-DEGPHYS_Air1 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="Air";
+DEGPHYS_Air1 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="Air";
Air1: DEGRADER, L=0.069, OUTFN="Air1.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Air1 , ELEMEDGE=3.64523;
D13: DRIFT, L=0.015772, ELEMEDGE=3.71423;
BMA1I: ECOLLIMATOR, XSIZE=0.005, YSIZE=0.005, L=0.002, ELEMEDGE=3.73;
D14: DRIFT, L=0.246, ELEMEDGE=3.732;
BMA1O: ECOLLIMATOR, XSIZE=0.00625, YSIZE=0.00625, L=0.002, ELEMEDGE=3.978;
D15: DRIFT, L=0.02, ELEMEDGE=3.98;
-DEGPHYS_Wedge1 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge1 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge1: DEGRADER, L=0.0176057, OUTFN="Wedge1.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge1 , ELEMEDGE=4;
Deg_D1: DRIFT, L=0.00589856, ELEMEDGE=4.01761;
-DEGPHYS_Wedge2 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge2 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge2: DEGRADER, L=0.0352114, OUTFN="Wedge2.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge2 , ELEMEDGE=4.0235;
Deg_D2: DRIFT, L=0.00589856, ELEMEDGE=4.05872;
-DEGPHYS_Wedge3 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge3 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge3: DEGRADER, L=0.0352114, OUTFN="Wedge3.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge3 , ELEMEDGE=4.06461;
Deg_D3: DRIFT, L=0.00589856, ELEMEDGE=4.09983;
-DEGPHYS_Wedge4 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge4 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge4: DEGRADER, L=0.0352114, OUTFN="Wedge4.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge4 , ELEMEDGE=4.10572;
Deg_D4: DRIFT, L=0.00589856, ELEMEDGE=4.14094;
-DEGPHYS_Wedge5 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge5 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge5: DEGRADER, L=0.0352114, OUTFN="Wedge5.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge5 , ELEMEDGE=4.14683;
Deg_D5: DRIFT, L=0.00589856, ELEMEDGE=4.18205;
-DEGPHYS_Wedge6 : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Wedge6 : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge6: DEGRADER, L=0.0190057, OUTFN="Wedge6.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Wedge6 , ELEMEDGE=4.18794;
-DEGPHYS_Single : PARTICLEMATTERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
+DEGPHYS_Single : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="GraphiteR6710";
Wedge: DEGRADER, L=0.177457, OUTFN="Wedge.h5", PARTICLEMATTERINTERACTION=DEGPHYS_Single , ELEMEDGE=4;
Alumina1: DRIFT, L=0.0003, ELEMEDGE=4.20555;
diff --git a/RegressionTests/GasStripping/GasStripping.in b/RegressionTests/GasStripping/GasStripping.in
index 3e2bbf3d..17d0593d 100644
--- a/RegressionTests/GasStripping/GasStripping.in
+++ b/RegressionTests/GasStripping/GasStripping.in
@@ -28,7 +28,7 @@ CyclDrift: Cyclotron, TYPE="BANDRF", CYHARMON=1, RINIT=0.0, PHIINIT=0.0, ZINIT=0
RFPHI=phase, RFFREQ=frequency, ESCALE=1E-6, SUPERPOSE=FALSE;
bstp_phys:PARTICLEMATTERINTERACTION, TYPE="BEAMSTRIPPING";
-bstp: BEAMSTRIPPING, PRESSURE=1.0e-6, TEMPERATURE=300, GAS="AIR", stop=TRUE, PARTICLEMATTERINTERACTION=bstp_phys;
+bstp: VACUUM, PRESSURE=1.0e-6, TEMPERATURE=300, GAS="AIR", stop=TRUE, PARTICLEMATTERINTERACTION=bstp_phys;
C1: LINE = (CyclDrift, bstp);
diff --git a/RegressionTests/MAP-Gantry2/MAP-Gantry2.in b/RegressionTests/MAP-Gantry2/MAP-Gantry2.in
index 20a0ba64..64dff498 100644
--- a/RegressionTests/MAP-Gantry2/MAP-Gantry2.in
+++ b/RegressionTests/MAP-Gantry2/MAP-Gantry2.in
@@ -85,12 +85,12 @@ D71A: DRIFT, L=0.3175, ELEMEDGE=34.14, NSLICES=1;
D72: DRIFT, L=0.04250, ELEMEDGE=34.4575; //D72: DRIFT, L=0.1687, ELEMEDGE=34.4575;
-//CollPHYS_Cu : SURFACEPHYSICS, TYPE="Collimator", MATERIAL="Copper";
+//CollPHYS_Cu : PARTICLEMATTERINTERACTION, TYPE=SCATTERING, MATERIAL="Copper";
//Coll_b4gap_size=0.0550; //default=0.0550
//Coll_b4gap: ECOLLIMATOR, XSIZE=Coll_b4gap_size, YSIZE=Coll_b4gap_size, DX=0, DY=0,
-//L=0.050, ELEMEDGE=34.50, OUTFN="Coll_b4Gap_size.h5";// , SURFACEPHYSICS=CollPHYS_Cu ;
+//L=0.050, ELEMEDGE=34.50, OUTFN="Coll_b4Gap_size.h5";// , PARTICLEMATTERINTERACTION=CollPHYS_Cu ;
//Mon_Coll_b4gap: MONITOR, OUTFN="Mon_Coll_beforeGap.h5", ELEMEDGE=34.55; //here
//
@@ -110,7 +110,7 @@ D74B: DRIFT, L=0.02, ELEMEDGE=36.1771, NSLICES=5;
//Coll_atgap_size=0.0150; //default=0.0150
//Coll_atgap: ECOLLIMATOR, XSIZE=Coll_atgap_size, YSIZE=Coll_atgap_size, DX=0, DY=0,
-//L=0.050, ELEMEDGE=36.2071, OUTFN="Coll_atGap.h5";//, SURFACEPHYSICS=CollPHYS_Cu ;
+//L=0.050, ELEMEDGE=36.2071, OUTFN="Coll_atGap.h5";//, PARTICLEMATTERINTERACTION=CollPHYS_Cu ;
//Mon_Coll_atgap: MONITOR, OUTFN="Mon_Coll_atGap.h5", ELEMEDGE=36.2071+0.050+0.010;
//
@@ -145,7 +145,7 @@ D81a: DRIFT, L=0.160, ELEMEDGE=37.3717, NSLICES=1; //original length L=0.2785
//
//Coll_aftrgap_size=0.0240; //default= 0.0240
//Coll_aftergap: ECOLLIMATOR, XSIZE=Coll_aftrgap_size, YSIZE=Coll_aftrgap_size, DX=0, DY=0,
-//L=0.050, ELEMEDGE=37.5317, OUTFN="Coll_afterGap.h5";//, SURFACEPHYSICS=CollPHYS_Cu ;
+//L=0.050, ELEMEDGE=37.5317, OUTFN="Coll_afterGap.h5";//, PARTICLEMATTERINTERACTION=CollPHYS_Cu ;
//Mon_Coll_aftrgap: MONITOR, OUTFN="Mon_Coll_afterGap.h5", ELEMEDGE=37.5317+0.050+0.010;
diff --git a/RegressionTests/Transfer-Line-fixme/Transfer-Line.in b/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
index cb37365f..21bdbddc 100644
--- a/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
+++ b/RegressionTests/Transfer-Line-fixme/Transfer-Line.in
@@ -13,9 +13,9 @@ REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
value,{gamma,brho,Edes,beta,gambet};
-KX1IPHYS: ParticleMatterInteraction, TYPE="Collimator",MATERIAL="Cu";
-KX2IPHYS: ParticleMatterInteraction, TYPE="Collimator",MATERIAL="Graphite";
-KX3IPHYS: ParticleMatterInteraction, TYPE="Collimator",MATERIAL="Mo";
+KX1IPHYS: ParticleMatterInteraction, TYPE=SCATTERING, MATERIAL="Copper";
+KX2IPHYS: ParticleMatterInteraction, TYPE=SCATTERING, MATERIAL="Graphite";
+KX3IPHYS: ParticleMatterInteraction, TYPE=SCATTERING, MATERIAL="Molybdenum";
SM3:SBEND, ELEMEDGE=0.62+0.04,
E1=30 * Pi / 180.0,
--
GitLab