revert matlab doc opts12 vs opts docsrc ordering since opts needs to come before opts.modeord

Author: ahbarnett

docs/matlabhelp.doc

@@ -19,7 +19,6 @@
      eps   relative precision requested (generally between 1e-15 and 1e-1)
      ms    number of Fourier modes computed, may be even or odd;
            in either case, mode range is integers lying in [-ms/2, (ms-1)/2]
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -31,6 +30,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
    Outputs:
      f     size-ms complex column vector of Fourier coefficients, or, if
            ntrans>1, a matrix of size (ms,ntrans).
@@ -65,7 +65,6 @@
            of ntrans columns is transformed with the same nonuniform targets.
      isign if >=0, uses + sign in exponential, otherwise - sign.
      eps   relative precision requested (generally between 1e-15 and 1e-1)
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -77,6 +76,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
   Outputs:
      c     complex column vector of nj answers at targets, or,
            if ntrans>1, matrix of size (nj,ntrans).
@@ -161,7 +161,6 @@
      eps   relative precision requested (generally between 1e-15 and 1e-1)
      ms,mt  number of Fourier modes requested in x & y; each may be even or odd.
             In either case the mode range is integers lying in [-m/2, (m-1)/2]
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -173,6 +172,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
    Outputs:
      f     size (ms,mt) complex matrix of Fourier coefficients
            (ordering given by opts.modeord in each dimension; ms fast, mt slow),
@@ -210,7 +210,6 @@
            matrices is transformed with the same nonuniform targets.
      isign if >=0, uses + sign in exponential, otherwise - sign.
      eps   relative precision requested (generally between 1e-15 and 1e-1)
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -222,6 +221,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
   Outputs:
      c     complex column vector of nj answers at targets, or,
            if ntrans>1, matrix of size (nj,ntrans).
@@ -309,7 +309,6 @@
      ms,mt,mu  number of Fourier modes requested in x,y and z; each may be
            even or odd.
            In either case the mode range is integers lying in [-m/2, (m-1)/2]
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -321,6 +320,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
    Outputs:
      f     size (ms,mt,mu) complex array of Fourier coefficients
            (ordering given by opts.modeord in each dimension; ms fastest, mu
@@ -360,7 +360,6 @@
            3D arrays is transformed with the same nonuniform targets.
      isign if >=0, uses + sign in exponential, otherwise - sign.
      eps   relative precision requested (generally between 1e-15 and 1e-1)
-     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
      opts   optional struct with optional fields controlling the following:
      opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
      opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -372,6 +371,7 @@
      opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
      opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
      opts.nthreads:   number of threads, or 0: use all available (default)
+     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
   Outputs:
      c     complex column vector of nj answers at targets, or,
            if ntrans>1, matrix of size (nj,ntrans).

matlab/finufft1d1.docsrc

@@ -16,8 +16,8 @@
 ISIGNEPS
 %     ms    number of Fourier modes computed, may be even or odd;
 %           in either case, mode range is integers lying in [-ms/2, (ms-1)/2]
-OPTS12
 OPTS
+OPTS12
 %   Outputs:
 %     f     size-ms complex column vector of Fourier coefficients, or, if
 %           ntrans>1, a matrix of size (ms,ntrans).

matlab/finufft1d1.m

@@ -17,7 +17,6 @@
 %     eps   relative precision requested (generally between 1e-15 and 1e-1)
 %     ms    number of Fourier modes computed, may be even or odd;
 %           in either case, mode range is integers lying in [-ms/2, (ms-1)/2]
-%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %     opts   optional struct with optional fields controlling the following:
 %     opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
 %     opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -29,6 +28,7 @@
 %     opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
 %     opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
 %     opts.nthreads:   number of threads, or 0: use all available (default)
+%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %   Outputs:
 %     f     size-ms complex column vector of Fourier coefficients, or, if
 %           ntrans>1, a matrix of size (ms,ntrans).

matlab/finufft1d2.docsrc

@@ -15,8 +15,8 @@
 %           (with mode ordering given by opts.modeord). If a matrix, each
 %           of ntrans columns is transformed with the same nonuniform targets.
 ISIGNEPS
-OPTS12
 OPTS
+OPTS12
 %  Outputs:
 %     c     complex column vector of nj answers at targets, or,
 %           if ntrans>1, matrix of size (nj,ntrans).

matlab/finufft1d2.m

@@ -16,7 +16,6 @@
 %           of ntrans columns is transformed with the same nonuniform targets.
 %     isign if >=0, uses + sign in exponential, otherwise - sign.
 %     eps   relative precision requested (generally between 1e-15 and 1e-1)
-%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %     opts   optional struct with optional fields controlling the following:
 %     opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
 %     opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -28,6 +27,7 @@
 %     opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
 %     opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
 %     opts.nthreads:   number of threads, or 0: use all available (default)
+%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %  Outputs:
 %     c     complex column vector of nj answers at targets, or,
 %           if ntrans>1, matrix of size (nj,ntrans).

matlab/finufft2d1.docsrc

@@ -20,8 +20,8 @@
 ISIGNEPS
 %     ms,mt  number of Fourier modes requested in x & y; each may be even or odd.
 %            In either case the mode range is integers lying in [-m/2, (m-1)/2]
-OPTS12
 OPTS
+OPTS12
 %   Outputs:
 %     f     size (ms,mt) complex matrix of Fourier coefficients
 %           (ordering given by opts.modeord in each dimension; ms fast, mt slow),

matlab/finufft2d1.m

@@ -21,7 +21,6 @@
 %     eps   relative precision requested (generally between 1e-15 and 1e-1)
 %     ms,mt  number of Fourier modes requested in x & y; each may be even or odd.
 %            In either case the mode range is integers lying in [-m/2, (m-1)/2]
-%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %     opts   optional struct with optional fields controlling the following:
 %     opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
 %     opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -33,6 +32,7 @@
 %     opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
 %     opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
 %     opts.nthreads:   number of threads, or 0: use all available (default)
+%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %   Outputs:
 %     f     size (ms,mt) complex matrix of Fourier coefficients
 %           (ordering given by opts.modeord in each dimension; ms fast, mt slow),

matlab/finufft2d2.docsrc

@@ -17,8 +17,8 @@
 %           If a 3D array, 3rd dimension sets ntrans, and each of ntrans
 %           matrices is transformed with the same nonuniform targets.
 ISIGNEPS
-OPTS12
 OPTS
+OPTS12
 %  Outputs:
 %     c     complex column vector of nj answers at targets, or,
 %           if ntrans>1, matrix of size (nj,ntrans).

matlab/finufft2d2.m

@@ -18,7 +18,6 @@
 %           matrices is transformed with the same nonuniform targets.
 %     isign if >=0, uses + sign in exponential, otherwise - sign.
 %     eps   relative precision requested (generally between 1e-15 and 1e-1)
-%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %     opts   optional struct with optional fields controlling the following:
 %     opts.debug:   0 (silent, default), 1 (timing breakdown), 2 (debug info).
 %     opts.spread_debug: spreader: 0 (no text, default), 1 (some), or 2 (lots)
@@ -30,6 +29,7 @@
 %     opts.spread_thread:   for ntrans>1 only. 0:auto, 1:seq multi, 2:par, etc
 %     opts.maxbatchsize:  for ntrans>1 only. max blocking size, or 0 for auto.
 %     opts.nthreads:   number of threads, or 0: use all available (default)
+%     opts.modeord: 0 (CMCL increasing mode ordering, default), 1 (FFT ordering)
 %  Outputs:
 %     c     complex column vector of nj answers at targets, or,
 %           if ntrans>1, matrix of size (nj,ntrans).

matlab/finufft3d1.docsrc

@@ -22,8 +22,8 @@ ISIGNEPS
 %     ms,mt,mu  number of Fourier modes requested in x,y and z; each may be
 %           even or odd.
 %           In either case the mode range is integers lying in [-m/2, (m-1)/2]
-OPTS12
 OPTS
+OPTS12
 %   Outputs:
 %     f     size (ms,mt,mu) complex array of Fourier coefficients
 %           (ordering given by opts.modeord in each dimension; ms fastest, mu