Commit 4d50c7ca authored by Uldis Locans's avatar Uldis Locans

change surfacephysics to particlematerinteraction in input files

parent d9a986fd
......@@ -16,9 +16,9 @@ REAL rf = 50.6328e6; //need to be confirmed
VALUE,{gamma,brho,Edes,beta,gambet};
DEGPHYS: SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="Graphite";
DEGPHYS: PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="Graphite";
DEG1: DEGRADER, L=0.01, ELEMEDGE=0.02, OUTFN="DEG1.h5", SURFACEPHYSICS=DEGPHYS;
DEG1: DEGRADER, L=0.01, ELEMEDGE=0.02, OUTFN="DEG1.h5", PARTICLEMATERINTERACTION=DEGPHYS;
M0: Monitor, L=0.001, ELEMEDGE=0.010, OUTFN="M0.h5";
M1: Monitor, L=0.001, ELEMEDGE=0.035, OUTFN="M1.h5";
......
......@@ -66,33 +66,33 @@ 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 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="Air";
Air1: DEGRADER, L=0.069, OUTFN="Air1.h5", SURFACEPHYSICS=DEGPHYS_Air1 , ELEMEDGE=3.64523;
DEGPHYS_Air1 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="Air";
Air1: DEGRADER, L=0.069, OUTFN="Air1.h5", PARTICLEMATERINTERACTION=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 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge1: DEGRADER, L=0.0176057, OUTFN="Wedge1.h5", SURFACEPHYSICS=DEGPHYS_Wedge1 , ELEMEDGE=4;
DEGPHYS_Wedge1 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge1: DEGRADER, L=0.0176057, OUTFN="Wedge1.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge1 , ELEMEDGE=4;
Deg_D1: DRIFT, L=0.00589856, ELEMEDGE=4.01761;
DEGPHYS_Wedge2 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge2: DEGRADER, L=0.0352114, OUTFN="Wedge2.h5", SURFACEPHYSICS=DEGPHYS_Wedge2 , ELEMEDGE=4.0235;
DEGPHYS_Wedge2 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge2: DEGRADER, L=0.0352114, OUTFN="Wedge2.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge2 , ELEMEDGE=4.0235;
Deg_D2: DRIFT, L=0.00589856, ELEMEDGE=4.05872;
DEGPHYS_Wedge3 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge3: DEGRADER, L=0.0352114, OUTFN="Wedge3.h5", SURFACEPHYSICS=DEGPHYS_Wedge3 , ELEMEDGE=4.06461;
DEGPHYS_Wedge3 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge3: DEGRADER, L=0.0352114, OUTFN="Wedge3.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge3 , ELEMEDGE=4.06461;
Deg_D3: DRIFT, L=0.00589856, ELEMEDGE=4.09983;
DEGPHYS_Wedge4 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge4: DEGRADER, L=0.0352114, OUTFN="Wedge4.h5", SURFACEPHYSICS=DEGPHYS_Wedge4 , ELEMEDGE=4.10572;
DEGPHYS_Wedge4 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge4: DEGRADER, L=0.0352114, OUTFN="Wedge4.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge4 , ELEMEDGE=4.10572;
Deg_D4: DRIFT, L=0.00589856, ELEMEDGE=4.14094;
DEGPHYS_Wedge5 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge5: DEGRADER, L=0.0352114, OUTFN="Wedge5.h5", SURFACEPHYSICS=DEGPHYS_Wedge5 , ELEMEDGE=4.14683;
DEGPHYS_Wedge5 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge5: DEGRADER, L=0.0352114, OUTFN="Wedge5.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge5 , ELEMEDGE=4.14683;
Deg_D5: DRIFT, L=0.00589856, ELEMEDGE=4.18205;
DEGPHYS_Wedge6 : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge6: DEGRADER, L=0.0190057, OUTFN="Wedge6.h5", SURFACEPHYSICS=DEGPHYS_Wedge6 , ELEMEDGE=4.18794;
DEGPHYS_Wedge6 : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge6: DEGRADER, L=0.0190057, OUTFN="Wedge6.h5", PARTICLEMATERINTERACTION=DEGPHYS_Wedge6 , ELEMEDGE=4.18794;
DEGPHYS_Single : SURFACEPHYSICS, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge: DEGRADER, L=0.177457, OUTFN="Wedge.h5", SURFACEPHYSICS=DEGPHYS_Single , ELEMEDGE=4;
DEGPHYS_Single : PARTICLEMATERINTERACTION, TYPE="DEGRADER", MATERIAL="GraphiteR6710";
Wedge: DEGRADER, L=0.177457, OUTFN="Wedge.h5", PARTICLEMATERINTERACTION=DEGPHYS_Single , ELEMEDGE=4;
Alumina1: DRIFT, L=0.0003, ELEMEDGE=4.20555;
D16: DRIFT, L=0.00465, ELEMEDGE=4.20585;
......
......@@ -13,9 +13,9 @@ REAL brho = (PMASS*1.0e9*gambet) / CLIGHT;
value,{gamma,brho,Edes,beta,gambet};
KX1IPHYS: SurfacePhysics, TYPE="Collimator",MATERIAL="Cu";
KX2IPHYS: SurfacePhysics, TYPE="Collimator",MATERIAL="Graphite";
KX3IPHYS: SurfacePhysics, TYPE="Collimator",MATERIAL="Mo";
KX1IPHYS: ParticleMaterInteraction, TYPE="Collimator",MATERIAL="Cu";
KX2IPHYS: ParticleMaterInteraction, TYPE="Collimator",MATERIAL="Graphite";
KX3IPHYS: ParticleMaterInteraction, TYPE="Collimator",MATERIAL="Mo";
SM3:SBEND, ELEMEDGE=0.62+0.04,
E1=30 * Pi / 180.0,
......
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