RingCyclotronMatched: update test

RegressionTests/RingCyclotronMatched/RingCyclotronMatched.in

 OPTION, ECHO = FALSE;
 OPTION, PSDUMPFREQ  = 1;
 OPTION, SPTDUMPFREQ = 1;
+OPTION, STATDUMPFREQ = 1;
 OPTION, PSDUMPEACHTURN = FALSE;
 OPTION, REPARTFREQ = 20;
 OPTION, CZERO = FALSE;
 OPTION, TELL = TRUE;
+OPTION, PSDUMPFRAME=BUNCH_MEAN;
 Option, CLOTUNEONLY=FALSE;
 Option, VERSION=10900;
 
 Title,string="OPAL-cycl: test matched distribution PSI Ring";
 
-REAL Edes=.580;
+REAL Edes=0.200;
 REAL gamma=(Edes+PMASS)/PMASS;
 REAL beta=sqrt(1-(1/gamma^2));
 REAL gambet=gamma*beta;
@@ -25,18 +27,18 @@ REAL phi04=phi01;
 REAL phi05=phi01+180.0;
 REAL phi03=phi01+10.0;
 
-REAL volt1st=0.9;
-REAL volt3rd=0.9*4.0*0.112;
+REAL volt1st=0.0;
+REAL volt3rd=0.0;
 
-REAL turns = 0;
-REAL nstep = 0;
+REAL turns = 1;
+REAL nstep = 720;
 
 REAL frequency=50.650;
 REAL frequency3=3.0*frequency;
 
-ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=0.0, PRINIT=-0.000174, RINIT=2130.0,
-	SYMMETRY=8.0, RFFREQ=frequency,
-	FMAPFN="s03av.nar", FMLOWE=0.072, FMHIGHE=0.590;
+
+ring: Cyclotron, TYPE="RING", CYHARMON=6, PHIINIT=26.0, PRINIT=-0.01550354, RINIT=2042.86,
+        SYMMETRY=8.0, RFFREQ=frequency, FMAPFN="s03av.nar", FMLOWE=0.072, FMHIGHE=0.590;
 
 rf0: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
 	FREQ=frequency, RMIN = 1900.0, RMAX = 4500.0, ANGLE=35.0,  PDIS = 416.0,
@@ -60,20 +62,10 @@ rf4: RFCavity, VOLT=volt1st, FMAPFN="Cav1.dat", TYPE="SINGLEGAP",
 
 l1:   LINE = (ring,rf0,rf1,rf2,rf3,rf4);
 
+Dist1:DISTRIBUTION, TYPE=GAUSSMATCHED, LINE=l1, NSTEPS=nstep, SECTOR=FALSE, SCALABLE=TRUE,
+        RESIDUUM=1e-14, EX = 1.0e-06, EY = 1.0e-06, ET = 1.0e-06;
 
-Dist1:DISTRIBUTION, TYPE=GAUSSMATCHED, LINE=l1, NSTEPS=1440, SECTOR=FALSE,
-	EX = 1.0e-06,
-	EY = 1.0e-06,
-	ET = 1.0e-06;
-
-/*
-Dist1:DISTRIBUTION, TYPE=GAUSSMATCHED, LINE=l1, FMAPFN="ring_tc15_sector.dat",
-	EX = 1.0e-06,
-	EY = 1.0e-06,
-	ET = 1.0e-06;
-*/
-
-Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=16,
+Fs1:FIELDSOLVER, FSTYPE=FFT, MX=32, MY=32, MT=32,
 	PARFFTX=true, PARFFTY=true, PARFFTT=true,
 	BCFFTX=open, BCFFTY=open, BCFFTT=open;
 

RegressionTests/RingCyclotronMatched/reference/RingCyclotronMatched.lbal.md5

-db6c18c994176e2e65d93687c0652625  RingCyclotronMatched.lbal
+19b74e20380a079386cd73851391428c  RingCyclotronMatched.lbal

RegressionTests/RingCyclotronMatched/reference/RingCyclotronMatched.out.md5

-2b23e78faa7d5ca889e4907ffe0d6cdd  RingCyclotronMatched.out
+19f40983d10d87fdec9a2ef3ad20a34f  RingCyclotronMatched.out

RegressionTests/RingCyclotronMatched/reference/RingCyclotronMatched.stat.md5

-7e8c5feef5ed412f2784985fb7f05c06  RingCyclotronMatched.stat
+ea80569171c9ecf26f2af2a393b4bb64  RingCyclotronMatched.stat