Remove nt2; use nhsym>=279 instead.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@998 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

gcom2.f90

@@ -50,7 +50,6 @@ integer ndebug         !Write debugging info?                   GUI
 integer ndphi          !Set to 1 to compute dphi             GUI,Decoder
 integer nhispol        !Pol angle matching HisCall or HisGrid Decoder
 integer nt1            !Time to start FFTs                      GUI
-integer nt2            !Time to start quick decode              GUI
 integer nblank         !Is NB checked?                          GUI
 integer nfmid          !Center frequency of main display        GUI
 integer nfrange        !Frequency range of main display         GUI
@@ -109,7 +108,7 @@ common/gcom2/fcenter,ps0(431),psavg(450),s2(64,3100),ccf(-5:540),           &
      ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5,     &
      dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb,                  &
      nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep,       &
-     nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1,nt2,                        &
+     nmode,mode65,nbpp,ndebug,ndphi,nhispol,nt1,                            &
      nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain,     &
      shok,sendingsh,d2a(661500),d2b(661500),b(60000),jza,jzb,ntime,         &
      idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow,    &

map65.py

@@ -1310,11 +1310,6 @@ def update():
         Audio.gcom2.nt1=options.nt1.get()
     except:
         Audio.gcom2.nt1=48
-    try:
-        Audio.gcom2.nt2=options.nt2.get()
-    except:
-        Audio.gcom2.nt2=52
-
     t=options.savedir.get() + \
         '                                        ' + \
         '                                        '
@@ -1811,7 +1806,6 @@ try:
         elif key == 'fcal': options.fcal.set(value)
         elif key == 'CSmin': options.ncsmin.set(value)
         elif key == 'Nt1': options.nt1.set(value)
-        elif key == 'Nt2': options.nt2.set(value)
         elif key == 'dphi': options.dphi.set(value)
         elif key == 'SaveDir': options.savedir.set(value)
         elif key == 'AzElDir': options.azeldir.set(value)        
@@ -1908,7 +1902,6 @@ f.write("fb " + str(options.fb.get()) + "\n")
 f.write("fcal " + str(options.fcal.get()) + "\n")
 f.write("CSmin " + str(options.ncsmin.get()) + "\n")
 f.write("Nt1 " + str(options.nt1.get()) + "\n")
-f.write("Nt2 " + str(options.nt2.get()) + "\n")
 f.write("SaveDir " + str(options.savedir.get()) + "\n")
 f.write("AzElDir " + str(options.azeldir.get()) + "\n")
 f.write("TxFirst " + str(TxFirst.get()) + "\n")

options.py

@@ -48,7 +48,6 @@ fb=IntVar()
 fcal=IntVar()
 ncsmin=IntVar()
 nt1=IntVar()
-nt2=IntVar()
 savedir=StringVar()
 azeldir=StringVar()
 
@@ -109,15 +108,13 @@ min_callsign_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
     label_text='CSmin:',entry_width=9,value=4,entry_textvariable=ncsmin)
 nt1_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
     label_text='Rx t1:',entry_width=9,value=48,entry_textvariable=nt1)
-nt2_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
-    label_text='Rx t2:',entry_width=9,value=52,entry_textvariable=nt2)
 savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:',
     entry_width=23,value=g.appdir+'\save',entry_textvariable=savedir)
 azeldir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='AzElDir:',
     entry_width=23,value=g.appdir,entry_textvariable=azeldir)
 widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \
            fa_entry,fb_entry,fcal_entry,min_callsign_entry, \
-           nt1_entry,nt2_entry,savedir_entry,azeldir_entry,)
+           nt1_entry,savedir_entry,azeldir_entry,)
 for widget in widgets:
     widget.pack(padx=2,pady=2)
 Pmw.alignlabels(widgets)

recvpkt.F90

@@ -117,8 +117,9 @@ subroutine recvpkt(iarg)
            ndone1=1
         endif
 
-! See if it's time to start second stage of processing
+! See if it's time to start the full decoding procedure.
-        if(ndone1.eq.1 .and. ns.ge.nt2 .and.ndone2.eq.0) then
+        nhsym=(k-(kbuf-1)*60*96000)/17832.9252
+        if(ndone1.eq.1 .and. nhsym.ge.279 .and.ndone2.eq.0) then
            kk=k
            nlost=lost_tot                         ! Save stats for printout
            ndone2=1