From a276a643bb90418b3fc512c80b5c7d277c166eb2 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Fri, 1 May 2020 17:23:21 -0400 Subject: [PATCH] Reorder nfqso reording after dedupe --- lib/js8/syncjs8.f90 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/js8/syncjs8.f90 b/lib/js8/syncjs8.f90 index ad2d76a..520f9ea 100644 --- a/lib/js8/syncjs8.f90 +++ b/lib/js8/syncjs8.f90 @@ -159,12 +159,7 @@ subroutine syncjs8(dd,icos,nfa,nfb,syncmin,nfqso,s,candidate,ncand,sbase) enddo ncand=k -! Put nfqso at top of list - do i=1,ncand - if(abs(candidate0(1,i)-nfqso).lt.10.0) candidate0(1,i)=-candidate0(1,i) - enddo - -! Save only the best of near-dupe freqs. + ! Save only the best of near-dupe freqs. do i=1,ncand if(i.ge.2) then do j=1,i-1 @@ -181,6 +176,12 @@ subroutine syncjs8(dd,icos,nfa,nfb,syncmin,nfqso,s,candidate,ncand,sbase) endif enddo + ! Put nfqso at top of list + do i=1,ncand + if(abs(candidate0(1,i)-nfqso).lt.10.0) candidate0(1,i)=-candidate0(1,i) + enddo + + fac=20.0/maxval(s) s=fac*s