diff --git a/.gitignore b/.gitignore index c5094ea8f..3ffc4aed5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,6 @@ jnq* *.o *.mod *.pro.user +*.txt cmake-build-debug cmake-build-release diff --git a/lib/iscat.f90 b/lib/iscat.f90 index c02a0fbe5..f412df0f4 100644 --- a/lib/iscat.f90 +++ b/lib/iscat.f90 @@ -55,8 +55,8 @@ subroutine iscat(cdat0,npts0,nh,npct,t2,pick,cfile6,minsync,ntol, & if(pick) t3=t2+t3 ! Compute symbol spectra and establish sync: - call synciscat(cdat,npts,nh,npct,s0,jsym,df,ntol,NFreeze, & - MouseDF,mousebutton,mode4,nafc,psavg,xsync,sig,ndf0,msglen, & + call synciscat(cdat,npts,nh,npct,s0,jsym,df,ntol, & + mousebutton,mode4,nafc,psavg,xsync,sig,ndf0,msglen, & ipk,jpk,idf,df1) nfdot=nint(idf*df1) diff --git a/lib/synciscat.f90 b/lib/synciscat.f90 index 5ce27acfe..747eeca64 100644 --- a/lib/synciscat.f90 +++ b/lib/synciscat.f90 @@ -1,5 +1,5 @@ -subroutine synciscat(cdat,npts,nh,npct,s0,jsym,df,ntol,NFreeze, & - MouseDF,mousebutton,mode4,nafc,psavg,xsync,sig,ndf0,msglen, & +subroutine synciscat(cdat,npts,nh,npct,s0,jsym,df,ntol, & + mousebutton,mode4,nafc,psavg,xsync,sig,ndf0,msglen, & ipk,jpk,idf,df1) ! Synchronize an ISCAT signal @@ -86,8 +86,8 @@ subroutine synciscat(cdat,npts,nh,npct,s0,jsym,df,ntol,NFreeze, & ttot=npts/fsample !Length of record (s) df1=df/ttot !Step size for f1=fdot - idf1=-25.0/df1 - idf2=5.0/df1 + idf1=int(-25.0/df1) + idf2=int(5.0/df1) if(nafc.eq.0) then idf1=0 idf2=0 diff --git a/robots/go b/robots/go deleted file mode 100755 index f7bf846fc..000000000 --- a/robots/go +++ /dev/null @@ -1,2 +0,0 @@ -curl https://pskreporter.info/cgi-bin/robot.pl > robo.dat -robo | sort -nr -k2 -k1 diff --git a/robots/robo.f90 b/robots/robo.f90 deleted file mode 100644 index 1f748378c..000000000 --- a/robots/robo.f90 +++ /dev/null @@ -1,48 +0,0 @@ -program robo - -! Examine spots from PSK Reporter for past week to identify probable robots - -! In a bash shell, from command line: -! $ curl https://pskreporter.info/cgi-bin/robot.pl > robo.dat -! $ robo | sort -nr -k2 - - parameter (NCHARS=20000) - parameter (NMAX=100) - - character*1 c - character*20000 blob - character*12 callsign(0:NMAX) - integer*1 ic1 - - open(10,file='/tmp/robo.dat',status='old',access='stream') - callsign=' ' - - do ichar=1,NCHARS - read(10,end=10) ic1 - ic=ic1 - if(ic.lt.0) ic=ic+256 - c=char(ic) - blob(ichar:ichar)=c - enddo -10 continue - - do icall=1,NMAX - i1=index(blob,'":{"median_minutes":')-1 - do i=i1,i1-10,-1 - if(i1.lt.1) go to 20 - if(blob(i:i).eq.'"') exit - enddo - i0=i+1 - callsign(icall)=blob(i0:i1) - i2=index(blob,',')-1 - read(blob(i1+21:i2),*) median_minutes - i3=index(blob,'median_hours')+14 - i4=index(blob,'}')-1 - read(blob(i3:i4),*) median_hours - write(*,3001) median_minutes,median_hours,trim(callsign(icall)) -3001 format(2i5,2x,a) - blob=blob(i4+3:) - enddo - -20 continue -end program robo