change map order to two on advice of Philippe (src/2702c2e9)

RegressionTests/MAP-FODO/FODO.in

@@ -29,17 +29,17 @@ D4:  DRIFT, 		L=.3, 				 ELEMEDGE=3.400, NSLICES=20;
 QUADTEST: LINE=( D1, QP1 , DG1, QP2, DG2, QP3, D3, D4);
 
 DIST: DISTRIBUTION, TYPE=GAUSS,
-SIGMAX=  0,   SIGMAPX= 1.0e06,  CORRX= 0.0,
-SIGMAY=  0,   SIGMAPY= 1.0e06,  CORRY= 0.0,
-OFFSETZ     =  0.005,        SIGMAT= 0.0005, 
-SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, 
-INPUTMOUNITS=EV,WRITETOFILE= TRUE;
+SIGMAX  =  0,     SIGMAPX = 1.0e06,  CORRX = 0.0,
+SIGMAY  =  0,     SIGMAPY = 1.0e06,  CORRY = 0.0,
+OFFSETZ =  0.005, SIGMAT  = 0.0005,
+SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0,
+INPUTMOUNITS=EV, WRITETOFILE= TRUE;
 
 DIST1: DISTRIBUTION, TYPE = FROMFILE, FNAME="data/FODO_DIST.dat"; //FNAME="PartDatabase.dat";
 
-FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64, 
+FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64,
                  PARFFTX=true, PARFFTY=true, PARFFTT=true,
-                 BCFFTX=open, BCFFTY=open, BCFFTT=open, 
+                 BCFFTX=open, BCFFTY=open, BCFFTT=open,
                  BBOXINCR=1, GREENSF=STANDARD;
 
 BEAM1: BEAM, PARTICLE=PROTON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=1;
@@ -47,7 +47,7 @@ BEAM1: BEAM, PARTICLE=PROTON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CHAR
 SELECT, LINE=QUADTEST;
 
 
-TRACK, LINE= QUADTEST, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.0, MAP_ORDER=8;
+TRACK, LINE= QUADTEST, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.0, MAP_ORDER=2;
 
 RUN, METHOD = "THICK", BEAM=BEAM1, FIELDSOLVER=FS1, DISTRIBUTION=DIST1;
 

RegressionTests/MAP-FODODipole/FODODipole.in

@@ -26,13 +26,13 @@ Sb1:  SBEND, 		K0= -2.3287040424894165, L=0.9798157487421315, ELEMEDGE=.7,
         //0.99968272, 
         FMAPFN="HardEdge.t7",
         DESIGNENERGY=Edes*1e3, GAP=75*2/1000, NSLICES=20;
-D2:  DRIFT, 		L=.5, 				   ELEMEDGE=1.7, NSLICES=5 ;     
+D2:  DRIFT, 		L=.5, 				   ELEMEDGE=1.7, NSLICES=5 ;
 Qd: QUADRUPOLE, 	L=0.2, 	K1= 11.040970109549919, ELEMEDGE=2.2, NSLICES=10;
-D3:  DRIFT, 		L=.5, 				   ELEMEDGE=2.4, NSLICES=20 ; 
+D3:  DRIFT, 		L=.5, 				   ELEMEDGE=2.4, NSLICES=20 ;
 Sb2:  SBEND, 		K0= -2.3287040424894165, L=0.9798157487421315, ELEMEDGE=2.9,
         FMAPFN="HardEdge.t7",
         DESIGNENERGY=Edes*1e3, GAP=75*2/1000, NSLICES=20;
-D4:  DRIFT, 		L=.5, 				   ELEMEDGE=3.9, NSLICES=5 ; 
+D4:  DRIFT, 		L=.5, 				   ELEMEDGE=3.9, NSLICES=5 ;
 //beamline = [Qf, D, Sb, D, Qd, D, Sb, D]
 FODOCELL: LINE=(Qf, D1,Sb1, D2, Qd, D3, Sb2, D4);
 
@@ -47,9 +47,9 @@ SIGMAPT= 0.0, CORRT= 0.0, R61= 0.0, INPUTMOUNITS=EV, WRITETOFILE=TRUE;
 DIST: DISTRIBUTION, TYPE = FROMFILE, FNAME= "data/bunch.dat"; // "bunch_x.dat";
 
 
-FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64, 
+FS1:FIELDSOLVER, FSTYPE=NONE, MX=64, MY=64, MT=64,
                  PARFFTX=true, PARFFTY=true, PARFFTT=true,
-                 BCFFTX=open, BCFFTY=open, BCFFTT=open, 
+                 BCFFTX=open, BCFFTY=open, BCFFTT=open,
                  BBOXINCR=1, GREENSF=STANDARD;
 
 BEAM1: BEAM, PARTICLE=ELECTRON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CHARGE=-1;
@@ -57,7 +57,7 @@ BEAM1: BEAM, PARTICLE=ELECTRON, PC=P0, NPART=200, BCURRENT=2.0e-03, BFREQ=rf, CH
 SELECT, LINE=FODOCELL;
 
 
-TRACK, LINE= FODOCELL, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.4, MAP_ORDER=8;
+TRACK, LINE= FODOCELL, BEAM=BEAM1, MAXSTEPS=10000, DT=1.0e-10, ZSTOP=4.4, MAP_ORDER=2;
 
 RUN, METHOD = "THICK", BEAM=BEAM1, FIELDSOLVER=FS1, DISTRIBUTION=DIST;