Commit e2e902d8 authored by Christof Metzger-Kraus's avatar Christof Metzger-Kraus

replacing OFFSETZ with ZSTART

parent a0add75f
......@@ -74,7 +74,7 @@ Dist1:DISTRIBUTION, TYPE = gauss,
sigmay = 0.00018,
sigmapy = 0.0028,
corry = 0.0,
OFFSETZ = 29.90000,
OFFSETZ = 0.0,
sigmapt = 0.00040,
INPUTMOUNITS = EV;
......@@ -95,7 +95,7 @@ REAL N1 = 402*dt1/cdt;
REAL N2 = N1 + (400*dt1/cdt);
//TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N1+N1, DT=cdt;
TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N1+N2, DT=cdt;
TRACK,LINE=l1, BEAM=beam1, MAXSTEPS=N1+N2, DT=cdt, ZSTART=29.90000;
RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
ENDTRACK;
......@@ -103,4 +103,4 @@ ENDTRACK;
// RUN, METHOD = "PARALLEL-T", BEAM=beam1, FIELDSOLVER=Fs1, DISTRIBUTION=Dist1;
//ENDTRACK;
STOP;
STOP;
\ No newline at end of file
......@@ -26,7 +26,7 @@ CORRX = 0.698356, CORRY = 0.732165, CORRZ = 0.0889277,
R51 = 0, R52 = 0, R61 = 0, R62 = 0,
CUTOFFX = 5, CUTOFFPX = 5, CUTOFFY = 5,
CUTOFFPY = 5, CUTOFFLONG = 5, CUTOFFPZ = 5,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 4.20585,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 0,
TYPE = GAUSS, INPUTMOUNITS = NONE;
D16: DRIFT, L=0.00465, ELEMEDGE=4.20585;
......@@ -211,16 +211,14 @@ REAL STEP1= 2174;
REAL STEP2= STEP0 + STEP1;
SELECT, LINE=BEAMLINE_A2;
TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2,
MAXSTEPS={STEP0, STEP1}, DT={TSlow,TSlow};
TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2, MAXSTEPS={STEP0, STEP1}, DT={TSlow,TSlow}, ZSTART=4.20585;
RUN, METHOD = "PARALLEL-T", BEAM=BEAM_A2, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1;
ENDTRACK;
// // reference with
// SELECT, LINE=BEAMLINE_A2;
// TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2,
// MAXSTEPS=STEP2, DT=TSlow;
// TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2, MAXSTEPS=STEP2, DT=TSlow;
// RUN, METHOD = "PARALLEL-T", BEAM=BEAM_A2, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1;
// ENDTRACK;
STOP;
STOP;
\ No newline at end of file
......@@ -26,7 +26,7 @@ CORRX = 0.698356, CORRY = 0.732165, CORRZ = 0.0889277,
R51 = 0, R52 = 0, R61 = 0, R62 = 0,
CUTOFFX = 5, CUTOFFPX = 5, CUTOFFY = 5,
CUTOFFPY = 5, CUTOFFLONG = 5, CUTOFFPZ = 5,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 4.20585,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 0,
TYPE = GAUSS, INPUTMOUNITS = NONE;
D16: DRIFT, L=0.00465, ELEMEDGE=4.20585;
......@@ -210,9 +210,8 @@ REAL STEP0= (5.631- 4.20585)/(beta*CLIGHT*TSlow);
REAL STEP1= (6.855- 5.631)/(beta*CLIGHT*TFast);
SELECT, LINE=BEAMLINE_A2;
TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2,
MAXSTEPS={STEP0,STEP1}, DT={TSlow,TFast};
TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2, MAXSTEPS={STEP0,STEP1}, DT={TSlow,TFast}, ZSTART=4.20585;
RUN, METHOD = "PARALLEL-T", BEAM=BEAM_A2, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1;
ENDTRACK;
STOP;
STOP;
\ No newline at end of file
......@@ -26,7 +26,7 @@ CORRX = 0.698356, CORRY = 0.732165, CORRZ = 0.0889277,
R51 = 0, R52 = 0, R61 = 0, R62 = 0,
CUTOFFX = 5, CUTOFFPX = 5, CUTOFFY = 5,
CUTOFFPY = 5, CUTOFFLONG = 5, CUTOFFPZ = 5,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 4.20585,
OFFSETX = 0, OFFSETY =0, OFFSETZ = 0,
TYPE = GAUSS, INPUTMOUNITS = NONE;
D16: DRIFT, L=0.00465, ELEMEDGE=4.20585;
......@@ -212,8 +212,8 @@ REAL STEP2= (7.3404- 6.855)/(beta*CLIGHT*TSlow);
SELECT, LINE=BEAMLINE_A2;
TRACK, LINE=BEAMLINE_A2, BEAM=BEAM_A2,
MAXSTEPS={STEP0,STEP1,STEP2}, DT={TSlow,TFast,TSlow};
MAXSTEPS={STEP0,STEP1,STEP2}, DT={TSlow,TFast,TSlow}, ZSTART = 4.20585;
RUN, METHOD = "PARALLEL-T", BEAM=BEAM_A2, FIELDSOLVER=FS1, DISTRIBUTION=DISTRIB1;
ENDTRACK;
STOP;
STOP;
\ No newline at end of file
......@@ -37,7 +37,7 @@ Fs1: FIELDSOLVER, FSTYPE = SAAMG, MX = 16, MY = 16, MT = 16,
MAXITERS = 1000, PRECMODE = STD;
Dist1: DISTRIBUTION, TYPE = GAUSS,
OFFSETX = 0.0, OFFSETY = 0.0, OFFSETZ = 15.0e-3, // Centroid of bunch (m)
OFFSETX = 0.0, OFFSETY = 0.0, OFFSETZ = 0.0, // Centroid of bunch (m)
SIGMAX = 1.5e-3, SIGMAY = 1.5e-3, SIGMAZ = 5.0e-3, // Sigmas of the Gaussian bunch (m)
OFFSETPX = 0.0, OFFSETPY = 0.0, OFFSETPZ = 0.0, // Mean momenta (eV)
SIGMAPX = 0.0 , SIGMAPY = 0.0 , SIGMAPZ = 0.0 , // Sigmas of the momenta (eV)
......@@ -52,11 +52,11 @@ Beam1: BEAM, PARTICLE = H2, MASS = H2mass, CHARGE = 1.0, BFREQ = RF_FREQ*harmoni
Select, LINE = L1;
track, LINE = L1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 0.1, DT = 1.0e-10;
track, LINE = L1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 0.1, DT = 1.0e-10, ZSTART=15.0e-3;
run, METHOD = "PARALLEL-T", BEAM = Beam1, FIELDSOLVER = Fs1,
DISTRIBUTION = Dist1, BOUNDARYGEOMETRY = INF_GEOM;
endtrack;
Stop;
Stop;
\ No newline at end of file
......@@ -22,7 +22,7 @@ L1: LINE = (D1);
Fs1: FIELDSOLVER, FSTYPE = FFT, MX = 16, MY = 16, MT = 16, BBOXINCR=0.1;
Dist1: DISTRIBUTION, TYPE = GAUSS,
OFFSETX = 0.0, OFFSETY = 0.0, OFFSETZ = 15.0e-3, // Centroid of bunch (m)
OFFSETX = 0.0, OFFSETY = 0.0, OFFSETZ = 0.0, // Centroid of bunch (m)
SIGMAX = 5.0e-3, SIGMAY = 5.0e-3, SIGMAZ = 5.0e-3, // Sigmas of the Gaussian bunch (m)
OFFSETPX = 0.0, OFFSETPY = 0.0, OFFSETPZ = 0.0, // Mean momenta (eV)
SIGMAPX = 0.0 , SIGMAPY = 0.0 , SIGMAPZ = 0.0 , // Sigmas of the momenta (eV)
......@@ -33,8 +33,8 @@ Beam1: BEAM, PARTICLE = PROTON, CHARGE = 1.0, BFREQ = 1.0, PC = P0, NPART = 1E5,
SELECT, LINE = L1;
TRACK, LINE = L1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 1.0, DT = 1.0e-10;
TRACK, LINE = L1, BEAM = Beam1, MAXSTEPS = 1000, ZSTOP = 1.0, DT = 1.0e-10, ZSTART = 15.0e-3;
RUN, METHOD = "PARALLEL-T", BEAM = Beam1, FIELDSOLVER = Fs1, DISTRIBUTION = Dist1;
ENDTRACK;
STOP;
STOP;
\ No newline at end of file
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