From b4723d31862796fa202f9c7c5c7c4985bfd91f63 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 25 Feb 2021 18:43:44 -0500 Subject: [PATCH] Use Decode = Fast unless file 'ndepth.dat' is present in CWD. --- UnitTests.txt | 22 ++++++++++++++++------ lib/q65_decode.f90 | 5 ++++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/UnitTests.txt b/UnitTests.txt index aa07f459f..2c69d04ef 100644 --- a/UnitTests.txt +++ b/UnitTests.txt @@ -5,12 +5,17 @@ RxFreq: 1000/10 Commit No_AP MyCall BothCalls ----------------------------------------------- -767f53: 1 1 5 116 6 10 85 21 32 59 RC1 -767f53: 2 2 7 301 6 10 241 21 33 168 -767f53: 3 2 7 334 6 10 283 21 33 194 -94c315: 1 1 5 61 6 10 56 21 33 39 -94c315: 2 2 7 205 6 12 183 21 34 126 -94c315: 3 2 7 234 6 12 209 21 34 152 +767f53: 1 1 5 116 6 10 85 21 32 59 RC1 +767f53: 2 2 7 301 6 10 241 21 33 168 +767f53: 3 2 7 334 6 10 283 21 33 194 + +94c315: 1 1 5 61 6 10 56 21 33 39 +94c315: 2 2 7 205 6 12 183 21 34 126 +94c315: 3 2 7 234 6 12 209 21 34 152 + +7ad881: 1 2 7 69 6 12 61 21 33 46 +7ad881: 2 2 7 184 6 12 188 21 34 128 +7ad881: 3 2 7 244 6 12 216 21 34 148 Mode: Q65-30A Data: 30A_N0AN_6m_Ionoscatter (69 files, 6m ionoscatter) @@ -22,10 +27,15 @@ Commit No_AP MyCall BothCalls 767f53: 1 8 16 76 15 23 70 33 42 48 767f53: 2 10 16 225 15 24 217 34 44 134 767f53: 3 10 16 266 15 24 260 34 44 155 + 94c315: 1 8 16 45 16 23 43 33 42 32 94c315: 2 11 17 163 16 23 159 34 44 101 94c315: 3 11 17 241 16 23 184 34 44 117 +7ad881: 1 10 18 94 17 24 101 35 45 90 +7ad881: 2 12 18 259 17 24 279 35 45 244 +7ad881: 3 12 18 299 17 24 322 35 45 284 + Mode: Q65-60B Data: 60B_1296_Troposcatter (75 files) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 86a00aa16..2d45f1067 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -67,7 +67,7 @@ contains integer dat4(13) !Decoded message as 12 6-bit integers integer dgen(13) logical lclearave,lnewdat0,lapcqonly,unpk77_success - logical single_decode,lagain + logical single_decode,lagain,ex complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s @@ -112,6 +112,9 @@ contains baud=12000.0/nsps this%callback => callback nFadingModel=1 + + inquire(file='ndepth.dat',exist=ex) + if(.not.ex) ndepth=iand(ndepth,not(3)) + 1 !Treat any ndepth as "Fast" maxiters=67 ibwa=max(1,int(1.8*log(baud*mode_q65)) + 1) ibwb=min(10,ibwa+4)