Skip to content

Commit

Permalink
Merge pull request #784 from MethodicalAcceleratorDesign/al-dev
Browse files Browse the repository at this point in the history
Reverted equations for pt in module EMIT, as well as the relative tests
  • Loading branch information
alatina committed Jul 12, 2019
2 parents 9d19f88 + 19b47dd commit d0c75d5
Show file tree
Hide file tree
Showing 6 changed files with 2,447 additions and 2,414 deletions.
127 changes: 80 additions & 47 deletions src/emit.f90
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
double precision :: el, tilt, bvk
double precision :: edg1, edg2, sk1, sk2, hgap, fint, sks, sksol, h, ct
double precision :: corr, hx, hy, hxx, hxy, hyy, h1, hcb1, hcbs1
double precision :: tedg1, fact1, fact1x, rfac, rfac1, drfac1_dx, drfac1_dy
double precision :: h2, hcb2, tedg2, fact2, fact2x, rfac2
double precision :: tedg1, fact1, dfact1_dx, rfac, rfac1, drfac1_dx, drfac1_dy
double precision :: h2, hcb2, tedg2, fact2, dfact2_dx, rfac2
double precision :: drfac2_dx, drfac2_dy, bi2gi2, betas, gammas
double precision :: e5sq1, e5sq2, e5sqs1, e5sqs2, x, y
double precision :: f1, f2, f1s, f2s, twon, str, st
Expand All @@ -255,6 +255,7 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
double precision :: drfac1_dpx, drfac1_dpy, drfac2_dpx, drfac2_dpy
double precision :: denominator1, denominator2
double precision :: bet1_sqr, bet2_sqr, dbet1_sqr_dpt, dbet2_sqr_dpt
double precision :: p1, p2

integer, external :: node_fd_errors
double precision, external :: node_value, get_value
Expand Down Expand Up @@ -354,9 +355,9 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)

tedg1 = tan(edg1)
fact1 = (one + h*x1) * (one - tedg1*x1)
fact1x = h - tedg1 - 2.0*h*tedg1*x1
dfact1_dx = h - tedg1 - two*h*tedg1*x1
rfac1 = cg*el*h1**2*fact1
drfac1_dx = cg*el * (two*(hx*hxx+hy*hyx)*fact1 + h1**2*fact1x)
drfac1_dx = cg*el * (two*(hx*hxx+hy*hyx)*fact1 + h1**2*dfact1_dx)
drfac1_dy = cg*el * two*(hx*hxy+hy*hyy)*fact1

hx = sk1*x2 + sks*y2 + h + half*sk2 * (x2**2 - y2**2)
Expand All @@ -371,18 +372,20 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)

tedg2 = tan(edg2)
fact2 = (one + h*x2) * (one - tedg2*x2)
fact2x = h - tedg2 - 2.0*h*tedg2*x2
dfact2_dx = h - tedg2 - two*h*tedg2*x2

rfac2 = cg*el*h2**2*fact2
drfac2_dx = cg*el * (two*(hx*hxx+hy*hyx)*fact2 + h2**2*fact2x)
drfac2_dx = cg*el * (two*(hx*hxx+hy*hyx)*fact2 + h2**2*dfact2_dx)
drfac2_dy = cg*el * two*(hx*hxy+hy*hyy)*fact2

p1 = sqrt(pt1*pt1 + two*pt1/betas + one) ! delta + 1
p2 = sqrt(pt2*pt2 + two*pt2/betas + one) ! delta + 1
bet1_sqr = (pt1*pt1 + two*pt1/betas + one) / (one/betas + pt1)**2;
bet2_sqr = (pt2*pt2 + two*pt2/betas + one) / (one/betas + pt2)**2;
dbet1_sqr_dpt = (two/betas+two*pt1)/(pt1+one/betas)**2-(two*((pt1*two)/betas+pt1**2+one))/(pt1+one/betas)**3;
dbet2_sqr_dpt = (two/betas+two*pt2)/(pt2+one/betas)**2-(two*((pt2*two)/betas+pt2**2+one))/(pt2+one/betas)**3;
denominator1 = 2*sqrt(((rfac1-two)*rfac1)/bet1_sqr+one);
denominator2 = 2*sqrt(((rfac2-two)*rfac2)/bet2_sqr+one);
denominator1 = two*sqrt(((rfac1-two)*rfac1)/bet1_sqr+one);
denominator2 = two*sqrt(((rfac2-two)*rfac2)/bet2_sqr+one);

!---- Cubic integration over h**3 * E(i,5) * conjg(E(i,5)).
bi2gi2 = one / (betas * gammas)**2
Expand Down Expand Up @@ -426,12 +429,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac1_dpy*py1*rfac1)-(two*drfac1_dpy*py1))/(bet1_sqr*denominator1);
rw(4,6) = -(dbet1_sqr_dpt*py1*rfac1**2-two*dbet1_sqr_dpt*py1*rfac1) / &
(two*bet1_sqr**2*sqrt((rfac1**2-two*rfac1+bet1_sqr)/bet1_sqr));
rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
rw(6,6) = one-rfac1;

rw(6,1) = - drfac1_dx * p1**2
rw(6,3) = - drfac1_dy * p1**2
rw(6,6) = one - two * rfac1 * (one + pt1)
!! if the sixth variable was pt, the RW(6,*) equations would look like
!rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
!rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
!rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
!rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
!rw(6,6) = one-rfac1;
RE = matmul(RE,RW)

RW = EYE
Expand All @@ -449,13 +455,17 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac2_dpy*py2*rfac2)-(two*drfac2_dpy*py2))/(bet2_sqr*denominator2);
rw(4,6) = -(dbet2_sqr_dpt*py2*rfac2**2-two*dbet2_sqr_dpt*py2*rfac2) / &
(two*bet2_sqr**2*sqrt((rfac2**2-two*rfac2+bet2_sqr)/bet2_sqr));
rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
rw(6,6) = one-rfac2;
rw(6,1) = - drfac2_dx * p2**2
rw(6,3) = - drfac2_dy * p2**2
rw(6,6) = one - two * rfac2 * (one + pt2)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
!rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
!rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
!rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
!rw(6,6) = one-rfac2;
RE = matmul(RW,RE)

case (code_quadrupole , code_sextupole, code_octupole, code_solenoid) !---- Common to all pure multipoles.
sk1 = zero
sk2 = zero
Expand Down Expand Up @@ -509,6 +519,8 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
drfac2_dpy = -cg*sksol/el

!
p1 = sqrt(pt1*pt1 + two*pt1/betas + one) ! delta + 1
p2 = sqrt(pt2*pt2 + two*pt2/betas + one) ! delta + 1
bet1_sqr = (pt1*pt1 + two*pt1/betas + one) / (one/betas + pt1)**2;
bet2_sqr = (pt2*pt2 + two*pt2/betas + one) / (one/betas + pt2)**2;
denominator1 = 2*sqrt(((rfac1-two)*rfac1)/bet1_sqr+one);
Expand Down Expand Up @@ -538,12 +550,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac1_dpy*py1*rfac1)-(two*drfac1_dpy*py1))/(bet1_sqr*denominator1);
rw(4,6) = -(dbet1_sqr_dpt*py1*rfac1**2-two*dbet1_sqr_dpt*py1*rfac1) / &
(two*bet1_sqr**2*sqrt((rfac1**2-two*rfac1+bet1_sqr)/bet1_sqr));
rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
rw(6,6) = one-rfac1;

rw(6,1) = - drfac1_dx * p1**2
rw(6,3) = - drfac1_dy * p1**2
rw(6,6) = one - two * rfac1 * (one + pt1)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
!rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
!rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
!rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
!rw(6,6) = one-rfac1;
RE = matmul(RE,RW)

RW = EYE
Expand All @@ -561,11 +576,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac2_dpy*py2*rfac2)-(two*drfac2_dpy*py2))/(bet2_sqr*denominator2);
rw(4,6) = -(dbet2_sqr_dpt*py2*rfac2**2-two*dbet2_sqr_dpt*py2*rfac2) / &
(two*bet2_sqr**2*sqrt((rfac2**2-two*rfac2+bet2_sqr)/bet2_sqr));
rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
rw(6,6) = one-rfac2;
rw(6,1) = - drfac2_dx * p2**2
rw(6,3) = - drfac2_dy * p2**2
rw(6,6) = one - two * rfac2 * (one + pt2)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
!rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
!rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
!rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
!rw(6,6) = one-rfac2;
RE = matmul(RW,RE)

case (code_multipole) !---- Thin multipoles
Expand Down Expand Up @@ -611,6 +630,7 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)

!---- Support variables
x1 = orb1(1); px1 = orb1(2); y1 = orb1(3); py1 = orb1(4); t1 = orb1(5); pt1 = orb1(6)
p1 = sqrt(pt1*pt1 + two*pt1/betas + one) ! delta + 1
bet1_sqr = (pt1*pt1 + two*pt1/betas + one) / (one/betas + pt1)**2;
dbet1_sqr_dpt = (two/betas+two*pt1)/(pt1+one/betas)**2-(two*((pt1*two)/betas+pt1**2+one))/(pt1+one/betas)**3;
denominator1 = 2*sqrt(((rfac1-two)*rfac1)/bet1_sqr+one);
Expand All @@ -630,11 +650,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac1_dpy*py1*rfac1)-(two*drfac1_dpy*py1))/(bet1_sqr*denominator1);
rw(4,6) = -(dbet1_sqr_dpt*py1*rfac1**2-two*dbet1_sqr_dpt*py1*rfac1) / &
(two*bet1_sqr**2*sqrt((rfac1**2-two*rfac1+bet1_sqr)/bet1_sqr));
rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
rw(6,6) = one-rfac1;
rw(6,1) = - drfac1_dx * p1**2
rw(6,3) = - drfac1_dy * p1**2
rw(6,6) = one - two * rfac1 * (one + pt1)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
!rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
!rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
!rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
!rw(6,6) = one-rfac1;

! RE = RW * RE * RW
RE = matmul(RW, matmul(RE,RW))
Expand Down Expand Up @@ -698,6 +722,8 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
x1 = orb1(1); px1 = orb1(2); y1 = orb1(3); py1 = orb1(4); t1 = orb1(5); pt1 = orb1(6)
x2 = orb2(1); px2 = orb2(2); y2 = orb2(3); py2 = orb2(4); t2 = orb2(5); pt2 = orb2(6)

p1 = sqrt(pt1*pt1 + two*pt1/betas + one)
p2 = sqrt(pt2*pt2 + two*pt2/betas + one)
bet1_sqr = (pt1*pt1 + two*pt1/betas + one) / (one/betas + pt1)**2;
bet2_sqr = (pt2*pt2 + two*pt2/betas + one) / (one/betas + pt2)**2;
dbet1_sqr_dpt = (two/betas+two*pt1)/(pt1+one/betas)**2-(two*((pt1*two)/betas+pt1**2+one))/(pt1+one/betas)**3;
Expand All @@ -721,12 +747,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac1_dpy*py1*rfac1)-(two*drfac1_dpy*py1))/(bet1_sqr*denominator1);
rw(4,6) = -(dbet1_sqr_dpt*py1*rfac1**2-two*dbet1_sqr_dpt*py1*rfac1) / &
(two*bet1_sqr**2*sqrt((rfac1**2-two*rfac1+bet1_sqr)/bet1_sqr));
rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
rw(6,6) = one-rfac1;

rw(6,1) = - drfac1_dx * p1**2
rw(6,3) = - drfac1_dy * p1**2
rw(6,6) = one - two * rfac1 * (one + pt1)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac1_dx*pt1-drfac1_dx/betas;
!rw(6,2) = -drfac1_dpx*pt1-drfac1_dpx/betas;
!rw(6,3) = -drfac1_dy*pt1-drfac1_dy/betas;
!rw(6,4) = -drfac1_dpy*pt1-drfac1_dpy/betas;
!rw(6,6) = one-rfac1;
RE = matmul(RE,RW)

RW = EYE
Expand All @@ -744,11 +773,15 @@ subroutine emdamp(code, deltap, em1, em2, orb1, orb2, re)
((two*drfac2_dpy*py2*rfac2)-(two*drfac2_dpy*py2))/(bet2_sqr*denominator2);
rw(4,6) = -(dbet2_sqr_dpt*py2*rfac2**2-two*dbet2_sqr_dpt*py2*rfac2) / &
(two*bet2_sqr**2*sqrt((rfac2**2-two*rfac2+bet2_sqr)/bet2_sqr));
rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
rw(6,6) = one-rfac2;
rw(6,1) = - drfac2_dx * p2**2
rw(6,3) = - drfac2_dy * p2**2
rw(6,6) = one - two * rfac2 * (one + pt2)
!! if the sixth variable was pt, the RW(6,:) equations would look like
!rw(6,1) = -drfac2_dx*pt2-drfac2_dx/betas;
!rw(6,2) = -drfac2_dpx*pt2-drfac2_dpx/betas;
!rw(6,3) = -drfac2_dy*pt2-drfac2_dy/betas;
!rw(6,4) = -drfac2_dpy*pt2-drfac2_dpy/betas;
!rw(6,6) = one-rfac2;
RE = matmul(RW,RE)

case (code_rfmultipole) !---- thin RF multipole
Expand Down
48 changes: 24 additions & 24 deletions tests/test-emit-2/test-emit-2.ref
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

++++++++++++++++++++++++++++++++++++++++++++
+ MAD-X 5.04.02 (64 bit, Darwin) +
+ MAD-X 5.05.01 (64 bit, Darwin) +
+ Support: mad@cern.ch, http://cern.ch/mad +
+ Release date: 2018.10.03 +
+ Execution date: 2019.04.30 13:19:03 +
+ Release date: 2019.06.07 +
+ Execution date: 2019.06.07 17:54:25 +
++++++++++++++++++++++++++++++++++++++++++++
Beam, SEQUENCE=Machine, PARTICLE=electron, energy=3, RADIATE=True;

Expand Down Expand Up @@ -120,10 +120,10 @@ enter EMIT module
py 0.15165232E-29 0.41245501E+01 0.29927911E-30
pt 0.26021594E-01 0.53905911E-29 0.13022468E+01

Damping partition numbers 1.49534453 1.00000032 0.50465608
Damping constants [1/s] 0.28263157E+03 0.18900772E+03 0.95383866E+02
Damping times [s] 0.35381751E-02 0.52907891E-02 0.10483953E-01
Emittances [pi micro m] 0.11259233E-02 0.27519820E-30 0.28530881E+01
Damping partition numbers 1.49533276 1.00000032 1.50467344
Damping constants [1/s] 0.28262935E+03 0.18900772E+03 0.28439481E+03
Damping times [s] 0.35382030E-02 0.52907891E-02 0.35162386E-02
Emittances [pi micro m] 0.11259322E-02 0.27519820E-30 0.95690415E+00

EMIT: beam parameters have been updated.

Expand All @@ -144,13 +144,13 @@ parameter: pc double value: 2.999999956
parameter: gamma double value: 5870.853595
parameter: beta double value: 0.9999999855
parameter: brho double value: 10.00692271
parameter: ex double value: 1.125923312e-09
parameter: exn double value: 6.610130826e-06
parameter: ex double value: 1.125932175e-09
parameter: exn double value: 6.610182862e-06
parameter: ey double value: 2.751981994e-37
parameter: eyn double value: 1.615648315e-33
parameter: et double value: 2.853088103e-06
parameter: sigt double value: 0.001481252466
parameter: sige double value: 0.001926106961
parameter: et double value: 9.569041543e-07
parameter: sigt double value: 0.0008578396932
parameter: sige double value: 0.001115467778
parameter: kbunch double value: 1
parameter: npart double value: 0
parameter: bcurrent double value: 0
Expand All @@ -163,7 +163,7 @@ parameter: u0 double value: 0.0002542024392
parameter: qs double value: 0.01229083024
parameter: arad double value: 2.817940323e-15
parameter: bv double value: 1
parameter: pdamp double array: 1.495345e+00 1.000000e+00 5.046561e-01
parameter: pdamp double array: 1.495333e+00 1.000000e+00 1.504673e+00
parameter: n1min double value: -1


Expand Down Expand Up @@ -268,7 +268,7 @@ enter EMIT module

M o d e 1 M o d e 2 M o d e 3
Fractional tunes undamped 0.54473120 0.09300237 0.01229083
damped 0.54473120 0.09300237 0.01229083
damped 0.54473120 0.09300237 0.01229082

beta* [m] x 0.11192592E+02 0.50132093E-29 0.19146961E-02
y 0.24489317E-29 0.59288110E+01 0.15434933E-31
Expand All @@ -286,10 +286,10 @@ enter EMIT module
py 0.35953802E-29 0.41248810E+01 0.29358016E-30
pt 0.26021781E-01 0.35925532E-29 0.13022468E+01

Damping partition numbers 1.29625405 1.00000041 0.70374674
Damping constants [1/s] 0.24500130E+03 0.18900724E+03 0.13301317E+03
Damping times [s] 0.40816110E-02 0.52908026E-02 0.75180523E-02
Emittances [pi micro m] 0.44844860E-02 0.59353367E-31 0.20459708E+01
Damping partition numbers 1.29624117 1.00000041 1.70376019
Damping constants [1/s] 0.24499886E+03 0.18900724E+03 0.32202288E+03
Damping times [s] 0.40816516E-02 0.52908026E-02 0.31053694E-02
Emittances [pi micro m] 0.44845305E-02 0.59353367E-31 0.84509855E+00

EMIT: beam parameters have been updated.

Expand All @@ -316,13 +316,13 @@ parameter: pc double value: 2.999999956
parameter: gamma double value: 5870.853595
parameter: beta double value: 0.9999999855
parameter: brho double value: 10.00692271
parameter: ex double value: 4.484485954e-09
parameter: exn double value: 2.63277601e-05
parameter: ex double value: 4.484530517e-09
parameter: exn double value: 2.632802173e-05
parameter: ey double value: 5.935336675e-38
parameter: eyn double value: 3.484549215e-34
parameter: et double value: 2.045970782e-06
parameter: sigt double value: 0.001254359952
parameter: sige double value: 0.001631069713
parameter: et double value: 8.450985528e-07
parameter: sigt double value: 0.0008061722208
parameter: sige double value: 0.001048278042
parameter: kbunch double value: 1
parameter: npart double value: 0
parameter: bcurrent double value: 0
Expand All @@ -335,7 +335,7 @@ parameter: u0 double value: 0.0002542017677
parameter: qs double value: 0.01229083026
parameter: arad double value: 2.817940323e-15
parameter: bv double value: 1
parameter: pdamp double array: 1.296254e+00 1.000000e+00 7.037467e-01
parameter: pdamp double array: 1.296241e+00 1.000000e+00 1.703760e+00
parameter: n1min double value: -1


Expand Down
14 changes: 7 additions & 7 deletions tests/test-emit-2/twiss1.ref
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
@ GAMMA %le 5870.853595
@ KBUNCH %le 1
@ BCURRENT %le 0
@ SIGE %le 0.001926106961
@ SIGT %le 0.001481252466
@ SIGE %le 0.001115467778
@ SIGT %le 0.0008578396932
@ NPART %le 0
@ EX %le 1.125923312e-09
@ EX %le 1.125932175e-09
@ EY %le 2.751981994e-37
@ ET %le 2.853088103e-06
@ ET %le 9.569041543e-07
@ BV_FLAG %le 1
@ LENGTH %le 67.200074
@ ALFA %le 0.0008829339349
Expand All @@ -41,9 +41,9 @@
@ SYNCH_4 %le 0
@ SYNCH_5 %le 0
@ TITLE %33s "ALBA-24 "
@ ORIGIN %17s "5.04.02 Darwin 64"
@ DATE %08s "30/04/19"
@ TIME %08s "13.19.03"
@ ORIGIN %17s "5.05.01 Darwin 64"
@ DATE %08s "07/06/19"
@ TIME %08s "17.55.44"
* NAME S BETX BETY
$ %s %le %le %le
"QD1" 4.215 14.01022277 8.121167274
Expand Down

0 comments on commit d0c75d5

Please sign in to comment.