w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-06 07:07:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up wsprd_exp. Build WSJT-X with wsprd_exp, for testing.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8408 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2018-01-13 03:26:54 +00:00
parent 9832602632
commit f1aafe76c7
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -641,7 +641,7 @@ set (wsprsim_CSRCS
) )
set (wsprd_CSRCS set (wsprd_CSRCS
lib/wsprd/wsprd.c lib/wsprd/wsprd_exp.c
lib/wsprd/wsprsim_utils.c lib/wsprd/wsprsim_utils.c
lib/wsprd/wsprd_utils.c lib/wsprd/wsprd_utils.c
lib/wsprd/fano.c lib/wsprd/fano.c

24
lib/wsprd/wsprd_exp.c
View File

@ -694,7 +694,7 @@ void usage(void)
printf("\n"); printf("\n");
printf("Options:\n"); printf("Options:\n");
printf(" -a <path> path to writeable data files, default=\".\"\n"); printf(" -a <path> path to writeable data files, default=\".\"\n");
printf(" -b x (sequence estimator block size; 1,2,3)\n"); printf(" -B disable block demodulation - use single-symbol noncoherent demod\n");
printf(" -c write .c2 file at the end of the first pass\n"); printf(" -c write .c2 file at the end of the first pass\n");
printf(" -C maximum number of decoder cycles per bit, default 10000\n"); printf(" -C maximum number of decoder cycles per bit, default 10000\n");
printf(" -d deeper search. Slower, a few more decodes\n"); printf(" -d deeper search. Slower, a few more decodes\n");
@ -728,7 +728,7 @@ int main(int argc, char *argv[])
char uttime[5],date[7]; char uttime[5],date[7];
int c,delta,maxpts=65536,verbose=0,quickmode=0,more_candidates=0, stackdecoder=0; int c,delta,maxpts=65536,verbose=0,quickmode=0,more_candidates=0, stackdecoder=0;
int writenoise=0,usehashtable=1,wspr_type=2, ipass, nblocksize=1; int writenoise=0,usehashtable=1,wspr_type=2, ipass, nblocksize=1;
int writec2=0, npasses=2, subtraction=1; int writec2=0, npasses=2, subtraction=1, block_demod=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;
unsigned int nbits=81, stacksize=200000; unsigned int nbits=81, stacksize=200000;
unsigned int npoints, metric, cycles, maxnp; unsigned int npoints, metric, cycles, maxnp;
@ -788,17 +788,13 @@ int main(int argc, char *argv[])
idat=malloc(sizeof(float)*maxpts); idat=malloc(sizeof(float)*maxpts);
qdat=malloc(sizeof(float)*maxpts); qdat=malloc(sizeof(float)*maxpts);
while ( (c = getopt(argc, argv, "a:b:cC:de:f:HJmqstwvz:")) !=-1 ) { while ( (c = getopt(argc, argv, "a:BcC:de:f:HJmqstwvz:")) !=-1 ) {
switch (c) { switch (c) {
case 'a': case 'a':
data_dir = optarg; data_dir = optarg;
break; break;
case 'b': // not used at the moment - this is hardwired to 3 for 2nd pass case 'B':
nblocksize=(int) atoi(optarg); block_demod=0;
if( nblocksize < 1 || nblocksize > 3 ) {
usage();
return 1;
}
break; break;
case 'c': case 'c':
writec2=1; writec2=1;
@ -828,7 +824,7 @@ int main(int argc, char *argv[])
case 'q': //no shift jittering case 'q': //no shift jittering
quickmode = 1; quickmode = 1;
break; break;
case 's': //single pass mode (same as original wsprd) case 's': //single pass mode
subtraction = 0; subtraction = 0;
npasses = 1; npasses = 1;
break; break;
@ -964,7 +960,7 @@ int main(int argc, char *argv[])
minsync2=0.12; minsync2=0.12;
} }
if(ipass == 1 ) { if(ipass == 1 ) {
nblocksize=3; // try all blocksizes up to 3 if(block_demod == 1) nblocksize=3; // try all blocksizes up to 3
maxdrift=0; // no drift for smaller frequency estimator variance maxdrift=0; // no drift for smaller frequency estimator variance
minsync2=0.10; minsync2=0.10;
} }
@ -1247,7 +1243,7 @@ int main(int argc, char *argv[])
worth_a_try = 0; worth_a_try = 0;
} }
int idt, ii, jiggered_shift; int idt, ii, jittered_shift;
float y,sq,rms; float y,sq,rms;
not_decoded=1; not_decoded=1;
int ib=1, blocksize; int ib=1, blocksize;
@ -1258,12 +1254,12 @@ int main(int argc, char *argv[])
ii=(idt+1)/2; ii=(idt+1)/2;
if( idt%2 == 1 ) ii=-ii; if( idt%2 == 1 ) ii=-ii;
ii=iifac*ii; ii=iifac*ii;
jiggered_shift=shift1+ii; jittered_shift=shift1+ii;
// Use mode 2 to get soft-decision symbols // Use mode 2 to get soft-decision symbols
t0 = clock(); t0 = clock();
noncoherent_sequence_detection(idat, qdat, npoints, symbols, &f1, noncoherent_sequence_detection(idat, qdat, npoints, symbols, &f1,
&jiggered_shift, &drift1, symfac, &jittered_shift, &drift1, symfac,
&sync1, &blocksize); &sync1, &blocksize);
tsync2 += (float)(clock()-t0)/CLOCKS_PER_SEC; tsync2 += (float)(clock()-t0)/CLOCKS_PER_SEC;