diff --git a/lib/Makefile.jt65_osx b/lib/Makefile.jt65_osx index 9316b5fc9..2d4e56c2e 100644 --- a/lib/Makefile.jt65_osx +++ b/lib/Makefile.jt65_osx @@ -35,7 +35,7 @@ OBJS1 = astrosub.o astro0.o astro.o sun.o coord.o tmoonsub.o \ symspec.o analytic.o db.o \ encode232.o interleave9.o\ entail.o fano232.o gran.o sync9.o decjt9.o \ - fil3.o decoder.o timer.o \ + fil3.o decoder.o timer.o exp_decode65.o fqso_first.o\ twkfreq.o symspec2.o shell.o sync65.o peakup.o slope.o xcor.o\ fillcom.o chkss2.o zplot9.o flat1.o flat2.o \ jt65a.o symspec65.o flat65.o ccf65.o decode65a.o \ diff --git a/lib/jt65.f90 b/lib/jt65.f90 index b480d58e0..3f0658371 100644 --- a/lib/jt65.f90 +++ b/lib/jt65.f90 @@ -13,7 +13,8 @@ logical :: display_help=.false.,err character(len=500) optarg common/tracer/limtrace,lu equivalence (lenfile,ihdr(2)) - type (option) :: long_options(4) = [ & + type (option) :: long_options(5) = [ & + option ('freq',.true.,'n','default=1270',''), & option ('help',.false.,'h','Display this help message',''), & option ('ntrials',.true.,'n','default=1000',''), & option ('robust sync',.false.,'n','default: disabled',''), & @@ -21,7 +22,7 @@ logical :: display_help=.false.,err limtrace=0 lu=12 -ntol=50 +ntol=10 nfqso=1270 nagain=0 nsubmode=0 @@ -32,11 +33,13 @@ n2pass=2 nrobust=0 do - call getopt('hn:rs',long_options,c,optarg,narglen,nstat,noffset,nremain,err) + call getopt('f:hn:rs',long_options,c,optarg,narglen,nstat,noffset,nremain,err) if( nstat .ne. 0 ) then exit end if select case (c) + case ('f') + read (optarg(:narglen), *) nfqso case ('h') display_help = .true. case ('n') @@ -44,15 +47,15 @@ nrobust=0 case ('r') nrobust=1 case ('s') - nlow=1250 - nhigh=1290 + nlow=nfqso-ntol + nhigh=nfqso+ntol n2pass=1 end select end do nargs=iargc() if(display_help .or. (nargs.lt.1)) then - print*,'Usage: jt65 [-n ntrials] [-s] file1 [file2 ...]' + print*,'Usage: jt65 [-f freq] [-n ntrials] [-s] file1 [file2 ...]' print*,' -r robust sync' print*,' -s single-signal mode' go to 999