mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 13:30:52 -05:00 
			
		
		
		
	Merge branch 'superfox' of bitbucket.org:k1jt/wsjtx into superfox
This commit is contained in:
		
						commit
						f1e4f998ce
					
				@ -164,11 +164,12 @@ program sfoxtest
 | 
				
			|||||||
        endif
 | 
					        endif
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        crcvd=0.
 | 
					        crcvd=0.
 | 
				
			||||||
        crcvd(1:NMAX)=cshift(sig*cdat(1:NMAX),-nint(xdt*fsample)) + cnoise
 | 
					        crcvd(1:NMAX)=cshift(cdat(1:NMAX),-nint(xdt*fsample))
 | 
				
			||||||
        call timer('watterso',0)
 | 
					        call timer('watterso',0)
 | 
				
			||||||
        if(fspread.ne.0 .or. delay.ne.0) call watterson(crcvd,NMAX,NZ,fsample,&
 | 
					        if(fspread.ne.0 .or. delay.ne.0) call watterson(crcvd,NMAX,NZ,fsample,&
 | 
				
			||||||
             delay,fspread)
 | 
					             delay,fspread)
 | 
				
			||||||
        call timer('watterso',1)
 | 
					        call timer('watterso',1)
 | 
				
			||||||
 | 
					        crcvd=sig*crcvd+cnoise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        dat=aimag(sigr*cdat(1:NMAX)) + xnoise     !Add generated AWGN noise
 | 
					        dat=aimag(sigr*cdat(1:NMAX)) + xnoise     !Add generated AWGN noise
 | 
				
			||||||
        fac=32767.0
 | 
					        fac=32767.0
 | 
				
			||||||
@ -242,7 +243,7 @@ program sfoxtest
 | 
				
			|||||||
     rmsf=sqrt(sqf/ngoodsync)
 | 
					     rmsf=sqrt(sqf/ngoodsync)
 | 
				
			||||||
     ebno=snr-10*log10(baud/2500*mm0*KK/NN)
 | 
					     ebno=snr-10*log10(baud/2500*mm0*KK/NN)
 | 
				
			||||||
     write(*,1310) snr,ebno,nfiles,fgoodsync,fgood,ave_harderr,nworst,rmsf,rmst
 | 
					     write(*,1310) snr,ebno,nfiles,fgoodsync,fgood,ave_harderr,nworst,rmsf,rmst
 | 
				
			||||||
1310 format(f7.2,f7.2 i6,2f7.3,f7.1,i6,f7.2,f6.3)
 | 
					1310 format(f7.2,f7.2 i6,2f7.4,f7.1,i6,f7.2,f6.3)
 | 
				
			||||||
     if(fgood.le.0.5 .and. fgood0.gt.0.5) then
 | 
					     if(fgood.le.0.5 .and. fgood0.gt.0.5) then
 | 
				
			||||||
        threshold=isnr + 1 - (fgood0-0.50)/(fgood0-fgood+0.000001)
 | 
					        threshold=isnr + 1 - (fgood0-0.50)/(fgood0-fgood+0.000001)
 | 
				
			||||||
     endif
 | 
					     endif
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user