diff --git a/q65w/libq65/ftninit.f90 b/q65w/libq65/ftninit.f90 index 2741d662c..c55249866 100644 --- a/q65w/libq65/ftninit.f90 +++ b/q65w/libq65/ftninit.f90 @@ -27,9 +27,6 @@ subroutine ftninit ! Import FFTW wisdom, if available wisfile=trim(appd)//'/m65_wisdom.dat'// C_NULL_CHAR iret=fftwf_import_wisdom_from_filename(wisfile) + return - -950 write(0,*) '!Error opening ALL65.TXT' - stop - end subroutine ftninit diff --git a/q65w/libq65/symspec.f90 b/q65w/libq65/symspec.f90 index ecd4068ab..00de817ef 100644 --- a/q65w/libq65/symspec.f90 +++ b/q65w/libq65/symspec.f90 @@ -1,15 +1,11 @@ -subroutine symspec(k,ndiskdat,nb,nbslider,idphi,nfsample, & - fgreen,gainx,gainy,phasex,phasey,rejectx,rejecty, & - pxdb,pydb,ssz5a,nkhz,ihsym,nzap,slimit,lstrong) +subroutine symspec(k,ndiskdat,nb,nbslider,nfsample, & + pxdb,ssz5a,nkhz,ihsym,nzap,slimit,lstrong) ! k pointer to the most recent new data ! ndiskdat 0/1 to indicate if data from disk ! nb 0/1 status of noise blanker -! idphi Phase correction for Y channel, degrees ! nfsample sample rate (Hz) -! fgreen Frequency of green marker in I/Q calibrate mode (-48.0 to +48.0 kHz) ! pxdb power in x channel (0-60 dB) -! pydb power in y channel (0-60 dB) ! ssz5a polarized spectrum, for waterfall display ! nkhz integer kHz portion of center frequency, e.g., 125 for 144.125 ! ihsym index number of this half-symbol (1-322) @@ -23,8 +19,6 @@ subroutine symspec(k,ndiskdat,nb,nbslider,idphi,nfsample, & common/datcom/dd(4,5760000),ss(322,NFFT),savg(NFFT),fcenter,nutc, & junk(NJUNK) real*4 ssz5a(NFFT),w(NFFT),w2a(NFFT),w2b(NFFT) - complex z - complex zsumx,zsumy complex cx(NFFT) complex cx00(NFFT) complex cx0(0:1023),cx1(0:1023) @@ -69,7 +63,6 @@ subroutine symspec(k,ndiskdat,nb,nbslider,idphi,nfsample, & peaklimit=sigmas*max(10.0,rms) faclim=3.0 px=0. - py=0. nwindow=2 nfft2=1024 @@ -82,8 +75,8 @@ subroutine symspec(k,ndiskdat,nb,nbslider,idphi,nfsample, & cx0(i)=cmplx(dd(1,j+i),dd(2,j+i)) enddo call timf2(k,nfft2,nwindow,nb,peaklimit, & - faclim,cx0,gainx,gainy,phasex,phasey,cx1,slimit,lstrong, & - px,py,nzap) + faclim,cx0,cx1,slimit,lstrong, & + px,nzap) do i=0,kstep-1 dd(1,j+i)=real(cx1(i)) @@ -111,15 +104,11 @@ subroutine symspec(k,ndiskdat,nb,nbslider,idphi,nfsample, & nsum=nblks*kstep - nzap if(nsum.le.0) nsum=1 rmsx=sqrt(0.5*px/nsum) - rmsy=sqrt(0.5*py/nsum) rms=rmsx endif pxdb=0. - pydb=0. if(rmsx.gt.1.0) pxdb=20.0*log10(rmsx) - if(rmsy.gt.1.0) pydb=20.0*log10(rmsy) if(pxdb.gt.60.0) pxdb=60.0 - if(pydb.gt.60.0) pydb=60.0 cx00=cx diff --git a/q65w/libq65/timf2.f90 b/q65w/libq65/timf2.f90 index 681e1dc24..c22f3ce05 100644 --- a/q65w/libq65/timf2.f90 +++ b/q65w/libq65/timf2.f90 @@ -1,5 +1,5 @@ subroutine timf2(k,nfft,nwindow,nb,peaklimit,faclim, & - cx0,gainx,gainy,phasex,phasey,cx1,slimit,lstrong,px,py,nzap) + cx0,cx1,slimit,lstrong,px,nzap) ! Sequential processing of time-domain I/Q data, using Linrad-like ! "first FFT" and "first backward FFT". @@ -7,8 +7,6 @@ subroutine timf2(k,nfft,nwindow,nb,peaklimit,faclim, & ! cx0 - complex input data ! nfft - length of FFTs ! nwindow - 0 for no window, 2 for sin^2 window -! gainx,y - gain error in Q channel, relative to I -! phasex,y - phase error ! cx1 - output data ! Non-windowed processing means no overlap, so kstep=nfft. @@ -29,7 +27,6 @@ subroutine timf2(k,nfft,nwindow,nb,peaklimit,faclim, & real*4 s(0:MAXFFT-1) logical*1 lstrong(0:MAXFFT-1),lprev integer ia(MAXSIGS),ib(MAXSIGS) - complex h,u,v logical first data first/.true./ data k0/99999999/ diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index d2e4f55a4..2856dae6f 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -325,13 +325,10 @@ void MainWindow::dataSink(int k) static int nfsample=96000; static int nsec0=0; static int nsum=0; - static float fgreen; static int ndiskdat; static int nb; - static float px=0.0,py=0.0; + static float px=0.0; static uchar lstrong[1024]; - static float rejectx; - static float rejecty; static float slimit; static double xsum=0.0; @@ -347,10 +344,8 @@ void MainWindow::dataSink(int k) if(m_NB) nb=1; nfsample=96000; if(!m_fs96000) nfsample=95238; - fgreen=m_wide_graph_window->fGreen(); - symspec_(&k, &ndiskdat, &nb, &m_NBslider, &m_dPhi, &nfsample, &fgreen, - &m_gainx, &m_gainy, &m_phasex, &m_phasey, &rejectx, &rejecty, - &px, &py, s, &nkhz, &ihsym, &nzap, &slimit, lstrong); + symspec_(&k, &ndiskdat, &nb, &m_NBslider, &nfsample, + &px, s, &nkhz, &ihsym, &nzap, &slimit, lstrong); int nsec=QDateTime::currentSecsSinceEpoch(); if(nsec==nsec0) { diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index 8eb557063..eb924ed07 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -205,11 +205,8 @@ extern int killbyname(const char* progName); extern "C" { //----------------------------------------------------- C and Fortran routines - void symspec_(int* k, int* ndiskdat, int* nb, - int* m_NBslider, int* idphi, int* nfsample, float* fgreen, - float* gainx, float* gainy, - float* phasex, float* phasey, float* rejectx, float* rejecty, - float* px, float* py, float s[], int* nkhz, int* nhsym, + void symspec_(int* k, int* ndiskdat, int* nb, int* m_NBslider, int* nfsample, + float* px, float s[], int* nkhz, int* nhsym, int* nzap, float* slimit, uchar lstrong[]); void astrosub00_ (int* nyear, int* month, int* nday, double* uth, int* nfreq,