w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-17 16:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add -d deep search option.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5669 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2015-07-03 15:05:09 +00:00
parent 13953fea98
commit 4303a955b7
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/wsprd/wsprd_exp.c
View File

@ -573,7 +573,7 @@ int main(int argc, char *argv[])
char wisdom_fname[200],all_fname[200],spots_fname[200]; char wisdom_fname[200],all_fname[200],spots_fname[200];
char timer_fname[200],hash_fname[200]; char timer_fname[200],hash_fname[200];
char uttime[5],date[7]; char uttime[5],date[7];
int c,delta,maxpts=65536,verbose=0,quickmode=0; int c,delta,maxpts=65536,verbose=0,quickmode=0,decode_all_bins=0;
int writenoise=0,usehashtable=1,wspr_type=2, ipass; int writenoise=0,usehashtable=1,wspr_type=2, ipass;
int writec2=0, npasses=2, subtraction=1; int writec2=0, npasses=2, subtraction=1;
int shift1, lagmin, lagmax, lagstep, ifmin, ifmax, worth_a_try, not_decoded; int shift1, lagmin, lagmax, lagstep, ifmin, ifmax, worth_a_try, not_decoded;
@ -632,7 +632,7 @@ int main(int argc, char *argv[])
idat=malloc(sizeof(double)*maxpts); idat=malloc(sizeof(double)*maxpts);
qdat=malloc(sizeof(double)*maxpts); qdat=malloc(sizeof(double)*maxpts);
while ( (c = getopt(argc, argv, "a:ce:f:Hmqstwvz:")) !=-1 ) { while ( (c = getopt(argc, argv, "a:cde:f:Hmqstwvz:")) !=-1 ) {
switch (c) { switch (c) {
case 'a': case 'a':
data_dir = optarg; data_dir = optarg;
@ -640,6 +640,9 @@ int main(int argc, char *argv[])
case 'c': case 'c':
writec2=1; writec2=1;
break; break;
case 'd':
decode_all_bins=1;
break;
case 'e': case 'e':
dialfreq_error = strtof(optarg,NULL); // units of Hz dialfreq_error = strtof(optarg,NULL); // units of Hz
// dialfreq_error = dial reading - actual, correct frequency // dialfreq_error = dial reading - actual, correct frequency
@ -858,18 +861,29 @@ int main(int argc, char *argv[])
} }
int npk=0; int npk=0;
for(j=1; j<410; j++) { unsigned char candidate;
if( if( decode_all_bins ) {
(smspec[j]>smspec[j-1]) && for(j=1; j<410; j=j+2) {
(smspec[j]>smspec[j+1]) && candidate = smspec[j]>min_snr && (npk<200);
(npk<200) if ( candidate ) {
) { freq0[npk]=(j-205)*df;
freq0[npk]=(j-205)*df; snr0[npk]=10*log10(smspec[j])-snr_scaling_factor;
snr0[npk]=10*log10(smspec[j])-snr_scaling_factor; npk++;
npk++; }
}
} else {
for(j=1; j<410; j++) {
candidate = (smspec[j]>smspec[j-1]) &&
(smspec[j]>smspec[j+1]) &&
(npk<200);
if ( candidate ) {
freq0[npk]=(j-205)*df;
snr0[npk]=10*log10(smspec[j])-snr_scaling_factor;
npk++;
}
} }
} }
// Compute corrected fmin, fmax, accounting for dial frequency error // Compute corrected fmin, fmax, accounting for dial frequency error
fmin += dialfreq_error; // dialfreq_error is in units of Hz fmin += dialfreq_error; // dialfreq_error is in units of Hz
fmax += dialfreq_error; fmax += dialfreq_error;